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(); } 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" + primaryStr + "|"); 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) {