From 1c991536968257b5e1e79169c93348ed6d3e6a8f Mon Sep 17 00:00:00 2001 From: hades Date: Tue, 17 May 2022 14:06:00 +0800 Subject: [PATCH 1/4] =?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 814bc3530..5648ab98d 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 + "|"); From 4d89583adba4b6f0effeebaf065b91dab04f28f6 Mon Sep 17 00:00:00 2001 From: hades Date: Wed, 18 May 2022 20:29:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-71790=20=E3=80=90win11=E9=80=82?= =?UTF-8?q?=E9=85=8D=E3=80=91FR11=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E9=94=99npe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/start/module/DesignerStartup.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java index 4149753f7..917de56f0 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java @@ -158,26 +158,26 @@ public class DesignerStartup extends Activator { private void registerDaoSelector() { // 注入设计器db cache 是否可用 - DesignerWorkspaceInfo info = WorkspaceUtils.getWorkspaceInfo(); - if (info.getType() == DesignerWorkspaceType.Remote) { - DaoSelectorFactory.registerDaoSelector(() -> false); - } else { - String webInfPath = WorkspaceUtils.getWorkspaceInfo().getPath(); - String dbConfigPath = StableUtils.pathJoin(webInfPath, ProjectConstants.CONFIG_DIRECTORY, - EncryptionConstants.PROPERTY_NAME); - String entityPath = generatePath(webInfPath, PropertiesConstants.ENTITY_PROP); - String xmlEntityPath = generatePath(webInfPath, PropertiesConstants.XML_ENTITY_PROP); - String classNamePath = generatePath(webInfPath, PropertiesConstants.CLASS_NAME_PROP); - // 校验 平台迁移文件/缓存文件 - boolean existPropCache = new File(entityPath).exists() && new File(xmlEntityPath).exists() && new File(classNamePath).exists(); - DaoSelectorFactory.registerDaoSelector(() -> DesignerEnvManager.getEnvManager().isPropertiesUsable() - && OptimizeUtil.isOpen() - && existPropCache - // demo启动时 前后目录可能会不一致 造成读取缓存失败 - && !startupArgsValue.getValue().isDemo() - && !new File(dbConfigPath).exists()); - - } + DaoSelectorFactory.registerDaoSelector(() -> false); +// DesignerWorkspaceInfo info = WorkspaceUtils.getWorkspaceInfo(); +// if (info.getType() == DesignerWorkspaceType.Remote) { +// } else { +// String webInfPath = WorkspaceUtils.getWorkspaceInfo().getPath(); +// String dbConfigPath = StableUtils.pathJoin(webInfPath, ProjectConstants.CONFIG_DIRECTORY, +// EncryptionConstants.PROPERTY_NAME); +// String entityPath = generatePath(webInfPath, PropertiesConstants.ENTITY_PROP); +// String xmlEntityPath = generatePath(webInfPath, PropertiesConstants.XML_ENTITY_PROP); +// String classNamePath = generatePath(webInfPath, PropertiesConstants.CLASS_NAME_PROP); +// // 校验 平台迁移文件/缓存文件 +// boolean existPropCache = new File(entityPath).exists() && new File(xmlEntityPath).exists() && new File(classNamePath).exists(); +// DaoSelectorFactory.registerDaoSelector(() -> DesignerEnvManager.getEnvManager().isPropertiesUsable() +// && OptimizeUtil.isOpen() +// && existPropCache +// // demo启动时 前后目录可能会不一致 造成读取缓存失败 +// && !startupArgsValue.getValue().isDemo() +// && !new File(dbConfigPath).exists()); +// +// } } private String generatePath(String webInfPath, String name) { From b394d8ccafe551aaba62bb2a9f4623ef822954f4 Mon Sep 17 00:00:00 2001 From: hades Date: Wed, 18 May 2022 21:04:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-71790=20=E9=85=8D=E7=BD=AE=E4=B9=9F?= =?UTF-8?q?=E7=BD=AE=E4=B8=BAfalse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 7761038b7..3694c6f83 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -2220,7 +2220,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { writer.attr("layoutTemplateStyle", this.getLayoutTemplateStyle()); writer.attr("showServerDatasetAuthTip", this.isShowServerDatasetAuthTip()); writer.attr("useOptimizedUPM4Adapter", this.isUseOptimizedUPM4Adapter()); - writer.attr("propertiesUsable", this.isPropertiesUsable()); + writer.attr("propertiesUsable", false); writer.end(); } From 3d0099687eeb8f907a1a3ba6aba4f31bfa6e62bd Mon Sep 17 00:00:00 2001 From: pengda Date: Thu, 19 May 2022 14:35:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-71925=20=E6=9D=A1=E4=BB=B6=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E6=B1=87=E6=80=BB=E5=AD=97=E6=AE=B5=E5=80=BC-?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7=E7=BB=93=E6=9E=9C=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/series/SeriesCondition/ChartConditionPane.java | 5 +---- .../SeriesCondition/ColSelectedWithSummaryMethodEditor.java | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java index 4085c7f10..73ee26234 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java @@ -81,10 +81,7 @@ public class ChartConditionPane extends LiteConditionPane { return this; } }); - Editor[] editors = ValueEditorPaneFactory.allEditors(); - ColSelectedWithSummaryMethodEditor colSelectedWithSummaryMethodEditor = new ColSelectedWithSummaryMethodEditor(); - Editor[] allEditors = ArrayUtils.add(editors,colSelectedWithSummaryMethodEditor); - conditionValuePane = ValueEditorPaneFactory.createValueEditorPane(allEditors,StringUtils.EMPTY,StringUtils.EMPTY); + conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPane(); conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height)); conditionOPComboBox.setPreferredSize(new Dimension(80, 20)); Component[][] components = { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java index 875bc705a..a949e9ecd 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java @@ -38,13 +38,11 @@ public class ColSelectedWithSummaryMethodEditor extends Editor