From b33926ae1e9d50c9b0b0c88cc619091b3a820655 Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Sat, 2 Apr 2022 14:46:26 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-68915=20=E6=95=B0=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=98=BE=E7=A4=BA=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=20&&=20REPORT-68890=20=E8=A1=A5=E5=85=85=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE=E5=8B=BE=E9=80=89=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E5=87=BA=E7=8E=B0=E6=95=B0=E6=8D=AE=E5=80=8D=E6=95=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/sort/header/HeaderAreaPane.java   | 4 +++-
 .../java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
index 25641340c..d7c9aab40 100644
--- a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
+++ b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderAreaPane.java
@@ -208,7 +208,9 @@ public class HeaderAreaPane extends JPanel {
             if (isNotSelectables(headerColumnRow)) {
                 SortHeader sortHeader = templateCellElement.getCellExpandAttr().getCellSortAttr().getSortHeader();
                 headerColumnRow = ColumnRow.ERROR;
-                sortHeader.setHeaderArea(headerColumnRow.toString());
+                if (sortHeader != null) {
+                    sortHeader.setHeaderArea(headerColumnRow.toString());
+                }
             } else {
                 handleDisableHeaderCell(templateCellElement);
             }
diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
index 486492161..1c50499f7 100644
--- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
+++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
@@ -471,6 +471,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
                 @Override
                 public void attributeChange() {
                     update();
+                    checkButtonEnabled();
                     fireTargetModified();
                 }
             };