From ce05afdf4c4b1ecb2e84b4e7c3f50c16b4361c46 Mon Sep 17 00:00:00 2001
From: kuangshuai <kuangshuai_ios@icloud.com>
Date: Thu, 18 Jun 2020 16:19:03 +0800
Subject: [PATCH] =?UTF-8?q?MOBILE-27698=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=B1=BB=E6=8F=92=E4=BB=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile/ui/MobileStyleDefinePane.java      | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java
index e418bba0e..6c03df00d 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java
@@ -67,19 +67,19 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
         this.customBeanPane.populateBean(ob);
 
         customCombo.setSelectedIndex(ob.isCommonCustom() ? 1 : 0);
-        if(ob.getBackground() != null) {
-            colorSelectBox.setSelectObject(((ColorBackground)ob.getBackground()).getColor());
+        if(ob.getCommonBackground() != null) {
+            colorSelectBox.setSelectObject(((ColorBackground)ob.getCommonBackground()).getColor());
         }
-        borderType.setSelectedLineStyle(ob.getBorderType());
-        if (ob.getBorderColor() != null) {
-            borderColor.setSelectObject(ob.getBorderColor());
+        borderType.setSelectedLineStyle(ob.getCommonBorderType());
+        if (ob.getCommonBorderColor() != null) {
+            borderColor.setSelectObject(ob.getCommonBorderColor());
         }
-        borderRadius.setValue(ob.getBorderRadius());
-        if (ob.getIconColor() != null) {
-            iconColor.setSelectObject(ob.getIconColor());
+        borderRadius.setValue(ob.getCommonBorderRadius());
+        if (ob.getCommonIconColor() != null) {
+            iconColor.setSelectObject(ob.getCommonIconColor());
         }
-        if (ob.getFont() != null) {
-            fontConfigPane.populateBean(ob.getFont());
+        if (ob.getCommonFont() != null) {
+            fontConfigPane.populateBean(ob.getCommonFont());
         }
     }
 
@@ -89,12 +89,12 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
         this.widget.setMobileStyle(mobileStyle);
         this.customBeanPane.updateBean();
         mobileStyle.setCommonCustom(customCombo.getSelectedIndex() == 1);
-        mobileStyle.setBackground(ColorBackground.getInstance(colorSelectBox.getSelectObject()));
-        mobileStyle.setBorderType(borderType.getSelectedLineStyle());
-        mobileStyle.setBorderColor(borderColor.getSelectObject());
-        mobileStyle.setBorderRadius(borderRadius.getValue());
-        mobileStyle.setIconColor(iconColor.getSelectObject());
-        mobileStyle.setFont(fontConfigPane.updateBean());
+        mobileStyle.setCommonBackground(ColorBackground.getInstance(colorSelectBox.getSelectObject()));
+        mobileStyle.setCommonBorderType(borderType.getSelectedLineStyle());
+        mobileStyle.setCommonBorderColor(borderColor.getSelectObject());
+        mobileStyle.setCommonBorderRadius(borderRadius.getValue());
+        mobileStyle.setCommonIconColor(iconColor.getSelectObject());
+        mobileStyle.setCommonFont(fontConfigPane.updateBean());
         return mobileStyle;
     }