From a4c3b7b9cc0fa65310b8f51a7c2f59f3f09dda8d Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Wed, 4 Nov 2020 17:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/JTemplate.java    | 6 ++++--
 .../mainframe/predefined/ui/preview/ElementCasePreview.java | 6 ------
 .../predefined/ui/preview/PredefinedStylePreviewPane.java   | 4 ++--
 .../com/fr/design/mainframe/predefined/previewData          | 3 +--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index f501f5ab0..2c1b15177 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -578,8 +578,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         UIUtil.invokeLaterIfNeeded(new Runnable() {
             @Override
             public void run() {
-                JTemplate.this.predefinedBtn.setText(getTemplatePredefinedStyle());
-                setPredefinedButtonSize(predefinedBtn);
+                if(predefinedBtn != null){
+                    JTemplate.this.predefinedBtn.setText(getTemplatePredefinedStyle());
+                    setPredefinedButtonSize(predefinedBtn);
+                }
             }
         });
     }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ElementCasePreview.java b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ElementCasePreview.java
index 6aaa9416b..a7ec75e89 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ElementCasePreview.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/ElementCasePreview.java
@@ -5,19 +5,13 @@ import com.fr.base.Style;
 import com.fr.config.predefined.PredefinedCellStyle;
 import com.fr.config.predefined.PredefinedCellStyleConfig;
 import com.fr.config.predefined.PredefinedStyle;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.FRFont;
 import com.fr.log.FineLoggerFactory;
-import com.fr.stable.StringUtils;
 import com.fr.third.javax.annotation.Nonnull;
-
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import javax.swing.JSeparator;
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java
index b0a7ab4b3..5b6d20049 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/predefined/ui/preview/PredefinedStylePreviewPane.java
@@ -37,7 +37,7 @@ public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implemen
     private ChartPreStylePreView columnChartPane;
 
     private int COLUMN_CHART_WIDTH = 517;
-    private int COLUMN_CHART_HEIGHT = 300;
+    private int COLUMN_CHART_HEIGHT = 290;
 
     private JPanel parent;
 
@@ -51,7 +51,7 @@ public class PredefinedStylePreviewPane extends StyleSettingPreviewPane implemen
         this.setBackground(Color.WHITE);
         this.elementCasePreview = new ElementCasePreview();
         this.add(initChartPreViewPane());
-        this.elementCasePreview.setPreferredSize(new Dimension(517, 190));
+        this.elementCasePreview.setPreferredSize(new Dimension(517, 200));
         this.add(this.elementCasePreview);
     }
 
diff --git a/designer-base/src/main/resources/com/fr/design/mainframe/predefined/previewData b/designer-base/src/main/resources/com/fr/design/mainframe/predefined/previewData
index 263e85a73..cfcf502f3 100644
--- a/designer-base/src/main/resources/com/fr/design/mainframe/predefined/previewData
+++ b/designer-base/src/main/resources/com/fr/design/mainframe/predefined/previewData
@@ -2,5 +2,4 @@
 南通市 324,646 324,646 100%
 合肥市 248,938 348,938 140%
 邵阳市 248,938 348,938 140%
-苏州市 248,938 348,938 140%
-合计 1,071,460 1,371,460 128%
\ No newline at end of file
+合计 1,071,460 1,371,460 128%