From d94391653a4ebe6d363c964a6bff52766b53fdf4 Mon Sep 17 00:00:00 2001 From: xiqiu Date: Tue, 17 May 2022 09:51:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-71719=20=E6=94=B9=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=8B=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/data/datapane/connect/SslPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java index c440079911..16c25131cb 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java @@ -70,10 +70,10 @@ 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, From 689509bd63b52262c2e665ba1253e267f8f209cb Mon Sep 17 00:00:00 2001 From: xiqiu Date: Tue, 17 May 2022 09:56:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-71719=20=E6=94=B9=E4=B8=8B=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/data/datapane/connect/SslPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java index 16c25131cb..8789a39a18 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/SslPane.java @@ -78,8 +78,8 @@ public class SslPane extends BasicPane { usingComps = new Component[][]{ compCa, compVerifyCa, - compClientCert, compClientKey, + compClientCert // comCipher }; usingSsl.setSelected(true); From 1c991536968257b5e1e79169c93348ed6d3e6a8f Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 17 May 2022 14:06:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-70681=20=E6=90=9C=E7=B4=A2=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=20=E9=AB=98?= =?UTF-8?q?=E4=BA=AE=E5=B1=95=E7=A4=BA=E6=97=B6=20=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/alphafine/AlphaFineUtil.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java index 814bc3530d..5648ab98d6 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java +++ b/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, "|" + primaryStr + "|");