From c8019d174d59da1236bbec1b29d2271168a6467c Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 11 Nov 2020 14:11:47 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-43198=20=E9=A2=84=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=9B=9E=E9=80=80=E9=81=97=E6=BC=8F=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/predefined/PatternStyle.java | 8 +++-- .../style/CellPredefinedStyleSettingPane.java | 30 +++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/predefined/PatternStyle.java b/designer-base/src/main/java/com/fr/design/mainframe/predefined/PatternStyle.java index 94892f75e..c4ebcf225 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/predefined/PatternStyle.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/predefined/PatternStyle.java @@ -1,7 +1,7 @@ package com.fr.design.mainframe.predefined; import com.fr.config.predefined.PredefinedStyle; -import com.fr.predefined.PredefinedPatternStyleManager; +//import com.fr.predefined.PredefinedPatternStyleManager; /** @@ -11,13 +11,15 @@ public enum PatternStyle { DARK_STYLE(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Dark_Pattern")) { @Override public PredefinedStyle getPredefinedStyle() { - return PredefinedPatternStyleManager.INSTANCE.getDarkMode(); +// return PredefinedPatternStyleManager.INSTANCE.getDarkMode(); + return new PredefinedStyle(); } }, LIGHT_STYLE(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Predefined_Light_Pattern")) { @Override public PredefinedStyle getPredefinedStyle() { - return PredefinedPatternStyleManager.INSTANCE.getLightMode(); +// return PredefinedPatternStyleManager.INSTANCE.getLightMode(); + return new PredefinedStyle(); } }; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CellPredefinedStyleSettingPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CellPredefinedStyleSettingPane.java index 86de92d74..4f38c8baa 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CellPredefinedStyleSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CellPredefinedStyleSettingPane.java @@ -25,7 +25,7 @@ import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.predefined.ui.PredefinedStyleSettingPane; import com.fr.design.mainframe.predefined.ui.preview.StyleSettingPreviewPane; import com.fr.design.style.BorderUtils; -import com.fr.predefined.PredefinedPatternStyleManager; +//import com.fr.predefined.PredefinedPatternStyleManager; import com.fr.stable.Constants; import com.fr.stable.StringUtils; import com.fr.third.javax.annotation.Nonnull; @@ -85,20 +85,20 @@ public class CellPredefinedStyleSettingPane extends PredefinedStyleSettingPane allStyle = config.getAllStyles(); - this.applicationFormat.clearBoxItems(); - for (String name : allStyle.keySet()) { - this.applicationFormat.addItem(name); - } - if (allStyle.containsKey(ob.getName())) { - this.applicationFormat.setSelectedItem(ob.getName()); - }else { - this.applicationFormat.setSelectedItem(config.getDefaultStyleName()); - } - this.customPredefinedStylePane.populateBean(ob); - this.setPopulating(false); +// PredefinedStyle currentStyle = PredefinedPatternStyleManager.INSTANCE.getStyleFromName(getPredefinedStyleName()); +// PredefinedCellStyleConfig config = currentStyle.getCellStyleConfig(); +// Map allStyle = config.getAllStyles(); +// this.applicationFormat.clearBoxItems(); +// for (String name : allStyle.keySet()) { +// this.applicationFormat.addItem(name); +// } +// if (allStyle.containsKey(ob.getName())) { +// this.applicationFormat.setSelectedItem(ob.getName()); +// }else { +// this.applicationFormat.setSelectedItem(config.getDefaultStyleName()); +// } +// this.customPredefinedStylePane.populateBean(ob); +// this.setPopulating(false); }