From 5355d7dda4e6378403a8ab291600f370565e8ba7 Mon Sep 17 00:00:00 2001
From: "Mata.Li" <Mata.Li@fanruan.com>
Date: Wed, 14 Nov 2018 20:06:54 +0800
Subject: [PATCH 01/20] REPORT-12161 & REPORT-10599

---
 .../java/com/fr/design/dialog/UIDialog.java   | 23 +++++++++------
 .../fr/design/javascript/JSContentPane.java   | 27 ++++++++++++-----
 .../design/javascript/JavaScriptImplPane.java |  4 ++-
 .../fr/design/mainframe/DesignerFrame.java    | 11 ++++++-
 .../com/fr/design/mainframe/JTemplate.java    |  2 +-
 .../mainframe/toolbar/ToolBarMenuDock.java    | 29 ++++++++++++++++---
 .../design/mainframe/WidgetPropertyPane.java  | 19 ++++++++----
 .../fr/design/mainframe/ElementCasePane.java  |  2 +-
 8 files changed, 87 insertions(+), 30 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
index 7380bb58f..193a5ea07 100644
--- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
@@ -73,7 +73,7 @@ public abstract class UIDialog extends JDialog {
         }
         this.setName(pane.title4PopupWindow());
         this.setModal(true);
-        this.pack();
+
         GUICoreUtils.centerWindow(this);
     }
 
@@ -90,12 +90,10 @@ public abstract class UIDialog extends JDialog {
         //取消
         addCancelButton(buttonsPane);
 
-        this.getRootPane().setDefaultButton(okButton);
-
         return controlPane;
     }
 
-    protected void addCustomButton(JPanel buttonsPane){
+    protected void addCustomButton(JPanel buttonsPane) {
 
     }
 
@@ -110,6 +108,18 @@ public abstract class UIDialog extends JDialog {
                 doCancel();
             }
         });
