Merge pull request #14465 in DESIGN/design from final/11.0 to release/11.0

* commit '845e5c7ef9894ab8cebcb1fb61859d7696456bdc':
  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, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Latest_JAR")), loadingLabel),
+                new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, jarVersionLabel, jarCurrentLabel), jarRestoreLabel},
+                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) {