Merge pull request #6173 in DESIGN/design from final/10.0 to release/10.0

* commit 'b5d01817053d6398a321638229465c323dbf4d16':
  REPORT-60561 全局自适应-样式细节优化
  REPORT-60516 10.0release设计器打开cpt很慢
  REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全

designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java

@@ -41,6 +41,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
     public JPanel attrJPanel;
     public FitPreviewPane previewJPanel;
     public FitAttrModel fitAttrModel;
+    private static final int BELOW_SET_COMPONENT_HSPACE = 8;
 
 
     protected BaseFitAttrPane() {
@@ -179,7 +180,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
 
     @Override
     protected String title4PopupWindow() {
-        return i18nText("Fine-Designer_PC_Element_Case_Fit_Attr");
+        return i18nText("Fine-Designer_PC_Fit_Attr");
     }
 
     protected abstract String[] getItemNames();
@@ -202,7 +203,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
         itemChoose.addItemListener(itemListener);
         UILabel belowSetLabel = new UILabel(i18nText("Fine-Design_Report_Blow_Set"));
         JPanel buttonPane = GUICoreUtils.createFlowPane(new Component[]{
-                belowSetLabel, itemChoose}, FlowLayout.LEFT, 0, 0);
+                belowSetLabel, itemChoose}, FlowLayout.LEFT, BELOW_SET_COMPONENT_HSPACE);
         chooseJPanel.add(buttonPane);
         chooseJPanel.setPreferredSize(new Dimension(500, 50));
         JPanel jPanel = new JPanel();

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -34,22 +34,6 @@ public class ReportFitAttrAction extends JTemplateAction {
             return null;
         }
     };
-    private static final MenuKeySet REPORT_FIT_ATTR_ELEMENTCASE = new MenuKeySet() {
-        @Override
-        public char getMnemonic() {
-            return 'T';
-        }
-
-        @Override
-        public String getMenuName() {
-            return Toolkit.i18nText("Fine-Designer_PC_Element_Case_Fit_Attr");
-        }
-
-        @Override
-        public KeyStroke getKeyStroke() {
-            return null;
-        }
-    };
 
     public ReportFitAttrAction(JTemplate jTemplate) {
         super(jTemplate);
@@ -57,12 +41,7 @@ public class ReportFitAttrAction extends JTemplateAction {
     }
 
     private void initMenuStyle() {
-        JTemplate jTemplate = getEditingComponent();
+        this.setMenuKeySet(REPORT_FIT_ATTR);
-        if (jTemplate.isJWorkBook()) {
-            this.setMenuKeySet(REPORT_FIT_ATTR);
-        } else {
-            this.setMenuKeySet(REPORT_FIT_ATTR_ELEMENTCASE);
-        }
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon("/com/fr/design/images/reportfit/fit");

designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java

@@ -53,7 +53,6 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
 
     @Override
     protected T doInBackground() throws Exception {
-        TimeUnit.SECONDS.sleep(5);
         return this.callable.call();
     }