From 0c4d4294887ee33f577956ba647c58862b4ddd48 Mon Sep 17 00:00:00 2001 From: Carlson Date: Wed, 2 Aug 2023 10:29:30 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-79271=20feat:=E5=85=BC=E5=AE=B9=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4=E4=B8=BA=E6=96=B0=E5=A2=9E=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/mode/ChartEditContext.java | 45 ++++++++++++------- .../chart/mode/ChartEditSupportDataType.java | 13 ------ 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java index 2aa862292f..30ff6c8911 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditContext.java @@ -3,6 +3,9 @@ package com.fr.design.mainframe.chart.mode; import com.fr.common.annotations.Open; import com.fr.design.base.mode.DesignModeContext; +import java.util.HashSet; +import java.util.Set; + /** * @author shine * @version 10.0 @@ -13,28 +16,21 @@ public class ChartEditContext { private static ChartEditMode current = ChartEditMode.NORMAL; - private static ChartEditSupportDataType supportDataType = ChartEditSupportDataType.BOTH; + private static final Set features = new HashSet<>(); + + /** + * 功能点枚举 + */ + public enum DuchampFeature { + SUPPORT_REPORT_DATA + } /** * 切换图表编辑模式 * @param mode 图表编辑模式 */ public static void switchTo(ChartEditMode mode) { - if (mode == ChartEditMode.NORMAL) { - switchTo(mode, ChartEditSupportDataType.BOTH); - } else if (mode == ChartEditMode.DUCHAMP) { - switchTo(mode, ChartEditSupportDataType.TABLE_DATA); - } - } - - /** - * 切换图表编辑模式 - * @param mode 图表编辑模式 - * @param type 图表支持的数据来源 - */ - public static void switchTo(ChartEditMode mode, ChartEditSupportDataType type) { current = mode; - supportDataType = type; } public static boolean duchampMode() { @@ -54,10 +50,27 @@ public class ChartEditContext { return !DesignModeContext.isDuchampMode(); } + /** + * 注册功能点 + */ + public static void addDuchampFeature(DuchampFeature feature) { + features.add(feature); + } + + /** + * 移除功能点 + */ + public static void removeDuchampFeature(DuchampFeature feature) { + features.remove(feature); + } + /** * 当前模式下是否支持单元格数据来源 */ public static boolean supportReportData() { - return supportDataType == ChartEditSupportDataType.REPORT || supportDataType == ChartEditSupportDataType.BOTH; + if (normalMode()) { + return true; + } + return features.contains(DuchampFeature.SUPPORT_REPORT_DATA); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java b/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java deleted file mode 100644 index 5c8236133a..0000000000 --- a/designer-base/src/main/java/com/fr/design/mainframe/chart/mode/ChartEditSupportDataType.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.fr.design.mainframe.chart.mode; - -/** - * @author Carlson - * @version 11.0 - * Created by Carlson on 2023/8/1 14:25 - * @description 图表数据来源,兼容用 - **/ -public enum ChartEditSupportDataType { - TABLE_DATA, // 数据集数据 - REPORT, // 单元格数据 - BOTH // 包含二者 -}