+        JPanel defaultPane = (JPanel) this.getContentPane();
+        InputMap inputMapAncestor = defaultPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+        ActionMap actionMap = defaultPane.getActionMap();
+
+        // transfer focus to CurrentEditor
+        inputMapAncestor.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "dialogOK");
+        actionMap.put("dialogOK", new AbstractAction() {
+
+            public void actionPerformed(ActionEvent evt) {
+                doOK();
+            }
+        });
     }
 
     private void addOkButton(JPanel buttonsPane) {
@@ -130,7 +140,6 @@ public abstract class UIDialog extends JDialog {
      * 添加监听器
      *
      * @param l 监听器
-     *
      */
     public void addDialogActionListener(DialogActionListener l) {
         listeners.add(l);
@@ -138,7 +147,6 @@ public abstract class UIDialog extends JDialog {
 
     /**
      * 清除所有监听器
-     *
      */
     public void clearDialogActionListeners() {
         listeners.clear();
@@ -146,7 +154,6 @@ public abstract class UIDialog extends JDialog {
 
     /**
      * 确定操作
-     *
      */
     public void doOK() {
         try {
@@ -177,7 +184,6 @@ public abstract class UIDialog extends JDialog {
 
     /**
      * 取消操作
-     *
      */
     public void doCancel() {
 
@@ -224,7 +230,6 @@ public abstract class UIDialog extends JDialog {
 
     /**
      * 检测结果是否合法
-     *
      */
     public abstract void checkValid() throws Exception;
 
diff --git a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
index 77e16e312..cd6e01df3 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 public class JSContentPane extends BasicPane {
     private RSyntaxTextArea contentTextArea;
     private UILabel funNameLabel;
+    private AutoCompletion ac;
 
     private int titleWidth = 180;
 
@@ -78,14 +79,6 @@ public class JSContentPane extends BasicPane {
         contentTextArea.setCodeFoldingEnabled(true);
         contentTextArea.setAntiAliasingEnabled(true);
 
-        CompletionProvider provider = createCompletionProvider();
-
-        AutoCompletion ac = new AutoCompletion(provider);
-        String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts();
-
-        ac.setTriggerKey(convert2KeyStroke(shortCuts));
-        ac.install(contentTextArea);
-
         UIScrollPane sp = new UIScrollPane(contentTextArea);
         this.add(sp, BorderLayout.CENTER);
 
@@ -104,13 +97,31 @@ public class JSContentPane extends BasicPane {
     }
 
     public void populate(String js) {
+        if (ac == null) {
+            CompletionProvider provider = createCompletionProvider();
+            ac = new AutoCompletion(provider);
+            String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts();
+
+            ac.setTriggerKey(convert2KeyStroke(shortCuts));
+            ac.install(contentTextArea);
+        }
+
         this.contentTextArea.setText(js);
     }
 
     public String update() {
+        if (ac != null) {
+            this.ac.uninstall();
+            ac = null;
+        }
+
         return this.contentTextArea.getText();
     }
 
+    public void reset() {
+        this.contentTextArea.setText(null);
+    }
+
     public void setFunctionTitle(String[] args) {
         funNameLabel.setText(createFunctionTitle(args));
     }
diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
index 23a33976b..8806d6853 100644
--- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
+++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
@@ -138,6 +138,9 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
     public void populateBean(JavaScriptImpl javaScriptImpl) {
         if (javaScriptImpl == null) {
             javaScriptImpl = new JavaScriptImpl();
+            jsPane.reset();
+        }else{
+            jsPane.populate(javaScriptImpl.getContent());
         }
 
         int rowCount = javaScriptImpl.getJSImportSize();
@@ -147,7 +150,6 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
         }
         importedJsPane.populate(value);
         parameterPane.populate(javaScriptImpl.getParameters());
-        jsPane.populate(javaScriptImpl.getContent());
 
         if (itemNameTextField != null) {
             itemNameTextField.setText(javaScriptImpl.getItemName());
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index be2695815..7d9a3d749 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -155,6 +155,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     // 右边的虚线
     private DottedLine rightDottedLine;
 
+    //用于判断设计器是否打开了
+    private boolean designerOpened = false;
+
     private int contentWidth = (int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth());
 
     private int contentHeight = (int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight());
@@ -351,7 +354,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      */
     public void addDesignerOpenedListener(DesignerOpenedListener listener) {
 
-        designerOpenedListenerList.add(listener);
+        if (!designerOpened) {
+            designerOpenedListenerList.add(listener);
+        }
     }
 
     /**
@@ -362,6 +367,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         for (DesignerOpenedListener listener : designerOpenedListenerList) {
             listener.designerOpened();
         }
+
+        designerOpened = true;
+        //使用完清除监听
+        designerOpenedListenerList.clear();
     }
 
     protected DesktopCardPane getCenterTemplateCardPane() {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index 737b5ba16..d14a066e5 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -780,7 +780,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 ((JTemplateActionListener) listeners[i + 1]).templateClosed(this);
             }
         }
-
+        this.undoState = null;
         this.repaint(30);
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index 8f20583ab..b46719efe 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -148,6 +148,9 @@ public abstract class ToolBarMenuDock {
     };
     private static final String FINEREPORT = "FineReport";
     private static final int MENUBAR_HEIGHT = 22;
+
+    private static final List<PluginEventListener> PLUGIN_LISTENERS = new ArrayList<>();
+
     private MenuDef[] menus;
     private ToolBarDef toolBarDef;
     private List<UpdateActionModel> shortCutsList;
@@ -218,6 +221,8 @@ public abstract class ToolBarMenuDock {
     }
 
     public MenuDef[] menus(final ToolBarMenuDockPlus plus) {
+        //删除之前创建的插件菜单监听
+        clearPluginListeners();
         java.util.List<MenuDef> menuList = new java.util.ArrayList<MenuDef>();
         // 添加文件菜单
         menuList.add(createFileMenuDef(plus));
@@ -248,6 +253,15 @@ public abstract class ToolBarMenuDock {
         return menuList.toArray(new MenuDef[menuList.size()]);
     }
 
+    //清空监听
+    private static synchronized void clearPluginListeners() {
+
+        for (PluginEventListener listener : PLUGIN_LISTENERS) {
+            GeneralContext.stopListenPlugin(listener);
+        }
+        PLUGIN_LISTENERS.clear();
+    }
+
     /**
      * 获取所有actionmodel
      *
@@ -644,7 +658,7 @@ public abstract class ToolBarMenuDock {
             }
         };
 
-        GeneralContext.listenPlugin(PluginEventType.BeforeStop, new PluginEventListener() {
+        PluginEventListener beforeStop = new PluginEventListener() {
 
             @Override
             public void on(PluginEvent event) {
@@ -652,8 +666,9 @@ public abstract class ToolBarMenuDock {
                 Set<MenuHandler> menuHandlers = runtime.get(MenuHandler.MARK_STRING);
                 removeExtraMenus(menuDef, anchor, action, menuHandlers);
             }
-        }, filter);
-        GeneralContext.listenPlugin(PluginEventType.AfterRun, new PluginEventListener() {
+        };
+
+        PluginEventListener afterRun = new PluginEventListener() {
 
             @Override
             public void on(PluginEvent event) {
@@ -662,7 +677,13 @@ public abstract class ToolBarMenuDock {
                 Set<MenuHandler> menuHandlers = runtime.get(MenuHandler.MARK_STRING);
                 addExtraMenus(menuDef, anchor, action, menuHandlers);
             }
-        }, filter);
+        };
+
+        GeneralContext.listenPlugin(PluginEventType.BeforeStop, beforeStop, filter);
+        GeneralContext.listenPlugin(PluginEventType.AfterRun, afterRun, filter);
+
+        PLUGIN_LISTENERS.add(afterRun);
+        PLUGIN_LISTENERS.add(beforeStop);
     }
 
     private void removeExtraMenus(MenuDef menuDef, String anchor, ShortCutMethodAction action, Set<MenuHandler> set) {
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
index d6ee25342..0cf740dbe 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
@@ -28,7 +28,7 @@ import java.util.Set;
  * 控件属性表绘制
  * Modified by fanglei
  */
-public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPropertyPane {
+public class WidgetPropertyPane extends FormDockView implements BaseWidgetPropertyPane {
 
     private static final int PADDING = 10;
     private static final int PADDING_M = 12;
@@ -108,11 +108,10 @@ public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPrope
      */
     private void initTables() {
         formWidgetCardPane.populate();
-        eventTable.refresh();
+
         if (mobileExtraPropertyPanes != null) {
             for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) {
                 extraPane.initPropertyGroups(designer);
-                extraPane.populate(designer);
             }
         }
         if (widgetPropertyTables != null) {
@@ -222,7 +221,7 @@ public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPrope
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event"),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal")
         };
-        final CardLayout tabbedPane =  new CardLayout();
+        final CardLayout tabbedPane = new CardLayout();
         final JPanel center = new JPanel(tabbedPane);
         center.add(formWidgetCardPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties"));
         center.add(eventTable, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event"));
@@ -232,6 +231,16 @@ public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPrope
         tabsHeaderIconPane = new UIHeadGroup(tabTitles) {
             @Override
             public void tabChanged(int index) {
+                //切换的时候再populate
+                if (index == 1) {
+                    eventTable.refresh();
+                } else if (index == 2) {
+                    if (mobileExtraPropertyPanes != null) {
+                        for (MobileWidgetDefinePane extraPane : mobileExtraPropertyPanes) {
+                            extraPane.populate(designer);
+                        }
+                    }
+                }
                 tabbedPane.show(center, tabTitles[index]);
             }
         };
@@ -292,7 +301,7 @@ public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPrope
             if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED
                     || evt.getCreatorEventID() == DesignerEvent.CREATOR_RESIZED) {
                 formWidgetCardPane.populate();
-            } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED){
+            } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) {
                 // 防止多次触发
                 if (lastAffectedCreator != null && lastAffectedCreator == evt.getAffectedCreator()) {
                     return;
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
index 8832ec4c3..df9476c71 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
@@ -596,7 +596,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
      * @return 是则返回true
      */
     public boolean isSelectedOneCell() {
-        return selection.isSelectedOneCell(this);
+        return (selection == null) ? false : selection.isSelectedOneCell(this);
     }
 
     /**

From 916fcba1a67db2773edf3cf8469b9edcaacd7a9f Mon Sep 17 00:00:00 2001
From: vito <vito@finereport.com>
Date: Thu, 15 Nov 2018 11:13:30 +0800
Subject: [PATCH 02/20] =?UTF-8?q?REPORT-12697=20mac=E5=9C=A8jni=E5=9C=A8?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=B3=BB=E7=BB=9F=E4=B8=8B=E6=8A=A5=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/com/fr/start/jni/splash.dylib   | Bin 41248 -> 57200 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/designer-realize/src/main/resources/com/fr/start/jni/splash.dylib b/designer-realize/src/main/resources/com/fr/start/jni/splash.dylib
index 5d096b2b37d34197e377f7b1ed115c3768bd0d08..2b59ee3eb04f6377b0a8f06d9f60096a1216ee32 100755
GIT binary patch
literal 57200
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

literal 41248
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
bmIo{kSRSxEV0pmufaL+p1C|H=iahY&LXX+I


From 4c2586a6c2a9cce58512c321ae07f4e131d99a06 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Thu, 15 Nov 2018 20:17:55 +0800
Subject: [PATCH 03/20] =?UTF-8?q?REPORT-12721=20HistoryTemplateListPane?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/file/HistoryTemplateListPane.java  | 143 +++++++++++++++++-
 1 file changed, 140 insertions(+), 3 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java
index 073c4fd1d..73d305333 100644
--- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java
@@ -1,16 +1,153 @@
 package com.fr.design.file;
 
+import com.fr.base.chart.chartdata.CallbackEvent;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.file.FILE;
+import com.fr.file.FileNodeFILE;
+
+import java.util.List;
+
 /**
  * 历史模板缓存
- *
+ * <p>
  * 为可能存在的插件做兼容处理
  *
  * @see HistoryTemplateListCache
  * @deprecated use HistoryTemplateListCache instead
  */
 @Deprecated
-public class HistoryTemplateListPane {
-    public static HistoryTemplateListCache getInstance() {
+public class HistoryTemplateListPane implements CallbackEvent {
+
+
+    private static volatile HistoryTemplateListPane THIS;
+
+    public static HistoryTemplateListPane getInstance() {
+        if (THIS == null) {
+            synchronized (HistoryTemplateListPane.class) {
+                if (THIS == null) {
+                    THIS = new HistoryTemplateListPane();
+                }
+            }
+        }
+        return THIS;
+    }
+
+    private static HistoryTemplateListCache instead() {
         return HistoryTemplateListCache.getInstance();
     }
+
+
+    /**
+     * 关闭选择的文件
+     *
+     * @param selected 选择的
+     */
+    public void closeSelectedReport(JTemplate<?, ?> selected) {
+        instead().closeSelectedReport(selected);
+    }
+
+    /**
+     * 临时关闭选择的文件
+     *
+     * @param selected 选择的
+     */
+    public void closeVirtualSelectedReport(JTemplate<?, ?> selected) {
+        instead().closeVirtualSelectedReport(selected);
+    }
+
+
+    public JTemplate<?, ?> getCurrentEditingTemplate() {
+        return instead().getCurrentEditingTemplate();
+    }
+
+    public void setCurrentEditingTemplate(JTemplate<?, ?> jt) {
+        instead().setCurrentEditingTemplate(jt);
+
+    }
+
+    /**
+     * 添加历史记录
+     */
+    public void addHistory() {
+        instead().addHistory();
+    }
+
+
+    public List<JTemplate<?, ?>> getHistoryList() {
+        return instead().getHistoryList();
+    }
+
+
+    /**
+     * 清空历史记录
+     */
+    public void removeAllHistory() {
+        instead().removeAllHistory();
+    }
+
+    public int getHistoryCount() {
+        return instead().getHistoryCount();
+    }
+
+
+    public JTemplate<?, ?> get(int index) {
+        return instead().get(index);
+    }
+
+
+    public JTemplate<?, ?> getTemplate(int index) {
+        return instead().getTemplate(index);
+    }
+
+    /**
+     * 获取模板的index
+     *
+     * @param jt 模板
+     * @return 位置
+     */
+    public int contains(JTemplate<?, ?> jt) {
+        return instead().contains(jt);
+    }
+
+
+    /**
+     * 判断是否打开过该模板
+     *
+     * @param filename 文件名
+     * @return 文件位置
+     */
+    public int contains(String filename) {
+        return instead().contains(filename);
+    }
+
+    /**
+     * 是否是当前编辑的文件
+     *
+     * @param filename 文件名
+     * @return 是则返回TRUE
+     */
+    public boolean isCurrentEditingFile(String filename) {
+        return instead().isCurrentEditingFile(filename);
+    }
+
+
+    public void callback() {
+        getCurrentEditingTemplate().repaint();
+    }
+
+    /**
+     * 打开new模板的同时关闭old模板,优先关已保存的、先打开的
+     */
+    public void closeOverLineTemplate() {
+        instead().closeOverLineTemplate();
+    }
+
+
+    public void deleteFile(FileNodeFILE file) {
+        instead().deleteFile(file);
+    }
+
+    public boolean rename(FILE tplFile, String from, String to) {
+        return instead().rename(tplFile, from, to);
+    }
 }

From 8a9923d02a7e9d30111531b0b47027b706039536 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Thu, 15 Nov 2018 20:24:24 +0800
Subject: [PATCH 04/20] =?UTF-8?q?REPORT-12721=20HistoryTemplateListPane?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/file/HistoryTemplateListPane.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java
index 73d305333..a51735f64 100644
--- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java
@@ -131,8 +131,9 @@ public class HistoryTemplateListPane implements CallbackEvent {
     }
 
 
+    @Override
     public void callback() {
-        getCurrentEditingTemplate().repaint();
+        instead().callback();
     }
 
     /**

From 3c40011366f54e8e4844cab5e3f409fc90abc43a Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Fri, 16 Nov 2018 16:37:19 +0800
Subject: [PATCH 05/20] =?UTF-8?q?=20=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=80=A6=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/fun/ConnectionProvider.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/fun/ConnectionProvider.java b/designer-base/src/main/java/com/fr/design/fun/ConnectionProvider.java
index 766f7d414..8e5aed5b8 100644
--- a/designer-base/src/main/java/com/fr/design/fun/ConnectionProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/ConnectionProvider.java
@@ -10,32 +10,36 @@ import com.fr.stable.fun.mark.Mutable;
  */
 public interface ConnectionProvider extends Mutable {
 
-    public static final String XML_TAG = "ConnectionProvider";
+    String XML_TAG = "ConnectionProvider";
 
     // 2016-12-14 1 -> 2 , 增加connection.feature方法导致不兼容.
     int CURRENT_LEVEL = 2;
 
     /**
      * 数据连接弹出菜单的名字
+     *
      * @return 名字
      */
-    public String nameForConnection();
+    String nameForConnection();
 
     /**
      * 数据连接弹出菜单的图标
+     *
      * @return 图标路径
      */
-    public String iconPathForConnection();
+    String iconPathForConnection();
 
     /**
      * 数据连接的类型
+     *
      * @return 连接类型
      */
-    public Class<? extends com.fr.data.impl.Connection> classForConnection();
+    Class<? extends com.fr.data.impl.Connection> classForConnection();
 
     /**
      * 数据连接的设计界面
+     *
      * @return 设计界面
      */
-    public Class<? extends BasicBeanPane<? extends Connection>> appearanceForConnection();
+    Class<? extends BasicBeanPane<? extends Connection>> appearanceForConnection();
 }
\ No newline at end of file

From f38df1c8b616588887ff9d29d1f288a2addde015 Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Sun, 18 Nov 2018 12:55:25 +0800
Subject: [PATCH 06/20] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E5=9D=90=E6=A0=87=E8=BD=B4=E5=88=BB?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/gui/style/axis/ChartValuePane.java      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
index 32e656479..82b5dd326 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
@@ -2,6 +2,7 @@ package com.fr.design.mainframe.chart.gui.style.axis;
 
 import com.fr.base.BaseFormula;
 import com.fr.base.Utils;
+import com.fr.chart.base.AxisUnitType;
 import com.fr.chart.base.ChartBaseUtils;
 import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Axis;
@@ -257,10 +258,10 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 			axisLineStylePane.update(axis);
 			axis.setAxisReversed(this.axisReversed.isSelected());
 			String unitValue = Utils.objectToString(unitCombox.getSelectedItem());
-			if(ComparatorUtils.equals(unitValue, ChartConstants.UNIT_I18N_VALUES[0])) {
+			if(ComparatorUtils.equals(unitValue, AxisUnitType.UNIT_NONE.toLocaleString())) {
 				unitValue = null;
 			}
-			numberAxis.setShowUnit(ChartConstants.getUnitValueFromKey(unitValue));
+			numberAxis.setShowUnit(AxisUnitType.parse(unitValue));
             if(numberAxis.isSurpportAxisTitle()) {
                 updateAxisTitle(numberAxis);
             }
@@ -378,11 +379,13 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 
             axisLineStylePane.populate(axis);
             axisReversed.setSelected(axis.hasAxisReversed());
-            String unitKey = numberAxis.getShowUnit();
-            if(StringUtils.isBlank(unitKey)) {
-                unitKey = ChartConstants.UNIT_I18N_KEYS[0];
+			String unitKey;
+            if(numberAxis.getShowUnit() != null) {
+            	unitKey = numberAxis.getShowUnit().getStringType();
+			}else{
+                unitKey = AxisUnitType.UNIT_NONE.getStringType();
             }
-            unitCombox.setSelectedItem(ChartConstants.getUnitKey2Value(unitKey));
+            unitCombox.setSelectedItem(AxisUnitType.parse(unitKey).toLocaleString());
 
             if(numberAxis.isSurpportAxisTitle()) {
                 populateAxisTitle(axis);

From 081d76d68dbc676c180858426c0b71a3d602e0d3 Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Sun, 18 Nov 2018 13:30:30 +0800
Subject: [PATCH 07/20] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/chart/gui/style/axis/ChartValuePane.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
index 82b5dd326..02080857d 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
@@ -4,7 +4,6 @@ import com.fr.base.BaseFormula;
 import com.fr.base.Utils;
 import com.fr.chart.base.AxisUnitType;
 import com.fr.chart.base.ChartBaseUtils;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.Axis;
 import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.NumberAxis;
@@ -79,7 +78,7 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
         axisLineStylePane = new ChartAxisLineStylePane();
         zeroPane = aliagnZero4Second();
         axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed"));
-        unitCombox = new UIComboBox(ChartConstants.UNIT_I18N_VALUES);
+        unitCombox = new UIComboBox(AxisUnitType.UNIT_I18N_VALUES);
         formatPane = new FormatPaneWithOutFont();
         axisLabelPane = new ChartAxisLabelPane();
         dataPane = createDataDefinePane();

From d6670650e54cbee6e6b2b3f523d20340b506037f Mon Sep 17 00:00:00 2001
From: "Wim.Zhai" <Wim.Zhai@fanruan.com>
Date: Sun, 18 Nov 2018 20:02:21 +0800
Subject: [PATCH 08/20] CHART-3206 & CHART-3374 9to10

---
 .../java/com/fr/design/style/color/ColorSelectDetailPane.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java
index 73dfe5ca9..758c673fa 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java
@@ -95,7 +95,7 @@ public class ColorSelectDetailPane extends BasicPane {
             public void stateChanged(ChangeEvent e) {
                 ColorSelectionModel model = (ColorSelectionModel) e.getSource();
                 colorChooserPreview.setMyColor(model.getSelectedColor());
-                colorChooserPreview.paint(colorChooserPreview.getGraphics());
+                colorChooserPreview.repaint();
             }
         });
         previewPanel.add(colorChooserPreview);

From 8058d1142a429f593a8fd803b02c3ecc4983db7f Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Mon, 19 Nov 2018 09:52:20 +0800
Subject: [PATCH 09/20] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/chart/gui/style/axis/ChartValuePane.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
index 02080857d..8f55156df 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
@@ -78,7 +78,7 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
         axisLineStylePane = new ChartAxisLineStylePane();
         zeroPane = aliagnZero4Second();
         axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed"));
-        unitCombox = new UIComboBox(AxisUnitType.UNIT_I18N_VALUES);
+        unitCombox = new UIComboBox(AxisUnitType.getUNIT_I18N_VALUES());
         formatPane = new FormatPaneWithOutFont();
         axisLabelPane = new ChartAxisLabelPane();
         dataPane = createDataDefinePane();

From 2dba45028720e3ad57fc42b9e4900370134cd45a Mon Sep 17 00:00:00 2001
From: qinghuiliu <Liu_upc@163.com>
Date: Mon, 19 Nov 2018 10:12:51 +0800
Subject: [PATCH 10/20] =?UTF-8?q?=E6=94=B9=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/chart/gui/style/axis/ChartValuePane.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
index 8f55156df..35b57d09d 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
@@ -78,7 +78,7 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
         axisLineStylePane = new ChartAxisLineStylePane();
         zeroPane = aliagnZero4Second();
         axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed"));
-        unitCombox = new UIComboBox(AxisUnitType.getUNIT_I18N_VALUES());
+        unitCombox = new UIComboBox(AxisUnitType.getI18NValues());
         formatPane = new FormatPaneWithOutFont();
         axisLabelPane = new ChartAxisLabelPane();
         dataPane = createDataDefinePane();

From c396d3469f57b0bd217847c7cd25ee0050b3e604 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Mon, 19 Nov 2018 15:02:39 +0800
Subject: [PATCH 11/20] =?UTF-8?q?REPORT-10535=09=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E9=80=82=E9=85=8D=E5=8A=9F=E8=83=BD=E2=80=94=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AFTAB=E7=BB=84=E4=BB=B6=E5=A4=9A=E6=A0=B7?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/layout/FRGUIPaneFactory.java    |  11 +
 .../ui/DefaultMobileStyleDefinePane.java      |  97 ++++++++
 .../mobile/ui/DownMenuStyleDefinePane.java    | 174 ++++++++++++++
 .../design/mainframe/mobile/ui/LinePane.java  | 108 +++++++++
 .../ui/MobileTemplateStyleDefinePane.java     | 219 ++++++++++++++++++
 .../mobile/ui/SliderStyleDefinePane.java      | 150 ++++++++++++
 .../ui/StyleDefinePaneWithSelectConf.java     | 113 +++++++++
 .../mobile/ui/TabIconConfigPane.java          | 172 ++++++++++++++
 .../ui/TemplateStyleDefinePaneFactory.java    |  55 +++++
 .../mobile/ui/UpMenuStyleDefinePane.java      | 211 +++++++++++++++++
 .../widget/MobileTabFontConfPane.java         | 143 ++++++++++++
 .../mainframe/widget/UITitleSplitLine.java    |  69 ++++++
 .../AbstractTemplateStylePane.java            |  10 +
 .../AccessibleTemplateStyleEditor.java        |  13 +-
 .../accessibles/MobileTemplateStylePane.java  | 113 +++++++++
 .../widget/accessibles/TemplateStylePane.java |   5 +-
 .../accessibles/TemplateStylePreviewPane.java |  14 +-
 .../preview/MobileTemplatePreviewPane.java    |  53 +++++
 .../creator/cardlayout/XWCardTagLayout.java   |   6 +
 .../mobile/TabMobilePropertyUI.java           |  30 +++
 .../layout/WCardTagLayoutDefinePane.java      |   3 +-
 .../mobile/TabMobileWidgetDefinePane.java     |  69 ++++++
 22 files changed, 1818 insertions(+), 20 deletions(-)
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/LinePane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/StyleDefinePaneWithSelectConf.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TabIconConfigPane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TemplateStyleDefinePaneFactory.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AbstractTemplateStylePane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/widget/preview/MobileTemplatePreviewPane.java
 create mode 100644 designer-form/src/main/java/com/fr/design/designer/properties/mobile/TabMobilePropertyUI.java
 create mode 100644 designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java

diff --git a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
index db48cf995..09eaad466 100644
--- a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
+++ b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
@@ -251,6 +251,17 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
+
+    /**
+     * 创建一个靠左流式布局，流式内嵌
+     *
+     * @return JPanel对象
+     */
+    public static JPanel createBoxFlowInnerContainerPane(int hgap, int vgap) {
+        JPanel jp = new JPanel();
+        jp.setLayout(new FlowLayout(FlowLayout.LEFT, hgap, vgap));
+        return jp;
+    }
     /**
      * 创建一个靠左流式布局，流式内嵌，首元素距离左边0
      *
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java
new file mode 100644
index 000000000..b42f1a6ce
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java
@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.base.GraphHelper;
+import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
+import com.fr.form.ui.CardSwitchButton;
+import com.fr.form.ui.container.cardlayout.WCardTagLayout;
+import com.fr.general.FRFont;
+import com.fr.general.cardtag.mobile.DefaultMobileTemplateStyle;
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+
+import java.awt.BasicStroke;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+public class DefaultMobileStyleDefinePane extends MobileTemplateStyleDefinePane {
+
+    public DefaultMobileStyleDefinePane(WCardTagLayout tagLayout) {
+        super(tagLayout);
+    }
+
+    @Override
+    public void populateBean(MobileTemplateStyle ob) {
+        updatePreviewPane();
+    }
+
+    protected void createConfigPane() {
+
+    }
+
+    @Override
+    protected void initDefaultConfig() {
+
+    }
+
+    @Override
+    public MobileTemplateStyle updateSubStyle() {
+        return null;
+    }
+
+    @Override
+    public MobileTemplateStyle updateBean() {
+        return new DefaultMobileTemplateStyle();
+    }
+
+    @Override
+    protected MobileTemplateStyle getDefaultTemplateStyle() {
+        return new DefaultMobileTemplateStyle();
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+    protected MobileTemplatePreviewPane createPreviewPane() {
+        return new DefaultStylePreviewPane();
+    }
+
+    public class DefaultStylePreviewPane extends MobileTemplatePreviewPane {
+
+        public DefaultStylePreviewPane() {
+            this.setBackground(DefaultMobileTemplateStyle.DEFAULT_INITIAL_COLOR);
+        }
+
+        public void repaint() {
+            super.repaint();
+        }
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+            Dimension dimension = this.getSize();
+            int panelWidth = dimension.width;
+            int panelHeight = dimension.height;
+            Graphics2D g2d = (Graphics2D) g.create();
+            FRFont frFont = DefaultMobileTemplateStyle.DEFAULT_TAB_FONT.getFont();
+            FontMetrics fm = GraphHelper.getFontMetrics(frFont);
+            WCardTagLayout cardTagLayout = DefaultMobileStyleDefinePane.this.getTagLayout();
+            int eachWidth = panelWidth / cardTagLayout.getWidgetCount();
+            g2d.setFont(frFont);
+            for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
+                CardSwitchButton cardSwitchButton = cardTagLayout.getSwitchButton(i);
+                String widgetName = cardSwitchButton.getText();
+                int width = fm.stringWidth(widgetName);
+                g2d.drawString(widgetName, (eachWidth - width) / 2, (panelHeight) / 2);
+                if (i == 0) {
+                    g2d.setStroke(new BasicStroke(2.0f));
+                    g2d.drawLine(0, panelHeight - 1, eachWidth, panelHeight - 1);
+                }
+                g2d.translate(eachWidth, 0);
+            }
+        }
+    }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java
new file mode 100644
index 000000000..b8f267e98
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java
@@ -0,0 +1,174 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.base.GraphHelper;
+import com.fr.base.IconManager;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.widget.UITitleSplitLine;
+import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
+import com.fr.form.ui.CardSwitchButton;
+import com.fr.form.ui.container.cardlayout.WCardTagLayout;
+import com.fr.general.FRFont;
+import com.fr.general.cardtag.mobile.DownMenuStyle;
+import com.fr.general.cardtag.mobile.LineDescription;
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.util.ArrayList;
+
+public class DownMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
+    private LinePane splitLinePane;
+    private TabIconConfigPane initIconConfigPane;
+    private TabIconConfigPane selectIconConfigPane;
+
+    public DownMenuStyleDefinePane(WCardTagLayout tagLayout) {
+        super(tagLayout);
+    }
+
+    protected void createExtraConfPane(JPanel centerPane) {
+        UITitleSplitLine iconSplitLine = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"), 520);
+        iconSplitLine.setPreferredSize(new Dimension(520, 20));
+        centerPane.add(iconSplitLine);
+
+        initIconConfigPane = new TabIconConfigPane(getTagLayout().getWidgetCount());
+        selectIconConfigPane = new TabIconConfigPane(getTagLayout().getWidgetCount());
+
+        UILabel initIconLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Initial_Icon"));
+        UILabel selectIconLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Select_Icon"));
+        initIconLabel.setPreferredSize(new Dimension(55, 20));
+        selectIconLabel.setPreferredSize(new Dimension(55, 20));
+        JPanel initIconContainPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{initIconLabel, initIconConfigPane}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        JPanel selectIconContainePane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{selectIconLabel, selectIconConfigPane}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        initIconContainPane.setPreferredSize(new Dimension(240, 50));
+        selectIconContainePane.setPreferredSize(new Dimension(240, 50));
+        centerPane.add(initIconContainPane);
+        centerPane.add(selectIconContainePane);
+        UITitleSplitLine splitLine = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Spit_Line"), 520);
+        splitLine.setPreferredSize(new Dimension(520, 20));
+        splitLinePane = new LinePane();
+        splitLinePane.addLineChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        centerPane.add(splitLine);
+        centerPane.add(splitLinePane);
+    }
+
+    @Override
+    protected void initDefaultConfig() {
+        this.initialColorBox.setSelectObject(DownMenuStyle.DEFAULT_INITIAL_COLOR);
+        this.fontConfPane.populate(DownMenuStyle.DEFAULT_TAB_FONT.getFont());
+        this.selectColorBox.setSelectObject(DownMenuStyle.DEFAULT_SELECT_COLOR);
+        this.selectFontColor.setColor(DownMenuStyle.DEFAULT_SELECT_FONT_COLOR);
+        this.splitLinePane.populate(DownMenuStyle.DEFAULT_SPLIT_LINE);
+    }
+
+    @Override
+    protected MobileTemplatePreviewPane createPreviewPane() {
+        return new DownMenuStylePreviewPane();
+    }
+
+
+    @Override
+    public void populateBean(MobileTemplateStyle ob) {
+        super.populateBean(ob);
+        DownMenuStyle downMenuStyle = (DownMenuStyle) ob;
+        splitLinePane.populate(downMenuStyle.getSplitLine());
+        ArrayList<String> initialIconNames = new ArrayList<String>();
+        ArrayList<String> selectIconNames = new ArrayList<String>();
+        for (int i = 0; i < getTagLayout().getWidgetCount(); i++) {
+            CardSwitchButton cardSwitchButton = (CardSwitchButton) getTagLayout().getWidget(i);
+            initialIconNames.add(cardSwitchButton.getInitIconName());
+            selectIconNames.add(cardSwitchButton.getSelectIconName());
+        }
+        initIconConfigPane.populate(initialIconNames);
+        selectIconConfigPane.populate(selectIconNames);
+    }
+
+    @Override
+    protected MobileTemplateStyle getDefaultTemplateStyle() {
+        return new DownMenuStyle();
+    }
+
+    @Override
+    public MobileTemplateStyle updateStyleWithSelectConf() {
+        DownMenuStyle downMenuStyle = new DownMenuStyle();
+        downMenuStyle.setSplitLine(splitLinePane.update());
+        ArrayList<String> initialIconNames = initIconConfigPane.update();
+        ArrayList<String> selectIconNames = selectIconConfigPane.update();
+        for (int i = 0; i < getTagLayout().getWidgetCount(); i++) {
+            CardSwitchButton cardSwitchButton = (CardSwitchButton) getTagLayout().getWidget(i);
+            cardSwitchButton.setInitIconName(initialIconNames.get(i));
+            cardSwitchButton.setSelectIconName(selectIconNames.get(i));
+        }
+        return downMenuStyle;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+    public class DownMenuStylePreviewPane extends MobileTemplatePreviewPane {
+        private LineDescription splitLine;
+        private static final String PAINT_ICON = "fund_white";
+
+        public DownMenuStylePreviewPane() {
+            this.setBackground(Color.decode("#3888EE"));
+        }
+
+        public void repaint() {
+            super.repaint();
+        }
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+            Color selectFontColor = this.getTabFontConfig().getSelectColor();
+            Dimension dimension = this.getSize();
+            int panelWidth = dimension.width;
+            int panelHeight = dimension.height;
+            Graphics2D g2d = (Graphics2D) g.create();
+            FRFont frFont = this.getTabFontConfig().getFont();
+            FontMetrics fm = GraphHelper.getFontMetrics(frFont);
+            WCardTagLayout cardTagLayout = DownMenuStyleDefinePane.this.getTagLayout();
+            int eachWidth = panelWidth / cardTagLayout.getWidgetCount();
+            for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
+                g2d.setFont(frFont);
+                g2d.setColor(i == 0 ? selectFontColor : frFont.getForeground());
+                CardSwitchButton cardSwitchButton = cardTagLayout.getSwitchButton(i);
+                String widgetName = cardSwitchButton.getText();
+                int width = fm.stringWidth(widgetName);
+                String iconName = PAINT_ICON;
+                g2d.drawImage(IconManager.getIconManager().getIconImage(iconName), (eachWidth - 18) / 2, 6, null);
+                g2d.drawString(widgetName, (eachWidth - width) / 2, panelHeight / 2 + 9);
+                if (splitLine.getLineStyle() != 0) {
+                    g2d.setColor(splitLine.getColor());
+
+                    g2d.drawLine(eachWidth, 0, eachWidth, panelHeight);
+                }
+
+                g2d.translate(eachWidth, 0);
+
+            }
+
+        }
+
+        public void populateConfig(MobileTemplateStyle templateStyle) {
+            super.populateConfig(templateStyle);
+            this.splitLine = ((DownMenuStyle) templateStyle).getSplitLine();
+        }
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/LinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/LinePane.java
new file mode 100644
index 000000000..fabc7ca5b
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/LinePane.java
@@ -0,0 +1,108 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.icombobox.LineComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.general.cardtag.mobile.LineDescription;
+import com.fr.stable.CoreConstants;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+public class LinePane extends JPanel {
+    private LineComboBox lineStyle;
+    private NewColorSelectBox lineColor;
+    private EventListenerList lineChangeListener = new EventListenerList();
+
+    public LinePane() {
+        init();
+    }
+
+    private void init() {
+        this.setLayout(new VerticalFlowLayout(FlowLayout.CENTER, 0, 10));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 20, 5, 20));
+        UILabel lineLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"));
+        UILabel colorLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors"));
+        lineLabel.setPreferredSize(new Dimension(55, 20));
+        colorLabel.setPreferredSize(new Dimension(55, 20));
+
+        lineStyle = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
+        lineStyle.setPreferredSize(new Dimension(152, 20));
+        lineColor = new NewColorSelectBox(137);
+        lineStyle.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                fireLineStateChanged();
+            }
+        });
+        lineColor.addSelectChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                fireLineStateChanged();
+            }
+        });
+        this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{lineLabel, lineStyle}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM));
+        this.add(TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{colorLabel, lineColor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM));
+    }
+
+    public LineDescription update() {
+        LineDescription lineDescription = new LineDescription();
+        lineDescription.setColor(lineColor.getSelectObject());
+        lineDescription.setLineStyle(lineStyle.getSelectedLineStyle());
+        return lineDescription;
+    }
+
+    public void populate(LineDescription lineDescription) {
+        lineStyle.setSelectedLineStyle(lineDescription.getLineStyle());
+        lineColor.setSelectObject(lineDescription.getColor());
+    }
+
+
+    /**
+     * 添加监听
+     *
+     * @param changeListener 监听列表
+     */
+    public void addLineChangeListener(ChangeListener changeListener) {
+        lineChangeListener.add(ChangeListener.class, changeListener);
+    }
+
+    /**
+     * 移除监听
+     * Removes an old ColorChangeListener.
+     *
+     * @param changeListener 监听列表
+     */
+    public void removeLineChangeListener(ChangeListener changeListener) {
+        lineChangeListener.remove(ChangeListener.class, changeListener);
+    }
+
+    /**
+     * 颜色状态改变
+     */
+    public void fireLineStateChanged() {
+        Object[] listeners = lineChangeListener.getListenerList();
+        ChangeEvent e = null;
+
+        for (int i = listeners.length - 2; i >= 0; i -= 2) {
+            if (listeners[i] == ChangeListener.class) {
+                if (e == null) {
+                    e = new ChangeEvent(this);
+                }
+                ((ChangeListener) listeners[i + 1]).stateChanged(e);
+            }
+        }
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
new file mode 100644
index 000000000..a1d487ab7
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
@@ -0,0 +1,219 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.dialog.AttrScrollPane;
+import com.fr.design.dialog.BasicScrollPane;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.widget.MobileTabFontConfPane;
+import com.fr.design.mainframe.widget.UITitleSplitLine;
+import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
+import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.form.ui.container.cardlayout.WCardTagLayout;
+import com.fr.general.FRFont;
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+import com.fr.general.cardtag.mobile.TabFontConfig;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<MobileTemplateStyle> {
+    private UIComboBox custom;
+    protected NewColorSelectBox initialColorBox;
+    protected MobileTabFontConfPane fontConfPane;
+    private JPanel centerPane;
+    protected MobileTemplatePreviewPane previewPane;
+    private static final String[] TAB_STYLES = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Custom")};
+    private WCardTagLayout tagLayout;
+
+
+    public MobileTemplatePreviewPane getPreviewPane() {
+        return previewPane;
+    }
+
+    public MobileTemplateStyleDefinePane(WCardTagLayout tagLayout) {
+        this.tagLayout = tagLayout;
+        init();
+    }
+
+
+    public WCardTagLayout getTagLayout() {
+        return tagLayout;
+    }
+
+    protected void init() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        previewPane = createPreviewPane();
+        previewPane.setPreferredSize(new Dimension(500, 60));
+        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        TitledBorder titledBorder = GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null);
+        titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 9, Color.BLUE));
+        northPane.setBorder(titledBorder);
+        northPane.setPreferredSize(new Dimension(500, 83));
+        northPane.add(previewPane, BorderLayout.CENTER);
+        this.add(northPane, BorderLayout.NORTH);
+        createConfigPane();
+
+    }
+
+    protected void createConfigPane() {
+        JPanel configPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        TitledBorder titledBorder = GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"), null);
+        titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 9, Color.BLUE));
+        configPane.setBorder(titledBorder);
+        centerPane = createCenterPane();
+        custom = new UIComboBox(TAB_STYLES);
+        custom.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                boolean isCustom = custom.getSelectedIndex() == 1;
+                centerPane.setVisible(isCustom);
+                updatePreviewPane();
+            }
+        });
+        centerPane.setVisible(false);
+        custom.setPreferredSize(new Dimension(157, 20));
+        final JPanel scrollPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        BasicScrollPane basicScrollPane = new AttrScrollPane() {
+            @Override
+            protected JPanel createContentPane() {
+                return scrollPanel;
+            }
+        };
+        configPane.add(basicScrollPane, BorderLayout.CENTER);
+        this.add(configPane, BorderLayout.CENTER);
+
+        JPanel outPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
+        outPanel.setBorder(BorderFactory.createEmptyBorder(10, 20, 5, 20));
+        UILabel tabStyleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Style"));
+        tabStyleLabel.setPreferredSize(new Dimension(55, 20));
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tabStyleLabel, custom}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        jPanel.setPreferredSize(new Dimension(200, 20));
+        outPanel.add(jPanel);
+        scrollPanel.add(outPanel, BorderLayout.NORTH);
+
+        UITitleSplitLine backgroundSplit = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 520);
+        backgroundSplit.setPreferredSize(new Dimension(520, 20));
+        centerPane.add(backgroundSplit);
+
+        centerPane.add(createBackgroundConfPane());
+
+        UITitleSplitLine fontSplit = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Char"), 520);
+        fontSplit.setPreferredSize(new Dimension(520, 20));
+        centerPane.add(fontSplit);
+
+        centerPane.add(createFontConfPane());
+
+        createExtraConfPane(centerPane);
+
+        scrollPanel.add(centerPane, BorderLayout.CENTER);
+        initDefaultConfig();
+    }
+
+    protected JPanel createCenterPane() {
+        JPanel panel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 10);
+        return panel;
+    }
+
+    protected JPanel createBackgroundConfPane() {
+        initialColorBox = new NewColorSelectBox(137);
+        initialColorBox.addSelectChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        UILabel fillLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill"));
+        fillLabel.setPreferredSize(new Dimension(55, 20));
+        JPanel boxFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainerPane(10, 0);
+        boxFlowPane.add(fillLabel);
+        boxFlowPane.add(initialColorBox);
+        initialColorBox.setPreferredSize(new Dimension(157, 20));
+        boxFlowPane.setPreferredSize(new Dimension(500, 20));
+        boxFlowPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
+        return boxFlowPane;
+    }
+
+    protected JPanel createFontConfPane() {
+        fontConfPane = new MobileTabFontConfPane();
+        fontConfPane.addFontChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        UILabel initCharLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Init_Char"));
+        initCharLabel.setPreferredSize(new Dimension(55, 20));
+        JPanel jPanel3 = FRGUIPaneFactory.createBoxFlowInnerContainerPane(5, 0);
+        jPanel3.add(initCharLabel);
+        jPanel3.add(fontConfPane);
+        jPanel3.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
+        return jPanel3;
+    }
+
+
+    protected void createExtraConfPane(JPanel centerPane) {
+
+    }
+
+    protected abstract void initDefaultConfig();
+
+    protected abstract MobileTemplatePreviewPane createPreviewPane();
+
+    @Override
+    public void populateBean(MobileTemplateStyle ob) {
+        centerPane.setVisible(ob.isCustom());
+        custom.setSelectedItem(ob.isCustom() ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default") :
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Custom"));
+        initialColorBox.setSelectObject(ob.getInitialColor());
+        fontConfPane.populate(ob.getTabFontConfig().getFont());
+        updatePreviewPane();
+    }
+
+
+    @Override
+    public MobileTemplateStyle updateBean() {
+        if (custom.getSelectedIndex() == 0) {
+            return getDefaultTemplateStyle();
+        }
+        MobileTemplateStyle ob = updateSubStyle();
+        ob.setCustom(custom.getSelectedIndex() == 1);
+        ob.setInitialColor(initialColorBox.getSelectObject());
+        TabFontConfig config = ob.getTabFontConfig();
+        config.setFont(fontConfPane.update());
+        return ob;
+    }
+
+    protected abstract MobileTemplateStyle getDefaultTemplateStyle();
+
+    public void updatePreviewPane() {
+        previewPane.populateConfig(updateBean());
+        previewPane.setBackground(previewPane.getInitialColor());
+        previewPane.repaint();
+    }
+
+    public abstract MobileTemplateStyle updateSubStyle();
+
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java
new file mode 100644
index 000000000..4765edc52
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java
@@ -0,0 +1,150 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.widget.UITitleSplitLine;
+import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
+import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.form.ui.container.cardlayout.WCardTagLayout;
+import com.fr.general.FRFont;
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+import com.fr.general.cardtag.mobile.SliderStyle;
+
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+public class SliderStyleDefinePane extends MobileTemplateStyleDefinePane {
+    private NewColorSelectBox initDotColor;
+    private NewColorSelectBox selectDotColor;
+
+
+    public SliderStyleDefinePane(WCardTagLayout tagLayout) {
+        super(tagLayout);
+    }
+
+    @Override
+    public void populateBean(MobileTemplateStyle ob) {
+        super.populateBean(ob);
+        SliderStyle sliderStyle = (SliderStyle) ob;
+        initDotColor.setSelectObject(sliderStyle.getInitDotColor());
+        selectDotColor.setSelectObject(sliderStyle.getSelectDotColor());
+    }
+
+    @Override
+    protected MobileTemplateStyle getDefaultTemplateStyle() {
+        return new SliderStyle();
+    }
+
+    @Override
+    public MobileTemplateStyle updateSubStyle() {
+        SliderStyle sliderStyle = new SliderStyle();
+        sliderStyle.setInitDotColor(initDotColor.getSelectObject());
+        sliderStyle.setSelectDotColor(selectDotColor.getSelectObject());
+        return sliderStyle;
+    }
+
+
+    protected void createExtraConfPane(JPanel centerPane) {
+        UITitleSplitLine dotIndicator = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Slider_Dot_Indicator"), 520);
+        dotIndicator.setPreferredSize(new Dimension(520, 20));
+        centerPane.add(dotIndicator);
+        initDotColor = new NewColorSelectBox(137);
+        initDotColor.addSelectChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        selectDotColor = new NewColorSelectBox(137);
+        selectDotColor.addSelectChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        UILabel initColor = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Init_Fill"));
+
+        UILabel selectColor = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Select_Fill"));
+        initColor.setPreferredSize(new Dimension(55, 20));
+        selectColor.setPreferredSize(new Dimension(55, 20));
+        JPanel initDotColorPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{initColor, initDotColor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        JPanel selectDotColorPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{selectColor, selectDotColor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        initDotColorPane.setPreferredSize(new Dimension(240, 20));
+        selectDotColorPane.setPreferredSize(new Dimension(240, 20));
+        centerPane.add(initDotColorPane);
+        centerPane.add(selectDotColorPane);
+
+    }
+
+    @Override
+    protected void initDefaultConfig() {
+        this.initialColorBox.setSelectObject(SliderStyle.DEFAULT_INITIAL_COLOR);
+        this.fontConfPane.populate(SliderStyle.DEFAULT_TAB_FONT.getFont());
+        initDotColor.setSelectObject(SliderStyle.DEFAULT_INITIAL_DOT_COLOR);
+        selectDotColor.setSelectObject(SliderStyle.DEFAULT_SELECT_DOT_COLOR);
+    }
+
+    @Override
+    protected MobileTemplatePreviewPane createPreviewPane() {
+        return new SliderStylePreviewPane();
+    }
+
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+
+    public class SliderStylePreviewPane extends MobileTemplatePreviewPane {
+        private Color initDotColor;
+        private Color selectDotColor;
+
+        public SliderStylePreviewPane() {
+
+        }
+
+        public void repaint() {
+            super.repaint();
+        }
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+            Graphics2D g2d = (Graphics2D) g.create();
+            FRFont frFont = this.getTabFontConfig().getFont();
+            g2d.setFont(frFont);
+            g2d.setColor(frFont.getForeground());
+            g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Slider_Title"), 10, 18);
+            WCardTagLayout cardTagLayout = SliderStyleDefinePane.this.getTagLayout();
+            g2d.translate(10, 25);
+            for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
+                if (i == 0) {
+                    g2d.setColor(selectDotColor);
+                    g2d.fillOval(0, 0, 6, 6);
+                    g2d.translate(9, 0);
+                    continue;
+                }
+                g2d.setColor(initDotColor);
+                g2d.fillOval(0, 0, 6, 6);
+                g2d.translate(9, 0);
+            }
+
+        }
+
+        public void populateConfig(MobileTemplateStyle templateStyle) {
+            super.populateConfig(templateStyle);
+            this.initDotColor = ((SliderStyle) templateStyle).getInitDotColor();
+            this.selectDotColor = ((SliderStyle) templateStyle).getSelectDotColor();
+        }
+    }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/StyleDefinePaneWithSelectConf.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/StyleDefinePaneWithSelectConf.java
new file mode 100644
index 000000000..9096fc957
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/StyleDefinePaneWithSelectConf.java
@@ -0,0 +1,113 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.widget.MobileTabFontConfPane;
+import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.form.ui.container.cardlayout.WCardTagLayout;
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+
+public abstract class StyleDefinePaneWithSelectConf extends MobileTemplateStyleDefinePane {
+
+    protected NewColorSelectBox selectColorBox;
+    protected UIColorButton selectFontColor;
+
+    public StyleDefinePaneWithSelectConf(WCardTagLayout tagLayout) {
+        super(tagLayout);
+    }
+
+    protected JPanel createBackgroundConfPane() {
+        JPanel panel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 10);
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 5, 20));
+        initialColorBox = new NewColorSelectBox(137);
+        initialColorBox.addSelectChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+
+        selectColorBox = new NewColorSelectBox(137);
+        selectColorBox.addSelectChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        UILabel initFillLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Init_Fill"));
+        UILabel selectFillLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Select_Fill"));
+        initFillLabel.setPreferredSize(new Dimension(55, 20));
+        selectFillLabel.setPreferredSize(new Dimension(55, 20));
+        JPanel jPanel2 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{initFillLabel, initialColorBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        JPanel jPanel3 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{selectFillLabel, selectColorBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        jPanel2.setPreferredSize(new Dimension(240, 20));
+        jPanel3.setPreferredSize(new Dimension(240, 20));
+        panel.add(jPanel2);
+        panel.add(jPanel3);
+        return panel;
+    }
+
+    protected JPanel createFontConfPane() {
+        JPanel panel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 10);
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 5, 20));
+        fontConfPane = new MobileTabFontConfPane();
+        fontConfPane.addFontChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        selectFontColor = new UIColorButton();
+        selectFontColor.addColorChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+
+                updatePreviewPane();
+            }
+        });
+        UILabel initCharLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Init_Char"));
+        initCharLabel.setPreferredSize(new Dimension(55, 20));
+        JPanel jPanel3 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{initCharLabel, fontConfPane}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        jPanel3.setPreferredSize(new Dimension(500, 20));
+
+        UILabel selectCharLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Select_Char"));
+        selectCharLabel.setPreferredSize(new Dimension(55, 20));
+        selectFontColor.setPreferredSize(new Dimension(20, 20));
+        JPanel jPanel4 = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{selectCharLabel, selectFontColor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        JPanel jPanel5 = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
+        jPanel5.setPreferredSize(new Dimension(500, 20));
+        jPanel5.add(jPanel4);
+        panel.add(jPanel3);
+        panel.add(jPanel5);
+        return panel;
+    }
+
+    @Override
+    public MobileTemplateStyle updateSubStyle() {
+        MobileTemplateStyle mobileTemplateStyle = updateStyleWithSelectConf();
+        mobileTemplateStyle.setSelectColor(selectColorBox.getSelectObject());
+        mobileTemplateStyle.getTabFontConfig().setSelectColor(selectFontColor.getColor());
+        return mobileTemplateStyle;
+    }
+
+    protected abstract MobileTemplateStyle updateStyleWithSelectConf();
+
+    @Override
+    public void populateBean(MobileTemplateStyle mobileTemplateStyle) {
+        super.populateBean(mobileTemplateStyle);
+        selectColorBox.setSelectObject(mobileTemplateStyle.getSelectColor());
+        selectFontColor.setColor(mobileTemplateStyle.getTabFontConfig().getSelectColor());
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TabIconConfigPane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TabIconConfigPane.java
new file mode 100644
index 000000000..6f424e19e
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TabIconConfigPane.java
@@ -0,0 +1,172 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.base.GraphHelper;
+import com.fr.base.IconManager;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.web.CustomIconPane;
+import com.fr.form.ui.WidgetInfoConfig;
+import com.fr.general.ComparatorUtils;
+import com.fr.stable.Constants;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.plaf.basic.BasicButtonUI;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.geom.Rectangle2D;
+import java.util.ArrayList;
+
+public class TabIconConfigPane extends JPanel {
+    private UIButton editIconButton;
+    private String curIconName;
+    private IconButton selectIconButton;
+    private ArrayList<IconButton> iconButtons = new ArrayList<IconButton>();
+
+    public TabIconConfigPane(int count) {
+        initComp(count);
+    }
+
+    public void initComp(int count) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel panel = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
+        panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
+        editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
+        editIconButton.setPreferredSize(new Dimension(62, 20));
+        panel.add(editIconButton);
+        editIconButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                final CustomIconPane cip = new CustomIconPane();
+                BasicDialog editDialog = cip.showWindow(DesignerContext.getDesignerFrame());
+                editDialog.addDialogActionListener(new DialogActionAdapter() {
+                    @Override
+                    public void doOk() {
+                        curIconName = cip.update();
+                        setShowIconImage();
+                        TabIconConfigPane.this.repaint();
+                    }
+                });
+                editDialog.setVisible(true);
+            }
+        });
+        editIconButton.setEnabled(false);
+        this.add(panel, BorderLayout.CENTER);
+
+        JPanel northPane = new JPanel();
+        northPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
+        for (int i = 0; i < count; i++) {
+            IconButton iconButton = new IconButton("");
+            northPane.add(iconButton);
+            iconButtons.add(iconButton);
+        }
+        this.add(northPane, BorderLayout.NORTH);
+    }
+
+    public void setShowIconImage() {
+        selectIconButton.setIconName(curIconName);
+    }
+
+    public void populate(ArrayList<String> iconArr) {
+        for (int i = 0; i < iconButtons.size(); i++) {
+            iconButtons.get(i).setIconName(iconArr.get(i));
+        }
+    }
+
+    public ArrayList<String> update() {
+        ArrayList<String> iconNames = new ArrayList<String>();
+        for (int i = 0; i < iconButtons.size(); i++) {
+            iconNames.add(iconButtons.get(i).getIconName());
+        }
+        return iconNames;
+    }
+
+
+    private class IconButton extends JToggleButton implements ActionListener {
+        private String iconName;
+        private Image iconImage = null;
+        private static final int ICON_BUTTON_SIZE = 20;
+        private static final int ICON_X = 2;
+        private static final int ICON_Y = 2;
+
+        public IconButton(String name) {
+            this.iconName = name;
+            this.addActionListener(this);
+            this.setBackground(Color.WHITE);
+            this.setCursor(new Cursor(Cursor.HAND_CURSOR));
+            this.iconImage = WidgetInfoConfig.getInstance().getIconManager().getIconImage(name);
+        }
+
+        @Override
+        public void updateUI() {
+            setUI(new BasicButtonUI() {
+                public void paint(Graphics g, JComponent c) {
+                    super.paint(g, c);
+                }
+            });
+        }
+
+        public String getIconName() {
+            return iconName;
+        }
+
+        public void setIconName(String iconName) {
+            this.iconName = iconName;
+            this.iconImage = WidgetInfoConfig.getInstance().getIconManager().getIconImage(iconName);
+        }
+
+        @Override
+        public void paintComponent(Graphics g) {
+            super.paintComponent(g);
+            Graphics2D g2d = (Graphics2D) g;
+            // carl:这里缩放显示 16 × 16
+            if (iconImage != null) {
+                g2d.drawImage(iconImage, ICON_X, ICON_Y, IconManager.DEFAULT_ICONWIDTH, IconManager.DEFAULT_ICONHEIGHT, null);
+            }
+            if (this.iconName != null && ComparatorUtils.equals(this, selectIconButton)) {
+                g2d.setPaint(Color.decode("#419BF9"));
+            } else {
+                g2d.setPaint(Color.decode("#D9DADD"));
+            }
+            GraphHelper.draw(g2d, new Rectangle2D.Double(0, 0, 20, 20), Constants.LINE_MEDIUM);
+        }
+
+        @Override
+        public Dimension getPreferredSize() {
+            return new Dimension(ICON_BUTTON_SIZE, ICON_BUTTON_SIZE);
+        }
+
+        public void actionPerformed(ActionEvent evt) {
+            selectIconButton = this;
+            editIconButton.setEnabled(true);
+            TabIconConfigPane.this.repaint();// repaint
+        }
+
+        @Override
+        public void addChangeListener(ChangeListener changeListener) {
+            this.changeListener = changeListener;
+        }
+
+        private void fireChagneListener() {
+            if (this.changeListener != null) {
+                ChangeEvent evt = new ChangeEvent(this);
+                this.changeListener.stateChanged(evt);
+            }
+        }
+
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TemplateStyleDefinePaneFactory.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TemplateStyleDefinePaneFactory.java
new file mode 100644
index 000000000..3f923707d
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TemplateStyleDefinePaneFactory.java
@@ -0,0 +1,55 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.design.beans.BasicBeanPane;
+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.invoke.Reflect;
+import com.fr.log.FineLoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TemplateStyleDefinePaneFactory {
+    private static Map<String, StyleDefinePaneUI> defineMap = new HashMap<String, StyleDefinePaneUI>();
+
+    static {
+        defineMap.put(DefaultMobileTemplateStyle.STYLE_NAME, new StyleDefinePaneUI(DefaultMobileStyleDefinePane.class));
+        defineMap.put(UpMenuStyle.STYLE_NAME, new StyleDefinePaneUI(UpMenuStyleDefinePane.class));
+        defineMap.put(DownMenuStyle.STYLE_NAME, new StyleDefinePaneUI(DownMenuStyleDefinePane.class));
+        defineMap.put(SliderStyle.STYLE_NAME, new StyleDefinePaneUI(SliderStyleDefinePane.class));
+    }
+
+    public static BasicBeanPane<MobileTemplateStyle> createDefinePane(String style, WCardTagLayout tagLayout) {
+        StyleDefinePaneUI styleDefinePaneUI = defineMap.get(style);
+        Class<? extends BasicBeanPane<MobileTemplateStyle>> clazz = styleDefinePaneUI.getaClass();
+        if (clazz == null) {
+        }
+        BasicBeanPane<MobileTemplateStyle> quickPane = null;
+        try {
+            quickPane = Reflect.on(clazz).create(tagLayout).get();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return quickPane;
+    }
+
+    private static class StyleDefinePaneUI {
+        private Class<? extends BasicBeanPane<MobileTemplateStyle>> aClass;
+
+        public StyleDefinePaneUI(Class<? extends BasicBeanPane<MobileTemplateStyle>> aClass) {
+            this.aClass = aClass;
+        }
+
+        public Class<? extends BasicBeanPane<MobileTemplateStyle>> getaClass() {
+            return aClass;
+        }
+
+        public void setaClass(Class<? extends BasicBeanPane<MobileTemplateStyle>> aClass) {
+            this.aClass = aClass;
+        }
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java
new file mode 100644
index 000000000..41265faef
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java
@@ -0,0 +1,211 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.base.GraphHelper;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.widget.UITitleSplitLine;
+import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
+import com.fr.form.ui.CardSwitchButton;
+import com.fr.form.ui.container.cardlayout.WCardTagLayout;
+import com.fr.general.FRFont;
+import com.fr.general.cardtag.mobile.LineDescription;
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+import com.fr.general.cardtag.mobile.UpMenuStyle;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BasicStroke;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+
+public class UpMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
+    private UIRadioButton gapFix;
+    private UIRadioButton titleWidthFix;
+    private LinePane bottomBorderPane;
+    private LinePane underLinePane;
+
+    public UpMenuStyleDefinePane(WCardTagLayout tagLayout) {
+        super(tagLayout);
+    }
+
+    protected JPanel createCenterPane() {
+        JPanel panel = super.createCenterPane();
+        UILabel displayGap = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Display_Gap"));
+        displayGap.setPreferredSize(new Dimension(55, 20));
+        gapFix = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Gap_Fix"));
+        titleWidthFix = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Title_Width_Fix"));
+        ButtonGroup buttonGroup = new ButtonGroup();
+        titleWidthFix.setSelected(true);
+        buttonGroup.add(gapFix);
+        gapFix.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        titleWidthFix.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        buttonGroup.add(titleWidthFix);
+        gapFix.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        titleWidthFix.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+
+
+        JPanel flowLeft = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
+        flowLeft.add(gapFix);
+        flowLeft.add(titleWidthFix);
+        JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{displayGap, flowLeft}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        centerPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 15, 20));
+        centerPane.setPreferredSize(new Dimension(500, 20));
+        JPanel outerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        outerPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 15, 0));
+        outerPane.add(centerPane, BorderLayout.CENTER);
+        panel.add(outerPane);
+        return panel;
+    }
+
+    protected void createExtraConfPane(JPanel centerPane) {
+        bottomBorderPane = new LinePane();
+        underLinePane = new LinePane();
+        bottomBorderPane.addLineChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        underLinePane.addLineChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        UITitleSplitLine titleSplitLine = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Spit_Line"), 520);
+        titleSplitLine.setPreferredSize(new Dimension(520, 20));
+        centerPane.add(titleSplitLine);
+        centerPane.add(bottomBorderPane);
+        UITitleSplitLine titleUnderLine = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Under_Line"), 520);
+        titleUnderLine.setPreferredSize(new Dimension(520, 20));
+        centerPane.add(titleUnderLine);
+        centerPane.add(underLinePane);
+    }
+
+    @Override
+    protected void initDefaultConfig() {
+        this.initialColorBox.setSelectObject(UpMenuStyle.DEFAULT_INITIAL_COLOR);
+        this.fontConfPane.populate(UpMenuStyle.DEFAULT_TAB_FONT.getFont());
+        this.selectColorBox.setSelectObject(UpMenuStyle.DEFAULT_SELECT_COLOR);
+        this.selectFontColor.setColor(UpMenuStyle.DEFAULT_SELECT_FONT_COLOR);
+        this.bottomBorderPane.populate(UpMenuStyle.DEFAULT_BOTTOM_BORDER);
+        this.underLinePane.populate(UpMenuStyle.DEFAULT_UNDER_LINE);
+    }
+
+    @Override
+    protected MobileTemplatePreviewPane createPreviewPane() {
+        return new UpMenuStylePreviewPane();
+    }
+
+    @Override
+    public void populateBean(MobileTemplateStyle ob) {
+        super.populateBean(ob);
+        UpMenuStyle style = (UpMenuStyle) ob;
+        gapFix.setSelected(style.isGapFix());
+        titleWidthFix.setSelected(style.isTitleWidthFix());
+        bottomBorderPane.populate(style.getBottomBorder());
+        underLinePane.populate(style.getUnderline());
+    }
+
+    @Override
+    protected MobileTemplateStyle getDefaultTemplateStyle() {
+        return new UpMenuStyle();
+    }
+
+
+    @Override
+    public MobileTemplateStyle updateStyleWithSelectConf() {
+        UpMenuStyle style = new UpMenuStyle();
+        style.setGapFix(gapFix.isSelected());
+        style.setTitleWidthFix(titleWidthFix.isSelected());
+        style.setBottomBorder(bottomBorderPane.update());
+        style.setUnderline(underLinePane.update());
+        return style;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+
+
+    public class UpMenuStylePreviewPane extends MobileTemplatePreviewPane {
+        private LineDescription bottomBorder;
+        private LineDescription underLine;
+        private boolean isGapFix;
+
+        public UpMenuStylePreviewPane() {
+            this.setBackground(Color.WHITE);
+        }
+
+        public void repaint() {
+            super.repaint();
+        }
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+            Color selectFontColor = this.getTabFontConfig().getSelectColor();
+            Dimension dimension = this.getSize();
+            int panelWidth = dimension.width;
+            int panelHeight = dimension.height;
+            Graphics2D g2d = (Graphics2D) g.create();
+            FRFont frFont = UpMenuStyleDefinePane.this.fontConfPane.update();
+            FontMetrics fm = GraphHelper.getFontMetrics(frFont);
+            WCardTagLayout cardTagLayout = UpMenuStyleDefinePane.this.getTagLayout();
+            int eachWidth = panelWidth / cardTagLayout.getWidgetCount();
+            g2d.setFont(frFont);
+            for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
+                g2d.setColor(i == 0 ? selectFontColor : frFont.getForeground());
+                CardSwitchButton cardSwitchButton = cardTagLayout.getSwitchButton(i);
+                String widgetName = cardSwitchButton.getText();
+                int width = fm.stringWidth(widgetName);
+                g2d.drawString(widgetName, (eachWidth - width) / 2, (panelHeight) / 2);
+                if (i == 0) {
+                    g2d.setColor(this.underLine.getColor());
+                    g2d.setStroke(new BasicStroke(2.0f));
+                    int underLineX = this.isGapFix ? (eachWidth - width) / 2 : 0;
+                    int underLineWidth = this.isGapFix ? width : eachWidth;
+                    g2d.drawLine(underLineX, panelHeight - 1, underLineX + underLineWidth, panelHeight - 1);
+                }
+                if (bottomBorder.getLineStyle() != 0) {
+                    g2d.setColor(bottomBorder.getColor());
+                    g2d.drawLine(eachWidth, 0, eachWidth, panelHeight);
+                }
+                g2d.translate(eachWidth, 0);
+            }
+
+
+        }
+
+        public void populateConfig(MobileTemplateStyle templateStyle) {
+            super.populateConfig(templateStyle);
+            this.bottomBorder = ((UpMenuStyle) templateStyle).getBottomBorder();
+            this.underLine = ((UpMenuStyle) templateStyle).getUnderline();
+            this.isGapFix = ((UpMenuStyle) templateStyle).isGapFix();
+        }
+    }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java
new file mode 100644
index 000000000..3c17d3b9b
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java
@@ -0,0 +1,143 @@
+package com.fr.design.mainframe.widget;
+
+import com.fr.base.BaseUtils;
+import com.fr.base.Utils;
+import com.fr.design.gui.ibutton.UIColorButton;
+import com.fr.design.gui.ibutton.UIToggleButton;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.general.FRFont;
+
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.EventListenerList;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.Vector;
+
+public class MobileTabFontConfPane extends JPanel {
+    private EventListenerList fontChangeListener = new EventListenerList();
+    private UIComboBox fontFamily;
+    private UIComboBox fontSize;
+    private UIToggleButton bold;
+    private UIColorButton color;
+    private UIToggleButton italic;
+    private final static Icon[] ITALIC_ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_white.png")};
+    private final static Icon[] BOLD_ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_white.png")};
+
+
+    public MobileTabFontConfPane() {
+        super();
+        init();
+    }
+
+    private void init() {
+        this.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
+        fontFamily = new UIComboBox(Utils.getAvailableFontFamilyNames4Report());
+        Vector<Integer> integerList = new Vector<Integer>();
+        for (int i = 1; i < 100; i++) {
+            integerList.add(i);
+        }
+        fontFamily.setPreferredSize(new Dimension(152, 20));
+        fontSize = new UIComboBox(integerList);
+        color = new UIColorButton();
+        bold = new UIToggleButton(BOLD_ICONS, true);
+        italic = new UIToggleButton(ITALIC_ICONS, true);
+        fontFamily.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                fireFontStateChanged();
+            }
+        });
+        fontSize.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                fireFontStateChanged();
+            }
+        });
+        bold.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                fireFontStateChanged();
+            }
+        });
+        italic.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                fireFontStateChanged();
+            }
+        });
+        color.addColorChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                fireFontStateChanged();
+            }
+        });
+        this.add(fontFamily);
+        this.add(fontSize);
+        this.add(color);
+        this.add(bold);
+        this.add(italic);
+
+    }
+
+    public FRFont update() {
+        String family = (String) fontFamily.getSelectedItem();
+        int size = (int) fontSize.getSelectedItem();
+        int style = Font.PLAIN;
+        style += this.bold.isSelected() ? Font.BOLD : Font.PLAIN;
+        style += this.italic.isSelected() ? Font.ITALIC : Font.PLAIN;
+        FRFont frFont = FRFont.getInstance(family, style, size, color.getColor());
+        return frFont;
+    }
+
+    public void populate(FRFont frFont) {
+        fontFamily.setSelectedItem(frFont.getFamily());
+        fontSize.setSelectedItem(frFont.getSize());
+        color.setColor(frFont.getForeground());
+        bold.setSelected(frFont.isBold());
+        italic.setSelected(frFont.isItalic());
+
+    }
+
+
+    /**
+     * 添加监听
+     *
+     * @param changeListener 监听列表
+     */
+    public void addFontChangeListener(ChangeListener changeListener) {
+        fontChangeListener.add(ChangeListener.class, changeListener);
+    }
+
+    /**
+     * 移除监听
+     * Removes an old ColorChangeListener.
+     *
+     * @param changeListener 监听列表
+     */
+    public void removeFontChangeListener(ChangeListener changeListener) {
+        fontChangeListener.remove(ChangeListener.class, changeListener);
+    }
+
+    /**
+     * 颜色状态改变
+     */
+    public void fireFontStateChanged() {
+        Object[] listeners = fontChangeListener.getListenerList();
+        ChangeEvent e = null;
+
+        for (int i = listeners.length - 2; i >= 0; i -= 2) {
+            if (listeners[i] == ChangeListener.class) {
+                if (e == null) {
+                    e = new ChangeEvent(this);
+                }
+                ((ChangeListener) listeners[i + 1]).stateChanged(e);
+            }
+        }
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java
new file mode 100644
index 000000000..afd1a2c96
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java
@@ -0,0 +1,69 @@
+package com.fr.design.mainframe.widget;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.FRFont;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+
+public class UITitleSplitLine extends JPanel {
+    private static final Color LINE_COLOR = Color.decode("#E0E0E1");
+    private static final Color TITLE_COLOR = Color.decode("#333334");
+    private static final FRFont TITLE_FONT = FRFont.getInstance("PingFangSC-Regular", 0, 12.0F);
+
+    private Color color;
+    private UILabel label;
+    private int width;
+    private static final int OFFSETX = 10;
+    private static final int OFFSET = 3;
+
+
+    public UITitleSplitLine(String title, int width) {
+        this(title, LINE_COLOR, width);
+    }
+
+    public UITitleSplitLine(String title, Color color, int width) {
+        super();
+        this.color = color;
+        this.width = width;
+        this.label = new UILabel(title);
+    }
+
+    public void paint(Graphics g) {
+        super.paint(g);
+        Dimension size = label.getPreferredSize();
+        int labelH = size.height;
+        g.setColor(color);
+        g.drawLine(0, labelH / 2, OFFSETX, labelH / 2);
+        g.drawLine(OFFSETX + size.width + OFFSET * 2, labelH / 2, width, labelH / 2);
+        g.translate(OFFSETX + OFFSET, 0);
+        label.setFont(TITLE_FONT);
+        label.setForeground(TITLE_COLOR);
+        label.setSize(size.width, size.height);
+        label.paint(g);
+        g.translate(-OFFSETX - OFFSET, 0);
+    }
+
+
+    public static void main(String[] args) {
+//        JFrame jf = new JFrame("test");
+//        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+//        JPanel content = (JPanel) jf.getContentPane();
+//        content.setLayout(new BorderLayout());
+//        JPanel myPanel = new JPanel();
+//        myPanel.setLayout(new BorderLayout());
+//        JPanel Panel = new JPanel();
+//        Panel.setBackground(Color.blue);
+//        myPanel.add(new UITitleSplitLine("基本", 223), BorderLayout.CENTER);
+//        content.add(myPanel, BorderLayout.CENTER);
+//        GUICoreUtils.centerWindow(jf);
+//        jf.setSize(439, 400);
+//        jf.setVisible(true);
+    }
+
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AbstractTemplateStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AbstractTemplateStylePane.java
new file mode 100644
index 000000000..482b2cebc
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AbstractTemplateStylePane.java
@@ -0,0 +1,10 @@
+package com.fr.design.mainframe.widget.accessibles;
+
+import com.fr.design.dialog.BasicPane;
+
+public abstract class AbstractTemplateStylePane<T> extends BasicPane {
+
+    public abstract void populate(T ob);
+
+    public abstract T update();
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java
index 9e32a4d46..195a92e8a 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java
@@ -2,7 +2,6 @@ package com.fr.design.mainframe.widget.accessibles;
 
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.general.cardtag.TemplateStyle;
 import com.fr.design.mainframe.widget.wrappers.TemplateStyleWrapper;
 
 import javax.swing.SwingUtilities;
@@ -15,18 +14,16 @@ public class AccessibleTemplateStyleEditor extends UneditableAccessibleEditor {
 
     private static final Dimension DEFAULT_DIMENSION = new Dimension(600, 400);
 
-    private TemplateStylePane stylePane;
+    private AbstractTemplateStylePane stylePane;
 
-    public AccessibleTemplateStyleEditor() {
+    public AccessibleTemplateStyleEditor(AbstractTemplateStylePane stylePane) {
         super(new TemplateStyleWrapper());
+        this.stylePane = stylePane;
     }
 
     @Override
     protected void showEditorPane() {
-        if (stylePane == null) {
-            stylePane = new TemplateStylePane();
-            stylePane.setPreferredSize(DEFAULT_DIMENSION);
-        }
+        stylePane.setPreferredSize(DEFAULT_DIMENSION);
         BasicDialog dlg = stylePane.showWindow(SwingUtilities.getWindowAncestor(this));
         dlg.addDialogActionListener(new DialogActionAdapter() {
 
@@ -36,7 +33,7 @@ public class AccessibleTemplateStyleEditor extends UneditableAccessibleEditor {
                 fireStateChanged();
             }
         });
-        stylePane.populate((TemplateStyle) getValue());
+        stylePane.populate(getValue());
         dlg.setVisible(true);
     }
 }
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
new file mode 100644
index 000000000..f88221a42
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java
@@ -0,0 +1,113 @@
+package com.fr.design.mainframe.widget.accessibles;
+
+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 javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListModel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.ListCellRenderer;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class MobileTemplateStylePane extends AbstractTemplateStylePane<MobileTemplateStyle> {
+    private static final List<String> STYLE_LIST = new ArrayList<String>();
+    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);
+    }
+
+    private DefaultListModel listModel;
+    private JList styleList;
+    private Map<String, BasicBeanPane<MobileTemplateStyle>> map = new HashMap<>();
+    private JPanel right;
+    private CardLayout card;
+    public MobileTemplateStylePane(WCardTagLayout tagLayout){
+        init(tagLayout);
+    }
+
+    public void init(WCardTagLayout tagLayout){
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        listModel = new DefaultListModel();
+        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);
+        }
+        styleList = new JList(listModel);
+        styleList.setCellRenderer(render);
+
+        JPanel westPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        westPane.add(styleList, BorderLayout.CENTER);
+        westPane.setPreferredSize(new Dimension(100, 500));
+
+
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        JPanel attrConfPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        centerPane.setPreferredSize(new Dimension(500, 500));
+        attrConfPane.add(right, BorderLayout.CENTER);
+        centerPane.add(attrConfPane, BorderLayout.CENTER);
+        styleList.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                String selectedValue = (String)styleList.getSelectedValue();
+                card.show(right, selectedValue);
+            }
+        });
+        this.add(westPane, BorderLayout.WEST);
+        this.add(centerPane, BorderLayout.CENTER);
+    }
+    public static ListCellRenderer render = new DefaultListCellRenderer() {
+        @Override
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+            super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+
+            if (value instanceof MobileTemplateStyle) {
+                MobileTemplateStyle l = (MobileTemplateStyle) value;
+                this.setText(l.toString());
+            }
+            return this;
+        }
+    };
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template");
+    }
+
+    public void populate(MobileTemplateStyle templateStyle) {
+        for(int i = 0; i< listModel.getSize(); i++){
+            if((listModel.getElementAt(i)).equals(templateStyle.getStyle())){
+                styleList.setSelectedIndex(i);
+                map.get(templateStyle.getStyle()).populateBean(templateStyle);
+                card.show(right, templateStyle.getStyle());
+                return;
+            }
+        }
+        styleList.setSelectedIndex(0);
+    }
+
+    public MobileTemplateStyle update() {
+        return map.get(styleList.getSelectedValue()).updateBean();
+    }
+}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java
index fdd6cbb32..6374a19c5 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java
@@ -21,16 +21,17 @@ import javax.swing.ListCellRenderer;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Rectangle;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
 /**
  * Created by kerry on 2017/11/23.
  */
