From 57e534796370f9151d9d4fd5276bfacedbc76611 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Fri, 6 Jul 2018 12:04:32 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-9437=E3=80=9010.0=E4=B8=80=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E8=AE=BE=E8=AE=A1=E5=99=A8=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=8F-=E6=9C=8D=E5=8A=A1=E5=99=A8-=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=8E=BB=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/webattr/WriteToolBarPane.java          | 5 +++--
 .../src/com/fr/design/webattr/WriteWebSettingPane.java       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java b/designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java
index 99bbc8e92..f08f6e0cf 100644
--- a/designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java
+++ b/designer-realize/src/com/fr/design/webattr/WriteToolBarPane.java
@@ -155,7 +155,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
             webContent = new WebWrite();
         }
         WebWrite webWrite = (WebWrite) webContent;
-        if (webWrite.getSelectedColor() != null) {
+        if (webWrite.isEditRowColor()) {
             colorBox.setSelected(true);
             colorButton.setColor(webWrite.getSelectedColor());
         } else {
@@ -205,9 +205,10 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
         }
 
         if (colorBox.isSelected()) {
+            webWrite.setEditRowColor(true);
             webWrite.setSelectedColor(colorButton.getColor());
         } else {
-            webWrite.setSelectedColor(null);
+            webWrite.setEditRowColor(false);
         }
 
         webWrite.setUnloadCheck(unloadCheck.isSelected());
diff --git a/designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java b/designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java
index 6d5b068ba..b23e4c3b2 100644
--- a/designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java
+++ b/designer-realize/src/com/fr/design/webattr/WriteWebSettingPane.java
@@ -120,7 +120,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
         if (webWrite == null) {
             webWrite = new WebWrite();
         }
-        if (webWrite.getSelectedColor() != null) {
+        if (webWrite.isEditRowColor()) {
             colorBox.setSelected(true);
             colorButton.setColor(webWrite.getSelectedColor());
         } else {
@@ -148,9 +148,10 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
     protected WebWrite updateSubWebSettingBean() {
         WebWrite webWrite = new WebWrite();
         if (colorBox.isSelected()) {
+            webWrite.setEditRowColor(true);
             webWrite.setSelectedColor(colorButton.getColor());
         } else {
-            webWrite.setSelectedColor(null);
+            webWrite.setEditRowColor(false);
         }
         if (topRadioButton.isSelected()) {
             webWrite.setSheetPosition(Constants.TOP);