From 4d72891715cb1083904987b729f8a48ebcea3bfd Mon Sep 17 00:00:00 2001 From: Lanlan Date: Wed, 9 Dec 2020 17:37:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?REPORT-44988=20.FineReport100=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E6=9C=89=E5=BE=88=E5=A4=9A=E6=AE=8B=E7=95=99=E7=9A=84?= =?UTF-8?q?=E5=9F=8B=E7=82=B9=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messagecollect/impl/AbstractSendDataToCloud.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java index 77f370d9d0..21a46c2b5f 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java @@ -126,9 +126,9 @@ public abstract class AbstractSendDataToCloud implements XMLable { } } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); - return; + } finally { + fileEntityBuilder.deleteFileAndZipFile(file, pathName); } - fileEntityBuilder.deleteFileAndZipFile(file, pathName); } From 3635104837bebc08d2ef6483ae19ab70d08e044c Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Wed, 9 Dec 2020 18:24:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?CHART-17315=20=E6=A0=87=E7=AD=BE=E8=BE=B9?= =?UTF-8?q?=E6=A1=86=E8=83=8C=E6=99=AF=E9=9D=A2=E6=9D=BF=E5=9C=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=90=8E=E5=A2=9E=E5=8A=A0check?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/van/chart/column/VanChartColumnPlotLabelDetailPane.java | 1 + .../chart/designer/style/label/VanChartPlotLabelDetailPane.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelDetailPane.java index b2b287087e..7d8cad96d4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotLabelDetailPane.java @@ -73,5 +73,6 @@ public class VanChartColumnPlotLabelDetailPane extends VanChartPlotLabelDetailPa public void update(AttrLabelDetail detail) { super.update(detail); checkOrientationEnable(detail); + checkOrientation(); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java index 3047e608ff..5a8af100d4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java @@ -334,7 +334,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { checkPositionEnabled(); } - private void checkOrientation() { + protected void checkOrientation() { if (orientation != null && borderPaneWithTitle != null && backgroundPaneWithTitle != null) { boolean horizontal = orientation.getSelectedIndex() == HORIZONTAL_INDEX; From 7062ebb60864a99b031747d2e282cd0ce98b74db Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Wed, 9 Dec 2020 19:46:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?CHART-17340=20=E5=AF=8C=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/editor/script/i18n.js | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js b/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js index 95b4585c94..35acc1ffaa 100644 --- a/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js +++ b/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js @@ -16,7 +16,10 @@ "BI-Basic_Font_Color": "文字颜色", "BI-Word_Align_Left": "文字居左", "BI-Word_Align_Center": "文字居中", - "BI-Word_Align_Right": "文字居右" + "BI-Word_Align_Right": "文字居右", + "BI-Basic_Cancel": "取消", + "BI-Basic_Save": "保存", + "BI-Basic_More": "更多" }; var taiwan = { @@ -35,7 +38,10 @@ "BI-Basic_Font_Color": "文字顏色", "BI-Word_Align_Left": "文字居左", "BI-Word_Align_Center": "文字居中", - "BI-Word_Align_Right": "文字居右" + "BI-Word_Align_Right": "文字居右", + "BI-Basic_Cancel": "取消", + "BI-Basic_Save": "保存", + "BI-Basic_More": "更多" }; var english = { @@ -54,7 +60,10 @@ "BI-Basic_Font_Color": "Font Color", "BI-Word_Align_Left": "Align Left", "BI-Word_Align_Center": "Align Center", - "BI-Word_Align_Right": "Align Right" + "BI-Word_Align_Right": "Align Right", + "BI-Basic_Cancel": "Cancel", + "BI-Basic_Save": "Save", + "BI-Basic_More": "More" }; var japanese = { @@ -73,7 +82,10 @@ "BI-Basic_Font_Color": "テキストの色", "BI-Word_Align_Left": "左のテキスト", "BI-Word_Align_Center": "テキスト中心", - "BI-Word_Align_Right": "右のテキスト" + "BI-Word_Align_Right": "右のテキスト", + "BI-Basic_Cancel": "キャンセル", + "BI-Basic_Save": "セーブ", + "BI-Basic_More": "もっと" }; var korean = { @@ -92,7 +104,10 @@ "BI-Basic_Font_Color": "텍스트 색상", "BI-Word_Align_Left": "왼쪽 텍스트", "BI-Word_Align_Center": "텍스트 중심", - "BI-Word_Align_Right": "오른쪽 텍스트" + "BI-Word_Align_Right": "오른쪽 텍스트", + "BI-Basic_Cancel": "취소", + "BI-Basic_Save": "저장", + "BI-Basic_More": "더" }; function transformI18n(language) { From a90b445d79b8ed8769608dfdd83769ae4653e915 Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Thu, 10 Dec 2020 11:25:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?CHART-17340=20=E8=A1=A5=E5=85=85=E5=AF=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=9B=BD=E9=99=85=E5=8C=96=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/editor/script/i18n.js | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js b/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js index 35acc1ffaa..205117f3cd 100644 --- a/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js +++ b/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js @@ -19,7 +19,9 @@ "BI-Word_Align_Right": "文字居右", "BI-Basic_Cancel": "取消", "BI-Basic_Save": "保存", - "BI-Basic_More": "更多" + "BI-Basic_More": "更多", + "BI-Custom_Color": "自定义颜色", + "BI-Transparent_Color": "透明" }; var taiwan = { @@ -41,7 +43,9 @@ "BI-Word_Align_Right": "文字居右", "BI-Basic_Cancel": "取消", "BI-Basic_Save": "保存", - "BI-Basic_More": "更多" + "BI-Basic_More": "更多", + "BI-Custom_Color": "自定義顏色", + "BI-Transparent_Color": "透明" }; var english = { @@ -63,7 +67,9 @@ "BI-Word_Align_Right": "Align Right", "BI-Basic_Cancel": "Cancel", "BI-Basic_Save": "Save", - "BI-Basic_More": "More" + "BI-Basic_More": "More", + "BI-Custom_Color": "Custom Color", + "BI-Transparent_Color": "Transparent Color" }; var japanese = { @@ -85,7 +91,9 @@ "BI-Word_Align_Right": "右のテキスト", "BI-Basic_Cancel": "キャンセル", "BI-Basic_Save": "セーブ", - "BI-Basic_More": "もっと" + "BI-Basic_More": "もっと", + "BI-Custom_Color": "カスタムカラー", + "BI-Transparent_Color": "トランスペアレント" }; var korean = { @@ -107,7 +115,9 @@ "BI-Word_Align_Right": "오른쪽 텍스트", "BI-Basic_Cancel": "취소", "BI-Basic_Save": "저장", - "BI-Basic_More": "더" + "BI-Basic_More": "더", + "BI-Custom_Color": "맞춤 색상", + "BI-Transparent_Color": "투명한" }; function transformI18n(language) {