Merge pull request #11709 in DESIGN/design from bugfix/11.0 to feature/x

* commit '562569786970b19741e00d6137b064d6765b748d':
  REPORT-91610 数据脱敏-设计器内en下面板文案显示不全 【问题原因】en、ja、ko下面板文案显示不全 【改动思路】与产品沟通后，调大这几个语言下弹窗的宽度 【review建议】
  REPORT-91657 设计器单元格属性-其他面板文本显示截断 【问题原因】不同语言显示长度不同 【改动思路】选项面板水平布局修改为垂直布局

designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java

@@ -12,6 +12,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itableeditorpane.UITableEditAction;
 import com.fr.design.gui.itableeditorpane.UITableEditorPane;
 import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.stable.StringUtils;
 import com.fr.stable.collections.CollectionUtils;
@@ -25,6 +26,7 @@ import javax.swing.table.TableCellRenderer;
 import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -177,6 +179,15 @@ public class DesensitizationRuleChoosePane extends JPanel {
                             .collect(Collectors.toSet());
         }
 
+        /**
+         * 根据语言环境获取规则编辑页面的宽高
+         *
+         * @return
+         */
+        private Dimension getRuleEditPaneDimensionByLocale() {
+            return DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane");
+        }
+
         /**
          * 规则状态展示页面
          */
@@ -256,7 +267,7 @@ public class DesensitizationRuleChoosePane extends JPanel {
                     public void doCancel() {
                         super.doCancel();
                     }
-                }, BasicDialog.DEFAULT);
+                }, getRuleEditPaneDimensionByLocale());
                 basicDialog.setVisible(true);
             }
         }
@@ -301,7 +312,7 @@ public class DesensitizationRuleChoosePane extends JPanel {
                     public void doCancel() {
                         super.doCancel();
                     }
-                }, BasicDialog.DEFAULT);
+                }, getRuleEditPaneDimensionByLocale());
                 basicDialog.setVisible(true);
             }
         }

designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@@ -24,3 +24,4 @@ com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
 com.fr.design.report.WatermarkSettingPane=720*600
 com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65
+com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@@ -23,3 +23,4 @@ com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
 com.fr.design.report.WatermarkSettingPane=720*600
 com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65
+com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -23,3 +23,4 @@ com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
 com.fr.design.report.WatermarkSettingPane=720*600
 com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65
+com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -48,7 +48,6 @@ import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.FlowLayout;
 import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.event.ItemEvent;
@@ -169,7 +168,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
 
         groupsPane = new CellDesensitizationGroupsPane(this);
 
-        JPanel contentPane = FRGUIPaneFactory.createVerticalFlowLayout_F_Pane(true, VerticalFlowLayout.TOP, 0, 0, true);
+        JPanel contentPane = FRGUIPaneFactory.createVerticalFlowLayout_F_Pane(true, VerticalFlowLayout.TOP, 0, 10, true);
         contentPane.add(scopePane);
         contentPane.add(hyperlink);
         contentPane.add(groupsPane);
@@ -195,10 +194,10 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
         }
 
         JPanel head = new JPanel();
-        head.setLayout(new FlowLayout(FlowLayout.LEFT));
+        head.setLayout(new BorderLayout());
-        head.add(scopeLabel);
+        head.add(scopeLabel, BorderLayout.NORTH);
-        head.add(exportButton);
+        head.add(exportButton, BorderLayout.CENTER);
-        head.add(previewAndExportButton);
+        head.add(previewAndExportButton, BorderLayout.SOUTH);
         return head;
     }