From 84dd9246f0fec0aa879ce00a7edc5c1cb48c96c9 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Tue, 20 Nov 2018 10:06:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-10535=20=E7=95=8C=E9=9D=A2ui?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessibles/MobileTemplateStylePane.java  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java
index f88221a42..98309819d 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java
@@ -26,12 +26,12 @@ import java.util.List;
 import java.util.Map;
 
 public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTemplateStyle> {
-    private static final List<String> STYLE_LIST = new ArrayList<String>();
+    private static final List<MobileTemplateStyle> STYLE_LIST = new ArrayList<MobileTemplateStyle>();
     static {
-        STYLE_LIST.add(DefaultMobileTemplateStyle.STYLE_NAME);
-        STYLE_LIST.add(UpMenuStyle.STYLE_NAME);
-        STYLE_LIST.add(DownMenuStyle.STYLE_NAME);
-        STYLE_LIST.add(SliderStyle.STYLE_NAME);
+        STYLE_LIST.add(new DefaultMobileTemplateStyle());
+        STYLE_LIST.add(new UpMenuStyle());
+        STYLE_LIST.add(new DownMenuStyle());
+        STYLE_LIST.add(new SliderStyle());
     }
 
     private DefaultListModel listModel;
@@ -49,11 +49,11 @@ public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTem
         card = new CardLayout();
         right = FRGUIPaneFactory.createCardLayout_S_Pane();
         right.setLayout(card);
-        for(String style : STYLE_LIST){
-            listModel.addElement(style);
-            BasicBeanPane<MobileTemplateStyle> styleBasicBeanPane = TemplateStyleDefinePaneFactory.createDefinePane(style, tagLayout);
-            map.put(style, styleBasicBeanPane);
-            right.add(style, styleBasicBeanPane);
+        for(MobileTemplateStyle style : STYLE_LIST){
+            listModel.addElement(style.toString());
+            BasicBeanPane<MobileTemplateStyle> styleBasicBeanPane = TemplateStyleDefinePaneFactory.createDefinePane(style.getStyle(), tagLayout);
+            map.put(style.toString(), styleBasicBeanPane);
+            right.add(style.toString(), styleBasicBeanPane);
         }
         styleList = new JList(listModel);
         styleList.setCellRenderer(render);
@@ -97,10 +97,10 @@ public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTem
 
     public void populate(MobileTemplateStyle templateStyle) {
         for(int i = 0; i< listModel.getSize(); i++){
-            if((listModel.getElementAt(i)).equals(templateStyle.getStyle())){
+            if((listModel.getElementAt(i)).equals(templateStyle.toString())){
                 styleList.setSelectedIndex(i);
-                map.get(templateStyle.getStyle()).populateBean(templateStyle);
-                card.show(right, templateStyle.getStyle());
+                map.get(templateStyle.toString()).populateBean(templateStyle);
+                card.show(right, templateStyle.toString());
                 return;
             }
         }

From bf21ec926a5cb098fcc9ec6601ffd840684be608 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Tue, 20 Nov 2018 17:55:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessibles/MobileTemplateStylePane.java  | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java
index 98309819d..73a8935dc 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java
@@ -4,11 +4,8 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.mobile.ui.TemplateStyleDefinePaneFactory;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
-import com.fr.general.cardtag.mobile.DefaultMobileTemplateStyle;
-import com.fr.general.cardtag.mobile.DownMenuStyle;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
-import com.fr.general.cardtag.mobile.SliderStyle;
-import com.fr.general.cardtag.mobile.UpMenuStyle;
+import com.fr.general.cardtag.mobile.MobileTemplateStyleType;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.DefaultListModel;
 import javax.swing.JList;
@@ -26,12 +23,12 @@ import java.util.List;
 import java.util.Map;
 
 public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTemplateStyle> {
-    private static final List<MobileTemplateStyle> STYLE_LIST = new ArrayList<MobileTemplateStyle>();
+    private static final List<MobileTemplateStyleType> STYLE_LIST = new ArrayList<MobileTemplateStyleType>();
     static {
-        STYLE_LIST.add(new DefaultMobileTemplateStyle());
-        STYLE_LIST.add(new UpMenuStyle());
-        STYLE_LIST.add(new DownMenuStyle());
-        STYLE_LIST.add(new SliderStyle());
+        STYLE_LIST.add(MobileTemplateStyleType.DEFAULT_STYLE);
+        STYLE_LIST.add(MobileTemplateStyleType.UP_MENU_STYLE);
+        STYLE_LIST.add(MobileTemplateStyleType.DOWN_MENU_STYLE);
+        STYLE_LIST.add(MobileTemplateStyleType.SLIDER_STYLE);
     }
 
     private DefaultListModel listModel;
@@ -49,11 +46,11 @@ public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTem
         card = new CardLayout();
         right = FRGUIPaneFactory.createCardLayout_S_Pane();
         right.setLayout(card);
-        for(MobileTemplateStyle style : STYLE_LIST){
-            listModel.addElement(style.toString());
+        for(MobileTemplateStyleType style : STYLE_LIST){
+            listModel.addElement(style.getDisplayName());
             BasicBeanPane<MobileTemplateStyle> styleBasicBeanPane = TemplateStyleDefinePaneFactory.createDefinePane(style.getStyle(), tagLayout);
-            map.put(style.toString(), styleBasicBeanPane);
-            right.add(style.toString(), styleBasicBeanPane);
+            map.put(style.getDisplayName(), styleBasicBeanPane);
+            right.add(style.getDisplayName(), styleBasicBeanPane);
         }
         styleList = new JList(listModel);
         styleList.setCellRenderer(render);
@@ -97,7 +94,9 @@ public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTem
 
     public void populate(MobileTemplateStyle templateStyle) {
         for(int i = 0; i< listModel.getSize(); i++){
-            if((listModel.getElementAt(i)).equals(templateStyle.toString())){
+            String style = templateStyle.getStyle();
+            MobileTemplateStyleType templateStyleType = MobileTemplateStyleType.parse(style);
+            if((listModel.getElementAt(i)).equals(templateStyleType.getDisplayName())){
                 styleList.setSelectedIndex(i);
                 map.get(templateStyle.toString()).populateBean(templateStyle);
                 card.show(right, templateStyle.toString());