Merge pull request #8966 in DESIGN/design from bugfix/11.0 to feature/x

* commit '585eec3b225c378091df580fbe1ba5a4ccb467e1':
  REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对
  REPORT-71719 改下顺序
  REPORT-71719 改一下位置，调整下国际化

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

@@ -70,16 +70,16 @@ public class SslPane extends BasicPane {
         JPanel filePanelCa = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathCa, fileChooserButtonCa}}, new double[]{p}, new double[]{f, 20}, 0);
         Component[] compCa = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Ca") + ":", SwingConstants.RIGHT), filePanelCa};
         Component[] compVerifyCa = {null, verifyCa};
-        JPanel filePanelClientCert = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathClientCert, fileChooserButtonClientCert}}, new double[]{p}, new double[]{f, 20}, 0);
-        Component[] compClientCert = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Cert") + ":", SwingConstants.RIGHT), filePanelClientCert};
         JPanel filePanelClientKey = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathClientKey, fileChooserButtonClientKey}}, new double[]{p}, new double[]{f, 20}, 0);
         Component[] compClientKey = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Key") + ":", SwingConstants.RIGHT), filePanelClientKey};
+        JPanel filePanelClientCert = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{{keyPathClientCert, fileChooserButtonClientCert}}, new double[]{p}, new double[]{f, 20}, 0);
+        Component[] compClientCert = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Client_Cert") + ":", SwingConstants.RIGHT), filePanelClientCert};
 //        Component[] comCipher = {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Ssl_Cipher") + ":", SwingConstants.RIGHT), cipher};
         usingComps = new Component[][]{
                 compCa,
                 compVerifyCa,
-                compClientCert,
                 compClientKey,
+                compClientCert
 //                comCipher
         };
         usingSsl.setSelected(true);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.alphafine;
 
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.alphafine.search.manager.impl.ProductNewsSearchManager;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 import java.util.Set;
 
@@ -13,10 +14,15 @@ import java.util.Set;
 public class AlphaFineUtil {
 
     public static String highLightModelName(String modelName, String[] strings) {
-        if (strings == null) {
+        if (strings == null || ArrayUtils.isEmpty(strings)) {
             return modelName;
         }
         for (String string : strings) {
+            // 高亮分词 跳过高亮颜色本身的字符
+            boolean skipHighLight = modelName.contains(AlphaFineConstants.HIGH_LIGHT_COLOR) && AlphaFineConstants.HIGH_LIGHT_COLOR.contains(string);
+            if (skipHighLight) {
+                continue;
+            }
             String primaryStr = getReplacedString(modelName, string);
             if (StringUtils.isNotEmpty(primaryStr)) {
                 modelName = modelName.replaceAll("(?i)" + primaryStr, "|<font color=" + AlphaFineConstants.HIGH_LIGHT_COLOR + ">" + primaryStr + "</font>|");