Merge pull request #14711 in DESIGN/design from final/11.0 to persist/11.0

* commit '967684f2d2eb23507492862703db99909d50bae0':
  REPORT-117444 fix:模板主题管理2个相同的key，重复去掉一个
  REPORT-119602 fix:韩语设计器鼠标失焦，选不到数据脱敏
  REPORT-129230 fix:设计器更新升级中显示不全且无tooltips
  REPORT-125641 fix:设计器显示问题-英语显示不全

designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java

@@ -73,7 +73,7 @@ public class UpdateMainDialog extends UIDialog {
     private static final int UPDATE_PANE_ROW_SIZE = 30;
     private static final int UPDATE_CONTENT_PANE_ROW_SIZE = 10;
     private static final int UPDATE_CONTENT_PANE_COLUMN_SIZE = 10;
-    private static final int UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE = 100;
+    private static final int UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE = 115;
     private static final int SEARCH_PANE_ROW_SIZE = 50;
     private static final int SEARCH_PANE_TEXT_COLUMN = 130;
     private static final int SEARCH_PANE_COLUMN_GAP = 3;
@@ -187,12 +187,15 @@ public class UpdateMainDialog extends UIDialog {
         JPanel jarUpdateContentPane = new JPanel();
         jarUpdateContentPane.setLayout(new BorderLayout());
         jarUpdateContentPane.setBorder(BorderFactory.createLineBorder(new Color(UPDATE_CONTENT_PANE_BORDER_COLOR)));
-
+        UILabel jarVersionLabel = new UILabel(Toolkit.i18nText("Fine-Design_Updater_JAR_Version"));
+        UILabel latestJarLabel = new UILabel(Toolkit.i18nText("Fine-Design_Updater_Latest_JAR"));
+        jarVersionLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Updater_JAR_Version"));
+        latestJarLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Updater_Latest_JAR"));
         JPanel jarUpdateContentPane2 = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{
                 new Component[]{new UILabel(), new UILabel(), new UILabel()},
                 new Component[]{new UILabel(), updateVersionReminderPane, new UILabel()},
-                new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_JAR_Version")), jarCurrentLabel), jarRestoreLabel},
+                new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, jarVersionLabel, jarCurrentLabel), jarRestoreLabel},
-                new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Latest_JAR")), loadingLabel),
+                new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, latestJarLabel, loadingLabel),
                         getNewFeatureActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Latest_Feature_Detail"))},
                 new Component[]{new UILabel(), new UILabel(), new UILabel()}
         }, rowUpdateSubContentPaneSize, columnUpdateSubContentPaneSize, LayoutConstants.VGAP_LARGE);

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -198,9 +198,13 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
             checkBoxUpdatePane.setPreferredSize(new Dimension(120, 20));
             controlBtnPane.add(checkBoxUpdatePane);
 
-            UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_NotChange_Unmodified"));
+            String updateCheckBoxName = Toolkit.i18nText("Fine-Design_Basic_RWA_NotChange_Unmodified");
+            UpdateCheckBox = new UICheckBox(updateCheckBoxName);
+            UpdateCheckBox.setToolTipText(updateCheckBoxName);
+            UpdateCheckBox.setPreferredSize(new Dimension(100, 20));
             UIButton helpButton = new UIButton(HEIP_ICON);
             helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"));
+            helpButton.setPreferredSize(new Dimension(20, 20));
             helpButton.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {

designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java

@@ -63,7 +63,7 @@ public class DesktopWidgetStyleEditPane<T extends TemplateTheme> extends WidgetS
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Radius")), borderRadiusSpinner},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Icon_Color")), iconColorSelectBox},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Text_Style")), fontNameSelectBox},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Text_Style")), WidgetStyleComponentCombiner.combineTextStyleComponent(fontSizePane, fontColorButton, italic, bold)},
+                new Component[]{new UILabel(), WidgetStyleComponentCombiner.combineTextStyleComponent(fontSizePane, fontColorButton, italic, bold)},
                 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Background_Select_Box")), selectBackgroundColorBox}
         };
     }

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/model/DesensitizationCellPane.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.cell.settingpane.desensitization.model;
 
-import com.fr.base.operator.org.OrganizationOperator;
 import com.fr.data.desensitize.rule.DesensitizationRuleManager;
 import com.fr.data.desensitize.rule.base.DesensitizationRule;
 import com.fr.data.desensitize.rule.base.DesensitizationRuleSource;
@@ -10,27 +9,19 @@ import com.fr.design.data.datapane.preview.desensitization.view.rule.Desensitiza
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.event.UIObserverListener;
-import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombocheckbox.UIComboCheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.layout.VerticalFlowLayout;
-import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.JTemplateActionListener;
 import com.fr.report.cell.desensitization.CellDesensitizationBean;
 import com.fr.stable.StringUtils;
 import com.fr.third.org.apache.commons.collections4.map.HashedMap;
-import com.fr.workspace.WorkContext;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -43,7 +34,10 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
+
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 
 /**
  * 单元格脱敏规则设置面板
@@ -78,12 +72,10 @@ public class DesensitizationCellPane extends BasicBeanPane {
     }
 
     private void initComponent() {
-        editPanel = new JPanel();
+        editPanel = new JPanel(new BorderLayout());
-        editPanel.setLayout(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0, true));
 
         label = new UILabel();
         label.setEnabled(false);
-        editPanel.add(label);
 
         ruleButton = new UIButton(APOSTROPHE);
 
@@ -102,25 +94,25 @@ public class DesensitizationCellPane extends BasicBeanPane {
         emptyTextField.setEnabled(false);
         emptyTextField.setOpaque(false);
 
-        editPanel.add(initTableCellPanel());
+        editPanel.add(
+                column(
+                        row(cell(label)),
+                        cell(initTableCellPanel()).weight(2)
+                ).weight(1).getComponent()
+        );
+
     }
 
 
     /**
      * 初始化单元格中的panel
      */
-    private JPanel initTableCellPanel() {
+    private Component initTableCellPanel() {
-        double f = TableLayout.FILL;
+
-        double p = TableLayout.PREFERRED;
+        return column(
-
+                row(cell(ruleButton).weight(1), cell(ruleTextField).weight(4)),
-        double[] rowSize = new double[]{f, f};
+                row(cell(emptyTextField).weight(1), cell(rolesComboBox).weight(4))
-        double[] columnSize = new double[]{p, f};
+        ).getComponent();
-
-        Component[][] components = new Component[][]{
-                new Component[]{ruleButton, ruleTextField},
-                new Component[]{emptyTextField, rolesComboBox}
-        };
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 0);
     }
 
     private void addListener() {