-public class TemplateStylePane extends BasicPane {
+public class TemplateStylePane extends AbstractTemplateStylePane<TemplateStyle> {
     private DefaultListModel listModel;
     private JList styleList;
-    private TemplateStylePreviewPane previewPane = new TemplateStylePreviewPane(new DefaultTemplateStyle());
+    private TemplateStylePreviewPane previewPane = new TemplateStylePreviewPane(new DefaultTemplateStyle(), new Rectangle(0, 50, 540, 400));
 
     public TemplateStylePane(){
         init();
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePreviewPane.java
index 0f684006a..1e47d3089 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePreviewPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePreviewPane.java
@@ -1,26 +1,23 @@
 package com.fr.design.mainframe.widget.accessibles;
 
-import com.fr.base.BaseUtils;
 import com.fr.general.cardtag.TemplateStyle;
 
 import javax.swing.JPanel;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Image;
+import java.awt.Rectangle;
 
 /**
  * Created by kerry on 2017/12/11.
  */
 public class TemplateStylePreviewPane extends JPanel {
 
-    private static final int WIDTH = 540;
-    private static final int HEIGHT = 400;
-    private static final int OFFSETY = 50;
-
+    private Rectangle rectangle;
     private TemplateStyle templateStyle;
 
-    public TemplateStylePreviewPane(TemplateStyle templateStyle){
+    public TemplateStylePreviewPane(TemplateStyle templateStyle, Rectangle rectangle){
         this.templateStyle = templateStyle;
+        this.rectangle = rectangle;
     }
 
     public void repaint (TemplateStyle templateStyle){
@@ -32,7 +29,6 @@ public class TemplateStylePreviewPane extends JPanel {
     public void paint(Graphics g) {
         super.paint(g);
         Graphics2D g2d = (Graphics2D) g.create();
-        Image image = BaseUtils.readImage(templateStyle.getPreview());
-        g2d.drawImage(image, 0, OFFSETY, WIDTH, HEIGHT, null);
+        templateStyle.paintPreview(g2d, rectangle);
     }
 }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/preview/MobileTemplatePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/preview/MobileTemplatePreviewPane.java
new file mode 100644
index 000000000..d5ddbb6b9
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/preview/MobileTemplatePreviewPane.java
@@ -0,0 +1,53 @@
+package com.fr.design.mainframe.widget.preview;
+
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+import com.fr.general.cardtag.mobile.TabFontConfig;
+
+import javax.swing.JPanel;
+import java.awt.Color;
+
+public abstract class MobileTemplatePreviewPane extends JPanel {
+    private Color initialColor;
+    private Color selectColor;
+    private TabFontConfig tabFontConfig = new TabFontConfig();
+
+    public Color getInitialColor() {
+        return initialColor;
+    }
+
+    public void setInitialColor(Color initialColor) {
+        this.initialColor = initialColor;
+    }
+
+    public Color getSelectColor() {
+        return selectColor;
+    }
+
+    public void setSelectColor(Color selectColor) {
+        this.selectColor = selectColor;
+    }
+
+    public TabFontConfig getTabFontConfig() {
+        return tabFontConfig;
+    }
+
+    public void setTabFontConfig(TabFontConfig tabFontConfig) {
+        this.tabFontConfig = tabFontConfig;
+    }
+
+    public MobileTemplatePreviewPane(){
+
+    }
+
+    public void populateConfig(MobileTemplateStyle templateStyle){
+        this.setInitialColor(templateStyle.getInitialColor());
+        this.setBackground(templateStyle.getInitialColor());
+        this.setSelectColor(templateStyle.getSelectColor());
+        this.setTabFontConfig(templateStyle.getTabFontConfig());
+    }
+
+    public void repaint (){
+        super.repaint();
+    }
+
+}
diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
index f0d155f7a..1b9d2690e 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
@@ -16,9 +16,11 @@ import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWHorizontalBoxLayout;
 import com.fr.design.designer.creator.XWidgetCreator;
+import com.fr.design.designer.properties.mobile.TabMobilePropertyUI;
 import com.fr.design.form.layout.FRFlowLayout;
 import com.fr.design.form.layout.FRHorizontalLayout;
 import com.fr.design.form.layout.FRVerticalLayout;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.EditingMouseListener;
@@ -328,6 +330,10 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         return ComparatorUtils.equals(displayPosition, WTabDisplayPosition.TOP_POSITION) || ComparatorUtils.equals(displayPosition, WTabDisplayPosition.BOTTOM_POSITION);
     }
 
+    @Override
+    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+        return new WidgetPropertyUIProvider[]{ new TabMobilePropertyUI(this)};
+    }
 
     /**
      * data属性改变触发其他操作
diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/TabMobilePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/TabMobilePropertyUI.java
new file mode 100644
index 000000000..8ebdbd769
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/TabMobilePropertyUI.java
@@ -0,0 +1,30 @@
+package com.fr.design.designer.properties.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
+import com.fr.design.gui.itable.AbstractPropertyTable;
+import com.fr.design.widget.ui.designer.mobile.TabMobileWidgetDefinePane;
+
+public class TabMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
+    private XCreator xCreator;
+
+    public TabMobilePropertyUI(XCreator xCreator){
+        this.xCreator = xCreator;
+    }
+
+    @Override
+    public AbstractPropertyTable createWidgetAttrTable() {
+        return null;
+    }
+
+    @Override
+    public BasicPane createWidgetAttrPane() {
+        return new TabMobileWidgetDefinePane(xCreator);
+    }
+
+    @Override
+    public String tableTitle() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr");
+    }
+}
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java
index ee021d260..d1e68baf3 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java
@@ -15,6 +15,7 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.accessibles.AccessibleTabPaneBackgroundEditor;
 import com.fr.design.mainframe.widget.accessibles.AccessibleTemplateStyleEditor;
+import com.fr.design.mainframe.widget.accessibles.TemplateStylePane;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.container.WTabDisplayPosition;
@@ -51,7 +52,7 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
         backgroundEditor = new AccessibleTabPaneBackgroundEditor();
-        templateStyleEditor = new AccessibleTemplateStyleEditor();
+        templateStyleEditor = new AccessibleTemplateStyleEditor(new TemplateStylePane());
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p, p, p, p, p};
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java
new file mode 100644
index 000000000..f6d94da06
--- /dev/null
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java
@@ -0,0 +1,69 @@
+package com.fr.design.widget.ui.designer.mobile;
+
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.mainframe.widget.accessibles.AccessibleTemplateStyleEditor;
+import com.fr.design.mainframe.widget.accessibles.MobileTemplateStylePane;
+import com.fr.form.ui.container.cardlayout.WCardTagLayout;
+import com.fr.general.cardtag.mobile.MobileTemplateStyle;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+
+public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
+    private XCreator xCreator;
+    private AccessibleTemplateStyleEditor templateStyleEditor;
+    private AttributeChangeListener changeListener;
+
+    public TabMobileWidgetDefinePane(XCreator xCreator) {
+        this.xCreator = xCreator;
+    }
+
+    private void bindListeners2Widgets() {
+        reInitAllListeners();
+        this.changeListener = new AttributeChangeListener() {
+            @Override
+            public void attributeChange() {
+                update();
+            }
+        };
+    }
+    /**
+     * 后台初始化所有事件.
+     */
+    private void reInitAllListeners() {
+        initListener(this);
+    }
+
+    @Override
+    public void initPropertyGroups(Object source) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template"));
+        templateStyleEditor = new AccessibleTemplateStyleEditor(new MobileTemplateStylePane((WCardTagLayout) xCreator.toData()));
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{label, templateStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        this.add(jPanel, BorderLayout.CENTER);
+    }
+
+    @Override
+    public void populate(FormDesigner designer) {
+        templateStyleEditor.setValue(((WCardTagLayout)xCreator.toData()).getMobileTemplateStyle());
+        // 数据 populate 完成后，再设置监听
+        this.bindListeners2Widgets();
+        this.addAttributeChangeListener(changeListener);
+    }
+
+    @Override
+    public void update() {
+        ((WCardTagLayout)xCreator.toData()).setMobileTemplateStyle((MobileTemplateStyle) templateStyleEditor.getValue());
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
+
+    }
+}

From 8722af6cbf9995a779b5a84c5ff06e5785fc5340 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 19 Nov 2018 16:34:22 +0800
Subject: [PATCH 12/20] =?UTF-8?q?REPORT-12391=20=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=AB=AF=E5=8F=A3=E5=8F=B7=E5=8F=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=3D>=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GlobalNativePrintSettingPane.java         | 49 ++++++++++++++-----
 1 file changed, 38 insertions(+), 11 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java
index 82a4ff3f2..4b30458e6 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java
@@ -3,35 +3,39 @@ package com.fr.design.webattr.printsettings;
 import com.fr.base.print.NativePrintAttr;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UIIntNumberField;
+import com.fr.design.gui.itextfield.UINumberField;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.sun.jna.Native;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.Component;
+import java.awt.FlowLayout;
 
 /**
  * 本地打印设置面板——全局
  * Created by plough on 2018/10/31.
  */
 public class GlobalNativePrintSettingPane extends AbstractNativePrintSettingPane {
+    private static final int PRINT_PORT_FIELD_COLUMNS = 8;
+
     // 服务器配置面板特有的组件
     private UICheckBox defaultDownloadUrlCheck;  // 采用默认的软件下载地址
     private UITextField customUrlFieldWin;
     private UITextField customUrlFieldMac;
+    private UINumberField printPortField;  // 打印软件端口号
 
 
     @Override
     JPanel createHeaderPane(Component... comps) {
-
-        Component[] newComps = {
-                getDownloadUrlSettingPane()
-        };
-        Component[] allComps = new Component[comps.length + newComps.length];
+        Component[] allComps = new Component[comps.length + 1];
         System.arraycopy(comps, 0, allComps, 0, comps.length);
-        System.arraycopy(newComps, 0, allComps, comps.length, newComps.length);
+        allComps[comps.length] = getExtraSettingPane();
 
         JPanel headerPane = GUICoreUtils.createHeaderLayoutPane(allComps);
         headerPane.setBorder(BorderFactory.createEmptyBorder(2, 12, 5, 0));
@@ -48,6 +52,7 @@ public class GlobalNativePrintSettingPane extends AbstractNativePrintSettingPane
             nativePrintAttr.setCustomDownloadUrlMac(customUrlFieldMac.getText());
             nativePrintAttr.setCustomDownloadUrlWin(customUrlFieldWin.getText());
         }
+        nativePrintAttr.setPrintPort((int) printPortField.getValue());
     }
 
     @Override
@@ -55,21 +60,43 @@ public class GlobalNativePrintSettingPane extends AbstractNativePrintSettingPane
         defaultDownloadUrlCheck.setSelected(nativePrintAttr.isUseDefaultDownloadUrl());
         customUrlFieldMac.setText(nativePrintAttr.getCustomDownloadUrlMac());
         customUrlFieldWin.setText(nativePrintAttr.getCustomDownloadUrlWin());
+        printPortField.setValue(nativePrintAttr.getPrintPort());
     }
 
-    private JPanel getDownloadUrlSettingPane() {
+    // 服务器配置中，特有的设置面板
+    private JPanel getExtraSettingPane() {
+        // 软件下载地址
         defaultDownloadUrlCheck = GUICoreUtils.createNoBorderCheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"));
         JPanel downloadUrlSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(defaultDownloadUrlCheck, getCustomUrlSettingPane(), true);
         downloadUrlSettingCheckPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+        JPanel downloadTipPane = getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Software_Download_Url") + ": ");
+        downloadTipPane.setBorder(BorderFactory.createEmptyBorder(0, 0, -6, 0));
+
+        // 打印软件端口号
+        UILabel printPortTip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Native_Print_Port") + ": ");
+        JPanel printPortFiledPane = getPrintPortFieldPane();
 
         // TableLayout
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p};
+        double[] rowSize = {p, p};
         double[] columnSize = {p, p};
         Component[][] components = {
-                {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Software_Download_Url") + ": "), downloadUrlSettingCheckPane}
+            {
+                downloadTipPane, downloadUrlSettingCheckPane
+            }, {
+                printPortTip, printPortFiledPane
+            }
         };
-        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15);
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 0);
+    }
+
+    private JPanel getPrintPortFieldPane() {
+        printPortField = new UIIntNumberField();
+        printPortField.setMaxValue(NativePrintAttr.MAX_PRINT_PORT_VALUE);
+        printPortField.setColumns(PRINT_PORT_FIELD_COLUMNS);
+        JPanel panel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        panel.add(printPortField);
+        return panel;
     }
 
     private JPanel getCustomUrlSettingPane() {
@@ -85,7 +112,7 @@ public class GlobalNativePrintSettingPane extends AbstractNativePrintSettingPane
                 {new UILabel("macOS: "), customUrlFieldMac}
         };
         JPanel urlSettingPane =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 10);
