From 5b5f49540f2b3f7efa1250514af1c050d9ce6d72 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Fri, 10 Dec 2021 14:36:09 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-64062=20=E3=80=90=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=E3=80=91=E4=B8=8A=E4=B8=80=E4=B8=AA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E7=BD=AE=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BE=B9=E6=A1=86=E8=89=B2=E4=BC=9A=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
在新建主题单元格样式情况下，CellBorderStyle中的各字段为空，导致无法重置
线宽和颜色配置项。

【改动思路】
重置先宽和颜色配置项时给一个默认值
---
 .../src/main/java/com/fr/design/gui/style/BorderPane.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
index fe85d55030..9954162da7 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
@@ -223,6 +223,9 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
             } else if (cellBorderStyle.getHorizontalStyle() != Constants.LINE_NONE) {
                 this.currentLineCombo.setSelectedLineStyle(cellBorderStyle.getHorizontalStyle());
                 this.currentLineColorPane.setSelectObject(cellBorderStyle.getHorizontalColor());
+            } else {
+                this.currentLineCombo.setSelectedLineStyle(Constants.LINE_NONE);
+                this.currentLineColorPane.setSelectObject(Color.BLACK);
             }
         }