From aa971a8b2816f9d83c319689dfa6bdf6a0f447bb Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Wed, 11 Nov 2020 11:39:10 +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

---
 .../settingpane/style/CellPredefinedStyleSettingPane.java  | 7 ++++---
 .../fr/design/report/ReportPredefinedBackgroundPane.java   | 4 ++--
 .../src/main/java/com/fr/poly/PolyDesignUI.java            | 6 ------
 3 files changed, 6 insertions(+), 11 deletions(-)

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 6a111b781..86de92d74 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
@@ -84,7 +84,7 @@ public class CellPredefinedStyleSettingPane extends PredefinedStyleSettingPane<N
     @Override
     public void populateBean(NameStyle ob) {
         this.setPopulating(true);
-        super.populate(ob);
+//        super.populate(ob);
         PredefinedStyle currentStyle = PredefinedPatternStyleManager.INSTANCE.getStyleFromName(getPredefinedStyleName());
         PredefinedCellStyleConfig config = currentStyle.getCellStyleConfig();
         Map<String, PredefinedCellStyle> allStyle = config.getAllStyles();
@@ -122,7 +122,7 @@ public class CellPredefinedStyleSettingPane extends PredefinedStyleSettingPane<N
     public NameStyle updateBean() {
         Style style = updateStyle();
         if (!(style instanceof NameStyle)) {
-            return NameStyle.createCustomStyle(style);
+//            return NameStyle.createCustomStyle(style);
         }
         return (NameStyle) style;
     }
@@ -138,7 +138,8 @@ public class CellPredefinedStyleSettingPane extends PredefinedStyleSettingPane<N
 
     private NameStyle updatePredefinedStyle() {
         Object selectItem = this.applicationFormat.getSelectedItem();
-        return NameStyle.createPredefinedStyle(getPredefinedStyleName(), selectItem == null ? StringUtils.EMPTY : selectItem.toString(), Style.getInstance());
+//        return NameStyle.createPredefinedStyle(getPredefinedStyleName(), selectItem == null ? StringUtils.EMPTY : selectItem.toString(), Style.getInstance());
+        return null;
     }
 
     class CustomStylePane extends MultiTabPane<Style> {
diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportPredefinedBackgroundPane.java b/designer-realize/src/main/java/com/fr/design/report/ReportPredefinedBackgroundPane.java
index 5fcee4ba9..4582983b6 100644
--- a/designer-realize/src/main/java/com/fr/design/report/ReportPredefinedBackgroundPane.java
+++ b/designer-realize/src/main/java/com/fr/design/report/ReportPredefinedBackgroundPane.java
@@ -67,8 +67,8 @@ public class ReportPredefinedBackgroundPane extends PredefinedStyleSettingPane<R
     @Override
     public void populateBean(ReportSettingsProvider reportSettings) {
         this.setPopulating(true);
-        PredefinedNameStyleProvider nameBackground = reportSettings.getNameBackground();
-        super.populate(nameBackground);
+//        PredefinedNameStyleProvider nameBackground = reportSettings.getNameBackground();
+//        super.populate(nameBackground);
         this.backgroundPane.populateBean(reportSettings.getBackground());
         this.isPrintBackgroundCheckBox.setSelected(reportSettings.isPrintBackground());
         this.isExportBackgroundCheckBox.setSelected(reportSettings.isExportBackground());
diff --git a/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java b/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java
index cf5d87708..d12920bfd 100644
--- a/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java
+++ b/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java
@@ -8,7 +8,6 @@ import com.fr.base.Margin;
 import com.fr.base.PaperSize;
 import com.fr.base.ScreenResolution;
 import com.fr.base.iofile.attr.WatermarkAttr;
-import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.general.Background;
 
@@ -83,7 +82,6 @@ public class PolyDesignUI extends ComponentUI {
         g2d.setPaint(Color.WHITE);
         GraphHelper.fillRect(g, 0, 0, d.width, d.height);
         ReportSettingsProvider rs = report.getReportSettings();
-        rs.getNameBackground().resetPreferenceStyle(getGlobalPredefinedStyleName());
         if (rs != null) {
             Background bg = rs.getBackground();
             if (bg != null) {
@@ -93,10 +91,6 @@ public class PolyDesignUI extends ComponentUI {
         }
     }
 
-    private String getGlobalPredefinedStyleName() {
-        return HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getTemplatePredefinedStyle();
-    }
-
     @Override
     public void paint(Graphics g, JComponent c) {
         this.resolution = ((PolyArea)c).getResolution();