Pull request #1761: MOBILE-27698 移动端控件类插件设置边框不生效

Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0

* commit '921df92042373ff03f8ab2fe4edf68887de36c8b':
  MOBILE-27698 移动端控件类插件设置边框不生效

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) {
+        if(ob.getCommonBackground() != null) {
-            colorSelectBox.setSelectObject(((ColorBackground)ob.getBackground()).getColor());
+            colorSelectBox.setSelectObject(((ColorBackground)ob.getCommonBackground()).getColor());
         }
-        borderType.setSelectedLineStyle(ob.getBorderType());
+        borderType.setSelectedLineStyle(ob.getCommonBorderType());
-        if (ob.getBorderColor() != null) {
+        if (ob.getCommonBorderColor() != null) {
-            borderColor.setSelectObject(ob.getBorderColor());
+            borderColor.setSelectObject(ob.getCommonBorderColor());
         }
-        borderRadius.setValue(ob.getBorderRadius());
+        borderRadius.setValue(ob.getCommonBorderRadius());
-        if (ob.getIconColor() != null) {
+        if (ob.getCommonIconColor() != null) {
-            iconColor.setSelectObject(ob.getIconColor());
+            iconColor.setSelectObject(ob.getCommonIconColor());
         }
-        if (ob.getFont() != null) {
+        if (ob.getCommonFont() != null) {
-            fontConfigPane.populateBean(ob.getFont());
+            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.setCommonBackground(ColorBackground.getInstance(colorSelectBox.getSelectObject()));
-        mobileStyle.setBorderType(borderType.getSelectedLineStyle());
+        mobileStyle.setCommonBorderType(borderType.getSelectedLineStyle());
-        mobileStyle.setBorderColor(borderColor.getSelectObject());
+        mobileStyle.setCommonBorderColor(borderColor.getSelectObject());
-        mobileStyle.setBorderRadius(borderRadius.getValue());
+        mobileStyle.setCommonBorderRadius(borderRadius.getValue());
-        mobileStyle.setIconColor(iconColor.getSelectObject());
+        mobileStyle.setCommonIconColor(iconColor.getSelectObject());
-        mobileStyle.setFont(fontConfigPane.updateBean());
+        mobileStyle.setCommonFont(fontConfigPane.updateBean());
         return mobileStyle;
     }