REPORT-14268 10.0 设计器日文国际化问题协助修改

designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java

@@ -9,6 +9,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerBean;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.design.utils.gui.UIComponentUtils;
 
 
 import javax.swing.*;
@@ -16,6 +17,7 @@ import java.awt.*;
 
 public class VerticalChoosePane extends ChoosePane implements DesignerBean {
     private static final int RIGHTBORDER = 5;
+    private static final int MAX_WIDTH = 60;
 
     public VerticalChoosePane(Previewable previewable) {
         this(previewable, -1);
@@ -41,7 +43,7 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean {
         UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"), UILabel.LEFT);
         UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), UILabel.LEFT);
         UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), UILabel.LEFT);
-
+        UIComponentUtils.setLineWrap(l3, MAX_WIDTH);
         if (labelSize > 0) {
             Dimension pSize = new Dimension(labelSize, 20);
             l1.setPreferredSize(pSize);

designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -496,8 +496,8 @@ public abstract class ToolBarMenuDock {
         if (WorkContext.getCurrent().isLocal()) {
             shortCuts.add(new SoftwareUpdateAction());
         }
-
-        if (AlphaFineConfigManager.isALPHALicAvailable()) {
+        // 日文不显示AlphaFine
+        if (AlphaFineConfigManager.isALPHALicAvailable() && !GeneralContext.getLocale().equals(Locale.JAPAN)) {
             shortCuts.add(new AlphaFineAction());
         }
         shortCuts.add(SeparatorDef.DEFAULT);