From 50d3d79a18a4f21f38001c5f81db30eb1e6833e2 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Thu, 9 Apr 2020 16:39:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?MOBILE-26390=20=E5=AF=BC=E8=88=AA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE=E4=BA=86=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E5=AE=9E=E9=99=85=E9=A2=84=E8=A7=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

区分线型和线宽
---
 .../SidebarMobileBookMarkStyleCustomDefinePane.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
index 79bab33dfc..66358a30e9 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
@@ -145,7 +145,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
             }
         });
         normalBorderWidthComBox = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
-        normalBorderWidthComBox.setSelectedLineStyle(DEFAULT_STYLE.getBorderWidth());
+        normalBorderWidthComBox.setSelectedLineStyle(DEFAULT_STYLE.getBorderLineStyle());
         normalBorderColorBox = new ColorSelectBox(COLUMN_WIDTH);
         normalBorderColorBox.setSelectObject(DEFAULT_STYLE.getBorderColor());
         normalFontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
@@ -232,7 +232,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
             }
         });
         selectedBorderWidthComBox = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
-        selectedBorderWidthComBox.setSelectedLineStyle(DEFAULT_STYLE.getSelectedBorderWidth());
+        selectedBorderWidthComBox.setSelectedLineStyle(DEFAULT_STYLE.getSelectedBorderLineStyle());
         selectedBorderColorBox = new ColorSelectBox(COLUMN_WIDTH);
         selectedBorderColorBox.setSelectObject(DEFAULT_STYLE.getSelectedBorderColor());
         selectedFontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
@@ -316,7 +316,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
         normalBackgroundColorBox.setSelectObject(style.getBackgroundColor());
         normalOpacityDragBar.setValue(style.getOpacity());
         normalOpacitySpinner.setValue(style.getOpacity());
-        normalBorderWidthComBox.setSelectedLineStyle(style.getBorderWidth());
+        normalBorderWidthComBox.setSelectedLineStyle(style.getBorderLineStyle());
         normalBorderColorBox.setSelectObject(style.getBorderColor());
         normalFontNameComboBox.setSelectedItem(style.getFontFamily());
         normalFontSizeComboBox.setSelectedItem(style.getFontSize());
@@ -327,7 +327,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
         selectedBackgroundColorBox.setSelectObject(style.getSelectedBackgroundColor());
         selectedOpacityDragBar.setValue(style.getSelectedOpacity());
         selectedOpacitySpinner.setValue(style.getSelectedOpacity());
-        selectedBorderWidthComBox.setSelectedLineStyle(style.getSelectedBorderWidth());
+        selectedBorderWidthComBox.setSelectedLineStyle(style.getSelectedBorderLineStyle());
         selectedBorderColorBox.setSelectObject(style.getSelectedBorderColor());
         selectedFontNameComboBox.setSelectedItem(style.getSelectedFontFamily());
         selectedFontSizeComboBox.setSelectedItem(style.getSelectedFontSize());
@@ -349,7 +349,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
             style.setBackgroundColor(normalBackgroundColorBox.getSelectObject());
         }
         style.setOpacity((int) normalOpacitySpinner.getValue());
-        style.setBorderWidth(normalBorderWidthComBox.getSelectedLineStyle());
+        style.setBorderLineStyle(normalBorderWidthComBox.getSelectedLineStyle());
         style.setBorderColor(normalBorderColorBox.getSelectObject());
         if (normalFontNameComboBox.getSelectedItem() != null) {
             style.setFontFamily((String) normalFontNameComboBox.getSelectedItem());
@@ -365,7 +365,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
             style.setSelectedBackgroundColor(selectedBackgroundColorBox.getSelectObject());
         }
         style.setSelectedOpacity((int) selectedOpacitySpinner.getValue());
-        style.setSelectedBorderWidth(selectedBorderWidthComBox.getSelectedLineStyle());
+        style.setSelectedBorderLineStyle(selectedBorderWidthComBox.getSelectedLineStyle());
         style.setSelectedBorderColor(selectedBorderColorBox.getSelectObject());
         if (selectedFontNameComboBox.getSelectedItem() != null) {
             style.setSelectedFontFamily((String) selectedFontNameComboBox.getSelectedItem());

From daadcdc0fe30b1a0ee70ea3c15e429dc5344d8b0 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Thu, 9 Apr 2020 23:11:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?MOBILE-26026=20=E8=81=94=E6=8E=92=E6=8C=89?=
 =?UTF-8?q?=E9=92=AETab=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

设计器端区分线型和线宽
---
 .../fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java
index 722d5f91c5..2f269b028d 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java
@@ -196,7 +196,7 @@ public class UniteStyleDefinePane extends MobileTemplateStyleDefinePane {
         this.initialBackgroundColorBox.setSelectObject(style.getInitialColor());
         this.selectedBackgroundColorBox.setSelectObject(style.getSelectColor());
 
-        this.borderWidthComboBox.setSelectedLineStyle(style.getBorderWidth());
+        this.borderWidthComboBox.setSelectedLineStyle(style.getBorderLineStyle());
         this.borderColorBox.setSelectObject(style.getBorderColor());
         this.borderRadiusSpinner.setValue(style.getBorderRadius());
 
@@ -213,7 +213,7 @@ public class UniteStyleDefinePane extends MobileTemplateStyleDefinePane {
         style.setInitialColor(this.initialBackgroundColorBox.getSelectObject());
         style.setSelectColor(this.selectedBackgroundColorBox.getSelectObject());
 
-        style.setBorderWidth(this.borderWidthComboBox.getSelectedLineStyle());
+        style.setBorderLineStyle(this.borderWidthComboBox.getSelectedLineStyle());
         style.setBorderColor(this.borderColorBox.getSelectObject());
         style.setBorderRadius((int) this.borderRadiusSpinner.getValue());