Merge pull request #8993 in DESIGN/design from final/11.0 to persist/11.0

* commit '6e2ce8d366b8272cb6a9087a452432b2403ac194':
  REPORT-71925 条件属性汇总字段值-部分数据情况下条件属性结果不对
  REPORT-71790 配置也置为false
  REPORT-71790 【win11适配】FR11启动失败，报错npe
  REPORT-70681 搜索一些特殊字符 高亮展示时 展示效果不对

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();
     }
 

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java

@@ -81,10 +81,7 @@ public class ChartConditionPane extends LiteConditionPane<CommonCondition> {
                     return this;
                 }
             });
-            Editor<?>[] editors = ValueEditorPaneFactory.allEditors();
+            conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPane();
-            ColSelectedWithSummaryMethodEditor colSelectedWithSummaryMethodEditor = new ColSelectedWithSummaryMethodEditor();
-            Editor<?>[] allEditors = ArrayUtils.add(editors,colSelectedWithSummaryMethodEditor);
-            conditionValuePane = ValueEditorPaneFactory.createValueEditorPane(allEditors,StringUtils.EMPTY,StringUtils.EMPTY);
             conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height));
             conditionOPComboBox.setPreferredSize(new Dimension(80, 20));
             Component[][] components = {

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java

@@ -38,13 +38,11 @@ public class ColSelectedWithSummaryMethodEditor extends Editor<DSColumnWithSumma
     }
 
     public static void refreshCommonChartFieldNames(Chart chart) {
-        String[] columnNames = ChartDataHelper.getCommonChartFieldNames(chart);
+        //do nothing
-        refreshComboBoxModel(columnNames);
     }
 
     public static void refreshCustomChartTableFieldNames(Chart chart, CustomPlotType plotType) {
-        String[] columnNames = ChartDataHelper.getCustomChartTableFieldNames(chart, plotType);
+        // do nothing
-        refreshComboBoxModel(columnNames);
     }
 
     private static void refreshComboBoxModel(String[] columnNames) {

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>|");

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 {
+//        DesignerWorkspaceInfo info = WorkspaceUtils.getWorkspaceInfo();
-            String webInfPath = WorkspaceUtils.getWorkspaceInfo().getPath();
+//        if (info.getType() == DesignerWorkspaceType.Remote) {
-            String dbConfigPath = StableUtils.pathJoin(webInfPath, ProjectConstants.CONFIG_DIRECTORY,
+//        } else {
-                                                       EncryptionConstants.PROPERTY_NAME);
+//            String webInfPath = WorkspaceUtils.getWorkspaceInfo().getPath();
-            String entityPath = generatePath(webInfPath, PropertiesConstants.ENTITY_PROP);
+//            String dbConfigPath = StableUtils.pathJoin(webInfPath, ProjectConstants.CONFIG_DIRECTORY,
-            String xmlEntityPath = generatePath(webInfPath, PropertiesConstants.XML_ENTITY_PROP);
+//                                                       EncryptionConstants.PROPERTY_NAME);
-            String classNamePath = generatePath(webInfPath, PropertiesConstants.CLASS_NAME_PROP);
+//            String entityPath = generatePath(webInfPath, PropertiesConstants.ENTITY_PROP);
-            // 校验 平台迁移文件/缓存文件
+//            String xmlEntityPath = generatePath(webInfPath, PropertiesConstants.XML_ENTITY_PROP);
-            boolean existPropCache = new File(entityPath).exists() && new File(xmlEntityPath).exists() && new File(classNamePath).exists();
+//            String classNamePath = generatePath(webInfPath, PropertiesConstants.CLASS_NAME_PROP);
-            DaoSelectorFactory.registerDaoSelector(() -> DesignerEnvManager.getEnvManager().isPropertiesUsable()
+//            // 校验 平台迁移文件/缓存文件
-                    && OptimizeUtil.isOpen()
+//            boolean existPropCache = new File(entityPath).exists() && new File(xmlEntityPath).exists() && new File(classNamePath).exists();
-                    && existPropCache
+//            DaoSelectorFactory.registerDaoSelector(() -> DesignerEnvManager.getEnvManager().isPropertiesUsable()
-                    // demo启动时 前后目录可能会不一致 造成读取缓存失败
+//                    && OptimizeUtil.isOpen()
-                    && !startupArgsValue.getValue().isDemo()
+//                    && existPropCache
-                    && !new File(dbConfigPath).exists());
+//                    // demo启动时 前后目录可能会不一致 造成读取缓存失败
-
+//                    && !startupArgsValue.getValue().isDemo()
-        }
+//                    && !new File(dbConfigPath).exists());
+//
+//        }
     }
 
     private String generatePath(String webInfPath, String name) {