From ed6cb8f72b6d65aaacc84a1b3d77d5f5d12df88e Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Mon, 18 Oct 2021 18:49:40 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-61116=20=E3=80=90=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E3=80=91=E5=A4=9A=E9=80=89=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E6=A0=BC=E5=AD=90=E4=BB=8E=E8=B7=9F=E9=9A=8F?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2=E5=88=B0=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=EF=BC=8C=E5=86=85=E8=BE=B9=E6=A1=86=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
设置自定义单元格样式面板后，需要单独处理下边框设置

【改动思路】
同上
---
 .../cell/settingpane/style/CustomStylePane.java  | 16 +++++++++++-----
 .../cell/settingpane/style/StylePane.java        |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
index 302cc45b7..cafbf7d54 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/CustomStylePane.java
@@ -114,11 +114,10 @@ public class CustomStylePane extends MultiTabPane<Style> {
         return tabPane.getSelectedIndex() == ONE_INDEX;
     }
 
-    /**
-     * @param ePane
-     */
-    public void dealWithBorder(ElementCasePane ePane) {
-        this.reportPane = ePane;
+    public void dealWithBorder() {
+        if (reportPane == null) {
+            return;
+        }
         Object[] fourObjectArray = BorderUtils.createCellBorderObject(reportPane);
 
         if (fourObjectArray != null && fourObjectArray.length % LENGTH_FOUR == 0) {
@@ -130,7 +129,14 @@ public class CustomStylePane extends MultiTabPane<Style> {
                         (Color) fourObjectArray[THREE_INDEX]);
             }
         }
+    }
 
+    /**
+     * @param ePane
+     */
+    public void dealWithBorder(ElementCasePane ePane) {
+        this.reportPane = ePane;
+        dealWithBorder();
     }
 
     /**
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java
index bfd335f39..bad6e6b6a 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java
@@ -107,6 +107,7 @@ public class StylePane extends BasicPane implements UIObserver {
 					lastSelectedRealStyle = (Style) lastSelectedRealStyle.clone();
 					if (lastSelectedRealStyle != null) {
 						customStylePane.populateBean(lastSelectedRealStyle);
+						customStylePane.dealWithBorder();
 					}
 				} catch (CloneNotSupportedException ex) {
 					FineLoggerFactory.getLogger().error(ex.getMessage(), ex);