From 33d04434413aa1566db3ff80720346c475a9b56e Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 14 Nov 2023 22:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4=E4=B8=80=E6=B3=A2=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../designer/WidgetThemeDisplayAction.java | 2 + .../WidgetThemeDisplayConfigPane.java | 2 + .../edit/ParamContainerBackgroundPane.java | 88 ++++++++----------- .../widget/DesktopWidgetStyleEditPane.java | 1 - .../WidgetDisplayFormThemePreviewPane.java | 74 +++++++++------- 5 files changed, 82 insertions(+), 85 deletions(-) diff --git a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java index 31b3f50dc9..fed0ac4603 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java +++ b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java @@ -14,6 +14,8 @@ import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr; import java.awt.event.ActionEvent; /** + * 控件主题显示增强菜单action + * * @author Bruce.Deng * @since 11.0 * Created on 2022/11/28 diff --git a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java index 6fadc92cca..f424da8183 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayConfigPane.java @@ -12,6 +12,8 @@ import javax.swing.JPanel; import java.awt.Color; /** + * 控件主题显示增强配置窗口 + * * @author Bruce.Deng * @since 11.0 * Created on 2022/11/28 diff --git a/designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerBackgroundPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerBackgroundPane.java index b6fb44c92a..429df171ce 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/ParamContainerBackgroundPane.java @@ -17,63 +17,51 @@ import java.util.List; import java.util.Set; /** + * 参数面板背景编辑窗口 + * * @author Bruce.Deng * @since 11.0 * Created on 2023/1/5 */ public class ParamContainerBackgroundPane extends BackgroundPane { - public ParamContainerBackgroundPane(){ + + private NullBackgroundQuickPane nullBackgroundPane; + private ColorBackgroundQuickPane colorBackgroundPane; + private ImageBackgroundQuickPane imageBackgroundPane; + private GradientBackgroundQuickPane gradientBackgroundPane; + private TextureBackgroundQuickPane textureBackgroundPane; + private PatternBackgroundQuickPane patternBackgroundPane; + + public ParamContainerBackgroundPane() { super(); } @Override protected BackgroundQuickPane[] supportKindsOfBackgroundUI() { - NullBackgroundQuickPane nullBackgroundPane = new NullBackgroundQuickPane(); - - ColorBackgroundQuickPane colorBackgroundPane = new ColorBackgroundQuickPane(true); - colorBackgroundPane.registerChangeListener(new UIObserverListener() { - @Override - public void doChange() { - fireStateChanged(); - } - }); - - ImageBackgroundQuickPane imageBackgroundPane = new ImageBackgroundQuickPane(); - imageBackgroundPane.registerChangeListener(new UIObserverListener() { - @Override - public void doChange() { - fireStateChanged(); - } - }); - - GradientBackgroundQuickPane gradientBackgroundPane = createGradientBackgroundQuickPane(); - gradientBackgroundPane.registerChangeListener(new UIObserverListener() { - @Override - public void doChange() { - fireStateChanged(); - } - }); - - TextureBackgroundQuickPane textureBackgroundPane = new TextureBackgroundQuickPane(); - textureBackgroundPane.registerChangeListener(new UIObserverListener() { - @Override - public void doChange() { - fireStateChanged(); - } - }); - - PatternBackgroundQuickPane patternBackgroundPane = new PatternBackgroundQuickPane(); - patternBackgroundPane.registerChangeListener(new UIObserverListener() { - @Override - public void doChange() { - fireStateChanged(); - } - }); - - - - List kinds = new ArrayList(); + nullBackgroundPane = new NullBackgroundQuickPane(); + + colorBackgroundPane = new ColorBackgroundQuickPane(true); + colorBackgroundPane.registerChangeListener(this::fireStateChanged); + + imageBackgroundPane = new ImageBackgroundQuickPane(); + imageBackgroundPane.registerChangeListener(this::fireStateChanged); + + gradientBackgroundPane = createGradientBackgroundQuickPane(); + gradientBackgroundPane.registerChangeListener(this::fireStateChanged); + + textureBackgroundPane = new TextureBackgroundQuickPane(); + textureBackgroundPane.registerChangeListener(this::fireStateChanged); + + patternBackgroundPane = new PatternBackgroundQuickPane(); + patternBackgroundPane.registerChangeListener(this::fireStateChanged); + + + return createBackgroundQuickPanes(); + } + + private BackgroundQuickPane[] createBackgroundQuickPanes() { + List kinds = new ArrayList<>(); kinds.add(nullBackgroundPane); kinds.add(colorBackgroundPane); @@ -85,18 +73,14 @@ public class ParamContainerBackgroundPane extends BackgroundPane { Set providers = ExtraDesignClassManager.getInstance().getArray(BackgroundQuickUIProvider.MARK_STRING); for (BackgroundQuickUIProvider provider : providers) { BackgroundQuickPane newTypePane = provider.appearanceForBackground(); - newTypePane.registerChangeListener(new UIObserverListener() { - @Override - public void doChange() { - fireStateChanged(); - } - }); + newTypePane.registerChangeListener(this::fireStateChanged); kinds.add(newTypePane); } return kinds.toArray(new BackgroundQuickPane[kinds.size()]); } + protected GradientBackgroundQuickPane createGradientBackgroundQuickPane() { // 使用默认的150宽度构建渐变条 return new GradientBackgroundQuickPane(); diff --git a/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java index 983b256814..ff4a9a1709 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/theme/edit/widget/DesktopWidgetStyleEditPane.java @@ -54,7 +54,6 @@ public class DesktopWidgetStyleEditPane extends WidgetS Component[][] components = new Component[][]{ new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Color")), colorSelectBox}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Style")), stylePane}, - // todo 预览 new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Line")), lineComboBox}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Border_Radius")), borderRadiusSpinner}, new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Widget_Theme_Font_Size")), fontSizeComoBox}, diff --git a/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayFormThemePreviewPane.java b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayFormThemePreviewPane.java index cd9f92aaac..bba22b91b4 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayFormThemePreviewPane.java +++ b/designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetDisplayFormThemePreviewPane.java @@ -129,38 +129,7 @@ public class WidgetDisplayFormThemePreviewPane extends TemplateThemePreviewPane< private ChartCollection initColumnChart() { try { VanChart chart = (VanChart) ChartTypeManager.getInstance().getCharts(VanChartColumnPlot.VAN_CHART_COLUMN_PLOT_ID)[0].clone(); - chart.getTitle().setTitleVisible(false); - VanChartTools vanChartTools = chart.getVanChartTools(); - vanChartTools.setSort(false); - vanChartTools.setExport(false); - vanChartTools.setFullScreen(false); - - VanChartColumnPlot plot = chart.getPlot(); - AttrLabel defaultAttrLabel = plot.getDefaultAttrLabel(); - defaultAttrLabel.setEnable(true); - defaultAttrLabel.getAttrLabelDetail().getBorder().setBorderStyle(0); - defaultAttrLabel.getAttrLabelDetail().getBackground().setBackground(null); - plot.getConditionCollection().getDefaultAttr().addDataSeriesCondition(defaultAttrLabel); - - plot.getLegend().setPosition(Constants.TOP); - plot.getGradientStyle().setGradientType(GradientType.NONE); - plot.setSeriesOverlapPercent(30); - plot.setCategoryIntervalPercent(30); - - VanChartAxis defaultYAxis = plot.getDefaultYAxis(); - Title title = new Title(); - title.setTextObject(Toolkit.i18nText("Fine-Design_Chart_Axis_Title")); - title.getTextAttr().setRotation(-90); - title.getTextAttr().setThemed(true); - defaultYAxis.setTitle(title); - defaultYAxis.setShowAxisTitle(true); - defaultYAxis.setCustomMaxValue(true); - defaultYAxis.setCustomMinValue(true); - defaultYAxis.setCustomMainUnit(true); - defaultYAxis.setMaxValue(BaseFormula.createFormulaBuilder().build("=600")); - defaultYAxis.setMinValue(BaseFormula.createFormulaBuilder().build("=0")); - defaultYAxis.setMainUnit(BaseFormula.createFormulaBuilder().build("=200")); - + initChart(chart); Object[] category = { Toolkit.i18nText("Fine-Design_Chart_Category") + "1", Toolkit.i18nText("Fine-Design_Chart_Category") + "2", @@ -185,6 +154,47 @@ public class WidgetDisplayFormThemePreviewPane extends TemplateThemePreviewPane< return null; } + private void initChart(VanChart chart) { + chart.getTitle().setTitleVisible(false); + initVanChartsTools(chart.getVanChartTools()); + VanChartColumnPlot plot = chart.getPlot(); + AttrLabel defaultAttrLabel = plot.getDefaultAttrLabel(); + initDefaultAttrLabel(defaultAttrLabel); + initPlot(plot); + plot.getConditionCollection().getDefaultAttr().addDataSeriesCondition(defaultAttrLabel); + VanChartAxis defaultYAxis = plot.getDefaultYAxis(); + Title title = new Title(); + title.setTextObject(Toolkit.i18nText("Fine-Design_Chart_Axis_Title")); + title.getTextAttr().setRotation(-90); + title.getTextAttr().setThemed(true); + defaultYAxis.setTitle(title); + defaultYAxis.setShowAxisTitle(true); + defaultYAxis.setCustomMaxValue(true); + defaultYAxis.setCustomMinValue(true); + defaultYAxis.setCustomMainUnit(true); + defaultYAxis.setMaxValue(BaseFormula.createFormulaBuilder().build("=600")); + defaultYAxis.setMinValue(BaseFormula.createFormulaBuilder().build("=0")); + defaultYAxis.setMainUnit(BaseFormula.createFormulaBuilder().build("=200")); + } + + private void initVanChartsTools(VanChartTools vanChartTools) { + vanChartTools.setSort(false); + vanChartTools.setExport(false); + vanChartTools.setFullScreen(false); + } + + private void initDefaultAttrLabel(AttrLabel defaultAttrLabel) { + defaultAttrLabel.setEnable(true); + defaultAttrLabel.getAttrLabelDetail().getBorder().setBorderStyle(0); + defaultAttrLabel.getAttrLabelDetail().getBackground().setBackground(null); + } + + private void initPlot(VanChartColumnPlot plot) { + plot.getLegend().setPosition(Constants.TOP); + plot.getGradientStyle().setGradientType(GradientType.NONE); + plot.setSeriesOverlapPercent(30); + plot.setCategoryIntervalPercent(30); + } /** * 初始化饼图 *