Merge remote-tracking branch 'origin/release/10.0' into release/10.0

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();
     }
 }

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;
 

designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js

@@ -16,7 +16,12 @@
         "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": "更多",
+        "BI-Custom_Color": "自定义颜色",
+        "BI-Transparent_Color": "透明"
     };
 
     var taiwan = {
@@ -35,7 +40,12 @@
         "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": "更多",
+        "BI-Custom_Color": "自定義顏色",
+        "BI-Transparent_Color": "透明"
     };
 
     var english = {
@@ -54,7 +64,12 @@
         "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",
+        "BI-Custom_Color": "Custom Color",
+        "BI-Transparent_Color": "Transparent Color"
     };
 
     var japanese = {
@@ -73,7 +88,12 @@
         "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": "もっと",
+        "BI-Custom_Color": "カスタムカラー",
+        "BI-Transparent_Color": "トランスペアレント"
     };
 
     var korean = {
@@ -92,7 +112,12 @@
         "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": "더",
+        "BI-Custom_Color": "맞춤 색상",
+        "BI-Transparent_Color": "투명한"
     };
 
     function transformI18n(language) {

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);
     }