Merge pull request #3081 in DESIGN/design from final/10.0 to persist/10.0

* commit 'e6b01e023d85322fcff4d0fe1e0c95b9433ea52f':
  REPORT-45095 表单控件设置提交事件，添加字段后编辑字段，事件弹框消失
  REPORT-44714 【10.0.12冒烟】设计器缓存文件记录设计器设置失效 【问题原因】需要在中间版本发布，提一份到final 【改动思路】改动已经在release中通过，提一份到final
  CHART-17340 补充富文本国际化翻译
  CHART-17340 富文本颜色组件增加国际化

designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -45,6 +45,7 @@ public class UIResizableContainer extends JPanel {
     private boolean isLeftRightDragEnabled = true;
     private boolean isDownPaneVisible = true ;
     private int paraHeight;
+    private int parentHeight = -1;
 
     public UIResizableContainer(int direction) {
         this(new JPanel(), new JPanel(), direction);
@@ -207,7 +208,8 @@ public class UIResizableContainer extends JPanel {
             if (verticalToolPane == null || downPane == null) {
                 return;
             }
-
+            // REPORT-42913 如果用户修改了分辨率或者dpi，可能造成toolPaneY大于parent.getHeight，整个downPane将丢失，因此这里调整下toolPaneY
+            adjustToolPaneY(parent);
             if (direction == Constants.RIGHT) {
                 if(isDownPaneVisible){
                     upPane.setBounds(0, 0, containerWidth - toolPaneHeight, toolPaneY);
@@ -236,6 +238,18 @@ public class UIResizableContainer extends JPanel {
             }
         }
 
+        private void adjustToolPaneY(Container parent) {
+            if (parentHeight == -1) {
+                // 初始化下parentheight，存一下当前的父容器height
+                parentHeight = parent.getHeight();
+            }
+            if (parentHeight != parent.getHeight() && (parent.getHeight() - toolPaneHeight) >= 0) {
+                // 调整toolPaneY，保证至少水平的拖拽条horizontToolPane不丢失
+                toolPaneY = Math.min(toolPaneY, parent.getHeight() - toolPaneHeight);
+                parentHeight = parent.getHeight();
+            }
+        }
+
         @Override
         public void addLayoutComponent(String name, Component comp) {
         }
@@ -540,4 +554,4 @@ public class UIResizableContainer extends JPanel {
         jf.setSize(500, 500);
         jf.setVisible(true);
     }
-}
+}

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/write/submit/SmartInsertDBManipulationPane.java

@@ -456,7 +456,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                 newAdd.clear();
                 for (int i = 0; i < cs; i++) {
                     for (int j = 0; j < rs; j++) {
-                        TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j );
+                        TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
                         if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
                             String value = cellElement.toString();
                             if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
@@ -512,7 +512,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
         private SmartJTablePaneAction a = new AbstractSmartJTablePaneAction(this, SmartInsertDBManipulationPane.this) {
             @Override
             public void doOk() {
-                ((KeyColumnTableModel)keyColumnValuesTable.getModel()).refreshNameValueList((KeyColumnTableModel)model);
+                ((KeyColumnTableModel) keyColumnValuesTable.getModel()).refreshNameValueList((KeyColumnTableModel) model);
             }
 
             @Override