-        urlSettingPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+        urlSettingPane.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
         return urlSettingPane;
     }
 }

From 9306bb26b13add61188c936e18630c6340fba444 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 19 Nov 2018 16:35:53 +0800
Subject: [PATCH 13/20] =?UTF-8?q?REPORT-12391=20=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=AB=AF=E5=8F=A3=E5=8F=B7=E5=8F=AF=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=3D>=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webattr/printsettings/GlobalNativePrintSettingPane.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java
index 4b30458e6..7b3643899 100644
--- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java
+++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/GlobalNativePrintSettingPane.java
@@ -10,12 +10,10 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.sun.jna.Native;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.Component;
-import java.awt.FlowLayout;
 
 /**
  * 本地打印设置面板——全局

From 1516847f4958eab30cecedc30f77c6c3fd46d613 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Mon, 19 Nov 2018 16:41:29 +0800
Subject: [PATCH 14/20] =?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

---
 .../fr/design/layout/FRGUIPaneFactory.java    | 11 --------
 .../ui/MobileTemplateStyleDefinePane.java     |  8 +++---
 .../widget/MobileTabFontConfPane.java         |  5 ++--
 .../mainframe/widget/UITitleSplitLine.java    | 25 +++----------------
 .../com/fr/design/utils/gui/GUICoreUtils.java | 12 +++++++++
 5 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
index 09eaad466..db48cf995 100644
--- a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
+++ b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
@@ -251,17 +251,6 @@ public class FRGUIPaneFactory {
         return jp;
     }
 
-
-    /**
-     * 创建一个靠左流式布局，流式内嵌
-     *
-     * @return JPanel对象
-     */
-    public static JPanel createBoxFlowInnerContainerPane(int hgap, int vgap) {
-        JPanel jp = new JPanel();
-        jp.setLayout(new FlowLayout(FlowLayout.LEFT, hgap, vgap));
-        return jp;
-    }
     /**
      * 创建一个靠左流式布局，流式内嵌，首元素距离左边0
      *
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
index a1d487ab7..ae55b7971 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
@@ -34,13 +34,13 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
 public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<MobileTemplateStyle> {
+    private static final String[] TAB_STYLES = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Custom")};
     private UIComboBox custom;
     protected NewColorSelectBox initialColorBox;
     protected MobileTabFontConfPane fontConfPane;
     private JPanel centerPane;
     protected MobileTemplatePreviewPane previewPane;
-    private static final String[] TAB_STYLES = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Custom")};
     private WCardTagLayout tagLayout;
 
 
@@ -142,7 +142,7 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
         });
         UILabel fillLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill"));
         fillLabel.setPreferredSize(new Dimension(55, 20));
-        JPanel boxFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainerPane(10, 0);
+        JPanel boxFlowPane = GUICoreUtils.createBoxFlowInnerContainerPane(10, 0);
         boxFlowPane.add(fillLabel);
         boxFlowPane.add(initialColorBox);
         initialColorBox.setPreferredSize(new Dimension(157, 20));
@@ -161,7 +161,7 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
         });
         UILabel initCharLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Tab_Init_Char"));
         initCharLabel.setPreferredSize(new Dimension(55, 20));
-        JPanel jPanel3 = FRGUIPaneFactory.createBoxFlowInnerContainerPane(5, 0);
+        JPanel jPanel3 = GUICoreUtils.createBoxFlowInnerContainerPane(5, 0);
         jPanel3.add(initCharLabel);
         jPanel3.add(fontConfPane);
         jPanel3.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java
index 3c17d3b9b..b4d678f98 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java
@@ -20,14 +20,15 @@ import java.awt.event.ItemListener;
 import java.util.Vector;
 
 public class MobileTabFontConfPane extends JPanel {
+    private static final Icon[] ITALIC_ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_white.png")};
+    private static final Icon[] BOLD_ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_white.png")};
+
     private EventListenerList fontChangeListener = new EventListenerList();
     private UIComboBox fontFamily;
     private UIComboBox fontSize;
     private UIToggleButton bold;
     private UIColorButton color;
     private UIToggleButton italic;
-    private final static Icon[] ITALIC_ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_white.png")};
-    private final static Icon[] BOLD_ICONS = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_white.png")};
 
 
     public MobileTabFontConfPane() {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java
index afd1a2c96..f7e2779a4 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java
@@ -1,12 +1,8 @@
 package com.fr.design.mainframe.widget;
 
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRFont;
-
-import javax.swing.JFrame;
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -15,12 +11,12 @@ public class UITitleSplitLine extends JPanel {
     private static final Color LINE_COLOR = Color.decode("#E0E0E1");
     private static final Color TITLE_COLOR = Color.decode("#333334");
     private static final FRFont TITLE_FONT = FRFont.getInstance("PingFangSC-Regular", 0, 12.0F);
-
+    private static final int OFFSETX = 10;
+    private static final int OFFSET = 3;
     private Color color;
     private UILabel label;
     private int width;
-    private static final int OFFSETX = 10;
-    private static final int OFFSET = 3;
+
 
 
     public UITitleSplitLine(String title, int width) {
@@ -50,20 +46,5 @@ public class UITitleSplitLine extends JPanel {
     }
 
 
-    public static void main(String[] args) {
-//        JFrame jf = new JFrame("test");
-//        jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-//        JPanel content = (JPanel) jf.getContentPane();
-//        content.setLayout(new BorderLayout());
-//        JPanel myPanel = new JPanel();
-//        myPanel.setLayout(new BorderLayout());
-//        JPanel Panel = new JPanel();
-//        Panel.setBackground(Color.blue);
-//        myPanel.add(new UITitleSplitLine("基本", 223), BorderLayout.CENTER);
-//        content.add(myPanel, BorderLayout.CENTER);
-//        GUICoreUtils.centerWindow(jf);
-//        jf.setSize(439, 400);
-//        jf.setVisible(true);
-    }
 
 }
diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
index fb8b07be8..21af9365d 100644
--- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
+++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
@@ -526,6 +526,18 @@ public abstract class GUICoreUtils{
 		return leftPane;
 	}
 
+
+	/**
+	 * 创建一个靠左流式布局，流式内嵌
+	 *
+	 * @return JPanel对象
+	 */
+	public static JPanel createBoxFlowInnerContainerPane(int hgap, int vgap) {
+		JPanel jp = new JPanel();
+		jp.setLayout(new FlowLayout(FlowLayout.LEFT, hgap, vgap));
+		return jp;
+	}
+
 	/**
 	 * 生成一个以流式布局为布局的面板
 	 * @param comps 面板中的组件以及布局的参数，后3位参数（可选）分别表示对齐方式，水平间隙，垂直间隙

From 2d878197dc0df44876498b721935aad37a35b642 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Mon, 19 Nov 2018 19:46:04 +0800
Subject: [PATCH 15/20] =?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

---
 .../ui/DefaultMobileStyleDefinePane.java      |  4 ++-
 .../mobile/ui/DownMenuStyleDefinePane.java    | 35 ++++++++++++++-----
 .../ui/MobileTemplateStyleDefinePane.java     | 13 ++++---
 .../mobile/ui/SliderStyleDefinePane.java      | 33 ++++++++++++-----
 .../mobile/ui/UpMenuStyleDefinePane.java      | 17 +++++++--
 5 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java
index b42f1a6ce..d397c8d52 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java
@@ -80,11 +80,13 @@ public class DefaultMobileStyleDefinePane extends MobileTemplateStyleDefinePane
             WCardTagLayout cardTagLayout = DefaultMobileStyleDefinePane.this.getTagLayout();
             int eachWidth = panelWidth / cardTagLayout.getWidgetCount();
             g2d.setFont(frFont);
+            int fontHeight = fm.getHeight();
+            int ascentHeight = fm.getAscent();
             for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
                 CardSwitchButton cardSwitchButton = cardTagLayout.getSwitchButton(i);
                 String widgetName = cardSwitchButton.getText();
                 int width = fm.stringWidth(widgetName);
-                g2d.drawString(widgetName, (eachWidth - width) / 2, (panelHeight) / 2);
+                g2d.drawString(widgetName, (eachWidth - width) / 2, (panelHeight - fontHeight) / 2 + ascentHeight);
                 if (i == 0) {
                     g2d.setStroke(new BasicStroke(2.0f));
                     g2d.drawLine(0, panelHeight - 1, eachWidth, panelHeight - 1);
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java
index b8f267e98..a0184c9a8 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java
@@ -5,6 +5,7 @@ import com.fr.base.IconManager;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.UITitleSplitLine;
 import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
@@ -15,15 +16,18 @@ import com.fr.general.cardtag.mobile.DownMenuStyle;
 import com.fr.general.cardtag.mobile.LineDescription;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Stroke;
 import java.util.ArrayList;
 
 public class DownMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
@@ -36,6 +40,8 @@ public class DownMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
     }
 
     protected void createExtraConfPane(JPanel centerPane) {
+        JPanel panel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 0);
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 5, 20));
         UITitleSplitLine iconSplitLine = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"), 520);
         iconSplitLine.setPreferredSize(new Dimension(520, 20));
         centerPane.add(iconSplitLine);
@@ -51,8 +57,8 @@ public class DownMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
         JPanel selectIconContainePane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{selectIconLabel, selectIconConfigPane}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
         initIconContainPane.setPreferredSize(new Dimension(240, 50));
         selectIconContainePane.setPreferredSize(new Dimension(240, 50));
-        centerPane.add(initIconContainPane);
-        centerPane.add(selectIconContainePane);
+        panel.add(initIconContainPane);
+        panel.add(selectIconContainePane);
         UITitleSplitLine splitLine = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Spit_Line"), 520);
         splitLine.setPreferredSize(new Dimension(520, 20));
         splitLinePane = new LinePane();
@@ -62,6 +68,7 @@ public class DownMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
                 updatePreviewPane();
             }
         });
+        centerPane.add(panel);
         centerPane.add(splitLine);
         centerPane.add(splitLinePane);
     }
@@ -122,8 +129,10 @@ public class DownMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
     }
 
     public class DownMenuStylePreviewPane extends MobileTemplatePreviewPane {
-        private LineDescription splitLine;
+        private static final int ICON_OFFSET = 16;
+        private static final int GAP = 6;
         private static final String PAINT_ICON = "fund_white";
+        private LineDescription splitLine;
 
         public DownMenuStylePreviewPane() {
             this.setBackground(Color.decode("#3888EE"));
@@ -145,21 +154,31 @@ public class DownMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
             FontMetrics fm = GraphHelper.getFontMetrics(frFont);
             WCardTagLayout cardTagLayout = DownMenuStyleDefinePane.this.getTagLayout();
             int eachWidth = panelWidth / cardTagLayout.getWidgetCount();
+            g2d.setFont(frFont);
+            int fontHeight = fm.getHeight();
+            int ascent = fm.getAscent();
             for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
-                g2d.setFont(frFont);
+
                 g2d.setColor(i == 0 ? selectFontColor : frFont.getForeground());
                 CardSwitchButton cardSwitchButton = cardTagLayout.getSwitchButton(i);
                 String widgetName = cardSwitchButton.getText();
                 int width = fm.stringWidth(widgetName);
+                if(i == 0){
+                    Color oldColor = g2d.getColor();
+                    g2d.setColor(this.getSelectColor());
+                    g2d.fillRect(0, 0 ,eachWidth, panelHeight);
+                    g2d.setColor(oldColor);
+                }
                 String iconName = PAINT_ICON;
-                g2d.drawImage(IconManager.getIconManager().getIconImage(iconName), (eachWidth - 18) / 2, 6, null);
-                g2d.drawString(widgetName, (eachWidth - width) / 2, panelHeight / 2 + 9);
+                g2d.drawImage(IconManager.getIconManager().getIconImage(iconName), (eachWidth - ICON_OFFSET) / 2, (panelHeight - ICON_OFFSET - GAP - fontHeight) / 2, null);
+                g2d.drawString(widgetName, (eachWidth - width) / 2, (panelHeight + ICON_OFFSET + GAP - fontHeight) / 2  + ascent);
+                Stroke oldStroke = g2d.getStroke();
                 if (splitLine.getLineStyle() != 0) {
                     g2d.setColor(splitLine.getColor());
-
+                    g2d.setStroke(GraphHelper.getStroke(splitLine.getLineStyle()));
                     g2d.drawLine(eachWidth, 0, eachWidth, panelHeight);
                 }
-
+                g2d.setStroke(oldStroke);
                 g2d.translate(eachWidth, 0);
 
             }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
index ae55b7971..9f5809f92 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java
@@ -142,13 +142,12 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
         });
         UILabel fillLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill"));
         fillLabel.setPreferredSize(new Dimension(55, 20));
-        JPanel boxFlowPane = GUICoreUtils.createBoxFlowInnerContainerPane(10, 0);
-        boxFlowPane.add(fillLabel);
-        boxFlowPane.add(initialColorBox);
+
+        JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{fillLabel, initialColorBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        jPanel.setPreferredSize(new Dimension(240, 20));
         initialColorBox.setPreferredSize(new Dimension(157, 20));
-        boxFlowPane.setPreferredSize(new Dimension(500, 20));
-        boxFlowPane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 20));
-        return boxFlowPane;
+        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 5, 20));
+        return jPanel;
     }
 
     protected JPanel createFontConfPane() {
@@ -180,7 +179,7 @@ public abstract class MobileTemplateStyleDefinePane extends BasicBeanPane<Mobile
     @Override
     public void populateBean(MobileTemplateStyle ob) {
         centerPane.setVisible(ob.isCustom());
-        custom.setSelectedItem(ob.isCustom() ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default") :
+        custom.setSelectedItem(!ob.isCustom() ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default") :
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Custom"));
         initialColorBox.setSelectObject(ob.getInitialColor());
         fontConfPane.populate(ob.getTabFontConfig().getFont());
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java
index 4765edc52..ee81be2ee 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java
@@ -1,8 +1,10 @@
 package com.fr.design.mainframe.mobile.ui;
 
+import com.fr.base.GraphHelper;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.widget.UITitleSplitLine;
 import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
@@ -12,12 +14,15 @@ import com.fr.general.FRFont;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
 import com.fr.general.cardtag.mobile.SliderStyle;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 
@@ -53,6 +58,8 @@ public class SliderStyleDefinePane extends MobileTemplateStyleDefinePane {
 
 
     protected void createExtraConfPane(JPanel centerPane) {
+        JPanel panel = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 10);
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 5, 20));
         UITitleSplitLine dotIndicator = new UITitleSplitLine(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Slider_Dot_Indicator"), 520);
         dotIndicator.setPreferredSize(new Dimension(520, 20));
         centerPane.add(dotIndicator);
@@ -79,9 +86,9 @@ public class SliderStyleDefinePane extends MobileTemplateStyleDefinePane {
         JPanel selectDotColorPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{selectColor, selectDotColor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
         initDotColorPane.setPreferredSize(new Dimension(240, 20));
         selectDotColorPane.setPreferredSize(new Dimension(240, 20));
-        centerPane.add(initDotColorPane);
-        centerPane.add(selectDotColorPane);
-
+        panel.add(initDotColorPane);
+        panel.add(selectDotColorPane);
+        centerPane.add(panel);
     }
 
     @Override
@@ -105,6 +112,9 @@ public class SliderStyleDefinePane extends MobileTemplateStyleDefinePane {
 
 
     public class SliderStylePreviewPane extends MobileTemplatePreviewPane {
+        private static final int CIRCLE_SIZE = 6;
+        private static final int GAP = 4;
+        private static final int OFFSET_X = 10;
         private Color initDotColor;
         private Color selectDotColor;
 
@@ -119,23 +129,28 @@ public class SliderStyleDefinePane extends MobileTemplateStyleDefinePane {
         @Override
         public void paint(Graphics g) {
             super.paint(g);
+            Dimension dimension = this.getSize();
+            int panelHeight = dimension.height;
             Graphics2D g2d = (Graphics2D) g.create();
             FRFont frFont = this.getTabFontConfig().getFont();
             g2d.setFont(frFont);
             g2d.setColor(frFont.getForeground());
-            g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Slider_Title"), 10, 18);
+            FontMetrics fm = GraphHelper.getFontMetrics(frFont);
+            int fontHeight = fm.getHeight();
+            int ascent = fm.getAscent();
+            g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Slider_Title"), OFFSET_X, (panelHeight - fontHeight - GAP - CIRCLE_SIZE) / 2 + ascent);
             WCardTagLayout cardTagLayout = SliderStyleDefinePane.this.getTagLayout();
-            g2d.translate(10, 25);
+            g2d.translate(OFFSET_X, (panelHeight + fontHeight + GAP - CIRCLE_SIZE) / 2);
             for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
                 if (i == 0) {
                     g2d.setColor(selectDotColor);
-                    g2d.fillOval(0, 0, 6, 6);
-                    g2d.translate(9, 0);
+                    g2d.fillOval(0, 0, CIRCLE_SIZE, CIRCLE_SIZE);
+                    g2d.translate(CIRCLE_SIZE + GAP, 0);
                     continue;
                 }
                 g2d.setColor(initDotColor);
-                g2d.fillOval(0, 0, 6, 6);
-                g2d.translate(9, 0);
+                g2d.fillOval(0, 0, CIRCLE_SIZE, CIRCLE_SIZE);
+                g2d.translate(CIRCLE_SIZE + GAP, 0);
             }
 
         }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java
index 41265faef..3812324d4 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java
@@ -21,7 +21,6 @@ import javax.swing.ButtonGroup;
 import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.BasicStroke;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -29,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Stroke;
 
 public class UpMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
     private UIRadioButton gapFix;
@@ -177,23 +177,34 @@ public class UpMenuStyleDefinePane extends StyleDefinePaneWithSelectConf {
             WCardTagLayout cardTagLayout = UpMenuStyleDefinePane.this.getTagLayout();
             int eachWidth = panelWidth / cardTagLayout.getWidgetCount();
             g2d.setFont(frFont);
+            int fontHeight = fm.getHeight();
+            int ascentHeight = fm.getAscent();
             for (int i = 0; i < cardTagLayout.getWidgetCount(); i++) {
                 g2d.setColor(i == 0 ? selectFontColor : frFont.getForeground());
                 CardSwitchButton cardSwitchButton = cardTagLayout.getSwitchButton(i);
                 String widgetName = cardSwitchButton.getText();
                 int width = fm.stringWidth(widgetName);
-                g2d.drawString(widgetName, (eachWidth - width) / 2, (panelHeight) / 2);
+                if(i == 0){
+                    Color oldColor = g2d.getColor();
+                    g2d.setColor(this.getSelectColor());
+                    g2d.fillRect(0, 0 ,eachWidth, panelHeight);
+                    g2d.setColor(oldColor);
+                }
+                g2d.drawString(widgetName, (eachWidth - width) / 2, (panelHeight - fontHeight) / 2 + ascentHeight);
+                Stroke oldStroke = g2d.getStroke();
                 if (i == 0) {
                     g2d.setColor(this.underLine.getColor());
-                    g2d.setStroke(new BasicStroke(2.0f));
+                    g2d.setStroke(GraphHelper.getStroke(underLine.getLineStyle()));
                     int underLineX = this.isGapFix ? (eachWidth - width) / 2 : 0;
                     int underLineWidth = this.isGapFix ? width : eachWidth;
                     g2d.drawLine(underLineX, panelHeight - 1, underLineX + underLineWidth, panelHeight - 1);
                 }
                 if (bottomBorder.getLineStyle() != 0) {
                     g2d.setColor(bottomBorder.getColor());
+                    g2d.setStroke(GraphHelper.getStroke(bottomBorder.getLineStyle()));
                     g2d.drawLine(eachWidth, 0, eachWidth, panelHeight);
                 }
+                g2d.setStroke(oldStroke);
                 g2d.translate(eachWidth, 0);
             }
 

From 6f5e05b2f1000635ea2d493443f3ae6443bb5fe9 Mon Sep 17 00:00:00 2001
From: "alex.sung" <alex.sung@fanruan.com>
Date: Mon, 19 Nov 2018 20:07:29 +0800
Subject: [PATCH 16/20] =?UTF-8?q?REPORT-12593=2010.0=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E5=86=85=E5=AE=B9=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E5=A4=B1=E6=95=88=20=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=E7=9A=84=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E9=82=A3=E4=B8=AAcheckbox=E7=9A=84?=
 =?UTF-8?q?=E5=80=BC=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E7=9A=84=E8=A2=AB?=
 =?UTF-8?q?set=E5=88=B0CellGUIAttr=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=80=BC?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A2=ABwrite=E5=88=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/cell/settingpane/CellOtherSetPane.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
index 814a4ebec..4ac2aab9b 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
@@ -427,7 +427,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             }
         }
 
-        if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"))) {
+        if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))) {
             cellGUIAttr.setPreviewContent(previewCellContent.isSelected());
         }
 

From 795c9d1e0a04a574ab8eb7ec809f44ae236afccb Mon Sep 17 00:00:00 2001
From: "alex.sung" <alex.sung@fanruan.com>
Date: Mon, 19 Nov 2018 20:11:58 +0800
Subject: [PATCH 17/20] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=9D=A2=E6=9D=BF=E7=9A=84=E9=A2=84=E8=A7=88=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E9=82=A3=E4=B8=AAcheckbox=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E7=9A=84=E8=A2=ABset?=
 =?UTF-8?q?=E5=88=B0CellGUIAttr=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=80=BC?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=A2=ABwrite=E5=88=B0=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/cell/settingpane/CellOtherSetPane.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
index 814a4ebec..4ac2aab9b 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
@@ -427,7 +427,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
             }
         }
 
-        if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"))) {
+        if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))) {
             cellGUIAttr.setPreviewContent(previewCellContent.isSelected());
         }
 

From 595910ef7a693ec3383721cfba06a801d9f9be63 Mon Sep 17 00:00:00 2001
From: Hades <Hades@fanruan.com>
Date: Tue, 20 Nov 2018 11:31:36 +0800
Subject: [PATCH 18/20] =?UTF-8?q?REPORT-12622=20=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=94=AF=E6=8C=81=E6=89=AB=E7=A0=81=20ui?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/WidgetMobilePaneFactory.java       |  3 +
 .../widget/ui/mobile/ScanCodeMobilePane.java  | 64 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java

diff --git a/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java b/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java
index 8b9afc3f2..5d995ddad 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java
@@ -4,7 +4,9 @@ import com.fr.base.FRContext;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.widget.mobile.WidgetMobilePane;
 import com.fr.design.widget.ui.mobile.MultiFileEditorMobilePane;
+import com.fr.design.widget.ui.mobile.ScanCodeMobilePane;
 import com.fr.form.ui.MultiFileEditor;
+import com.fr.form.ui.TextEditor;
 import com.fr.form.ui.Widget;
 
 import java.util.HashMap;
@@ -18,6 +20,7 @@ public class WidgetMobilePaneFactory {
 
     static {
         mobilePaneMap.put(MultiFileEditor.class, MultiFileEditorMobilePane.class);
+        mobilePaneMap.put(TextEditor.class, ScanCodeMobilePane.class);
         mobilePaneMap.putAll(ExtraDesignClassManager.getInstance().getCellWidgetMobileOptionsMap());
     }
 
diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java
new file mode 100644
index 000000000..8fd0fc88c
--- /dev/null
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java
@@ -0,0 +1,64 @@
+package com.fr.design.widget.ui.mobile;
+
+import com.fr.base.mobile.MobileScanCodeAttr;
+import com.fr.base.mobile.ScanCodeState;
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.widget.mobile.WidgetMobilePane;
+import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.Widget;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+
+public class ScanCodeMobilePane extends WidgetMobilePane {
+
+    private UICheckBox appScanCodeCheck;
+
+    protected void init() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.add(getMobileSettingPane(), BorderLayout.NORTH);
+    }
+
+    private UIExpandablePane getMobileSettingPane() {
+        JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        appScanCodeCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Support_Scan_Code"), true);
+        appScanCodeCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
+        panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
+        panel.add(appScanCodeCheck);
+        final JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        panelWrapper.add(panel, BorderLayout.NORTH);
+        return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, panelWrapper);
+    }
+
+    @Override
+    public void populate(Widget widget) {
+        MobileScanCodeAttr mobileScanCodeAttr = ((TextEditor) widget).getMobileScanCodeAttr();
+        ScanCodeState scanCodeState = mobileScanCodeAttr.getScanCodeState();
+        appScanCodeCheck.setSelected(scanCodeState2boolean(scanCodeState));
+    }
+
+    @Override
+    public void update(Widget widget) {
+        MobileScanCodeAttr mobileScanCodeAttr = ((TextEditor) widget).getMobileScanCodeAttr();
+        mobileScanCodeAttr.setScanCodeState(boolean2ScanCodeState(appScanCodeCheck.isSelected()));
+    }
+
+    private ScanCodeState boolean2ScanCodeState(boolean scanCodeCheck) {
+        if (scanCodeCheck) {
+            return ScanCodeState.SUPPORT_SCAN_CODE;
+        } else {
+            return ScanCodeState.NOT_SUPPORT_SCAN_CODE;
+        }
+    }
+
+    private boolean scanCodeState2boolean(ScanCodeState scanCodeState) {
+        if (scanCodeState == ScanCodeState.SUPPORT_SCAN_CODE) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}

From 90fbfa525daa762e063a4332da9b5b8ce782e1e0 Mon Sep 17 00:00:00 2001
From: Hades <Hades@fanruan.com>
Date: Tue, 20 Nov 2018 12:34:58 +0800
Subject: [PATCH 19/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AASB?=
 =?UTF-8?q?=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java
index 8fd0fc88c..586501e7b 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java
@@ -55,10 +55,6 @@ public class ScanCodeMobilePane extends WidgetMobilePane {
     }
 
     private boolean scanCodeState2boolean(ScanCodeState scanCodeState) {
-        if (scanCodeState == ScanCodeState.SUPPORT_SCAN_CODE) {
-            return true;
-        } else {
-            return false;
-        }
+        return scanCodeState == ScanCodeState.SUPPORT_SCAN_CODE;
     }
 }

From 695aea46b367e73e9c355e61d86fc5ee7a61602d Mon Sep 17 00:00:00 2001
From: Hades <Hades@fanruan.com>
Date: Tue, 20 Nov 2018 13:55:00 +0800
Subject: [PATCH 20/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9enum=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/ui/mobile/ScanCodeMobilePane.java       | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java
index 586501e7b..e9c798ec9 100644
--- a/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java
+++ b/designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java
@@ -37,24 +37,14 @@ public class ScanCodeMobilePane extends WidgetMobilePane {
     public void populate(Widget widget) {
         MobileScanCodeAttr mobileScanCodeAttr = ((TextEditor) widget).getMobileScanCodeAttr();
         ScanCodeState scanCodeState = mobileScanCodeAttr.getScanCodeState();
-        appScanCodeCheck.setSelected(scanCodeState2boolean(scanCodeState));
+        appScanCodeCheck.setSelected(scanCodeState.getState());
     }
 
     @Override
     public void update(Widget widget) {
         MobileScanCodeAttr mobileScanCodeAttr = ((TextEditor) widget).getMobileScanCodeAttr();
-        mobileScanCodeAttr.setScanCodeState(boolean2ScanCodeState(appScanCodeCheck.isSelected()));
+        mobileScanCodeAttr.setScanCodeState(ScanCodeState.parse(appScanCodeCheck.isSelected()));
     }
 
-    private ScanCodeState boolean2ScanCodeState(boolean scanCodeCheck) {
-        if (scanCodeCheck) {
-            return ScanCodeState.SUPPORT_SCAN_CODE;
-        } else {
-            return ScanCodeState.NOT_SUPPORT_SCAN_CODE;
-        }
-    }
 
-    private boolean scanCodeState2boolean(ScanCodeState scanCodeState) {
-        return scanCodeState == ScanCodeState.SUPPORT_SCAN_CODE;
-    }
 }