Merge pull request #7735 in DESIGN/design from release/11.0 to feature/x

* commit '9f7a314a8f38f5e706031e52c4caa938d44f22d5':
  REPORT-63660 修正不合理的国际化命名
  REPORT-66011 还原
  REPORT-65920 【11.0】mac电脑设计器全屏，tab-移动端-样式模板，下拉框偶发性的会出现在下面一个层级
  REPORT-66011 设计器显示的文字错了
  REPORT-66011 设计器显示的文字错了

designer-base/src/main/java/com/fr/design/style/AbstractPopBox.java

@@ -10,8 +10,6 @@ import javax.swing.JWindow;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.util.ArrayList;
-import java.util.List;
 import java.awt.AWTEvent;
 import java.awt.Dimension;
 import java.awt.Point;
@@ -21,6 +19,8 @@ import java.awt.Window;
 import java.awt.event.AWTEventListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author kunsnat E-mail:kunsnat@gmail.com

designer-base/src/main/java/com/fr/design/utils/LoadingUtils.java

@@ -21,7 +21,7 @@ public class LoadingUtils {
     public static JPanel createLoadingPane() {
         JPanel jPanel = new JPanel();
         UILabel loadingLabel = new UILabel(LOADING_ICON);
-        UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading"));
+        UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Loading"));
         tipLabel.setForeground(TIP_COLOR);
         jPanel.setLayout(new LayoutManager() {
             @Override

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -44,7 +44,6 @@ import com.fr.report.cell.cellattr.core.group.DSColumn;
 import com.fr.report.cell.cellattr.core.group.FilterTypeEnum;
 import com.fr.report.cell.cellattr.core.group.SelectCount;
 import com.fr.stable.StringUtils;
-import com.fr.third.jodd.util.ArraysUtil;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
@@ -622,7 +621,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                         //显示set和tip
                         setCardPane.setPreferredSize(new Dimension(156, 20));
                         TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP);
-                        tipCardPane.setPreferredSize(new Dimension(224, 40));
+                        tipCardPane.setPreferredSize(new Dimension(224, 50));
                         TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER);
                     } else {
                         //未定义
@@ -746,7 +745,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                                     //显示set和tip
                                     setCardPane.setPreferredSize(new Dimension(156, 20));
                                     TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 2, VGAP);
-                                    tipCardPane.setPreferredSize(new Dimension(224, 40));
+                                    tipCardPane.setPreferredSize(new Dimension(224, 50));
                                     TableLayoutHelper.modifyTableLayoutIndexVGap(contentPane, 4, VGAP_INNER);
                                     break;
                                 case EVEN: