Merge pull request #9 in ~NEIL/design from feature/10.0 to release/10.0

* commit 'f62d186869171ba0cbcc3db755d4981ff6d3f314': (103 commits)
  1
  REPORT-12584 设计器编码转换 交互修改
  REPORT-13254 10.0的设计器mac不能点最大按钮
  REPORT-10535 验收bug修复
  DEC-5580 【10.0.2迭代验收】【全局水印】设计器字号可选范围与平台不统一
  DEC-5580 【10.0.2迭代验收】【全局水印】设计器字号可选范围与平台不统一
  DEC-5624 【10.0.2迭代验收】【全局水印】设计器中颜色配置不显示
  REPORT-13067 npe 无法拖报表块
  REPORT-13067 npe 无法拖报表块
  f
  REPORT-11623 模板加密 设计器拷贝剪切控制
  格式化
  REPORT-13034 FR模板挂载到BI，自适应异常 REPORT-12578 全局配置保存问题
  f
  remove useless code
  REPORT-12635
  REPORT-12635
  REPORT-11623 模板加密
  REPORT-12635
  REPORT-12635
  ...

designer-base/src/main/java/com/fr/base/vcs/DesignerMode.java

@@ -0,0 +1,83 @@
+package com.fr.base.vcs;
+
+import com.fr.design.base.mode.DesignModeContext;
+
+/**
+ * 兼容
+ *
+ * @deprecated user {@link com.fr.design.base.mode.DesignerMode} and {@link DesignModeContext} instead
+ */
+@Deprecated
+public enum DesignerMode {
+
+    NORMAL() {
+        @Override
+        public void doSwitch() {
+            DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.NORMAL);
+        }
+    },
+    VCS() {
+        @Override
+        public void doSwitch() {
+            DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.VCS);
+        }
+    },
+    AUTHORITY() {
+        @Override
+        public void doSwitch() {
+            DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.AUTHORITY);
+        }
+    };
+
+    abstract void doSwitch();
+
+
+    /**
+     * @return 是否时版本控制模式
+     * @deprecated use {@link DesignModeContext#isVcsMode()} instead
+     */
+    @Deprecated
+    public static boolean isVcsMode() {
+        return DesignModeContext.isVcsMode();
+    }
+
+
+    /**
+     * 切换设计器模式
+     *
+     * @param mode mode
+     * @deprecated use {@link DesignModeContext#switchTo(com.fr.design.base.mode.DesignerMode)} instead
+     */
+    @Deprecated
+    public static void setMode(DesignerMode mode) {
+        mode.doSwitch();
+    }
+
+    /**
+     * @return 获取当前设计器模式
+     * @deprecated use {@link DesignModeContext#getMode()} instead
+     */
+    @Deprecated
+    public static DesignerMode getMode() {
+        switch (DesignModeContext.getMode()) {
+            case VCS:
+                return VCS;
+            case AUTHORITY:
+                return AUTHORITY;
+            case NORMAL:
+            default:
+                return NORMAL;
+        }
+    }
+
+    /**
+     * 是否为权限编辑
+     *
+     * @return 是否为权限编辑
+     * @deprecated use {@link DesignModeContext#isAuthorityEditing()} instead
+     */
+    @Deprecated
+    public static boolean isAuthorityEditing() {
+        return DesignModeContext.isAuthorityEditing();
+    }
+}

designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java

@@ -35,7 +35,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction {
 		}
 
 		if (DesignerMode.isAuthorityEditing()) {
-			DesignerMode.setMode(DesignerMode.NORMARL);
+			DesignerMode.setMode(DesignerMode.NORMAL);
 			WestRegionContainerPane.getInstance().replaceDownPane(TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
 			HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
 			DesignerContext.getDesignerFrame().resetToolkitByPlus(tc.getToolBarMenuDockPlus());

designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java

@@ -5,10 +5,10 @@ package com.fr.design.actions.edit;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.TemplateComponentAction;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.TargetComponent;
 
-
-import javax.swing.*;
+import javax.swing.KeyStroke;
 import java.awt.event.KeyEvent;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
@@ -24,14 +24,12 @@ public class CopyAction extends TemplateComponentAction {
         this.setMnemonic('C');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
+        this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }
 
     @Override
     public boolean executeActionReturnUndoRecordNeeded() {
-        TargetComponent tc = getEditingComponent();
-        if (tc != null) {
-            tc.copy();
-        }
+        DesignModeContext.doCopy(getEditingComponent());
         return false;
     }
 }

designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java

@@ -3,14 +3,13 @@
  */
 package com.fr.design.actions.edit;
 
-import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.TemplateComponentAction;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.TargetComponent;
 
+import javax.swing.KeyStroke;
+import java.awt.event.KeyEvent;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
@@ -21,21 +20,18 @@ public class CutAction extends TemplateComponentAction {
     /**
      * Constructor
      */
-	public CutAction(TargetComponent t) {
-    	super(t);
-    	
+    public CutAction(TargetComponent t) {
+        super(t);
+
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
         this.setMnemonic('T');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
+        this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }
 
     @Override
     public boolean executeActionReturnUndoRecordNeeded() {
-        TargetComponent editPane = getEditingComponent();
-        if (editPane == null) {
-            return false;
-        }
-        return editPane.cut();
+        return DesignModeContext.doPaste(getEditingComponent());
     }
 }

designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java

@@ -3,14 +3,13 @@
  */
 package com.fr.design.actions.edit;
 
-import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.TemplateComponentAction;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.TargetComponent;
 
+import javax.swing.KeyStroke;
+import java.awt.event.KeyEvent;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
@@ -21,9 +20,9 @@ public class PasteAction extends TemplateComponentAction {
     /**
      * Constructor
      */
-	public PasteAction(TargetComponent t) {
-    	super(t);
-    	
+    public PasteAction(TargetComponent t) {
+        super(t);
+
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
         this.setMnemonic('P');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png"));
@@ -32,10 +31,6 @@ public class PasteAction extends TemplateComponentAction {
 
     @Override
     public boolean executeActionReturnUndoRecordNeeded() {
-        TargetComponent tc = getEditingComponent();
-        if (tc == null) {
-            return false;
-        }
-        return tc.paste();
+        return DesignModeContext.doPaste(getEditingComponent());
     }
 }

designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java

@@ -0,0 +1,223 @@
+package com.fr.design.actions.file.export;
+
+import com.fr.base.vcs.DesignerMode;
+import com.fr.design.actions.JTemplateAction;
+import com.fr.design.gui.iprogressbar.FRProgressBar;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.exception.RemoteDesignPermissionDeniedException;
+import com.fr.file.FILE;
+import com.fr.file.FILEChooserPane;
+import com.fr.io.exporter.ExporterKey;
+import com.fr.file.filter.ChooseFileFilter;
+import com.fr.io.exporter.DesignExportType;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StringUtils;
+import com.fr.third.jodd.io.FileNameUtil;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.exporter.TemplateExportOperator;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingWorker;
+import javax.swing.UIManager;
+import java.awt.event.ActionEvent;
+import java.io.OutputStream;
+import java.util.Map;
+
+public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JTemplateAction<E> {
+
+    private FRProgressBar progressbar;
+
+    public AbstractExportAction(E t) {
+        super(t);
+    }
+
+    /**
+     * 导出接口名
+     *
+     * @return String scopeName
+     */
+    public abstract ExporterKey exportKey();
+
+    /**
+     * 导出类型
+     *
+     * @return DesignExportType tyoe
+     */
+    public abstract DesignExportType exportType();
+
+    /**
+     * 目标文件过滤器
+     *
+     * @return ChooseFileFilter filter
+     */
+    protected abstract ChooseFileFilter getChooseFileFilter();
+
+    /**
+     * 目标文件扩展名
+     *
+     * @return String extensionName
+     */
+    protected abstract String getDefaultExtension();
+
+    /**
+     * 处理参数
+     *
+     * @return Map para
+     */
+    protected abstract Map<String, Object> processParameter();
+
+
+    /**
+     * 执行方法
+     */
+    @Override
+    public void actionPerformed(ActionEvent e) {
+
+        if (!processNotSaved()) {
+            return;
+        }
+
+        Map<String, Object> para = processParameter();
+
+        // 选择输入的文件
+        FILEChooserPane fileChooserPane = FILEChooserPane.getMultiEnvInstance(true, false);
+        fileChooserPane.addChooseFILEFilter(this.getChooseFileFilter());
+
+
+        String fileName = getTargetFileName();
+        fileChooserPane.setFileNameTextField(fileName, "." + this.getDefaultExtension());
+        int saveValue = fileChooserPane.showSaveDialog(DesignerContext.getDesignerFrame(), "." + this.getDefaultExtension());
+        if (saveValue == FILEChooserPane.JOPTIONPANE_OK_OPTION || saveValue == FILEChooserPane.OK_OPTION) {
+            FILE target = fileChooserPane.getSelectedFILE();
+            try {
+                target.mkfile();
+            } catch (Exception exp) {
+                FineLoggerFactory.getLogger().error("Error In Make New File", exp);
+            }
+            FineLoggerFactory.getLogger().info("\"" + target.getName() + "\"" + Toolkit.i18nText("Fine-Design_Report_Prepare_Export") + "!");
+
+            progressbar = new FRProgressBar(
+                    createExportWork(getSource(), target, para),
+                    DesignerContext.getDesignerFrame(),
+                    Toolkit.i18nText("Fine-Design_Report_Exporting"),
+                    StringUtils.EMPTY,
+                    0,
+                    100);
+
+            progressbar.start();
+        }
+    }
+
+    private FILE getSource() {
+        return this.getEditingComponent().getEditingFILE();
+    }
+
+    private String getTargetFileName() {
+        FILE source = getSource();
+        String fileName = source.getName();
+        return FileNameUtil.removeExtension(fileName);
+    }
+
+    private boolean processNotSaved() {
+        //当前编辑的模板
+        E e = getEditingComponent();
+        if (!e.isALLSaved() && !DesignerMode.isVcsMode()) {
+            e.stopEditing();
+            int returnVal = JOptionPane.showConfirmDialog(
+                    DesignerContext.getDesignerFrame(),
+                    Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + e.getEditingFILE() + "\" ?",
+                    ProductConstants.PRODUCT_NAME,
+                    JOptionPane.YES_NO_CANCEL_OPTION,
+                    JOptionPane.QUESTION_MESSAGE
+            );
+            if (returnVal == JOptionPane.YES_OPTION) {
+                e.saveTemplate();
+                FineLoggerFactory.getLogger().info(
+                        Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", e.getEditingFILE().getName())
+                );
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return true;
+        }
+    }
+
+    private SwingWorker createExportWork(final FILE source, final FILE target, final Map<String, Object> parameterMap) {
+        final String path = source.getPath();
+        final String name = target.getName();
+
+        return new SwingWorker<Void, Void>() {
+
+            @Override
+            protected Void doInBackground() throws Exception {
+                //bug 10516
+                Thread.sleep(100);
+                try (OutputStream outputStream = target.asOutputStream()) {
+                    this.setProgress(10);
+                    dealExporter(outputStream, path, parameterMap);
+                    this.setProgress(80);
+                    outputStream.flush();
+                    outputStream.close();
+                    this.setProgress(100);
+
+                    FineLoggerFactory.getLogger().info("\"" + name + "\"" + Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!");
+                    JOptionPane.showMessageDialog(
+                            DesignerContext.getDesignerFrame(),
+                            Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + name);
+
+
+                } catch (RemoteDesignPermissionDeniedException exp) {
+                    this.setProgress(100);
+                    target.closeTemplate();
+                    FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
+                    JOptionPane.showMessageDialog(
+                            DesignerContext.getDesignerFrame(),
+                            Toolkit.i18nText("Fine-Engine_Remote_Design_Permission_Denied"),
+                            null,
+                            JOptionPane.ERROR_MESSAGE,
+                            UIManager.getIcon("OptionPane.errorIcon")
+                    );
+                } catch (Exception exp) {
+                    this.setProgress(100);
+                    target.closeTemplate();
+                    FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
+                    JOptionPane.showMessageDialog(
+                            DesignerContext.getDesignerFrame(),
+                            Toolkit.i18nText("Fine-Design_Report_Export_Failed") + "\n" + path,
+                            null,
+                            JOptionPane.ERROR_MESSAGE,
+                            UIManager.getIcon("OptionPane.errorIcon")
+                    );
+                }
+                return null;
+            }
+
+            @Override
+            public void done() {
+                progressbar.close();
+            }
+        };
+    }
+
+    private void dealExporter(OutputStream outputStream, String path, final Map<String, Object> para) throws Exception {
+
+        // 没有办法处理这个 isLocal 判断，因为一个是修改参数传递结果，一个是返回值做结果
+        // todo 后续想想办法
+        if (WorkContext.getCurrent().isLocal()) {
+            WorkContext.getCurrent().get(TemplateExportOperator.class)
+                    .export(exportKey(), exportType(), outputStream, path, para);
+        } else {
+            byte[] contents =
+                    WorkContext.getCurrent().get(TemplateExportOperator.class)
+                            .export(exportKey(), exportType(), null, path, para);
+
+            outputStream.write(contents);
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/base/mode/DesignModeContext.java

@@ -0,0 +1,66 @@
+package com.fr.design.base.mode;
+
+import com.fr.design.designer.TargetComponent;
+
+import static com.fr.design.base.mode.DesignerMode.AUTHORITY;
+
+public class DesignModeContext {
+
+    private static DesignerMode mode = DesignerMode.NORMAL;
+
+    public static void switchTo(DesignerMode mode) {
+        DesignModeContext.mode = mode;
+    }
+
+    public static DesignerMode getMode() {
+        return mode;
+    }
+
+    /**
+     * 是否是版本控制模式
+     *
+     * @return 是否是版本控制模式
+     */
+    public static boolean isVcsMode() {
+        return mode == DesignerMode.VCS;
+    }
+
+    /**
+     * @return 是否是禁止拷贝剪切模式
+     */
+    public static boolean isBanCopyAndCut() {
+        return mode == DesignerMode.BAN_COPY_AND_CUT;
+    }
+
+
+    /**
+     * 是否为权限编辑
+     *
+     * @return 是否为权限编辑
+     */
+    public static boolean isAuthorityEditing() {
+        return mode == AUTHORITY;
+    }
+
+
+    public static void doCopy(TargetComponent principal) {
+        if (isBanCopyAndCut() || principal == null) {
+            return;
+        }
+        principal.copy();
+    }
+
+    public static boolean doPaste(TargetComponent principal) {
+        if (principal == null) {
+            return false;
+        }
+        return principal.paste();
+    }
+
+    public static boolean doCut(TargetComponent principal) {
+        if (isBanCopyAndCut() || principal == null) {
+            return false;
+        }
+        return principal.cut();
+    }
+}

designer-base/src/main/java/com/fr/design/base/mode/DesignerMode.java

@@ -0,0 +1,8 @@
+package com.fr.design.base.mode;
+
+public enum DesignerMode {
+    NORMAL,
+    BAN_COPY_AND_CUT,
+    VCS,
+    AUTHORITY
+}

designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@@ -15,6 +15,7 @@ import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
 
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
 
 import javax.swing.*;
@@ -34,8 +35,9 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private UIButton cancelButton;
     private JDialog dialog;
     private UILabel uiLabel;
+    // 编码转换.
+    private UIComboBox newCharSetComboBox;
     private String oirginalCharSet = null;
-    private String newCharSet = null;
 
     // Database pane
     public DatabaseConnectionPane() {
@@ -47,6 +49,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         uiLabel = new UILabel();
         okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
         cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
+        String[] defaultEncode = new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Encode_Auto")};
+        newCharSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         this.add(northPane, BorderLayout.NORTH);
@@ -61,6 +65,14 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
         // Center
         northPane.add(mainPanel(), BorderLayout.CENTER);
+        // ChartSet
+        JPanel chartSetPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
+        northPane.add(chartSetPane);
+        chartSetPane.setBorder(BorderFactory.createTitledBorder(
+                new ModLineBorder(ModLineBorder.TOP),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced")
+        ));
+        chartSetPane.add(GUICoreUtils.createNamedPane(newCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_New_Charset") + ":"));
     }
 
     protected abstract JPanel mainPanel();
@@ -70,7 +82,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     @Override
     public void populateBean(com.fr.data.impl.Connection ob) {
         this.oirginalCharSet = ob.getOriginalCharsetName();
-        this.newCharSet = ob.getNewCharsetName();
+        this.newCharSetComboBox.setSelectedItem(ob.getNewCharsetName());
 
         populateSubDatabaseConnectionBean((E) ob);
     }
@@ -82,7 +94,11 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         E ob = updateSubDatabaseConnectionBean();
 
         ob.setOriginalCharsetName(this.oirginalCharSet);
-        ob.setNewCharsetName(this.newCharSet);
+        if (this.newCharSetComboBox.getSelectedIndex() == 0) {
+            ob.setNewCharsetName(null);
+        } else {
+            ob.setNewCharsetName((String) this.newCharSetComboBox.getSelectedItem());
+        }
 
         return ob;
     }

designer-base/src/main/java/com/fr/design/designer/DesignerProxy.java

@@ -0,0 +1,7 @@
+package com.fr.design.designer;
+
+/**
+ * 暂时是空接口，标记一下模板设计时推出的代理其他 {@link TargetComponent} 的类
+ */
+public interface DesignerProxy {
+}

designer-base/src/main/java/com/fr/design/designer/TargetComponent.java

@@ -1,6 +1,5 @@
 package com.fr.design.designer;
 
-import com.fr.design.DesignState;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.mainframe.AuthorityEditPane;
@@ -8,7 +7,6 @@ import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
-import com.fr.stable.StringUtils;
 import com.fr.third.javax.annotation.Nullable;
 
 import javax.swing.JComponent;
@@ -115,82 +113,4 @@ public abstract class TargetComponent<T> extends JComponent {
     public EditingState createEditingState() {
         return EditingState.NULL;
     }
-
-    public static final TargetComponent<String> NULLAVOID = new TargetComponent<String>(StringUtils.EMPTY) {
-
-        @Override
-        public void copy() {
-        }
-
-        @Override
-        public boolean paste() {
-            return false;
-        }
-
-        @Override
-        public int getMenuState() {
-            return DesignState.WORK_SHEET;
-        }
-
-        @Override
-        public void cancelFormat() {
-            return;
-        }
-
-        @Override
-        public boolean cut() {
-            return false;
-        }
-
-        @Override
-        public void stopEditing() {
-        }
-
-        @Override
-        public AuthorityEditPane createAuthorityEditPane() {
-            return null;
-        }
-
-        @Override
-        public ToolBarMenuDockPlus getToolBarMenuDockPlus() {
-            return null;
-        }
-
-        @Override
-        public ToolBarDef[] toolbars4Target() {
-            return new ToolBarDef[0];
-        }
-
-        @Override
-        public MenuDef[] menus4Target() {
-            return new MenuDef[0];
-        }
-
-        @Override
-        public ShortCut[] shortcut4TemplateMenu() {
-            return new ShortCut[0];
-        }
-
-        @Override
-        public ShortCut[] shortCuts4Authority() {
-            return new ShortCut[0];
-
-        }
-
-        @Override
-        public JComponent[] toolBarButton4Form() {
-            return new JComponent[0];
-        }
-
-        @Override
-        public JPanel getEastUpPane() {
-            return new JPanel();
-        }
-
-        @Override
-        public JPanel getEastDownPane() {
-            return new JPanel();
-        }
-
-    };
 }

designer-base/src/main/java/com/fr/design/designer/properties/PropertyTab.java

@@ -0,0 +1,5 @@
+package com.fr.design.designer.properties;
+
+public enum PropertyTab {
+    ATTR, MOBILE
+}

designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java

@@ -0,0 +1,93 @@
+package com.fr.design.dialog;
+
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+/**
+ * 封装了"为该模版单独设置、采用服务器设置"选项功能的设置面板
+ * Created by plough on 2018/11/7.
+ */
+public abstract class AbstractTemplateServerSettingPane extends BasicPane {
+    private static final String[] CHOOSEITEM = new String[] {
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_I_Want_To_Set_Single"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Using_Server_Report_View_Settings")
+    };
+
+    protected static final int SINGLE_SET = 0;
+    protected static final int SERVER_SET = 1;
+
+    protected UIComboBox chooseComboBox;
+    protected JPanel buttonPane;
+    private JPanel contentPane;
+
+    protected AbstractTemplateServerSettingPane() {
+        initComponents();
+    }
+
+    private void initComponents() {
+        chooseComboBox = new UIComboBox(CHOOSEITEM);
+        chooseComboBox.addItemListener(itemListener);
+        UILabel belowSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set"));
+        belowSetLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20));
+        buttonPane = GUICoreUtils.createFlowPane(new Component[] {
+                belowSetLabel, chooseComboBox}, FlowLayout.LEFT, 0, 0);
+        buttonPane.setBorder(BorderFactory.createEmptyBorder(10, 20, 0, 0));
+
+        this.setLayout(new BorderLayout());
+        this.add(buttonPane, BorderLayout.NORTH);
+        this.contentPane = getContentPane();
+        this.add(contentPane, BorderLayout.CENTER);
+    }
+
+    /**
+     * 包含设置项的主面板
+     */
+    protected abstract JPanel getContentPane();
+
+    private ItemListener itemListener = new ItemListener() {
+        @Override
+        public void itemStateChanged(ItemEvent e) {
+            if (e.getStateChange() == ItemEvent.SELECTED) {
+                if (isUsingServerSettings()) {
+                    populateServerSettings();
+                    setSettingPaneEnabled(false);
+                } else {
+                    setSettingPaneEnabled(true);
+                }
+            }
+        }
+    };
+
+    private void setSettingPaneEnabled(boolean enabled) {
+        // GUICoreUtils.setEnabled 会遍历所有 Component。所以要先设置外层，如果是生效的，再设置内层
+        GUICoreUtils.setEnabled(contentPane, enabled);
+        if (enabled) {
+            checkContentPaneEnabled();
+        }
+    }
+
+    protected boolean isUsingServerSettings() {
+        return chooseComboBox.getSelectedIndex() == SERVER_SET;
+    }
+
+    /**
+     * 整个配置面板设置为可用后，可能还需要检测面板中部分区域的可用性
+     */
+    protected void checkContentPaneEnabled() {
+        // do nothing
+    }
+
+    /**
+     * 读取服务器配置并 populate 到主面板中
+     */
+    protected abstract void populateServerSettings();
+}

designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@@ -17,6 +17,7 @@ import com.fr.file.filetree.IOFileNodeFilter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
@@ -303,8 +304,6 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
     private boolean deleteNodes(Collection<ExpandMutableTreeNode> nodes) {
 
-        boolean isLocal = WorkContext.getCurrent().isLocal();
-
         boolean success = true;
         for (ExpandMutableTreeNode treeNode : nodes) {
             Object node = treeNode.getUserObject();
@@ -379,7 +378,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
 
         TreePath[] selectedTreePaths = reportletsTree.getSelectionPaths();
 
-        if (selectedTreePaths == null || selectedTreePaths.length != 1) {
+        if (ArrayUtils.isEmpty(selectedTreePaths)) {
             return false;
         }
         // 选中的是文件夹

designer-base/src/main/java/com/fr/design/fun/FormElementCaseEditorProcessor.java

@@ -1,31 +0,0 @@
-package com.fr.design.fun;
-
-import com.fr.stable.fun.ReportFitAttrProvider;
-import com.fr.stable.fun.mark.Immutable;
-
-import java.beans.PropertyDescriptor;
-
-/**
- * Created by Slpire on 2016/10/28.
- */
-public interface FormElementCaseEditorProcessor extends Immutable {
-    String MARK_STRING = "PropertyEditor";
-
-    int CURRENT_LEVEL = 1;
-
-
-    /**
-     * 生成属性表
-     * @param temp 传入当前操作的class
-     * @param reportFitAttr 传入的自适应属性
-     * @return 返回属性表
-     */
-    PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, ReportFitAttrProvider reportFitAttr);
-
-    /**
-     * 返回pc自适应属性值
-     * @param fitAttrProvider 传入的自适应属性
-     * @return 返回pc自适应属性值
-     */
-    int getFitStateInPC(ReportFitAttrProvider fitAttrProvider);
-}

designer-base/src/main/java/com/fr/design/fun/FormElementCaseEditorProvider.java

@@ -2,7 +2,6 @@ package com.fr.design.fun;
 
 import com.fr.form.FormProvider;
 import com.fr.form.ui.ElementCaseEditorProvider;
-import com.fr.stable.fun.ReportFitAttrProvider;
 import com.fr.stable.fun.mark.Mutable;
 
 import java.beans.PropertyDescriptor;
@@ -18,18 +17,4 @@ public interface FormElementCaseEditorProvider extends Mutable {
 
     PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, FormProvider formProvider, ElementCaseEditorProvider editor);
 
-    /**
-     * 生成属性表
-     * @param temp 传入当前操作的class
-     * @param reportFitAttr 传入的自适应属性
-     * @return 返回属性表
-     */
-    PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, ReportFitAttrProvider reportFitAttr);
-
-    /**
-     * 返回pc自适应属性值
-     * @param fitAttrProvider 传入的自适应属性
-     * @return 返回pc自适应属性值
-     */
-    int getFitStateInPC(ReportFitAttrProvider fitAttrProvider);
 }

designer-base/src/main/java/com/fr/design/fun/ParameterExpandablePaneUIProvider.java

@@ -0,0 +1,31 @@
+package com.fr.design.fun;
+
+import com.fr.design.designer.properties.PropertyTab;
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.stable.fun.mark.Mutable;
+
+/**
+ * created by hades on 18/10/16
+ * 该接口支持在设计器cpt&frm参数界面的属性和移动端下添加一个UIExpandablePane（可展开面板）
+ */
+public interface ParameterExpandablePaneUIProvider extends Mutable {
+
+    String XML_TAG = "ParameterExpandablePaneUIProvider";
+
+    int CURRENT_LEVEL = 1;
+
+    /**
+     * 创建可展开面板并添加子容器
+     *
+     * @return UIExpandablePane
+     */
+    UIExpandablePane createUIExpandablePane();
+
+    /**
+     * 指定添加UIExpandablePane到哪个PropertyTab下，例如属性，移动端
+     *
+     * @return PropertyTab
+     */
+    PropertyTab addToWhichPropertyTab();
+
+}

designer-base/src/main/java/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java

@@ -1,44 +0,0 @@
-package com.fr.design.fun.impl;
-
-import com.fr.design.fun.FormElementCaseEditorProcessor;
-import com.fr.stable.fun.ReportFitAttrProvider;
-import com.fr.stable.fun.mark.API;
-
-import java.beans.PropertyDescriptor;
-
-/**
- * Created by zhouping on 2015/9/10.
- */
-@API(level = FormElementCaseEditorProcessor.CURRENT_LEVEL)
-public abstract class AbstractFormElementCaseEditorProcessor implements FormElementCaseEditorProcessor {
-
-    public int currentAPILevel() {
-        return CURRENT_LEVEL;
-    }
-
-    public int layerIndex() {
-        return DEFAULT_LAYER_INDEX;
-    }
-
-
-    /**
-     * 生成属性表
-     * @param temp 传入当前操作的class
-     * @param reportFitAttr 传入的自适应属性
-     * @return 返回属性表
-     */
-    @Override
-    public PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, ReportFitAttrProvider reportFitAttr) {
-        return new PropertyDescriptor[0];
-    }
-
-    /**
-     * 返回pc自适应属性值
-     * @param fitAttrProvider 传入的自适应属性
-     * @return 返回pc自适应属性值
-     */
-    @Override
-    public int getFitStateInPC(ReportFitAttrProvider fitAttrProvider) {
-        return 0;
-    }
-}

designer-base/src/main/java/com/fr/design/fun/impl/AbstractFormElementCaseEditorProvider.java

@@ -3,7 +3,6 @@ package com.fr.design.fun.impl;
 import com.fr.design.fun.FormElementCaseEditorProvider;
 import com.fr.form.FormProvider;
 import com.fr.form.ui.ElementCaseEditorProvider;
-import com.fr.stable.fun.ReportFitAttrProvider;
 import com.fr.stable.fun.mark.API;
 
 import java.beans.PropertyDescriptor;
@@ -28,24 +27,4 @@ public abstract class AbstractFormElementCaseEditorProvider implements FormEleme
         return new PropertyDescriptor[0];
     }
 
-    /**
-     * 生成属性表
-     * @param temp 传入当前操作的class
-     * @param reportFitAttr 传入的自适应属性
-     * @return 返回属性表
-     */
-    @Override
-    public PropertyDescriptor[] createPropertyDescriptor(Class<?> temp, ReportFitAttrProvider reportFitAttr) {
-        return new PropertyDescriptor[0];
-    }
-
-    /**
-     * 返回pc自适应属性值
-     * @param fitAttrProvider 传入的自适应属性
-     * @return 返回pc自适应属性值
-     */
-    @Override
-    public int getFitStateInPC(ReportFitAttrProvider fitAttrProvider) {
-        return 0;
-    }
 }

designer-base/src/main/java/com/fr/design/fun/impl/AbstractParameterExpandablePaneUIProvider.java

@@ -0,0 +1,19 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.ParameterExpandablePaneUIProvider;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+@API(level = ParameterExpandablePaneUIProvider.CURRENT_LEVEL)
+public abstract class AbstractParameterExpandablePaneUIProvider extends AbstractProvider implements ParameterExpandablePaneUIProvider{
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+}

designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java

@@ -8,6 +8,7 @@ import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.JPanel;
 import java.awt.CardLayout;
@@ -71,7 +72,11 @@ class JControlUpdatePane extends JPanel {
                     cardPane.add(updatePanes[i], String.valueOf(i));
                 }
                 card.show(cardPane, String.valueOf(i));
-                updatePanes[i].populateBean(ob2Populate);
+                try{
+                    updatePanes[i].populateBean(ob2Populate);
+                }catch (Exception e){
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                }
                 break;
             }
         }

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeComparator.java

@@ -3,13 +3,15 @@ package com.fr.design.gui.itree.filetree;
 import com.fr.base.FRContext;
 import com.fr.file.filetree.FileNode;
 
+import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Comparator;
 
 /**
  * FileTreeNode compare...
  * Directory is in the first. and  normal file  the  in the  last.
  */
-public class FileNodeComparator implements Comparator<FileNode> {
+public class FileNodeComparator implements Comparator<FileNode>, Serializable {
     /**
      * 正序还是倒序
      */
@@ -46,7 +48,7 @@ public class FileNodeComparator implements Comparator<FileNode> {
 
     public FileNodeComparator(boolean reverse, String[] types) {
         this.isReverse = reverse;
-        this.supportTypes = types;
+        this.supportTypes = Arrays.copyOf(types, types.length);
     }
 
     /**

designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java

@@ -37,9 +37,12 @@ import java.util.Vector;
  * Pane to edit Font.
  */
 public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObserver {
+    public static final Integer[] FONT_SIZES = {
+            6, 8, 9, 10, 11, 12, 13, 14, 16,
+            18, 20, 22, 24, 26, 28, 30, 32, 34,
+            36, 38, 40, 48, 64, 72, 128
+    };
     private static final int MAX_FONT_SIZE = 100;
-    public static Integer[] FONT_SIZES = {new Integer(6), new Integer(8), new Integer(9), new Integer(10), new Integer(11), new Integer(12), new Integer(14), new Integer(16),
-            new Integer(18), new Integer(20), new Integer(22), new Integer(24), new Integer(26), new Integer(28), new Integer(36), new Integer(48), new Integer(72)};
     private static final Dimension BUTTON_SIZE = new Dimension(20, 18);
     private static final Dimension UNDER_LINE_SIZE = new Dimension(87, 20);
     private static final Dimension HIDE_SIZE = new Dimension(0, 0);

designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java

@@ -6,11 +6,14 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UINumberField;
 import com.fr.design.layout.FRGUIPaneFactory;
-
 import com.fr.js.Hyperlink;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -21,10 +24,17 @@ public abstract class AbstractHyperNorthPane<T extends Hyperlink> extends BasicB
     public static final int DEFAULT_H_VALUE = 400;
     public static final int DEFAULT_V_VALUE = 600;
 
-    private JPanel headerPane;
+    /**
+     * 链接打开方式对话框
+     */
     private UIComboBox targetFrameComboBox;
-
+    /**
+     * 对话框高度输入框
+     */
     private UINumberField heightTextFiled;
+    /**
+     * 对话框宽度输入框
+     */
     private UINumberField widthTextFiled;
 
 
@@ -35,7 +45,7 @@ public abstract class AbstractHyperNorthPane<T extends Hyperlink> extends BasicB
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
         JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        headerPane = this.setHeaderPanel();
+        JPanel headerPane = this.setHeaderPanel();
         this.add(headerPane, BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.CENTER);
         targetFrameComboBox = new UIComboBox(getTargetFrames());

designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java

@@ -1,184 +0,0 @@
-package com.fr.design.hyperlink;
-
-import com.fr.design.actions.UpdateAction;
-import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.gui.itree.filetree.ReportletPane;
-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.fr.js.ReportletHyperlink;
-import com.fr.stable.StringUtils;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-/**
- * 热点链接部分 上方 定义特征 样式 报表 等属性的界面.
- *
- * @author kunsnat
- */
-public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyperlink> {
-    private UITextField itemNameTextField;
-    private boolean needRenamePane = false;
-    private UITextField reportPathTextField;
-    private UICheckBox showParameterInterface;
-    private UIButton browserButton;
-
-    // richer:参数传递方式
-    private UIComboBox postComboBox;
-
-    public ReporletHyperNorthPane(boolean needRenamePane) {
-        this.needRenamePane = needRenamePane;
-        this.inits();
-    }
-
-    public ReporletHyperNorthPane() {
-        this.inits();
-    }
-
-    /**
-     * 初始化组件
-     */
-    public void inits() {
-        super.initComponents();
-    }
-
-    @Override
-    protected JPanel setHeaderPanel() {
-        JPanel headerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p};
-        double[] columnSize = {p, TableLayout.FILL};
-        // Reportlet.
-        JPanel reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-
-        reportPathTextField = new UITextField(20);
-        reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);
-
-        browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select"));
-        browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
-        reportletNamePane.add(browserButton, BorderLayout.EAST);
-        browserButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent evt) {
-                final ReportletPane reportletPane = new ReportletPane();
-                reportletPane.setSelectedReportletPath(reportPathTextField.getText());
-                BasicDialog reportletDialog = reportletPane.showWindow(SwingUtilities.getWindowAncestor(ReporletHyperNorthPane.this));
-
-                reportletDialog.addDialogActionListener(new DialogActionAdapter() {
-                    public void doOk() {
-                        reportPathTextField.setText(reportletPane.getSelectedReportletPath());
-                    }
-                });
-                reportletDialog.setVisible(true);
-            }
-        });
-
-        Component[][] components;
-        if (!this.needRenamePane) {
-            components = new Component[][]{
-                    {new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet") + ":"), reportletNamePane},
-            };
-        } else {
-            itemNameTextField = new UITextField();
-            components = new Component[][]{
-                    {new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), itemNameTextField},
-                    {new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet") + ":"), reportletNamePane},
-            };
-        }
-        JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-        headerPane.add(northPane, BorderLayout.NORTH);
-        return headerPane;
-    }
-
-    @Override
-    protected String title4PopupWindow() {
-        return "reportlet";
-    }
-
-    @Override
-    protected void populateSubHyperlinkBean(ReportletHyperlink link) {
-        if (itemNameTextField != null) {
-            this.itemNameTextField.setText(link.getItemName());
-        }
-        this.reportPathTextField.setText(link.getReportletPath());
-        this.showParameterInterface.setSelected(link.isShowParameterInterface());
-        this.postComboBox.setSelectedIndex(link.isByPost() ? 1 : 0);
-    }
-
-    @Override
-    protected ReportletHyperlink updateSubHyperlinkBean() {
-        ReportletHyperlink reportletHyperlink = new ReportletHyperlink();
-        updateSubHyperlinkBean(reportletHyperlink);
-
-        return reportletHyperlink;
-    }
-
-    @Override
-    protected void updateSubHyperlinkBean(ReportletHyperlink reportletHyperlink) {
-        if (itemNameTextField != null) {
-            reportletHyperlink.setItemName(this.itemNameTextField.getText());
-        }
-        reportletHyperlink.setReportletPath(this.reportPathTextField.getText());
-        reportletHyperlink.setShowParameterInterface(this.showParameterInterface.isSelected());
-        reportletHyperlink.setByPost(postComboBox.getSelectedIndex() == 1 ? true : false);
-    }
-
-    public String getReportletName() {
-        return StringUtils.isBlank(this.reportPathTextField.getText()) ? StringUtils.EMPTY : this.reportPathTextField.getText().substring(1);
-    }
-
-    /**
-     * 获取按钮焦点
-     */
-    public void requestButtonFocus() {
-        this.browserButton.requestFocus();
-        JPopupMenu popup = new JPopupMenu();
-        FakeTipAction tip = new FakeTipAction();
-        tip.setEnabled(false);
-        popup.add(tip);
-        GUICoreUtils.showPopupCloseMenu(popup, this.browserButton);
-    }
-
-    private class FakeTipAction extends UpdateAction {
-        public FakeTipAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Select"));
-        }
-
-        public void actionPerformed(ActionEvent e) {
-            //do nothing
-        }
-    }
-
-    @Override
-    protected JPanel setFootPanel() {
-        double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p};
-        double[] columnSize = {p, TableLayout.FILL};
-        showParameterInterface = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_UI_Display"));
-        JPanel showParameterPanel = new JPanel();
-        showParameterPanel.add(new UILabel());
-        showParameterPanel.add(showParameterInterface);
-
-        postComboBox = new UIComboBox(new String[]{"GET", "POST"});
-        JPanel postPanel = new JPanel();
-        postPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type")));
-        postPanel.add(postComboBox);
-        Component[][] components = {{postPanel},
-                {showParameterPanel},
-                {new UILabel(" ")}
-        };
-
-        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
-    }
-
-}

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java

@@ -0,0 +1,450 @@
+package com.fr.design.hyperlink;
+
+import com.fr.base.BaseFormula;
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.formula.TinyFormulaPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UINumberField;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.gui.itree.filetree.ReportletPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.js.ReportletHyperlink;
+import com.fr.js.ReportletHyperlinkDialogAttr;
+import com.fr.stable.CommonUtils;
+import com.fr.stable.FormulaProvider;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 热点链接部分 上方 定义特征 样式 报表 等属性的界面.
+ *
+ * @author kunsnat
+ */
+public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyperlink> {
+    /**
+     * item name text filed
+     */
+    private UITextField itemNameTextField;
+    /**
+     * 是否展示item name
+     */
+    private boolean needRenamePane = false;
+    /**
+     * 参数路径输入框
+     */
+    private UITextField reportPathTextField;
+    /**
+     * 是否展示参数面板勾选框
+     */
+    private UICheckBox showParameterInterface;
+    /**
+     * 选择文件按钮
+     */
+    private UIButton browserButton;
+
+    /**
+     * 参数传递方式下拉选择框
+     */
+    private UIComboBox postComboBox;
+    /**
+     * 对话框标题输入框
+     */
+    private TinyFormulaPane titleFiled;
+
+
+    /**
+     * 对话框居中按钮
+     */
+    private UIRadioButton center;
+    /**
+     * 对话框位置自定义按钮
+     */
+    private UIRadioButton custom;
+    /**
+     * 距左
+     */
+    private UINumberField leftLocation;
+    /**
+     * 距上
+     */
+    private UINumberField topLocation;
+
+
+    public ReportletHyperNorthPane(boolean needRenamePane) {
+        this.needRenamePane = needRenamePane;
+    }
+
+    public ReportletHyperNorthPane() {
+    }
+
+    /**
+     * 初始化面板
+     */
+    @Override
+    protected void initComponents() {
+        this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+        final List<Component[]> dialogComponents = new ArrayList<>();
+        final List<Component[]> othersComponents = new ArrayList<>();
+
+        initRenamePanel(dialogComponents, othersComponents);
+        initHeaderPanel(dialogComponents, othersComponents);
+        initTargetComboBoxPanel(dialogComponents, othersComponents);
+
+        initTitlePanel(dialogComponents);
+        initDialogSizePanel(dialogComponents);
+        initDialogLocationPanel(dialogComponents);
+
+        initFooterPanel(dialogComponents, othersComponents);
+
+        initPlaceHolder(othersComponents);
+
+        bindListener(dialogComponents, othersComponents);
+
+        // 创建内容面板
+        JPanel content = TableLayoutHelper.createTableLayoutPane(dialogComponents.toArray(new Component[dialogComponents.size()][]), TableLayoutHelper.FILL_LASTCOL_AND_ROW);
+        this.add(content, BorderLayout.CENTER);
+    }
+
+
+    /**
+     * 生成最上方的配置面板
+     *
+     * @return JPanel
+     */
+    @Override
+    protected JPanel setHeaderPanel() {
+
+        JPanel reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        // 路径输入框
+        reportPathTextField = new UITextField(20);
+        reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);
+
+        // 选择路径按钮
+        browserButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Select"));
+        browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
+        reportletNamePane.add(browserButton, BorderLayout.EAST);
+        browserButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                final ReportletPane reportletPane = new ReportletPane();
+                reportletPane.setSelectedReportletPath(reportPathTextField.getText());
+                BasicDialog reportletDialog = reportletPane.showWindow(SwingUtilities.getWindowAncestor(ReportletHyperNorthPane.this));
+
+                reportletDialog.addDialogActionListener(new DialogActionAdapter() {
+                    @Override
+                    public void doOk() {
+                        reportPathTextField.setText(reportletPane.getSelectedReportletPath());
+                    }
+                });
+                reportletDialog.setVisible(true);
+            }
+        });
+        return reportletNamePane;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return "reportlet";
+    }
+
+    @Override
+    protected void populateSubHyperlinkBean(ReportletHyperlink link) {
+        if (itemNameTextField != null) {
+            this.itemNameTextField.setText(link.getItemName());
+        }
+        this.reportPathTextField.setText(link.getReportletPath());
+        this.showParameterInterface.setSelected(link.isShowParameterInterface());
+        this.postComboBox.setSelectedIndex(link.isByPost() ? 1 : 0);
+
+        ReportletHyperlinkDialogAttr attr = link.getAttr();
+        titleFiled.populateBean(StringUtils.EMPTY);
+        leftLocation.setText(StringUtils.EMPTY);
+        topLocation.setText(StringUtils.EMPTY);
+        center.setSelected(true);
+        if (attr != null) {
+            Object title = attr.getTitle();
+            String titleContent;
+            if (title instanceof FormulaProvider) {
+                titleContent = ((FormulaProvider) title).getContent();
+            } else {
+                titleContent = title == null ? StringUtils.EMPTY : title.toString();
+            }
+            titleFiled.populateBean(titleContent);
+            boolean isCenter = attr.isCenter();
+            if (!isCenter) {
+                int left = attr.getLeft(), top = attr.getTop();
+                leftLocation.setText(Integer.toString(left));
+                topLocation.setText(Integer.toString(top));
+            }
+            center.setSelected(isCenter);
+            custom.setSelected(!isCenter);
+        }
+    }
+
+    @Override
+    protected ReportletHyperlink updateSubHyperlinkBean() {
+        ReportletHyperlink reportletHyperlink = new ReportletHyperlink();
+        updateSubHyperlinkBean(reportletHyperlink);
+        return reportletHyperlink;
+    }
+
+    @Override
+    protected void updateSubHyperlinkBean(ReportletHyperlink reportletHyperlink) {
+        if (itemNameTextField != null) {
+            reportletHyperlink.setItemName(this.itemNameTextField.getText());
+        }
+        reportletHyperlink.setReportletPath(this.reportPathTextField.getText());
+        reportletHyperlink.setShowParameterInterface(this.showParameterInterface.isSelected());
+        reportletHyperlink.setByPost(postComboBox.getSelectedIndex() == 1);
+
+        ReportletHyperlinkDialogAttr attr = new ReportletHyperlinkDialogAttr();
+        String title = titleFiled.updateBean();
+        if (CommonUtils.maybeFormula(title)) {
+            attr.setTitle(BaseFormula.createFormulaBuilder().build(titleFiled.updateBean()));
+        } else {
+            attr.setTitle(title);
+        }
+        attr.setCenter(center.isSelected());
+        if (!attr.isCenter()) {
+            attr.setLeft((int) leftLocation.getValue());
+            attr.setTop((int) topLocation.getValue());
+        }
+        reportletHyperlink.setAttr(attr);
+
+    }
+
+    public String getReportletName() {
+        String text = this.reportPathTextField.getText();
+        return StringUtils.isBlank(text) ? StringUtils.EMPTY : text.substring(1);
+    }
+
+    /**
+     * 获取按钮焦点
+     */
+    public void requestButtonFocus() {
+        this.browserButton.requestFocus();
+        JPopupMenu popup = new JPopupMenu();
+        FakeTipAction tip = new FakeTipAction();
+        tip.setEnabled(false);
+        popup.add(tip);
+        GUICoreUtils.showPopupCloseMenu(popup, this.browserButton);
+    }
+
+    private class FakeTipAction extends UpdateAction {
+        public FakeTipAction() {
+            this.setName(Toolkit.i18nText("Fine-Design_Basic_Template_Select"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            // do nothing
+        }
+    }
+
+    /**
+     * 底部面板，参数传递方式
+     *
+     * @return JPanel
+     */
+    @Override
+    protected JPanel setFootPanel() {
+        JPanel content = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+
+        // 参数传递方式下拉框
+        postComboBox = new UIComboBox(new String[]{"GET", "POST"});
+        postComboBox.setPreferredSize(new Dimension(60, 20));
+        postComboBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        content.add(postComboBox);
+
+
+        showParameterInterface = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Parameter_UI_Display"));
+
+        showParameterInterface.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
+        content.add(showParameterInterface);
+        return content;
+    }
+
+    private void bindListener(final List<Component[]> dialogComponents, final List<Component[]> othersComponents) {
+        final UIComboBox targetFrameComboBox = this.getTargetFrameComboBox();
+        targetFrameComboBox.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                boolean show = DIALOG == targetFrameComboBox.getSelectedIndex();
+                JPanel content;
+                List<Component[]> cs = show ? dialogComponents : othersComponents;
+                ReportletHyperNorthPane.this.removeAll();
+                content = TableLayoutHelper.createTableLayoutPane(cs.toArray(new Component[cs.size()][]), TableLayoutHelper.FILL_LASTCOL_AND_ROW);
+                ReportletHyperNorthPane.this.add(content, BorderLayout.CENTER);
+                ReportletHyperNorthPane.this.revalidate();
+                ReportletHyperNorthPane.this.repaint();
+            }
+        });
+    }
+
+    private void initPlaceHolder(List<Component[]> othersComponents) {
+        JPanel empty1 = new JPanel();
+        empty1.setPreferredSize(new Dimension(20, 20));
+        JPanel empty2 = new JPanel();
+        empty2.setPreferredSize(new Dimension(20, 20));
+        JPanel empty3 = new JPanel();
+        empty3.setPreferredSize(new Dimension(20, 23));
+
+        othersComponents.add(new Component[]{empty1, new JPanel()});
+        othersComponents.add(new Component[]{empty2, new JPanel()});
+        othersComponents.add(new Component[]{empty3, new JPanel()});
+    }
+
+    private void initRenamePanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) {
+        // 是否有重命名属性
+        if (this.needRenamePane) {
+            itemNameTextField = new UITextField();
+            Component[] renameComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Name") + ":"), itemNameTextField};
+            dialogComponents.add(renameComponents);
+            othersComponents.add(renameComponents);
+        }
+    }
+
+    private void initHeaderPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) {
+        //最上方位置的面板
+        JPanel headerPane = this.setHeaderPanel();
+        Component[] headerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet") + ":"), headerPane};
+        dialogComponents.add(headerComponents);
+        othersComponents.add(headerComponents);
+    }
+
+    private void initTargetComboBoxPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) {
+        // 链接打开于
+        UIComboBox targetFrameComboBox = new UIComboBox(getTargetFrames());
+        this.setTargetFrameComboBox(targetFrameComboBox);
+        targetFrameComboBox.setEditable(true);
+        targetFrameComboBox.setPreferredSize(new Dimension(100, 20));
+        JPanel targetFramePanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        targetFramePanel.add(targetFrameComboBox);
+        Component[] targetComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Link_Opened_In") + ":"), targetFramePanel};
+        dialogComponents.add(targetComponents);
+        othersComponents.add(targetComponents);
+    }
+
+    private void initTitlePanel(List<Component[]> dialogComponents) {
+        // 对话框标题
+        titleFiled = new TinyFormulaPane();
+        titleFiled.getUITextField().setColumns(15);
+        final JPanel titlePanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        titlePanel.add(titleFiled);
+        Component[] titleComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Title") + ":"), titlePanel};
+        dialogComponents.add(titleComponents);
+    }
+
+    private void initDialogSizePanel(List<Component[]> dialogComponents) {// 对话框大小
+        final JPanel sizeJPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        UILabel heightLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Height") + ":");
+        heightLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 10));
+        sizeJPanel.add(heightLabel);
+        UINumberField heightTextFiled = new UINumberField();
+        heightTextFiled.setMinValue(0);
+        heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE));
+        heightTextFiled.setPreferredSize(new Dimension(40, 20));
+        sizeJPanel.add(heightTextFiled);
+        this.setHeightTextFiled(heightTextFiled);
+        UILabel widthLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":");
+        widthLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+        sizeJPanel.add(widthLabel);
+        UINumberField widthTextFiled = new UINumberField();
+        widthTextFiled.setMinValue(0);
+        widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE));
+        widthTextFiled.setPreferredSize(new Dimension(40, 20));
+        sizeJPanel.add(widthTextFiled);
+        this.setWidthTextFiled(widthTextFiled);
+        sizeJPanel.setVisible(true);
+        dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Size") + ":"), sizeJPanel});
+    }
+
+    private void initDialogLocationPanel(List<Component[]> dialogComponents) {
+        // 显示位置
+        final JPanel locationPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
+        // 居中
+        center = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Center"));
+        // 自定义
+        custom = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Custom"));
+
+        custom.setBorder(BorderFactory.createEmptyBorder(4, 20, 4, 5));
+        ButtonGroup group = new ButtonGroup();
+        group.setSelected(center.getModel(), true);
+        group.add(center);
+        group.add(custom);
+        locationPanel.add(center);
+        locationPanel.add(custom);
+
+        // 位置 距左
+        final UILabel leftLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Left"));
+        leftLabel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 10));
+        leftLocation = new UINumberField();
+        leftLocation.setMinValue(0);
+        leftLocation.setPreferredSize(new Dimension(40, 20));
+        // 位置 距上
+        final UILabel topLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Top"));
+        topLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+        topLocation = new UINumberField();
+        topLocation.setMinValue(0);
+        topLocation.setPreferredSize(new Dimension(40, 20));
+
+        locationPanel.add(leftLabel);
+        locationPanel.add(leftLocation);
+        locationPanel.add(topLabel);
+        locationPanel.add(topLocation);
+        leftLabel.setVisible(false);
+        leftLocation.setVisible(false);
+        topLabel.setVisible(false);
+        topLocation.setVisible(false);
+        ChangeListener actionListener = new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                boolean visible = custom.isSelected();
+                leftLabel.setVisible(visible);
+                leftLocation.setVisible(visible);
+                topLabel.setVisible(visible);
+                topLocation.setVisible(visible);
+            }
+        };
+        // 默认居中
+        center.setSelected(true);
+        center.addChangeListener(actionListener);
+        custom.addChangeListener(actionListener);
+
+        dialogComponents.add(new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Show_Position") + ":"), locationPanel});
+    }
+
+    private void initFooterPanel(List<Component[]> dialogComponents, List<Component[]> othersComponents) {
+        // 最下方的配置面板
+        // 参数传递方式
+        Component[] footerComponents = new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Reportlet_Parameter_Type") + ":"), this.setFootPanel()};
+        dialogComponents.add(footerComponents);
+        othersComponents.add(footerComponents);
+    }
+}

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@@ -6,23 +6,30 @@ import com.fr.design.gui.frpane.ReportletParameterViewPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
 import com.fr.design.gui.itableeditorpane.UITableEditAction;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.parameter.ParameterReader;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.js.ReportletHyperlink;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.List;
 
 public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyperlink> {
-    private ReporletHyperNorthPane northPane;
+    /**
+     * 超链配置面板
+     */
+    private ReportletHyperNorthPane northPane;
+    /**
+     * 是否继承参数勾选框
+     */
     private UICheckBox extendParametersCheckBox;
 
     public ReportletHyperlinkPane(HashMap hyperLinkEditorMap, boolean needRenamePane) {
@@ -38,22 +45,29 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
-        northPane = new ReporletHyperNorthPane(needRenamePane());
+        northPane = new ReportletHyperNorthPane(needRenamePane());
         this.add(northPane, BorderLayout.NORTH);
 
-        parameterViewPane = new ReportletParameterViewPane(new UITableEditAction[]{new HyperlinkParametersAction()}, getChartParaType(), getValueEditorPane(), getValueEditorPane());
+        parameterViewPane = new ReportletParameterViewPane(
+                new UITableEditAction[]{
+                        new HyperlinkParametersAction()
+                },
+                getChartParaType(),
+                getValueEditorPane(),
+                getValueEditorPane()
+        );
 
         this.add(parameterViewPane, BorderLayout.CENTER);
 
-        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), null));
+        parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameter"), null));
 
-        extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
+        extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
         this.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, FlowLayout.LEFT), BorderLayout.SOUTH);
     }
 
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet");
+        return Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet");
     }
 
     @Override
@@ -77,6 +91,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
         return reportletHyperlink;
     }
 
+    @Override
     public void updateBean(ReportletHyperlink reportletHyperlink) {
         northPane.updateBean(reportletHyperlink);
         // Parameter.
@@ -94,16 +109,20 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
 
     }
 
+    /**
+     * 自动添加模板参数的按钮操作
+     */
     protected class HyperlinkParametersAction extends UITableEditAction {
         public HyperlinkParametersAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Parameter"));
+            this.setName(Toolkit.i18nText("Fine-Design_Basic_Template_Parameter"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"));
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             String tpl = northPane.getReportletName();
             if (StringUtils.isBlank(tpl)) {
-                JOptionPane.showMessageDialog(ReportletHyperlinkPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Please_Select_Reportlet") + ".", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(ReportletHyperlinkPane.this, Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Please_Select_Reportlet") + ".", Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE);
                 northPane.requestButtonFocus();
                 return;
             }
@@ -129,20 +148,22 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
     }
 
     public static class ChartNoRename extends ReportletHyperlinkPane {
+        @Override
         protected int getChartParaType() {
             return ParameterTableModel.CHART_NORMAL_USE;
         }
 
+        @Override
         protected boolean needRenamePane() {
             return false;
         }
     }
 
-    public ReporletHyperNorthPane getNorthPane() {
+    public ReportletHyperNorthPane getNorthPane() {
         return northPane;
     }
 
-    public void setNorthPane(ReporletHyperNorthPane northPane) {
+    public void setNorthPane(ReportletHyperNorthPane northPane) {
         this.northPane = northPane;
     }
 

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -37,6 +37,7 @@ import com.fr.design.menu.MenuManager;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.exception.DecryptTemplateException;
 import com.fr.file.FILE;
 import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
@@ -65,6 +66,7 @@ import javax.swing.JLayeredPane;
 import javax.swing.JMenuBar;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.UIManager;
 import javax.swing.WindowConstants;
 import javax.swing.border.MatteBorder;
 import java.awt.BorderLayout;
@@ -223,7 +225,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         public void mouseReleased(MouseEvent e) {
             if (DesignerMode.isAuthorityEditing()) {
-                DesignerMode.setMode(DesignerMode.NORMARL);
+                DesignerMode.setMode(DesignerMode.NORMAL);
                 WestRegionContainerPane.getInstance().replaceDownPane(
                         TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
                 HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
@@ -963,6 +965,17 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         try {
             openFile(tplFile);
+        } catch (DecryptTemplateException e) {
+            JOptionPane.showMessageDialog(
+                    this,
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Encrypt_Decrypt_Exception"),
+                    UIManager.getString("OptionPane.messageDialogTitle"),
+                    JOptionPane.WARNING_MESSAGE,
+                    UIManager.getIcon("OptionPane.errorIcon")
+            );
+            if (this.getSelectedJTemplate() == null) {
+                addAndActivateJTemplate();
+            }
         } catch (Throwable t) {
             FineLoggerFactory.getLogger().error(t.getMessage(), t);
             addAndActivateJTemplate();

designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java

@@ -3,12 +3,14 @@
  */
 package com.fr.design.mainframe;
 
-import java.awt.*;
-
-
+import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
+import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.base.mode.DesignerMode;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
-import com.fr.design.dialog.BasicPane;
+
+import java.awt.BorderLayout;
 
 
 /**
@@ -17,16 +19,22 @@ import com.fr.design.dialog.BasicPane;
  */
 public class DesktopCardPane extends BasicPane implements TargetModifiedListener {
 
-	private static final long serialVersionUID = 1L;
-	private JTemplate<?, ?> component;
+    private static final long serialVersionUID = 1L;
+    private JTemplate<?, ?> component;
 
-	protected DesktopCardPane() {
-		setLayout(new BorderLayout());
-	}
+    protected DesktopCardPane() {
+        setLayout(new BorderLayout());
+    }
 
-	protected void showJTemplate(final JTemplate<?, ?> jt) {
-		DesignerFrameFileDealerPane.getInstance().setCurrentEditingTemplate(jt);
-        if(component != null) {
+    protected void showJTemplate(final JTemplate<?, ?> jt) {
+        // 判断是否切换设计器状态到禁止拷贝剪切
+        if (jt.getTarget().getAttrMark(DesignBanCopyAttrMark.XML_TAG) != null) {
+            DesignModeContext.switchTo(DesignerMode.BAN_COPY_AND_CUT);
+        } else {
+            DesignModeContext.switchTo(DesignerMode.NORMAL);
+        }
+        DesignerFrameFileDealerPane.getInstance().setCurrentEditingTemplate(jt);
+        if (component != null) {
             remove(component);
         }
         add(component = jt, BorderLayout.CENTER);
@@ -34,18 +42,18 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         repaint();
         revalidate();
         component.requestGridFocus();
-	}
+    }
 
-	protected JTemplate<?, ?> getSelectedJTemplate() {
-		return component;
-	}
+    protected JTemplate<?, ?> getSelectedJTemplate() {
+        return component;
+    }
 
-	@Override
-	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Desktop");
-	}
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Desktop");
+    }
 
-	@Override
-	public void targetModified(TargetModifiedEvent e) {
-	}
+    @Override
+    public void targetModified(TargetModifiedEvent e) {
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -5,6 +5,7 @@ import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
 import com.fr.base.io.BaseBook;
+import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
 import com.fr.base.iofile.attr.TemplateIdAttrMark;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignModelAdapter;
@@ -17,6 +18,8 @@ import com.fr.design.actions.edit.UndoAction;
 import com.fr.design.actions.file.SaveAsTemplateAction;
 import com.fr.design.actions.file.SaveTemplateAction;
 import com.fr.design.actions.file.WebPreviewUtils;
+import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.designer.DesignerProxy;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.dialog.InformationWarnPane;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -69,7 +72,7 @@ import java.util.regex.Pattern;
 /**
  * 报表设计和表单设计的编辑区域(设计器编辑的IO文件)
  */
-public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, JTemplateProvider {
+public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, JTemplateProvider, DesignerProxy {
     // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
     private static final int PREFIX_NUM = 3000;
     private FILE editingFILE = null;
@@ -104,6 +107,12 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
 
     public JTemplate(T t, FILE file, boolean isNewFile) {
         super(t);
+        // 判断是否切换设计器状态到禁止拷贝剪切
+        if (t.getAttrMark(DesignBanCopyAttrMark.XML_TAG) != null) {
+            DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.BAN_COPY_AND_CUT);
+        } else {
+            DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.NORMAL);
+        }
         this.template = t;
         this.previewType = parserPreviewProvider(t.getPreviewType());
         this.editingFILE = file;
@@ -117,6 +126,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             openTime = System.currentTimeMillis();
             process.append(tic.loadProcess(t));
         }
+
     }
 
     // 刷新右侧属性面板

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DefaultMobileStyleDefinePane.java

@@ -0,0 +1,108 @@
+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();
+    }
+
+    public MobileTemplateStyle updateConfig(){
+        return new DefaultMobileTemplateStyle();
+    }
+
+
+    @Override
+    protected MobileTemplateStyle getDefaultTemplateStyle() {
+        return new DefaultMobileTemplateStyle();
+    }
+
+    @Override
+    public void populateSubStyle(MobileTemplateStyle ob) {
+
+    }
+
+    @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);
+            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 - fontHeight) / 2 + ascentHeight);
+                if (i == 0) {
+                    g2d.setStroke(new BasicStroke(2.0f));
+                    g2d.drawLine(0, panelHeight - 1, eachWidth, panelHeight - 1);
+                }
+                g2d.translate(eachWidth, 0);
+            }
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/DownMenuStyleDefinePane.java

@@ -0,0 +1,193 @@
+package com.fr.design.mainframe.mobile.ui;
+
+import com.fr.base.GraphHelper;
+import com.fr.base.Icon;
+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;
+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.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 {
+    private LinePane splitLinePane;
+    private TabIconConfigPane initIconConfigPane;
+    private TabIconConfigPane selectIconConfigPane;
+
+    public DownMenuStyleDefinePane(WCardTagLayout tagLayout) {
+        super(tagLayout);
+    }
+
+    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);
+
+        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));
+        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();
+        splitLinePane.addLineChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                updatePreviewPane();
+            }
+        });
+        centerPane.add(panel);
+        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 populateSubStyle(MobileTemplateStyle ob) {
+        super.populateSubStyle(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 static final int ICON_OFFSET = 16;
+        private static final int GAP = 6;
+        private static final String PAINT_ICON = "fund_white";
+        private static final String ICON_PATH = "/com/fr/web/images/fund_white.png";
+        private LineDescription splitLine;
+
+        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();
+            g2d.setFont(frFont);
+            int fontHeight = fm.getHeight();
+            int ascent = 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);
+                if(i == 0){
+                    Color oldColor = g2d.getColor();
+                    g2d.setColor(this.getSelectColor());
+                    g2d.fillRect(0, 0 ,eachWidth, panelHeight);
+                    g2d.setColor(oldColor);
+                }
+                Icon icon = new Icon(PAINT_ICON, ICON_PATH);
+                g2d.drawImage(IconManager.getIconManager().getDefaultIconImage(icon), (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);
+
+            }
+
+        }
+
+        public void populateConfig(MobileTemplateStyle templateStyle) {
+            super.populateConfig(templateStyle);
+            this.splitLine = ((DownMenuStyle) templateStyle).getSplitLine();
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/LinePane.java

@@ -0,0 +1,107 @@
+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);
+            }
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileTemplateStyleDefinePane.java

@@ -0,0 +1,233 @@
+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.CardSwitchButton;
+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 com.fr.stable.StringUtils;
+
+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 static final String[] TAB_STYLES = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Standard"),
+            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 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 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));
+        jPanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 5, 20));
+        return jPanel;
+    }
+
+    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 = GUICoreUtils.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());
+        populateSubStyle(ob);
+        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() {
+        //保存之前需要先将cardSwitchBtn的icon设置清空
+        for (int i = 0; i < getTagLayout().getWidgetCount(); i++) {
+            CardSwitchButton cardSwitchButton = (CardSwitchButton) getTagLayout().getWidget(i);
+            cardSwitchButton.setInitIconName(StringUtils.EMPTY);
+            cardSwitchButton.setSelectIconName(StringUtils.EMPTY);
+        }
+        return updateConfig();
+    }
+
+    public MobileTemplateStyle updateConfig(){
+        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(updateConfig());
+        previewPane.setBackground(previewPane.getInitialColor());
+        previewPane.repaint();
+    }
+
+    public abstract void populateSubStyle(MobileTemplateStyle ob);
+
+    public abstract MobileTemplateStyle updateSubStyle();
+
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SliderStyleDefinePane.java

@@ -0,0 +1,164 @@
+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;
+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.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;
+
+public class SliderStyleDefinePane extends MobileTemplateStyleDefinePane {
+    private NewColorSelectBox initDotColor;
+    private NewColorSelectBox selectDotColor;
+
+
+    public SliderStyleDefinePane(WCardTagLayout tagLayout) {
+        super(tagLayout);
+    }
+
+    @Override
+    public void populateSubStyle(MobileTemplateStyle 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) {
+        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);
+        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));
+        panel.add(initDotColorPane);
+        panel.add(selectDotColorPane);
+        centerPane.add(panel);
+    }
+
+    @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 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;
+
+        public SliderStylePreviewPane() {
+
+        }
+
+        public void repaint() {
+            super.repaint();
+        }
+
+        @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());
+            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(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, CIRCLE_SIZE, CIRCLE_SIZE);
+                    g2d.translate(CIRCLE_SIZE + GAP, 0);
+                    continue;
+                }
+                g2d.setColor(initDotColor);
+                g2d.fillOval(0, 0, CIRCLE_SIZE, CIRCLE_SIZE);
+                g2d.translate(CIRCLE_SIZE + GAP, 0);
+            }
+
+        }
+
+        public void populateConfig(MobileTemplateStyle templateStyle) {
+            super.populateConfig(templateStyle);
+            this.initDotColor = ((SliderStyle) templateStyle).getInitDotColor();
+            this.selectDotColor = ((SliderStyle) templateStyle).getSelectDotColor();
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/StyleDefinePaneWithSelectConf.java

@@ -0,0 +1,110 @@
+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();
+
+    public void populateSubStyle(MobileTemplateStyle ob) {
+        selectColorBox.setSelectObject(ob.getSelectColor());
+        selectFontColor.setColor(ob.getTabFontConfig().getSelectColor());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TabIconConfigPane.java

@@ -0,0 +1,182 @@
+package com.fr.design.mainframe.mobile.ui;
+
+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.utils.DrawRoutines;
+import com.fr.design.web.CustomIconPane;
+import com.fr.form.ui.WidgetInfoConfig;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.FRFont;
+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.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+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.setFont(FRFont.getInstance("Helvetica", Font.PLAIN, 12, Color.decode("#3A383A")));
+        editIconButton.setPreferredSize(new Dimension(62, 20));
+        panel.add(editIconButton);
+        editIconButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                final CustomIconPane cip = new CustomIconPane(){
+                    protected String createDescriptionText(){
+                        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Custom_Icon_Message");
+                    }
+                };
+                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);
+                }
+            });
+        }
+
+        protected void paintBorder(Graphics g) {
+            super.paintBorder(g);
+            if (ComparatorUtils.equals(this, selectIconButton)) {
+                DrawRoutines.drawRoundedBorder(
+                        g, Color.decode("#419BF9"), 0, 0, 20, 20);
+            } else {
+                DrawRoutines.drawRoundedBorder(
+                        g, Color.decode("#D9DADD"), 0, 0, 20, 20);
+            }
+
+        }
+
+        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);
+            }
+        }
+
+        @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);
+            }
+        }
+
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/TemplateStyleDefinePaneFactory.java

@@ -0,0 +1,54 @@
+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;
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UpMenuStyleDefinePane.java

@@ -0,0 +1,219 @@
+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.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;
+import java.awt.Stroke;
+
+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_Bottom_Border"), 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 populateSubStyle(MobileTemplateStyle ob) {
+        super.populateSubStyle(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);
+            int fontHeight = fm.getHeight();
+            int ascentHeight = fm.getAscent();
+            if (bottomBorder.getLineStyle() != 0) {
+                g2d.setColor(bottomBorder.getColor());
+                g2d.setStroke(GraphHelper.getStroke(bottomBorder.getLineStyle()));
+                g2d.drawLine(0, panelHeight - 1, panelWidth, panelHeight - 1);
+            }
+            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);
+                if(i == 0){
+                    Color oldColor = g2d.getColor();
+                    g2d.setColor(this.getSelectColor());
+                    g2d.fillRect(0, 0 ,eachWidth, panelHeight - 2);
+                    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(GraphHelper.getStroke(underLine.getLineStyle()));
+                    int underLineX = this.isGapFix ? (eachWidth - width) / 2 : 0;
+                    int underLineWidth = this.isGapFix ? width : eachWidth;
+                    g2d.drawLine(underLineX, panelHeight - 2, underLineX + underLineWidth, panelHeight - 2);
+                }
+                g2d.setStroke(oldStroke);
+                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();
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/widget/MobileTabFontConfPane.java

@@ -0,0 +1,144 @@
+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 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;
+
+
+    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);
+            }
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/widget/UITitleSplitLine.java

@@ -0,0 +1,50 @@
+package com.fr.design.mainframe.widget;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.general.FRFont;
+import javax.swing.JPanel;
+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 static final int OFFSETX = 10;
+    private static final int OFFSET = 3;
+    private Color color;
+    private UILabel label;
+    private int width;
+
+
+
+    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);
+    }
+
+
+
+}

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();
+}

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);
     }
 }

designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/MobileTemplateStylePane.java

@@ -0,0 +1,112 @@
+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.MobileTemplateStyle;
+import com.fr.general.cardtag.mobile.MobileTemplateStyleType;
+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<MobileTemplateStyleType> STYLE_LIST = new ArrayList<MobileTemplateStyleType>();
+    static {
+        STYLE_LIST.add(MobileTemplateStyleType.DEFAULT_STYLE);
+        STYLE_LIST.add(MobileTemplateStyleType.UP_MENU_STYLE);
+        STYLE_LIST.add(MobileTemplateStyleType.DOWN_MENU_STYLE);
+        STYLE_LIST.add(MobileTemplateStyleType.SLIDER_STYLE);
+    }
+
+    private DefaultListModel listModel;
+    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(MobileTemplateStyleType style : STYLE_LIST){
+            listModel.addElement(style.getDisplayName());
+            BasicBeanPane<MobileTemplateStyle> styleBasicBeanPane = TemplateStyleDefinePaneFactory.createDefinePane(style.getStyle(), tagLayout);
+            map.put(style.getDisplayName(), styleBasicBeanPane);
+            right.add(style.getDisplayName(), 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++){
+            String style = templateStyle.getStyle();
+            MobileTemplateStyleType templateStyleType = MobileTemplateStyleType.parse(style);
+            if((listModel.getElementAt(i)).equals(templateStyleType.getDisplayName())){
+                styleList.setSelectedIndex(i);
+                map.get(templateStyle.toString()).populateBean(templateStyle);
+                card.show(right, templateStyle.toString());
+                return;
+            }
+        }
+        styleList.setSelectedIndex(0);
+    }
+
+    public MobileTemplateStyle update() {
+        return map.get(styleList.getSelectedValue()).updateBean();
+    }
+}

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();

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);
     }
 }

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();
+    }
+
+}

designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/UpdateMainDialog.java

@@ -23,7 +23,12 @@ import com.fr.design.onlineupdate.ui.widget.UpdateInfoTableCellRender;
 import com.fr.design.onlineupdate.ui.widget.UpdateInfoTableModel;
 import com.fr.design.onlineupdate.ui.widget.UpdateInfoTextAreaCellRender;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.*;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.DateUtils;
+import com.fr.general.GeneralContext;
+import com.fr.general.GeneralUtils;
+import com.fr.general.IOUtils;
+import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
@@ -337,8 +342,14 @@ public class UpdateMainDialog extends UIDialog {
         initUpdateActionPane();
 
         add(jarVersionInfoPane, BorderLayout.NORTH);
-        add(jarUpdateInfoPane, BorderLayout.CENTER);
-        add(updateActionPane, BorderLayout.SOUTH);
+
+        //海外版本不显示更新信息
+        if (GeneralContext.getLocale().equals(Locale.CHINA) || GeneralContext.getLocale().equals(Locale.TAIWAN)){
+            add(jarUpdateInfoPane, BorderLayout.CENTER);
+            add(updateActionPane, BorderLayout.SOUTH);
+        }else {
+            add(updateActionPane, BorderLayout.CENTER);
+        }
 
         addActionListenerForUpdateBtn();
 

designer-base/src/main/java/com/fr/design/report/WatermarkPane.java

@@ -13,7 +13,6 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.style.color.NewColorSelectPane;
 import com.fr.design.utils.gui.GUICoreUtils;
 
-
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
@@ -30,7 +29,6 @@ import java.awt.event.ItemListener;
  * Created by plough on 2018/5/15.
  */
 public class WatermarkPane extends BasicPane {
-
     private static final int MAX_WIDTH = 160;
 
     // 水印预览面板
@@ -47,7 +45,7 @@ public class WatermarkPane extends BasicPane {
     }
 
     private void initComponents() {
-        this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
+        this.setBorder(BorderFactory.createEmptyBorder(4, 4, -5, 4));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
         JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -66,7 +64,7 @@ public class WatermarkPane extends BasicPane {
         // 设置
         JPanel rightPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         contentPane.add(rightPane, BorderLayout.EAST);
-        rightPane.add(initRightPane(), BorderLayout.CENTER);
+        rightPane.add(initRightPane(), BorderLayout.NORTH);
     }
 
     public void populate(WatermarkAttr watermark) {
@@ -84,6 +82,7 @@ public class WatermarkPane extends BasicPane {
         watermark.setText(formulaPane.getUITextField().getText());
         watermark.setFontSize((int)fontSizeComboBox.getSelectedItem());
         watermark.setColor(colorPane.getColor());
+        colorPane.updateUsedColor();
         return watermark;
     }
 
@@ -98,6 +97,7 @@ public class WatermarkPane extends BasicPane {
     protected UIScrollPane initRightPane(){
         formulaPane = new TinyFormulaPane();
         fontSizeComboBox = new UIComboBox(FRFontPane.FONT_SIZES);
+        fontSizeComboBox.setEditable(true);
         JPanel fontSizeTypePane = new JPanel(new BorderLayout(10,0));
         fontSizeTypePane.add(fontSizeComboBox, BorderLayout.CENTER);
 
@@ -157,7 +157,8 @@ public class WatermarkPane extends BasicPane {
     }
 
     private void populateColor(Color color) {
-        colorPane.setColor(color);
+        // 颜色面板的色值只有 rgb，去掉 alpha 通道
+        colorPane.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue()));
         colorPane.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {

designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java

@@ -0,0 +1,62 @@
+package com.fr.design.report;
+
+import com.fr.base.iofile.attr.WatermarkAttr;
+import com.fr.design.dialog.AbstractTemplateServerSettingPane;
+import com.fr.report.core.ReportUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+
+/**
+ * Created by plough on 2018/11/7.
+ */
+public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
+    private WatermarkPane watermarkPane;
+
+    public WatermarkSettingPane() {
+        super();
+        initComponents();
+    }
+
+    private void initComponents() {
+        buttonPane.setBorder(BorderFactory.createEmptyBorder(10, 8, 0, 0));
+    }
+
+    @Override
+    protected JPanel getContentPane() {
+        if (watermarkPane == null) {
+            watermarkPane = new WatermarkPane();
+        }
+        return watermarkPane;
+    }
+
+    @Override
+    protected void populateServerSettings() {
+        WatermarkAttr watermarkAttr = ReportUtils.getWatermarkAttrFromServerConfig();
+        watermarkPane.populate(watermarkAttr);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark");
+    }
+
+    public void populate(WatermarkAttr watermark) {
+        if (!watermark.isValid()) {
+            chooseComboBox.setSelectedIndex(SERVER_SET);
+            populateServerSettings();
+            return;
+        }
+        chooseComboBox.setSelectedIndex(SINGLE_SET);
+        watermarkPane.populate(watermark);
+    }
+
+
+    public WatermarkAttr update() {
+        WatermarkAttr watermark = watermarkPane.update();
+        if (isUsingServerSettings()) {
+            watermark.setValid(false);
+        }
+        return watermark;
+    }
+}

designer-base/src/main/java/com/fr/design/report/fit/FitType.java

@@ -0,0 +1,76 @@
+package com.fr.design.report.fit;
+
+import com.fr.design.designer.properties.items.Item;
+import com.fr.report.fit.ReportFitAttr;
+import com.fr.stable.StringUtils;
+
+/**
+ * Created by Administrator on 2016/4/13/0013.
+ */
+public enum FitType {
+    DEFAULT(0) {
+        @Override
+        public String description() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Default");
+        }
+
+    },
+    // 横向自适应, 纵向根据横向的比例来适配
+    HORIZONTAL_FIT(1) {
+        @Override
+        public String description() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Horizontal");
+        }
+    },
+    // 双向自适应, 横纵向都是根据页面宽高来计算
+    DOUBLE_FIT(2) {
+        @Override
+        public String description() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Horizontal_Vertical");
+        }
+    },
+
+    NOT_FIT(3) {
+        @Override
+        public String description() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-No");
+        }
+    };
+
+
+    private int state;
+
+
+    FitType(int state) {
+        this.state = state;
+    }
+
+    public static FitType parse(ReportFitAttr attr) {
+
+        if (attr == null) {
+            return DEFAULT;
+        }
+
+        for (FitType attrState : values()) {
+            if (attrState.state == attr.fitStateInPC()) {
+                return attrState;
+            }
+        }
+
+        return DEFAULT;
+    }
+
+    public int getState() {
+        return this.state;
+    }
+
+
+    public String description() {
+        return StringUtils.EMPTY;
+    }
+
+    public Item propertyItem() {
+        return new Item(this.description(), this.getState());
+    }
+
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java

@@ -0,0 +1,240 @@
+package com.fr.design.report.fit.menupane;
+
+import com.fr.config.Configuration;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIRadioButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.report.fit.FitType;
+import com.fr.report.fit.ReportFitAttr;
+import com.fr.report.fit.ReportFitConfig;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.Worker;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+/**
+ * Created by Administrator on 2016/5/5/0005.
+ */
+public class BrowserFitAttrPane extends BasicBeanPane<ReportFitAttr> {
+
+    protected FontRadioGroup fontRadioGroup;
+    protected FitRadioGroup fitRadionGroup;
+    protected UICheckBox globalCheck;
+    protected FitPreviewPane fitPreviewPane;
+    protected ReportFitAttr localFitAttr;
+    protected UIRadioButton defaultRadio;
+    protected UIRadioButton horizonRadio;
+    protected UIRadioButton doubleRadio;
+    protected UIRadioButton notFitRadio;
+    protected UIRadioButton fontFitRadio;
+    protected UIRadioButton fontNotFitRadio;
+    private UIButton editGlobalOps;
+    private JPanel borderPane;
+    private JPanel globalOpsPane;
+    private JPanel fitOpsPane;
+
+    public BrowserFitAttrPane() {
+        initComponents(ReportFitConfig.getInstance().getFrmFitAttr());
+    }
+
+    protected void initComponents(ReportFitAttr globalFitAttr) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        globalOpsPane = initGlobalOpsPane(globalFitAttr);
+        this.add(globalOpsPane, BorderLayout.NORTH);
+        fitOpsPane = initFitOpsPane();
+
+    }
+
+    protected void initBorderPane(String title) {
+        borderPane = FRGUIPaneFactory.createTitledBorderPaneCenter(title);
+        borderPane.add(fitOpsPane, BorderLayout.CENTER);
+        fitPreviewPane = new FitPreviewPane();
+        borderPane.add(fitPreviewPane, BorderLayout.SOUTH);
+        this.add(borderPane, BorderLayout.CENTER);
+    }
+
+    private JPanel initFitOpsPane() {
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p};
+        double[] columnSize = {p, p, p, p, p};
+
+        ActionListener actionListener = getPreviewActionListener();
+
+        fontRadioGroup = new FontRadioGroup();
+        fontFitRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit"));
+        fontFitRadio.setSelected(true);
+        fontNotFitRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-No"));
+        addRadioToGroup(fontRadioGroup, fontFitRadio, fontNotFitRadio);
+        fontRadioGroup.addActionListener(actionListener);
+
+        fitRadionGroup = new FitRadioGroup();
+        defaultRadio = new UIRadioButton(FitType.DEFAULT.description());
+        horizonRadio = new UIRadioButton(FitType.HORIZONTAL_FIT.description());
+        doubleRadio = new UIRadioButton(FitType.DOUBLE_FIT.description());
+        notFitRadio = new UIRadioButton(FitType.NOT_FIT.description());
+        addRadioToGroup(fitRadionGroup, defaultRadio, horizonRadio, doubleRadio, notFitRadio);
+        fitRadionGroup.addActionListener(actionListener);
+
+
+        JPanel fitOpsPane = TableLayoutHelper.createTableLayoutPane(initFitComponents(), rowSize, columnSize);
+        fitOpsPane.setBorder(BorderFactory.createEmptyBorder(10, 13, 10, 10));
+        return fitOpsPane;
+    }
+
+    protected Component[][] initFitComponents() {
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Font")), fontFitRadio, null, fontNotFitRadio},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Element")), defaultRadio, horizonRadio, doubleRadio, notFitRadio}
+        };
+        return components;
+    }
+
+    private void addRadioToGroup(ButtonGroup buttonGroup, UIRadioButton... radios) {
+        for (UIRadioButton radio : radios) {
+            buttonGroup.add(radio);
+        }
+    }
+
+    private JPanel initGlobalOpsPane(final ReportFitAttr globalFitAttr) {
+        final JPanel globalOpsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        globalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-UseGlobal"));
+        globalOpsPane.add(globalCheck);
+        globalCheck.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                boolean isLocalConfig = !globalCheck.isSelected();
+                //勾选全局时，采用全局保存的自适应属性更新界面
+                if (!isLocalConfig) {
+                    ReportFitAttr attr = globalFitAttr;
+                    fontRadioGroup.selectFontFit(((ReportFitAttr) attr).isFitFont());
+                    fitRadionGroup.selectIndexButton(attr.fitStateInPC());
+                    fitPreviewPane.refreshPreview(getCurrentFitOptions(), fitRadionGroup.isEnabled());
+                    remove(BrowserFitAttrPane.this.borderPane);
+                    initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Global"));
+                } else {
+                    ReportFitAttr attr = localFitAttr;
+                    fontRadioGroup.selectFontFit(((ReportFitAttr) attr).isFitFont());
+                    fitRadionGroup.selectIndexButton(attr.fitStateInPC());
+                    fitPreviewPane.refreshPreview(getCurrentFitOptions(), fitRadionGroup.isEnabled());
+                    remove(BrowserFitAttrPane.this.borderPane);
+                    initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Local"));
+                }
+                fontRadioGroup.setEnabled(isLocalConfig);
+                fitRadionGroup.setEnabled(isLocalConfig);
+                editGlobalOps.setVisible(!isLocalConfig);
+                String fitOptions = getCurrentFitOptions();
+                fitPreviewPane.refreshPreview(fitOptions, fitRadionGroup.isEnabled());
+            }
+        });
+
+        editGlobalOps = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-EditGlobal"));
+        editGlobalOps.setVisible(false);
+        editGlobalOps.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent evt) {
+                fontRadioGroup.setEnabled(true);
+                fitRadionGroup.setEnabled(true);
+                String fitOptions = getCurrentFitOptions();
+
+                fitPreviewPane.refreshPreview(fitOptions, fitRadionGroup.isEnabled());
+            }
+
+            public void mouseEntered(MouseEvent e) {
+                setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+            }
+
+            public void mouseExited(MouseEvent e) {
+                setCursor(Cursor.getDefaultCursor());
+            }
+        });
+        globalOpsPane.add(editGlobalOps);
+        return globalOpsPane;
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-AttrSet");
+    }
+
+    @Override
+    public void populateBean(ReportFitAttr attr) {
+        if (attr == null) {
+            //如果为空, 就用全局的
+            attr = ReportFitConfig.getInstance().getFrmFitAttr();
+            populateGlobalComponents();
+        } else {
+            initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Local"));
+        }
+        this.localFitAttr = attr;
+        fontRadioGroup.selectFontFit((attr).isFitFont());
+        fitRadionGroup.selectIndexButton(attr.fitStateInPC());
+        fitPreviewPane.refreshPreview(getCurrentFitOptions(), fitRadionGroup.isEnabled());
+    }
+
+    protected void populateGlobalComponents() {
+        globalCheck.setSelected(true);
+        fontRadioGroup.setEnabled(false);
+        fitRadionGroup.setEnabled(false);
+        editGlobalOps.setVisible(true);
+        initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Global"));
+    }
+
+    //有八种组合, 不过有意义的就是6种, 以此为key去缓存里找对应的预览图片
+    public String getCurrentFitOptions() {
+        return fitRadionGroup.getSelectRadioIndex() + "" + fontRadioGroup.getSelectRadioIndex();
+    }
+
+    private ActionListener getPreviewActionListener() {
+        return new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String fitOptions = getCurrentFitOptions();
+                fitPreviewPane.refreshPreview(fitOptions, fontRadioGroup.isEnabled());
+            }
+        };
+    }
+
+    @Override
+    public ReportFitAttr updateBean() {
+        ReportFitAttr attr = new ReportFitAttr();
+        attr.setFitFont(fontRadioGroup.isFontFit());
+        attr.setFitStateInPC(fitRadionGroup.getSelectRadioIndex());
+
+        // 直接用全局的
+        if (globalCheck.isSelected()) {
+            updateGlobalConfig(attr);
+            return null;
+        }
+        this.localFitAttr = attr;
+        return attr;
+    }
+
+    private void updateGlobalConfig(final ReportFitAttr attr) {
+
+        Configurations.update(new Worker() {
+            @Override
+            public void run() {
+                ReportFitConfig manager = ReportFitConfig.getInstance();
+                manager.setFrmFitAttr(attr);
+            }
+
+            @Override
+            public Class<? extends Configuration>[] targets() {
+                return new Class[]{ReportFitConfig.class};
+            }
+        });
+    }
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/FitPreviewPane.java

@@ -0,0 +1,74 @@
+package com.fr.design.report.fit.menupane;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.IOUtils;
+
+import javax.swing.ImageIcon;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Administrator on 2016/5/5/0005.
+ */
+public class FitPreviewPane extends BasicPane {
+    private static final String DEFAULT_FONT_TAG = "00";
+    private static final String DEFAULT_TAG = "01";
+    private static final String HORIZON_FONT_TAG = "10";
+    private static final String HORIZON_TAG = "11";
+    private static final String DOUBLE_FONT_TAG = "20";
+    private static final String DOUBLE_TAG = "21";
+    private static final String NOT_FONT_TAG = "30";
+    private static final String NOT_TAG = "31";
+
+    private UILabel imageLabel;
+    private Map<String, ImageIcon> cachedPreviewImage = new HashMap<String, ImageIcon>();
+    private Map<String, ImageIcon> globalCachedPreviewImage = new HashMap<String, ImageIcon>();
+
+    public FitPreviewPane() {
+        //初始化缓存图片, 有些无意义的组合.
+        initCacheImage();
+        //初始化组件
+        initComponents();
+    }
+
+    //默认和不自适应时，字体自适应不起效，只有6张图
+    private void initCacheImage() {
+        globalCachedPreviewImage.put(DEFAULT_FONT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/gray/" + DEFAULT_FONT_TAG + ".png")));
+        globalCachedPreviewImage.put(DEFAULT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/gray/" + DEFAULT_FONT_TAG + ".png")));
+        globalCachedPreviewImage.put(HORIZON_FONT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/gray/" + HORIZON_FONT_TAG + ".png")));
+        globalCachedPreviewImage.put(HORIZON_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/gray/" + HORIZON_TAG + ".png")));
+        globalCachedPreviewImage.put(DOUBLE_FONT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/gray/" + DOUBLE_FONT_TAG + ".png")));
+        globalCachedPreviewImage.put(DOUBLE_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/gray/" + DOUBLE_TAG + ".png")));
+        globalCachedPreviewImage.put(NOT_FONT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/gray/" + NOT_FONT_TAG + ".png")));
+        globalCachedPreviewImage.put(NOT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/gray/" + NOT_FONT_TAG + ".png")));
+        cachedPreviewImage.put(DEFAULT_FONT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/" + DEFAULT_FONT_TAG + ".png")));
+        cachedPreviewImage.put(DEFAULT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/" + DEFAULT_FONT_TAG + ".png")));
+        cachedPreviewImage.put(HORIZON_FONT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/" + HORIZON_FONT_TAG + ".png")));
+        cachedPreviewImage.put(HORIZON_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/" + HORIZON_TAG + ".png")));
+        cachedPreviewImage.put(DOUBLE_FONT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/" + DOUBLE_FONT_TAG + ".png")));
+        cachedPreviewImage.put(DOUBLE_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/" + DOUBLE_TAG + ".png")));
+        cachedPreviewImage.put(NOT_FONT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/" + NOT_FONT_TAG + ".png")));
+        cachedPreviewImage.put(NOT_TAG, new ImageIcon(IOUtils.readImage("/com/fr/design/images/reportfit/preview/" + NOT_FONT_TAG + ".png")));
+    }
+
+    private void initComponents() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        imageLabel = new UILabel();
+        imageLabel.setIcon(cachedPreviewImage.get(DEFAULT_TAG));
+        this.add(imageLabel);
+    }
+
+    public void refreshPreview(String index, boolean isEditedable) {
+        ImageIcon newImageIcon = isEditedable ? cachedPreviewImage.get(index) : globalCachedPreviewImage.get(index);
+        imageLabel.setIcon(newImageIcon);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Preview");
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/FitRadioGroup.java

@@ -0,0 +1,80 @@
+package com.fr.design.report.fit.menupane;
+
+import com.fr.design.gui.ibutton.UIRadioButton;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonGroup;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 自适应四个按钮选项的group
+ * <p>
+ * Created by Administrator on 2016/5/5/0005.
+ */
+public class FitRadioGroup extends ButtonGroup {
+
+    private List<UIRadioButton> radioButtons = new ArrayList<UIRadioButton>();
+
+    @Override
+    public void add(AbstractButton button) {
+        super.add(button);
+
+        UIRadioButton radioButton = (UIRadioButton) button;
+        radioButtons.add(radioButton);
+    }
+
+    /**
+     * 设置按钮状态
+     */
+    public boolean isEnabled() {
+        return radioButtons.get(0).isEnabled();
+    }
+
+    /**
+     * 设置按钮状态
+     */
+    public void setEnabled(boolean enabled) {
+        for (UIRadioButton radioButton : radioButtons) {
+            radioButton.setEnabled(enabled);
+        }
+    }
+
+    /**
+     * 获取当前选中的按钮index
+     *
+     * @return 按钮index
+     */
+    public int getSelectRadioIndex() {
+        for (int i = 0, len = radioButtons.size(); i < len; i++) {
+            if (radioButtons.get(i).isSelected()) {
+                return i;
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * 选中指定index的按钮
+     */
+    public void selectIndexButton(int index) {
+        if (index < 0 || index > radioButtons.size() - 1) {
+            return;
+        }
+
+        UIRadioButton button = radioButtons.get(index);
+        button.setSelected(true);
+    }
+
+    /**
+     * 给所有的按钮加上监听
+     */
+    public void addActionListener(ActionListener actionListener) {
+        for (UIRadioButton radioButton : radioButtons) {
+            radioButton.addActionListener(actionListener);
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/FontRadioGroup.java

@@ -0,0 +1,17 @@
+package com.fr.design.report.fit.menupane;
+
+/**
+ * 字体的两个选项组成的group
+ * <p>
+ * Created by Administrator on 2016/5/5/0005.
+ */
+public class FontRadioGroup extends FitRadioGroup {
+
+    public void selectFontFit(boolean isFontFit) {
+        selectIndexButton(isFontFit ? 0 : 1);
+    }
+
+    public boolean isFontFit() {
+        return getSelectRadioIndex() == 0;
+    }
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -0,0 +1,107 @@
+package com.fr.design.report.fit.menupane;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.actions.JTemplateAction;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.menu.MenuKeySet;
+import com.fr.report.fit.FitProvider;
+import com.fr.report.fit.ReportFitAttr;
+
+import javax.swing.KeyStroke;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+
+/**
+ * Created by Administrator on 2015/7/6 0006.
+ */
+public class ReportFitAttrAction extends JTemplateAction {
+    private static final Dimension MEDIUM = new Dimension(430, 400);
+    private static final MenuKeySet REPORT_FIT_ATTR = new MenuKeySet() {
+        @Override
+        public char getMnemonic() {
+            return 'T';
+        }
+
+        @Override
+        public String getMenuName() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Template");
+        }
+
+        @Override
+        public KeyStroke getKeyStroke() {
+            return null;
+        }
+    };
+    private static final MenuKeySet REPORT_FIT_ATTR_ELEMENTCASE = new MenuKeySet() {
+        @Override
+        public char getMnemonic() {
+            return 'T';
+        }
+
+        @Override
+        public String getMenuName() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Elementcase");
+        }
+
+        @Override
+        public KeyStroke getKeyStroke() {
+            return null;
+        }
+    };
+
+    public ReportFitAttrAction(JTemplate jTemplate) {
+        super(jTemplate);
+        initMenuStyle();
+    }
+
+    private void initMenuStyle() {
+        JTemplate jTemplate = getEditingComponent();
+        if (jTemplate.isJWorkBook()) {
+            this.setMenuKeySet(REPORT_FIT_ATTR);
+        } else {
+            this.setMenuKeySet(REPORT_FIT_ATTR_ELEMENTCASE);
+        }
+        this.setName(getMenuKeySet().getMenuKeySetName() + "...");
+        this.setMnemonic(getMenuKeySet().getMnemonic());
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/reportfit/fit.png"));
+    }
+
+    /**
+     * Action触发事件
+     *
+     * @param e 事件
+     */
+    public void actionPerformed(ActionEvent e) {
+        final JTemplate jwb = getEditingComponent();
+        if (jwb == null) {
+            return;
+        }
+        final FitProvider wbTpl = (FitProvider) jwb.getTarget();
+        ReportFitAttr fitAttr = wbTpl.getReportFitAttr();
+        if (jwb.isJWorkBook()) {
+            final TemplateFitAttrPane attrPane = new TemplateFitAttrPane();
+            showReportFitDialog(fitAttr, jwb, wbTpl, attrPane);
+        } else {
+            final ReportFitAttrPane attrPane = new ReportFitAttrPane();
+            showReportFitDialog(fitAttr, jwb, wbTpl, attrPane);
+        }
+    }
+
+    private void showReportFitDialog(ReportFitAttr fitAttr, final JTemplate jwb, final FitProvider wbTpl, final BasicBeanPane<ReportFitAttr> attrPane) {
+        attrPane.populateBean(fitAttr);
+        UIDialog dialog = attrPane.showUnsizedWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+            @Override
+            public void doOk() {
+                wbTpl.setReportFitAttr(attrPane.updateBean());
+                jwb.fireTargetModified();
+            }
+        });
+        dialog.setSize(MEDIUM);
+        dialog.setVisible(true);
+    }
+
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java

@@ -0,0 +1,56 @@
+package com.fr.design.report.fit.menupane;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.report.fit.ReportFitAttr;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+
+/**
+ * Created by Administrator on 2015/7/6 0006.
+ */
+public class ReportFitAttrPane extends BasicBeanPane<ReportFitAttr> {
+
+    private BrowserFitAttrPane attrPane;
+
+
+    public ReportFitAttrPane() {
+        initComponents();
+    }
+
+    private void initComponents() {
+        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        attrPane = new BrowserFitAttrPane();
+        this.add(attrPane);
+
+    }
+
+    /**
+     * 展示界面
+     *
+     * @param fitAttr 自适应属性
+     */
+    public void populateBean(ReportFitAttr fitAttr) {
+        attrPane.populateBean(fitAttr);
+    }
+
+    /**
+     * 提交数据
+     *
+     * @return 界面上的更新数据
+     */
+    public ReportFitAttr updateBean() {
+        return attrPane.updateBean();
+    }
+
+    /**
+     * 标题
+     *
+     * @return 标题
+     */
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Attr");
+    }
+
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java

@@ -0,0 +1,85 @@
+package com.fr.design.report.fit.menupane;
+
+import com.fr.config.Configuration;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.report.fit.ReportFitAttr;
+import com.fr.report.fit.ReportFitConfig;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.Worker;
+
+import java.awt.Component;
+
+/**
+ * Created by 夏翔 on 2016/6/24.
+ */
+public class TemplateBrowserFitAttrPane extends BrowserFitAttrPane {
+
+    public TemplateBrowserFitAttrPane() {
+        initComponents(ReportFitConfig.getInstance().getCptFitAttr());
+    }
+
+
+    @Override
+    protected Component[][] initFitComponents() {
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Font")), fontFitRadio, null, fontNotFitRadio},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Element")), horizonRadio, doubleRadio, notFitRadio}
+        };
+        return components;
+    }
+
+    @Override
+    public void populateBean(ReportFitAttr attr) {
+        //模板界面，自适应选项去掉了默认，这边的判断为了兼容之前的设置
+        if (attr != null && attr.fitStateInPC() == 0) {
+            attr.setFitStateInPC(3);
+        }
+        ReportFitAttr fitAttr = ReportFitConfig.getInstance().getCptFitAttr();
+        if (attr == null) {
+            //如果为空, 就用全局的
+            attr = fitAttr;
+            populateGlobalComponents();
+        } else if (fitAttr.fitStateInPC() == 0) {
+            attr = new ReportFitAttr();
+            attr.setFitStateInPC(3);
+            initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Local"));
+        } else {
+            initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Local"));
+        }
+        this.localFitAttr = attr;
+        fontRadioGroup.selectFontFit((attr).isFitFont());
+        fitRadionGroup.selectIndexButton(attr.fitStateInPC());
+        fitPreviewPane.refreshPreview(getCurrentFitOptions(), fitRadionGroup.isEnabled());
+    }
+
+    @Override
+    public ReportFitAttr updateBean() {
+        ReportFitAttr attr = new ReportFitAttr();
+        attr.setFitFont(fontRadioGroup.isFontFit());
+        attr.setFitStateInPC(fitRadionGroup.getSelectRadioIndex());
+
+        // 直接用全局的
+        if (globalCheck.isSelected()) {
+            updateGlobalConfig(attr);
+            return null;
+        }
+        this.localFitAttr = attr;
+        return attr;
+    }
+
+    private void updateGlobalConfig(final ReportFitAttr attr) {
+
+        Configurations.update(new Worker() {
+            @Override
+            public void run() {
+                ReportFitConfig manager = ReportFitConfig.getInstance();
+                manager.setCptFitAttr(attr);
+            }
+
+            @Override
+            public Class<? extends Configuration>[] targets() {
+                return new Class[]{ReportFitConfig.class};
+            }
+        });
+    }
+}

designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java

@@ -0,0 +1,55 @@
+package com.fr.design.report.fit.menupane;
+
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.report.fit.ReportFitAttr;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+
+/**
+ * Created by 夏翔 on 2016/6/24.
+ */
+public class TemplateFitAttrPane extends BasicBeanPane<ReportFitAttr> {
+    private TemplateBrowserFitAttrPane attrPane;
+
+
+    public TemplateFitAttrPane() {
+        initComponents();
+    }
+
+    private void initComponents() {
+        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+        this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        attrPane = new TemplateBrowserFitAttrPane();
+        this.add(attrPane);
+
+    }
+
+    /**
+     * 展示界面
+     *
+     * @param fitAttr 自适应属性
+     */
+    public void populateBean(ReportFitAttr fitAttr) {
+        attrPane.populateBean(fitAttr);
+    }
+
+
+    /**
+     * 提交数据
+     *
+     * @return 界面上的更新数据
+     */
+    public ReportFitAttr updateBean() {
+        return attrPane.updateBean();
+    }
+
+    /**
+     * 标题
+     *
+     * @return 标题
+     */
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Attr");
+    }
+}

designer-base/src/main/java/com/fr/design/style/color/ColorCell.java

@@ -89,6 +89,10 @@ public class ColorCell extends JComponent implements ColorSelectable {
      * @param 鼠标事件
      */
     public void processMouseEvent(MouseEvent e) {
+        if (!isEnabled()) {
+            return;
+        }
+
         if (e == null || e.getID() == MouseEvent.MOUSE_RELEASED) {
             colorSelectable.setColor(this.getColor());
             colorSelectable.colorSetted(this);

designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java

@@ -9,6 +9,7 @@ import java.util.regex.Pattern;
 
 import javax.swing.ButtonGroup;
 import javax.swing.Icon;
+import javax.swing.JButton;
 import javax.swing.JColorChooser;
 import javax.swing.JPanel;
 import javax.swing.SpinnerNumberModel;
@@ -706,7 +707,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec
         mainPanel.add(hexPanel, BorderLayout.SOUTH);
 
         JPanel rightPane = new JPanel(new BorderLayout());
-        SpecialUIButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON18, true);
+        JButton pickColorButton = PickColorButtonFactory.getPickColorButton(this, PickColorButtonFactory.IconType.ICON18, true);
         JPanel blankArea = new JPanel();
         blankArea.setPreferredSize(new Dimension(100, 175));
         rightPane.add(blankArea, BorderLayout.CENTER);

designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java

@@ -31,8 +31,6 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     // color setting action.
     private ArrayList<ChangeListener> colorChangeListenerList = new ArrayList<ChangeListener>();
 
-    // 颜色选择器
-    private ColorSelectDetailPane pane;
     // 是否支持透明
     private boolean isSupportTransparent;
 
@@ -52,10 +50,10 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     /**
      * Constructor.
      */
-    public NewColorSelectPane(boolean isSupportTransparent) {
+    NewColorSelectPane(boolean isSupportTransparent) {
         this.isSupportTransparent = isSupportTransparent;
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
+        this.setBorder(new UIRoundedBorder(UIConstants.TOOLBAR_BORDER_COLOR, 1, 5));
         if (isSupportTransparent) {
             UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
             this.add(transpanrentButton, BorderLayout.NORTH);
@@ -96,12 +94,13 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         // mod by anchore 16/11/16
         UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color"));
 
-        customButton.addMouseListener(new MouseAdapter() {
+        customButton.addActionListener(new ActionListener() {
             @Override
-            public void mousePressed(MouseEvent e) {
+            public void actionPerformed(ActionEvent e) {
                 customButtonPressed();
             }
         });
+
         customButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
         JPanel centerPane1 = FRGUIPaneFactory.createBorderLayout_S_Pane();
         centerPane1.setBorder(BorderFactory.createEmptyBorder(2, 8, 0, 8));
@@ -183,7 +182,8 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
     }
 
     protected void customButtonPressed() {
-        pane = new ColorSelectDetailPane(Color.WHITE);
+        // 颜色选择器
+        ColorSelectDetailPane pane = new ColorSelectDetailPane(Color.WHITE);
         ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this);
     }
 

designer-base/src/main/java/com/fr/design/style/color/PickColorButtonFactory.java

@@ -2,27 +2,32 @@ package com.fr.design.style.color;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.SpecialUIButton;
+import com.fr.design.gui.ibutton.UIBasicButtonUI;
 
 import javax.swing.*;
 import javax.swing.plaf.ButtonUI;
+import javax.swing.plaf.basic.BasicButtonUI;
 import java.awt.*;
 import java.awt.event.*;
 
 /**
  * Created by plough on 2016/12/22.
  */
-public class PickColorButtonFactory {
+class PickColorButtonFactory {
     private static int iconSize;
     private static final int SIZE_16 = 16;
     private static final int SIZE_18 = 18;
     private static IconType iconType;
     private static Image iconImage;
 
-    public static SpecialUIButton getPickColorButton(ColorSelectable colorSelectable, IconType iconType) {
-        return getPickColorButton(colorSelectable, iconType, false);
-    }
-
-    public static SpecialUIButton getPickColorButton(final ColorSelectable colorSelectable, IconType iconType, final boolean setColorRealTime) {
+    /**
+     * 生成取色按钮
+     * @param colorSelectable 接收取到的颜色值的对象
+     * @param iconType IconType 枚举，可选择 16px 和 18px 两个尺寸
+     * @param setColorRealTime 是否在取色过程中，实时更新颜色值
+     * @return SpecialUIButton 屏幕取色按钮
+     */
+    static JButton getPickColorButton(final ColorSelectable colorSelectable, IconType iconType, final boolean setColorRealTime) {
         SpecialUIButton pickColorButton = new SpecialUIButton(new WhiteButtonUI());
         PickColorButtonFactory.iconType = iconType;
 
@@ -37,9 +42,9 @@ public class PickColorButtonFactory {
         pickColorButton.setPreferredSize(new Dimension(iconSize, iconSize));
         pickColorButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
 
-        pickColorButton.addMouseListener(new MouseAdapter() {
+        pickColorButton.addActionListener(new ActionListener() {
             @Override
-            public void mousePressed(MouseEvent e) {
+            public void actionPerformed(ActionEvent e) {
                 new ColorPicker(colorSelectable, setColorRealTime);
             }
         });
@@ -47,12 +52,14 @@ public class PickColorButtonFactory {
         return pickColorButton;
     }
 
-    //  取色器按钮使用的图标
+    /**
+     * 取色按钮可使用的图标尺寸
+     */
     public enum IconType {
         ICON16, ICON18
     }
 
-    private static class WhiteButtonUI extends ButtonUI {
+    private static class WhiteButtonUI extends UIBasicButtonUI {
         @Override
         public void paint(Graphics g, JComponent c) {
             super.paint(g, c);

designer-base/src/main/java/com/fr/design/style/color/UsedColorPane.java

@@ -72,7 +72,7 @@ public class UsedColorPane extends BasicPane {
         int i = 0;
         if (needPickColorButton) {
             // 取色按钮
-            SpecialUIButton pickColorButton = PickColorButtonFactory.getPickColorButton(selectable, PickColorButtonFactory.IconType.ICON16, setColorRealTime);
+            JButton pickColorButton = PickColorButtonFactory.getPickColorButton(selectable, PickColorButtonFactory.IconType.ICON16, setColorRealTime);
             panel.add(pickColorButton);
             i++;
             this.reserveCells += 1;

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -65,12 +65,12 @@ public class DesignUtils {
      * @return 启动了返回true
      */
     public static boolean isStarted() {
-        try {
-            new Socket("localhost", port);
-            return true;
-        } catch (Exception exp) {
-
-        }
+//        try {
+//            new Socket("localhost", port);
+//            return true;
+//        } catch (Exception exp) {
+//
+//        }
         return false;
     }
 

designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java

@@ -18,6 +18,8 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.EditTextField;
 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.style.color.ColorCell;
 import com.fr.design.style.color.ColorFactory;
 import com.fr.design.style.color.ColorSelectBox;
@@ -524,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位参数（可选）分别表示对齐方式，水平间隙，垂直间隙
@@ -891,4 +905,26 @@ public abstract class GUICoreUtils{
 		panel.add(dynamicPaneWrapper, BorderLayout.CENTER);
 		return panel;
 	}
+
+	/**
+	 * 创建一个单列垂直布局的 TableLayout 面板
+	 * @param comps 组件数组
+	 * @return 布局完成后的面板
+	 */
+	public static JPanel createHeaderLayoutPane(Component... comps) {
+		// TableLayout
+		double p = TableLayout.PREFERRED;
+		double[] columnSize = {p};
+
+		double[] rowSize = new double[comps.length];
+		for (int i = 0; i < rowSize.length; i++) {
+			rowSize[i] = p;
+		}
+
+		Component[][] components = new Component[rowSize.length][columnSize.length];
+		for (int i = 0; i < rowSize.length; i++) {
+			components[i][0] = comps[i];
+		}
+		return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 10);
+	}
 }

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -41,333 +41,337 @@ import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 
 /**
- * 
  * carl：自定义Icon编辑
- *
  */
 public class CustomIconPane extends BasicPane {
-	private String selectedIconName = null;
-	private ListMap iconButtonMap = null;
-	private JPanel iconPane = null;
-	private ButtonGroup bg;
-	private UIScrollPane jsPane;
-	// 老一次次去拿真麻烦
-	private IconManager iconManager = null;
-	private UIButton removeButton;
-	private UIButton editButton;
-
-
-
-	private static final int THE_WIDTH = 180;
-	private static final int HORIZONTAL_COUNT = 6;
-	private static final int HEIGHT_PER = 29;
-	private static final int GAP = 10;
-	
-	public CustomIconPane() {
-		this.initComponents();
-	}
-	
-	private void initComponents() {
-		this.setLayout(FRGUIPaneFactory.createBorderLayout());
-		JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-		centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")));
-		JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
-		centerPane.add(noNamePane, BorderLayout.CENTER);
-		
-		iconPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-		
-		// 开始加图标选择按钮
-		initIcons();
-
-		jsPane = new UIScrollPane(iconPane);
-		refreshIconPane(false);
-		jsPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-		
-		jsPane.setPreferredSize(new Dimension(200,180));
-		noNamePane.add(jsPane);
-		
-		DescriptionTextArea des = new DescriptionTextArea(2);
-		des.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message1"));
-		centerPane.add(des, BorderLayout.SOUTH);		
-		
-		this.add(centerPane, BorderLayout.CENTER);
-		
-		JPanel eastPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
-		JPanel buttonPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
-		
-		// 增加、删除、编辑按钮
-		initAddButton(buttonPane);
-		initRemoveButton(buttonPane);
-		initEditButton(buttonPane);
-
-		eastPane.add(buttonPane);
-		this.add(eastPane, BorderLayout.EAST);
-		
-	}
-
-	private void initIcons() {
-		iconButtonMap = new ListMap();
-		iconManager = WidgetInfoConfig.getInstance().getIconManager();
-		bg = new ButtonGroup();
-		Object[] names = iconManager.getIconNames();
-		Object name = null;
-		for (int i = 0; i < names.length; i++) {
-			name = names[i];
-			if (name == null || !(name instanceof String)) {
-				continue;
-			}
-			// carl:默认选第一个
-			if (this.selectedIconName == null) {
-				this.selectedIconName = (String)name;
-			}
-			IconButton iconButton = new IconButton((String)name);
-			iconButtonMap.put(name, iconButton);
-			iconPane.add(iconButton);
-			bg.add(iconButton);
-		}
-	}
-
-	private void initAddButton(JPanel buttonPane) {
-		UIButton addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
-		addButton.setPreferredSize(new Dimension(80, 25));
-		addButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				final EditIconDialog add = new EditIconDialog();
-				add.populate(null);
-				add.showWindow(SwingUtilities.getWindowAncestor(CustomIconPane.this), new DialogActionAdapter() {
-					@Override
-					public void doOk() {
-						Icon icon = add.update();
-						if (iconManager.addIcon(icon, false)) {
-							IconButton iconButton = null;//初始化
-
-							addIcon(icon, iconButton);
-
-						}else {
-							// add failed
-							JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE);
-						}
-					}
+    private String selectedIconName = null;
+    private ListMap iconButtonMap = null;
+    private JPanel iconPane = null;
+    private ButtonGroup bg;
+    private UIScrollPane jsPane;
+    // 老一次次去拿真麻烦
+    private IconManager iconManager = null;
+    private UIButton removeButton;
+    private UIButton editButton;
+
+
+    private static final int THE_WIDTH = 180;
+    private static final int HORIZONTAL_COUNT = 6;
+    private static final int HEIGHT_PER = 29;
+    private static final int GAP = 10;
+
+    public CustomIconPane() {
+        this.initComponents();
+    }
+
+    private void initComponents() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")));
+        JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
+        centerPane.add(noNamePane, BorderLayout.CENTER);
+
+        iconPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+
+        // 开始加图标选择按钮
+        initIcons();
+
+        jsPane = new UIScrollPane(iconPane);
+        refreshIconPane(false);
+        jsPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+
+        jsPane.setPreferredSize(new Dimension(200, 180));
+        noNamePane.add(jsPane);
+
+        DescriptionTextArea des = new DescriptionTextArea(2);
+        des.setText(createDescriptionText());
+        centerPane.add(des, BorderLayout.SOUTH);
+
+        this.add(centerPane, BorderLayout.CENTER);
+
+        JPanel eastPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
+        JPanel buttonPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
+
+        // 增加、删除、编辑按钮
+        initAddButton(buttonPane);
+        initRemoveButton(buttonPane);
+        initEditButton(buttonPane);
+
+        eastPane.add(buttonPane);
+        this.add(eastPane, BorderLayout.EAST);
+
+    }
+
+
+    protected String createDescriptionText(){
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message1");
+    }
+
+    private void initIcons() {
+        iconButtonMap = new ListMap();
+        iconManager = WidgetInfoConfig.getInstance().getIconManager();
+        bg = new ButtonGroup();
+        Object[] names = iconManager.getIconNames();
+        Object name = null;
+        for (int i = 0; i < names.length; i++) {
+            name = names[i];
+            if (name == null || !(name instanceof String)) {
+                continue;
+            }
+            // carl:默认选第一个
+            if (this.selectedIconName == null) {
+                this.selectedIconName = (String) name;
+            }
+            IconButton iconButton = new IconButton((String) name);
+            iconButtonMap.put(name, iconButton);
+            iconPane.add(iconButton);
+            bg.add(iconButton);
+        }
+    }
+
+    private void initAddButton(JPanel buttonPane) {
+        UIButton addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
+        addButton.setPreferredSize(new Dimension(80, 25));
+        addButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                final EditIconDialog add = new EditIconDialog();
+                add.populate(null);
+                add.showWindow(SwingUtilities.getWindowAncestor(CustomIconPane.this), new DialogActionAdapter() {
+                    @Override
+                    public void doOk() {
+                        Icon icon = add.update();
+                        if (iconManager.addIcon(icon, false)) {
+                            IconButton iconButton = null;//初始化
+
+                            addIcon(icon, iconButton);
+
+                        } else {
+                            // add failed
+                            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE);
+                        }
+                    }
                 }).setVisible(true);
 
-			}
-		});
-		buttonPane.add(addButton);
-	}
-
-	private void initRemoveButton(JPanel buttonPane) {
-		removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
-		removeButton.setPreferredSize(new Dimension(80, 25));
-		removeButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				if (iconManager.isSystemIcon(selectedIconName)) {
-					return;
-				}
-				if (iconManager.removeIcon(selectedIconName)) {
-					IconButton iconButton = (IconButton)iconButtonMap.get(selectedIconName);
-					iconPane.remove(iconButton);
-					iconButtonMap.remove(selectedIconName);
-					bg.remove(iconButton);
-					selectedIconName = ((IconButton)iconButtonMap.getByIndex(0)).iconName;
-					refreshIconPane(false);
-					CustomIconPane.this.validate();
-					CustomIconPane.this.repaint();
-				} else {
-					// remove failed
-					JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"),
-		    				com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
-							JOptionPane.WARNING_MESSAGE);
-				}
-			}
-		});
-		buttonPane.add(removeButton);
-	}
-
-	private void initEditButton(JPanel buttonPane) {
-		editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
-		editButton.setPreferredSize(new Dimension(80, 25));
-		editButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				if (iconManager.isSystemIcon(selectedIconName)) {
-					return;
-				}
-				Icon oldIcon = null;
-				try {
-					oldIcon= iconManager.getIcon(selectedIconName);
-				} catch (CloneNotSupportedException e1) {
+            }
+        });
+        buttonPane.add(addButton);
+    }
+
+    private void initRemoveButton(JPanel buttonPane) {
+        removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
+        removeButton.setPreferredSize(new Dimension(80, 25));
+        removeButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if (iconManager.isSystemIcon(selectedIconName)) {
+                    return;
+                }
+                if (iconManager.removeIcon(selectedIconName)) {
+                    IconButton iconButton = (IconButton) iconButtonMap.get(selectedIconName);
+                    iconPane.remove(iconButton);
+                    iconButtonMap.remove(selectedIconName);
+                    bg.remove(iconButton);
+                    selectedIconName = ((IconButton) iconButtonMap.getByIndex(0)).iconName;
+                    refreshIconPane(false);
+                    CustomIconPane.this.validate();
+                    CustomIconPane.this.repaint();
+                } else {
+                    // remove failed
+                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"),
+                            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                            JOptionPane.WARNING_MESSAGE);
+                }
+            }
+        });
+        buttonPane.add(removeButton);
+    }
+
+    private void initEditButton(JPanel buttonPane) {
+        editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
+        editButton.setPreferredSize(new Dimension(80, 25));
+        editButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                if (iconManager.isSystemIcon(selectedIconName)) {
+                    return;
+                }
+                Icon oldIcon = null;
+                try {
+                    oldIcon = iconManager.getIcon(selectedIconName);
+                } catch (CloneNotSupportedException e1) {
                     // do nothing
-				}
-				if (oldIcon == null) {
-					JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
-							"Error",
-		    				"Error",
-							JOptionPane.ERROR_MESSAGE);
-				}
-
-				final EditIconDialog edit = new EditIconDialog();
-				edit.populate(oldIcon);
-				edit.showWindow(DesignerContext.getDesignerFrame(), new IconDialogActionListener(oldIcon) {
-					@Override
-					public void doOk() {
-						iconManager.removeIcon(oldIcon.getName());
-						Icon icon = edit.update();
-						if (iconManager.addIcon(icon, false)) {
-							IconButton iconButton = (IconButton)iconButtonMap.get(oldIcon.getName());
-							iconPane.remove(iconButton);
-							bg.remove(iconButton);
-
-							addIcon(icon, iconButton);
-
-						} else {
-							// 失败了再弄回去
-							iconManager.addIcon(oldIcon, true);
-							// edit failed
-							JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE);
-						}
-					}
+                }
+                if (oldIcon == null) {
+                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                            "Error",
+                            "Error",
+                            JOptionPane.ERROR_MESSAGE);
+                }
+
+                final EditIconDialog edit = new EditIconDialog();
+                edit.populate(oldIcon);
+                edit.showWindow(DesignerContext.getDesignerFrame(), new IconDialogActionListener(oldIcon) {
+                    @Override
+                    public void doOk() {
+                        iconManager.removeIcon(oldIcon.getName());
+                        Icon icon = edit.update();
+                        if (iconManager.addIcon(icon, false)) {
+                            IconButton iconButton = (IconButton) iconButtonMap.get(oldIcon.getName());
+                            iconPane.remove(iconButton);
+                            bg.remove(iconButton);
+
+                            addIcon(icon, iconButton);
+
+                        } else {
+                            // 失败了再弄回去
+                            iconManager.addIcon(oldIcon, true);
+                            // edit failed
+                            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE);
+                        }
+                    }
                 }).setVisible(true);
-			}
-		});
-		buttonPane.add(editButton);
-	}
-
-	private void updateButtonPane() {
-		if (editButton == null || removeButton == null){
-			return;
-		}
-		if (iconManager.isSystemIcon(selectedIconName)) {
-			editButton.setEnabled(false);
+            }
+        });
+        buttonPane.add(editButton);
+    }
+
+    private void updateButtonPane() {
+        if (editButton == null || removeButton == null) {
+            return;
+        }
+        if (iconManager.isSystemIcon(selectedIconName)) {
+            editButton.setEnabled(false);
             removeButton.setEnabled(false);
-		} else {
+        } else {
             editButton.setEnabled(true);
             removeButton.setEnabled(true);
         }
-	}
-	
-	@Override
-	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon");
-	}
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon");
+    }
 
     /**
      * 添加按钮
      *
-     * @param icon 图标
+     * @param icon       图标
      * @param iconButton 按钮
      */
-	public void addIcon(Icon icon,IconButton iconButton){
-		selectedIconName = icon.getName();
-		iconButton = new IconButton(icon.getName());
-		iconButtonMap.put(icon.getName(), iconButton);
-		iconPane.add(iconButton);
-		bg.add(iconButton);
-		refreshIconPane(true);
-		CustomIconPane.this.validate();
-		CustomIconPane.this.repaint();
-	}
-	
-	public static class IconDialogActionListener extends DialogActionAdapter {
-		protected Icon oldIcon;
-		
-		public IconDialogActionListener(Icon oldIcon) {
-			this.oldIcon = oldIcon;
-		}	
-	}
-	
-	public void populate(String iconName) {
-		if (iconName == null) {
-			return;
-		}
-		this.selectedIconName = iconName;
+    public void addIcon(Icon icon, IconButton iconButton) {
+        selectedIconName = icon.getName();
+        iconButton = new IconButton(icon.getName());
+        iconButtonMap.put(icon.getName(), iconButton);
+        iconPane.add(iconButton);
+        bg.add(iconButton);
+        refreshIconPane(true);
+        CustomIconPane.this.validate();
+        CustomIconPane.this.repaint();
+    }
+
+    public static class IconDialogActionListener extends DialogActionAdapter {
+        protected Icon oldIcon;
+
+        public IconDialogActionListener(Icon oldIcon) {
+            this.oldIcon = oldIcon;
+        }
+    }
+
+    public void populate(String iconName) {
+        if (iconName == null) {
+            return;
+        }
+        this.selectedIconName = iconName;
         updateButtonPane();
-		this.repaint();
-	}
-	
-	public String update() {
-		//把图标信息入库
-		Configurations.update(new WorkerFacade(WidgetInfoConfig.class) {
-			@Override
-			public void run() {
-				WidgetInfoConfig.getInstance().setIconManager(IconManager.getIconManager());
-			}
-		});
-		return selectedIconName;
-	}
-	
-	// 不知道怎么动态布局，就这么傻傻的调一下大小
-	private void refreshIconPane(boolean down) {
-		iconPane.setPreferredSize(new Dimension(THE_WIDTH, (iconButtonMap.size() / HORIZONTAL_COUNT + 1) * HEIGHT_PER + GAP));
-		UIScrollBar jsBar = jsPane.createVerticalScrollBar();
-		try {
-			if (down) {
-				// 将滚动条滚到最后
-				jsBar.setValue(jsBar.getMaximum() - jsBar.getVisibleAmount());
-			} else {
-				jsBar.setValue(0);
-			}
-		} catch (RuntimeException re) {
+        this.repaint();
+    }
+
+    public String update() {
+        //把图标信息入库
+        Configurations.update(new WorkerFacade(WidgetInfoConfig.class) {
+            @Override
+            public void run() {
+                WidgetInfoConfig.getInstance().setIconManager(IconManager.getIconManager());
+            }
+        });
+
+        return selectedIconName;
+    }
+
+    // 不知道怎么动态布局，就这么傻傻的调一下大小
+    private void refreshIconPane(boolean down) {
+        iconPane.setPreferredSize(new Dimension(THE_WIDTH, (iconButtonMap.size() / HORIZONTAL_COUNT + 1) * HEIGHT_PER + GAP));
+        UIScrollBar jsBar = jsPane.createVerticalScrollBar();
+        try {
+            if (down) {
+                // 将滚动条滚到最后
+                jsBar.setValue(jsBar.getMaximum() - jsBar.getVisibleAmount());
+            } else {
+                jsBar.setValue(0);
+            }
+        } catch (RuntimeException re) {
             return;
-		}
-		updateButtonPane();
-	}
-	
-	private class IconButton extends JToggleButton implements ActionListener{
-		private String iconName;
-		private Image iconImage = null;
+        }
+        updateButtonPane();
+    }
+
+    private class IconButton extends JToggleButton implements ActionListener {
+        private String iconName;
+        private Image iconImage = null;
         private static final int ICON_BUTTON_SIZE = 24;
         private static final int ICON_X = 4;
         private static final int ICON_Y = 4;
-		public IconButton(String name) {
-			this.iconName = name;
-			this.addActionListener(this);
+
+        public IconButton(String name) {
+            this.iconName = name;
+            this.addActionListener(this);
             this.setCursor(new Cursor(Cursor.HAND_CURSOR));
             this.setBorder(null);
             this.iconImage = WidgetInfoConfig.getInstance().getIconManager().getIconImage(name);
             this.setToolTipText(iconName);
-		}
+        }
 
         @Override
         public void updateUI() {
-            setUI(new BasicButtonUI(){
+            setUI(new BasicButtonUI() {
                 public void paint(Graphics g, JComponent c) {
                     super.paint(g, c);
                 }
             });
         }
-		
-		@Override
-		public void paintComponent(Graphics g) {
+
+        @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);
+                g2d.drawImage(iconImage, ICON_X, ICON_Y, IconManager.DEFAULT_ICONWIDTH, IconManager.DEFAULT_ICONHEIGHT, null);
             }
             if (this.iconName != null && ComparatorUtils.equals(this.iconName, selectedIconName)) {
-            	g2d.setPaint(Color.RED);
+                g2d.setPaint(Color.RED);
             } else {
                 g2d.setPaint(Color.LIGHT_GRAY);
             }
             GraphHelper.draw(g2d, new Rectangle2D.Double(0, 0, IconManager.DEFAULT_ICONWIDTH + 7,
-            		IconManager.DEFAULT_ICONHEIGHT + 7), Constants.LINE_THICK);
+                    IconManager.DEFAULT_ICONHEIGHT + 7), Constants.LINE_THICK);
         }
-		
+
         @Override
-		public Dimension getPreferredSize() {
+        public Dimension getPreferredSize() {
             return new Dimension(ICON_BUTTON_SIZE, ICON_BUTTON_SIZE);
         }
-        
+
         public void actionPerformed(ActionEvent evt) {
             CustomIconPane.this.selectedIconName = iconName;
 
             fireChagneListener();
-			updateButtonPane();
+            updateButtonPane();
             CustomIconPane.this.repaint();// repaint
         }
 
         @Override
-		public void addChangeListener(ChangeListener changeListener) {
+        public void addChangeListener(ChangeListener changeListener) {
             this.changeListener = changeListener;
         }
 
@@ -377,18 +381,18 @@ public class CustomIconPane extends BasicPane {
                 this.changeListener.stateChanged(evt);
             }
         }
-		
-	}
-	
-	private static class EditIconDialog extends BasicPane {
-		private UITextField nameTextField;
-		private UILabel showImageLabel;
-		private Image iconImage = null;
-		private String oldName = null;
-	    
-	    protected EditIconDialog() {
+
+    }
+
+    private static class EditIconDialog extends BasicPane {
+        private UITextField nameTextField;
+        private UILabel showImageLabel;
+        private Image iconImage = null;
+        private String oldName = null;
+
+        protected EditIconDialog() {
             init();
-	    }
+        }
 
         private void init() {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -402,16 +406,17 @@ public class CustomIconPane extends BasicPane {
             nameTextField = new UITextField(20);
 
             browseButton.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
+                public void actionPerformed(ActionEvent e) {
                     onBrowseButtonClicked();
-				}
-			});
+                }
+            });
 
             // 焦点丢失时看看名称是否已经存在
             nameTextField.addFocusListener(new FocusListener() {
                 public void focusGained(FocusEvent e) {
                     // do nothing
                 }
+
                 public void focusLost(FocusEvent e) {
                     if (oldName != null && ComparatorUtils.equals(oldName, nameTextField.getText())) {
                         return;
@@ -428,7 +433,7 @@ public class CustomIconPane extends BasicPane {
             JPanel imagePane = new JPanel();
             imagePane.setLayout(new FlowLayout(FlowLayout.LEFT, 30, 0));
             showImageLabel = new UILabel();
-            showImageLabel.setPreferredSize(new Dimension(20,20));
+            showImageLabel.setPreferredSize(new Dimension(20, 20));
             imagePane.add(showImageLabel);
             imagePane.add(browseButton);
             Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}};
@@ -448,7 +453,7 @@ public class CustomIconPane extends BasicPane {
                 // 将图片转化到16 × 16大小
                 Image image = BaseUtils.readImage(path);
                 BufferedImage bufferedImage = CoreGraphHelper.createBufferedImage(IconManager.DEFAULT_ICONWIDTH,
-IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB);
+                        IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB);
                 Graphics2D g2d = bufferedImage.createGraphics();
                 g2d.drawImage(image, 0, 0, IconManager.DEFAULT_ICONWIDTH, IconManager.DEFAULT_ICONHEIGHT, null);
                 bufferedImage.flush();
@@ -461,29 +466,29 @@ IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB);
         }
 
         @Override
-	    protected String title4PopupWindow() {
-	    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Add_Icon");
-	    }
-	    
-	    // 用户自定义的只有name 和 imgae两属性， path不要去管
-	    public void populate(Icon icon) {
-	    	if (icon == null) {
-				return;
-			}
-	    	oldName = icon.getName();
-	    	nameTextField.setText(icon.getName());
-	    	if (icon.getImage() != null) {
-	    		showImageLabel.setIcon(new ImageIcon(icon.getImage()));
-	    	}
-	    	iconImage = icon.getImage();
-	    }
-	    
-	    public Icon update() {
-	    	// 有一个是空，都返回null，反正不会添加的
-	    	if (StringUtils.isBlank(nameTextField.getText()) || iconImage == null) {
-				return null;
-			}
-	    	return new Icon(nameTextField.getText(), iconImage);
-	    }
-	}
+        protected String title4PopupWindow() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Add_Icon");
+        }
+
+        // 用户自定义的只有name 和 imgae两属性， path不要去管
+        public void populate(Icon icon) {
+            if (icon == null) {
+                return;
+            }
+            oldName = icon.getName();
+            nameTextField.setText(icon.getName());
+            if (icon.getImage() != null) {
+                showImageLabel.setIcon(new ImageIcon(icon.getImage()));
+            }
+            iconImage = icon.getImage();
+        }
+
+        public Icon update() {
+            // 有一个是空，都返回null，反正不会添加的
+            if (StringUtils.isBlank(nameTextField.getText()) || iconImage == null) {
+                return null;
+            }
+            return new Icon(nameTextField.getText(), iconImage);
+        }
+    }
 }

designer-base/src/main/java/com/fr/file/FILE.java

@@ -55,6 +55,7 @@ public interface FILE {
      * @return 是否新建成功
      * @throws Exception 异常
      */
+    @SuppressWarnings({"UnusedReturnValue"})
     boolean mkfile() throws Exception;
 
     /**

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -7,6 +7,8 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
+import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
@@ -15,6 +17,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.DefaultCompletionFilter;
 import com.fr.design.gui.itextfield.UIAutoCompletionField;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.gui.itree.filetree.FileTreeIcon;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
@@ -85,6 +88,7 @@ import java.awt.event.WindowEvent;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -176,6 +180,28 @@ public class FILEChooserPane extends BasicPane {
         return INSTANCE;
     }
 
+    public static FILEChooserPane getMultiEnvInstance(boolean showLoc, boolean showWebReport, FILEFilter filter) {
+        INSTANCE.showEnv = true;
+        INSTANCE.showLoc = showLoc;
+        INSTANCE.showWebReport = showWebReport;
+        // 替换掉 PlaceListModel
+        INSTANCE.setMultiPlaceListModel();
+        INSTANCE.removeAllFilter();
+        INSTANCE.addChooseFILEFilter(filter, 0);
+        return INSTANCE;
+    }
+
+    public static FILEChooserPane getMultiEnvInstance(boolean showLoc, boolean showWebReport) {
+        INSTANCE.showEnv = true;
+        INSTANCE.showLoc = showLoc;
+        INSTANCE.showWebReport = showWebReport;
+        // 替换掉 PlaceListModel
+        INSTANCE.setMultiPlaceListModel();
+        INSTANCE.removeAllFilter();
+        return INSTANCE;
+    }
+
+
     /**
      * @param showEnv
      * @param filter
@@ -912,96 +938,10 @@ public class FILEChooserPane extends BasicPane {
         return dialogName();
     }
 
-    private class PlaceListModel extends AbstractListModel {
-        private FileNodeFILE envFILE;
-        private FileNodeFILE webReportFILE;
-        private List<FileFILE> filesOfSystem = new ArrayList<FileFILE>();
-
-        PlaceListModel() {
-            if (FILEChooserPane.this.showEnv) {
-                envFILE = new FileNodeFILE(new FileNode(ProjectConstants.REPORTLETS_NAME, true)) {
-                    @Override
-                    public String getName() {
-                        return getEnvProjectName();
-                    }
-                };
-            }
-            if (FILEChooserPane.this.showWebReport) {
-                webReportFILE = new FileNodeFILE(FRContext.getCommonOperator().getWebRootPath());
-            }
-            if (FILEChooserPane.this.showLoc) {
-
-
-                if (WindowsDetector.detect(true)) {
-                    // windows下展示桌面
-                    File[] desktop = FileSystemView.getFileSystemView().getRoots();
-                    if (desktop != null) {
-                        for (int i = 0; i < desktop.length; i++) {
-                            if (desktop[i].exists()) {
-                                filesOfSystem.add(new FileFILE(desktop[i]));
-                            }
-                        }
-                    }
-                } else {
-                    // *nix下展示家目录
-                    filesOfSystem.add(new FileFILE(FileSystemView.getFileSystemView().getDefaultDirectory()));
-                }
-
-                // C, D, E等盘符
-                File[] roots = File.listRoots();
-                if (roots != null) {
-                    for (int i = 0; i < roots.length; i++) {
-                        if (roots[i].exists()) {
-                            filesOfSystem.add(new FileFILE(roots[i]));
-                        }
-                    }
-                }
-            }
-        }
-
-        @Override
-        public FILE getElementAt(int index) {
-            int n = FILEChooserPane.this.showEnv ? 1 : 0;
-            int n2 = FILEChooserPane.this.showWebReport ? 1 : 0;
-
-            if (index < n) {
-                return envFILE;
-            } else if (index < n + n2) {
-                return webReportFILE;
-            } else if (index < n + n2 + filesOfSystem.size()) {
-                return filesOfSystem.get(index - n - n2);
-            }
-            throw new IndexOutOfBoundsException();
-        }
-
-        @Override
-        public int getSize() {
-            if (FILEChooserPane.this.showEnv && FILEChooserPane.this.showWebReport) {
-                return 2 + filesOfSystem.size();
-            } else if (FILEChooserPane.this.showEnv || FILEChooserPane.this.showWebReport) {
-                return 1 + filesOfSystem.size();
-            } else {
-                return filesOfSystem.size();
-            }
-        }
-
-        private void setCD(final FILE lastDirectory) {
-            for (int i = 0; i < this.getSize(); i++) {
-                FILE file = this.getElementAt(i);
-                if (ComparatorUtils.equals(lastDirectory.prefix(), file.prefix())) {
-                    setCurrentDirectory(lastDirectory);
-                    return;
-                }
-            }
-            setCurrentDirectory(this.getElementAt(0));
-        }
-    }
-
-    private void setPlaceListModel() {
+    private void setPlaceListModel(AbstractPlaceListModel model) {
         if (placesList == null) {
             return;
         }
-        PlaceListModel model = new PlaceListModel();
         placesList.setModel(model);
         String lastDirectoryPath = DesignerEnvManager.getEnvManager().getDialogCurrentDirectory();
         String prefix = DesignerEnvManager.getEnvManager().getCurrentDirectoryPrefix();
@@ -1023,6 +963,20 @@ public class FILEChooserPane extends BasicPane {
         }
     }
 
+    private void setPlaceListModel() {
+        if (placesList == null) {
+            return;
+        }
+        setPlaceListModel(new PlaceListModel());
+    }
+
+    private void setMultiPlaceListModel() {
+        if (placesList == null) {
+            return;
+        }
+        setPlaceListModel(new MultiLocalEnvPlaceListModel());
+    }
+
     /*
      * 选中文件
      */
@@ -1052,7 +1006,7 @@ public class FILEChooserPane extends BasicPane {
             if (ComparatorUtils.equals(dir.prefix(), FILEFactory.ENV_PREFIX) || dir.prefix().endsWith(FILEFactory.WEBREPORT_PREFIX)) {
                 placesList.setSelectedIndex(0);
             } else if (ComparatorUtils.equals(dir.prefix(), FILEFactory.FILE_PREFIX)) {
-                PlaceListModel defaultListModel = (PlaceListModel) placesList.getModel();
+                AbstractPlaceListModel defaultListModel = (AbstractPlaceListModel) placesList.getModel();
                 for (int i = 0; i < defaultListModel.getSize(); i++) {
                     if (defaultListModel.getElementAt(i) instanceof FileFILE) {
                         FileFILE popDir = (FileFILE) defaultListModel.getElementAt(i);
@@ -1108,6 +1062,182 @@ public class FILEChooserPane extends BasicPane {
         }
     }
 
+    private abstract class AbstractPlaceListModel extends AbstractListModel<FILE> {
+
+        protected List<FileFILE> filesOfSystem = new ArrayList<FileFILE>();
+
+        protected void processSystemFile() {
+            if (WindowsDetector.detect(true)) {
+                // windows下展示桌面
+                File[] desktop = FileSystemView.getFileSystemView().getRoots();
+                if (desktop != null) {
+                    for (int i = 0; i < desktop.length; i++) {
+                        if (desktop[i].exists()) {
+                            filesOfSystem.add(new FileFILE(desktop[i]));
+                        }
+                    }
+                }
+            } else {
+                // *nix下展示家目录
+                filesOfSystem.add(new FileFILE(FileSystemView.getFileSystemView().getDefaultDirectory()));
+            }
+
+            // C, D, E等盘符
+            File[] roots = File.listRoots();
+            if (roots != null) {
+                for (int i = 0; i < roots.length; i++) {
+                    if (roots[i].exists()) {
+                        filesOfSystem.add(new FileFILE(roots[i]));
+                    }
+                }
+            }
+        }
+
+        protected void setCD(final FILE lastDirectory) {
+            for (int i = 0; i < this.getSize(); i++) {
+                FILE file = this.getElementAt(i);
+                if (ComparatorUtils.equals(lastDirectory.prefix(), file.prefix())) {
+                    setCurrentDirectory(lastDirectory);
+                    return;
+                }
+            }
+            setCurrentDirectory(this.getElementAt(0));
+        }
+    }
+
+    private class PlaceListModel extends AbstractPlaceListModel {
+        private FileNodeFILE envFILE;
+        private FileNodeFILE webReportFILE;
+
+        PlaceListModel() {
+            if (FILEChooserPane.this.showEnv) {
+                envFILE = new FileNodeFILE(new FileNode(ProjectConstants.REPORTLETS_NAME, true)) {
+                    @Override
+                    public String getName() {
+                        return getEnvProjectName();
+                    }
+                };
+            }
+            if (FILEChooserPane.this.showWebReport) {
+                webReportFILE = new FileNodeFILE(FRContext.getCommonOperator().getWebRootPath());
+            }
+            if (FILEChooserPane.this.showLoc) {
+                processSystemFile();
+            }
+        }
+
+        @Override
+        public FILE getElementAt(int index) {
+            int n = FILEChooserPane.this.showEnv ? 1 : 0;
+            int n2 = FILEChooserPane.this.showWebReport ? 1 : 0;
+
+            if (index < n) {
+                return envFILE;
+            } else if (index < n + n2) {
+                return webReportFILE;
+            } else if (index < n + n2 + filesOfSystem.size()) {
+                return filesOfSystem.get(index - n - n2);
+            }
+            throw new IndexOutOfBoundsException();
+        }
+
+        @Override
+        public int getSize() {
+            if (FILEChooserPane.this.showEnv && FILEChooserPane.this.showWebReport) {
+                return 2 + filesOfSystem.size();
+            } else if (FILEChooserPane.this.showEnv || FILEChooserPane.this.showWebReport) {
+                return 1 + filesOfSystem.size();
+            } else {
+                return filesOfSystem.size();
+            }
+        }
+
+    }
+
+    private class MultiLocalEnvPlaceListModel extends AbstractPlaceListModel {
+
+        private List<FileFILE> envFiles = new ArrayList<FileFILE>();
+        private FileNodeFILE webReportFILE;
+
+        MultiLocalEnvPlaceListModel() {
+            Iterator<String> iterator = DesignerEnvManager.getEnvManager().getEnvNameIterator();
+
+            while (iterator.hasNext()) {
+                final String envName = iterator.next();
+                DesignerWorkspaceInfo info = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName);
+                if (info.getType() == DesignerWorkspaceType.Local) {
+                    FileFILE fileFILE =
+                            new FileFILE(new File(info.getPath() + CoreConstants.SEPARATOR + ProjectConstants.REPORTLETS_NAME)) {
+                                @Override
+                                public String getName() {
+                                    return envName;
+                                }
+                            };
+                    if (fileFILE.exists() && fileFILE.isDirectory()) {
+                        envFiles.add(fileFILE);
+                    }
+                }
+            }
+
+            if (FILEChooserPane.this.showWebReport) {
+                webReportFILE = new FileNodeFILE(FRContext.getCommonOperator().getWebRootPath());
+            }
+            if (FILEChooserPane.this.showLoc) {
+                processSystemFile();
+            }
+        }
+
+        @Override
+        public FILE getElementAt(int index) {
+            int envCount = envFiles.size();
+            int webReportCount = FILEChooserPane.this.showWebReport ? 1 : 0;
+
+            if (index < envCount) {
+                return envFiles.get(index);
+            } else if (index < envCount + webReportCount) {
+                return webReportFILE;
+            } else if (index < envCount + webReportCount + filesOfSystem.size()) {
+                return filesOfSystem.get(index - envCount - webReportCount);
+            }
+            throw new IndexOutOfBoundsException();
+        }
+
+        @Override
+        public int getSize() {
+            int webReportCount = FILEChooserPane.this.showWebReport ? 1 : 0;
+            return envFiles.size() + filesOfSystem.size() + webReportCount;
+        }
+
+        private class FileFILE extends com.fr.file.FileFILE {
+
+            public FileFILE(File file) {
+                super(file);
+            }
+
+            @Override
+            public Icon getIcon() {
+                if (ComparatorUtils.equals(getTotalName(), ProjectConstants.REPORTLETS_NAME)) {
+                    return BaseUtils.readIcon("/com/fr/base/images/oem/logo.png");
+                } else {
+                    return FileTreeIcon.getIcon(new File(this.getPath()), false);
+                }
+            }
+
+            @Override
+            public FILE[] listFiles() {
+                FILE[] fileFILES = super.listFiles();
+
+                List<FileFILE> results = new ArrayList<>();
+
+                for (FILE fileFILE : fileFILES) {
+                    results.add(new FileFILE(new File(fileFILE.getPath())));
+                }
+
+                return results.toArray(new FILE[results.size()]);
+            }
+        }
+    }
+
     /*
      * 上面的LocationButtonPane
      */

designer-base/src/main/java/com/fr/file/FileFILE.java

@@ -4,6 +4,7 @@ import com.fr.base.io.XMLEncryptUtils;
 import com.fr.design.gui.itree.filetree.FileComparator;
 import com.fr.design.gui.itree.filetree.FileTreeIcon;
 import com.fr.general.ComparatorUtils;
+import com.fr.io.EncryptUtils;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.web.session.SessionLocalManager;
@@ -185,7 +186,7 @@ public class FileFILE implements FILE {
     public InputStream asInputStream() throws Exception {
         InputStream in = new java.io.FileInputStream(file);
         return file.getName().endsWith(".cpt") || file.getName().endsWith(".frm")
-                ? XMLEncryptUtils.decodeInputStream(in) : in;
+                ? XMLEncryptUtils.decodeInputStream(EncryptUtils.decodeInputStream(in)) : in;
     }
 
     /**

designer-base/src/main/java/com/fr/file/FileNodeFILE.java

@@ -9,6 +9,7 @@ import com.fr.design.gui.itree.filetree.FileTreeIcon;
 import com.fr.design.i18n.Toolkit;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
+import com.fr.io.EncryptUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
@@ -367,7 +368,7 @@ public class FileNodeFILE implements FILE {
         );
 
         return envPath.endsWith(".cpt") || envPath.endsWith(".frm")
-                ? XMLEncryptUtils.decodeInputStream(in) : in;
+                ? XMLEncryptUtils.decodeInputStream(EncryptUtils.decodeInputStream(in)) : in;
     }
 
     /**

designer-base/src/main/java/com/fr/file/MemFILE.java

@@ -18,6 +18,7 @@ public class MemFILE implements FILE {
      * @param name 名字
      * @return 新建目录
      */
+    @Override
     public boolean createFolder(String name) {
         return false;
     }
@@ -27,6 +28,7 @@ public class MemFILE implements FILE {
      *
      * @return 是否存在
      */
+    @Override
     public boolean exists() {
         return false;
     }
@@ -37,6 +39,7 @@ public class MemFILE implements FILE {
      * @return 是否新建成功
      * @throws Exception 异常
      */
+    @Override
     public boolean mkfile() throws Exception {
         return false;
     }
@@ -56,6 +59,7 @@ public class MemFILE implements FILE {
         return name;
     }
 
+    @Override
     public String getEnvFullName() {
         return name;
     }
@@ -65,6 +69,7 @@ public class MemFILE implements FILE {
      *
      * @return 是则返回true
      */
+    @Override
     public boolean isMemFile() {
         return true;
     }
@@ -74,6 +79,7 @@ public class MemFILE implements FILE {
      *
      * @return 是则返回true
      */
+    @Override
     public boolean isEnvFile() {
         return false;
     }
@@ -88,6 +94,7 @@ public class MemFILE implements FILE {
      *
      * @return 是则返回true
      */
+    @Override
     public boolean isDirectory() {
         return false;
     }
@@ -97,6 +104,7 @@ public class MemFILE implements FILE {
      *
      * @return 文件
      */
+    @Override
     public FILE[] listFiles() {
         return new FILE[0];
     }
@@ -106,6 +114,7 @@ public class MemFILE implements FILE {
      *
      * @return 前缀
      */
+    @Override
     public String prefix() {
         return FILEFactory.MEM_PREFIX;
     }
@@ -129,6 +138,7 @@ public class MemFILE implements FILE {
      *
      * @throws Exception 异常
      */
+    @Override
     public void closeTemplate() throws Exception {
     }
 
@@ -138,6 +148,7 @@ public class MemFILE implements FILE {
      * @return 输入流
      * @throws Exception 异常
      */
+    @Override
     public InputStream asInputStream() throws Exception {
         return null;
     }
@@ -148,6 +159,7 @@ public class MemFILE implements FILE {
      * @return 输出流
      * @throws Exception 异常
      */
+    @Override
     public OutputStream asOutputStream() throws Exception {
         return null;
     }

designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.actions;
+package com.fr.design.actions;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.iofile.attr.MobileOnlyTemplateAttrMark;

designer-form/src/main/java/com/fr/design/actions/NewFormAction.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.actions;
+package com.fr.design.actions;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;

designer-form/src/main/java/com/fr/design/actions/TemplateParameterAction.java

@@ -1,4 +1,4 @@
-package com.fr.design.mainframe.actions;
+package com.fr.design.actions;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;

designer-form/src/main/java/com/fr/design/actions/file/export/EmbeddedFormExportExportAction.java

@@ -0,0 +1,77 @@
+package com.fr.design.actions.file.export;
+
+import com.fr.base.BaseUtils;
+import com.fr.base.Parameter;
+import com.fr.base.extension.FileExtension;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JForm;
+import com.fr.design.menu.KeySetUtils;
+import com.fr.design.parameter.ParameterInputPane;
+import com.fr.file.filter.ChooseFileFilter;
+import com.fr.form.main.Form;
+import com.fr.io.exporter.DesignExportScope;
+import com.fr.io.exporter.DesignExportType;
+import com.fr.io.exporter.ExporterKey;
+import com.fr.stable.ArrayUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Export Embedded.
+ */
+public class EmbeddedFormExportExportAction extends AbstractExportAction<JForm> {
+
+
+    public EmbeddedFormExportExportAction(JForm jwb) {
+        super(jwb);
+        this.setMenuKeySet(KeySetUtils.EMBEDDED_EXPORT);
+        this.setName(getMenuKeySet().getMenuKeySetName() + "...");
+        this.setMnemonic(getMenuKeySet().getMnemonic());
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/oem/logo.png"));
+    }
+
+    @Override
+    public ExporterKey exportKey() {
+        return DesignExportScope.FINE_FORM;
+    }
+
+    @Override
+    protected String getDefaultExtension() {
+        return getEditingComponent().suffix().substring(1);
+    }
+
+    @Override
+    public DesignExportType exportType() {
+        return DesignExportType.EMBEDDED_FORM;
+    }
+
+    @Override
+    protected Map<String, Object> processParameter() {
+        // 输入参数
+        final Map<String, Object> parameterMap = new HashMap<String, Object>();
+        Form tpl = this.getEditingComponent().getTarget();
+
+        Parameter[] parameters = tpl.getParameters();
+        // 检查Parameter.
+        if (ArrayUtils.isNotEmpty(parameters)) {
+            final ParameterInputPane pPane = new ParameterInputPane(parameters);
+            pPane.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+
+                @Override
+                public void doOk() {
+                    parameterMap.putAll(pPane.update());
+                }
+            }).setVisible(true);
+        }
+        return parameterMap;
+    }
+
+
+    @Override
+    protected ChooseFileFilter getChooseFileFilter() {
+        return new ChooseFileFilter(FileExtension.FRM.getExtensions(), Toolkit.i18nText("Fine-Design_Form_EmbeddedTD"));
+    }
+}

designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java

@@ -1,11 +1,11 @@
 package com.fr.design.designer.beans.actions;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
 import com.fr.design.mainframe.FormDesigner;
 
-
-import javax.swing.*;
+import javax.swing.KeyStroke;
 import java.awt.event.KeyEvent;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
@@ -19,14 +19,12 @@ public class CopyAction extends FormWidgetEditAction {
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
         setUpdateBehavior(new ComponentEnable());
+        this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }
 
     @Override
     public boolean executeActionReturnUndoRecordNeeded() {
-        FormDesigner tc = getEditingComponent();
-        if (tc != null) {
-            tc.copy();
-        }
+        DesignModeContext.doCopy(getEditingComponent());
         return false;
     }
 }

designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java

@@ -1,33 +1,29 @@
 package com.fr.design.designer.beans.actions;
 
-import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
-
 import com.fr.design.mainframe.FormDesigner;
 
+import javax.swing.KeyStroke;
+import java.awt.event.KeyEvent;
+
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 public class CutAction extends FormWidgetEditAction {
 
-	public CutAction(FormDesigner t) {
-		super(t);
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
-		this.setMnemonic('T');
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
-		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
-		this.setUpdateBehavior(new ComponentEnable());
-	}
-
-	@Override
-	public boolean executeActionReturnUndoRecordNeeded() {
-		FormDesigner editPane = getEditingComponent();
-		if (editPane == null) {
-			return false;
-		}
-		return editPane.cut();
-	}
+    public CutAction(FormDesigner t) {
+        super(t);
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
+        this.setMnemonic('T');
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
+        this.setUpdateBehavior(new ComponentEnable());
+        this.setEnabled(!DesignModeContext.isBanCopyAndCut());
+    }
+
+    @Override
+    public boolean executeActionReturnUndoRecordNeeded() {
+        return DesignModeContext.doCut(getEditingComponent());
+    }
 }

designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java

@@ -1,36 +1,32 @@
 package com.fr.design.designer.beans.actions;
 
-import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
-
 import com.fr.base.BaseUtils;
-
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.mainframe.FormDesigner;
 
+import javax.swing.KeyStroke;
+import java.awt.event.KeyEvent;
+
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 public class PasteAction extends FormWidgetEditAction {
 
-	public PasteAction(FormDesigner t) {
-		super(t);
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
-		this.setMnemonic('P');
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png"));
-		this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
-	}
-
-	@Override
-	public boolean executeActionReturnUndoRecordNeeded() {
-		FormDesigner tc = getEditingComponent();
-		if (tc == null) {
-			return false;
-		}
-		return tc.paste();
-	}
-	@Override
-	public void update() {
-		this.setEnabled(true);
-	}
+    public PasteAction(FormDesigner t) {
+        super(t);
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
+        this.setMnemonic('P');
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png"));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
+    }
+
+    @Override
+    public boolean executeActionReturnUndoRecordNeeded() {
+        return DesignModeContext.doPaste(getEditingComponent());
+    }
+
+    @Override
+    public void update() {
+        this.setEnabled(true);
+    }
 
 }

designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java

@@ -4,7 +4,6 @@ import com.fr.base.BaseUtils;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.designer.properties.mobile.ElementCasePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
-import com.fr.design.fun.FormElementCaseEditorProcessor;
 import com.fr.design.fun.FormElementCaseEditorProvider;
 import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.fun.impl.AbstractFormElementCaseEditorProvider;
@@ -13,17 +12,18 @@ import com.fr.design.mainframe.*;
 import com.fr.design.mainframe.widget.editors.ElementCaseToolBarEditor;
 import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
+import com.fr.design.mainframe.widget.propertypane.BrowserFitPropertyEditor;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.FormProvider;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.ElementCaseEditorProvider;
 
+import com.fr.report.fit.ReportFitAttr;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CoreGraphHelper;
 import com.fr.stable.core.PropertyChangeAdapter;
-import com.fr.stable.fun.FitProvider;
-import com.fr.stable.fun.ReportFitAttrProvider;
+import com.fr.report.fit.FitProvider;
 
 import javax.swing.*;
 import java.awt.*;
@@ -104,35 +104,43 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 				new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
 						.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")
+
+
 		};
 		CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor();
-		return  (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraTableEditor);
+		return  ArrayUtils.addAll(propertyTableEditor, extraTableEditor);
 	}
 
+
 	public CRPropertyDescriptor[] getExtraTableEditor(){
 		CRPropertyDescriptor[] extraTableEditor = resolveCompatible();
-		FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getSingle(FormElementCaseEditorProcessor.MARK_STRING);
-		if (processor == null) {
+		CRPropertyDescriptor reportFitEditor = getReportFitEditor();
+		if (reportFitEditor == null) {
 			return extraTableEditor;
 		}
+		return ArrayUtils.add(extraTableEditor, reportFitEditor);
+	}
+
+	private CRPropertyDescriptor getReportFitEditor() {
 		this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
-		FitProvider wbTpl = (FitProvider) designer.getTarget();
-		ReportFitAttrProvider fitAttr = wbTpl.getFitAttr();
+		FitProvider wbTpl = designer.getTarget();
+		ReportFitAttr fitAttr = wbTpl.getReportFitAttr();
 		ElementCaseEditor editor = this.toData();
 		//兼容之前报表块（之前三个选项为：默认 横向 双向 现在是：横向 双向 不自适应)
 		if (editor.getFitStateInPC() == 0) {
 			editor.setReportFitAttr(null);
 		}
-		ReportFitAttrProvider reportFit = editor.getReportFitAttr();
+		ReportFitAttr reportFit = editor.getReportFitAttr();
 		if(fitAttr != null){
 			reportFit = fitAttr.fitInBrowser() ? editor.getReportFitAttr() : fitAttr;
 		}
-		ReportFitAttrProvider reportFitAttr = editor.getReportFitAttr() == null ? fitAttr : reportFit;
-		PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), reportFitAttr);
+		ReportFitAttr reportFitAttr = editor.getReportFitAttr() == null ? fitAttr : reportFit;
+		BrowserFitPropertyEditor browserFitPropertyEditor = new BrowserFitPropertyEditor();
+		CRPropertyDescriptor extraEditor = browserFitPropertyEditor.createPropertyDescriptor(this.data.getClass(), reportFitAttr);
 		if (editor.getReportFitAttr() == null) {
-			editor.setReportFitInPc(processor.getFitStateInPC(fitAttr));
+			editor.setReportFitInPc(browserFitPropertyEditor.getFitStateInPC(fitAttr));
 		}
-		return (CRPropertyDescriptor[]) ArrayUtils.addAll(extraTableEditor, extraEditor);
+		return extraEditor;
 	}
 
 

designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java

@@ -6,7 +6,9 @@ package com.fr.design.designer.creator;
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
+import com.fr.design.designer.properties.mobile.ScanCodeMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
@@ -82,4 +84,8 @@ public class XTextEditor extends XWrapperedFieldEditor {
         return "text_field_16.png";
     }
 
+    @Override
+    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+        return new WidgetPropertyUIProvider[] {new ScanCodeMobilePropertyUI(this)};
+    }
 }

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属性改变触发其他操作

designer-form/src/main/java/com/fr/design/designer/properties/mobile/ScanCodeMobilePropertyUI.java

@@ -0,0 +1,32 @@
+package com.fr.design.designer.properties.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XTextEditor;
+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.ScanCodeMobileDefinePane;
+
+public class ScanCodeMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
+
+    private XCreator xCreator;
+
+    public ScanCodeMobilePropertyUI(XTextEditor xTextEditor) {
+        this.xCreator = xTextEditor;
+    }
+
+    @Override
+    public AbstractPropertyTable createWidgetAttrTable() {
+        return null;
+    }
+
+    @Override
+    public BasicPane createWidgetAttrPane() {
+        return new ScanCodeMobileDefinePane(xCreator);
+    }
+
+    @Override
+    public String tableTitle() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr");
+    }
+}

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");
+    }
+}

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -5,10 +5,18 @@ import com.fr.base.ScreenResolution;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
 import com.fr.design.actions.UpdateAction;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.Painter;
-import com.fr.design.designer.beans.actions.*;
+import com.fr.design.designer.beans.actions.CopyAction;
+import com.fr.design.designer.beans.actions.CutAction;
+import com.fr.design.designer.beans.actions.FormDeleteAction;
+import com.fr.design.designer.beans.actions.MoveDownAction;
+import com.fr.design.designer.beans.actions.MoveToBottomAction;
+import com.fr.design.designer.beans.actions.MoveToTopAction;
+import com.fr.design.designer.beans.actions.MoveUpAction;
+import com.fr.design.designer.beans.actions.PasteAction;
 import com.fr.design.designer.beans.adapters.layout.FRParameterLayoutAdapter;
 import com.fr.design.designer.beans.events.CreatorEventListenerTable;
 import com.fr.design.designer.beans.events.DesignerEditListener;
@@ -19,7 +27,14 @@ import com.fr.design.designer.beans.location.RootResizeDirection;
 import com.fr.design.designer.beans.models.AddingModel;
 import com.fr.design.designer.beans.models.SelectionModel;
 import com.fr.design.designer.beans.models.StateModel;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XChartEditor;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
+import com.fr.design.designer.creator.XWAbsoluteLayout;
+import com.fr.design.designer.creator.XWBorderLayout;
+import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.event.DesignerOpenedListener;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -45,16 +60,27 @@ import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
-
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.bridge.StableFactory;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.TransferHandler;
 import javax.swing.border.Border;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.lang.reflect.InvocationHandler;
@@ -670,7 +696,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
                         refreshParameter();
                     }
                 } else {
-                    for( UpdateAction action : getActions()) {
+                    for (UpdateAction action : getActions()) {
                         action.update();
                     }
                 }
@@ -1343,6 +1369,9 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      */
     @Override
     public void copy() {
+        if (DesignModeContext.isBanCopyAndCut()) {
+            return;
+        }
         selectionModel.copySelectedCreator2ClipBoard();
     }
 
@@ -1364,6 +1393,9 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      */
     @Override
     public boolean cut() {
+        if (DesignModeContext.isBanCopyAndCut()) {
+            return false;
+        }
         selectionModel.cutSelectedCreator2ClipBoard();
         return false;
     }
@@ -1482,11 +1514,11 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
 
     }
 
-    public void setResolution(int resolution){
+    public void setResolution(int resolution) {
         this.resolution = resolution;
     }
 
-    public int getResolution(){
+    public int getResolution() {
         return this.resolution;
     }
 }

designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java

@@ -18,6 +18,7 @@ import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.roleAuthority.ReportAndFSManagePane;
 import com.fr.design.utils.ComponentUtils;
 
+import com.fr.form.main.parameter.FormParameterUI;
 import com.fr.page.WatermarkPainter;
 import com.fr.report.core.ReportUtils;
 import com.fr.stable.ArrayUtils;
@@ -113,7 +114,10 @@ public class FormDesignerUI extends ComponentUI {
 
     // 绘制水印
     private void paintWatermark(Graphics2D g) {
-        WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(designer.getTarget());
+        if (designer.getTarget() instanceof FormParameterUI) { // cpt 的参数面板
+            return;
+        }
+        WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplateAndGlobal(designer.getTarget());
         WatermarkPainter painter = WatermarkPainter.createPainter(watermark, designer.getResolution());
         painter.paint(g, 0, 0, designer.getArea().getBounds());
     }

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -5,7 +5,10 @@ import com.fr.base.PaperSize;
 import com.fr.base.Parameter;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
+import com.fr.design.actions.TemplateParameterAction;
 import com.fr.design.actions.core.WorkBookSupportable;
+import com.fr.design.actions.file.export.EmbeddedFormExportExportAction;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.cell.FloatElementsProvider;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.designer.beans.actions.CopyAction;
@@ -31,9 +34,6 @@ import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.xpane.FormHyperlinkGroupPane;
 import com.fr.design.gui.xpane.FormHyperlinkGroupPaneNoPop;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction;
-import com.fr.design.mainframe.actions.FormMobileAttrAction;
-import com.fr.design.mainframe.actions.TemplateParameterAction;
 import com.fr.design.mainframe.form.FormECCompositeProvider;
 import com.fr.design.mainframe.form.FormECDesignerProvider;
 import com.fr.design.mainframe.templateinfo.JFormProcessInfo;
@@ -47,6 +47,7 @@ import com.fr.design.menu.ToolBarDef;
 import com.fr.design.parameter.ParameterPropertyPane;
 import com.fr.design.preview.FormPreview;
 import com.fr.design.preview.MobilePreview;
+import com.fr.design.report.fit.menupane.ReportFitAttrAction;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.file.FILE;
@@ -118,7 +119,6 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
     @Override
     public void refreshEastPropertiesPane() {
         // 暂时用不到，遇到的时候再加刷新右侧tab面板的代码
-        return;
     }
 
     @Override
@@ -152,7 +152,6 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
     @Override
     public void setJTemplateResolution(int resolution) {
-        return;
     }
 
     @Override
@@ -195,7 +194,6 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
     }
 
     public void setAuthorityMode(boolean isUpMode) {
-        return;
     }
 
     public int getToolBarHeight() {
@@ -208,7 +206,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      * @return 菜单数组
      */
     public ShortCut[] shortcut4FileMenu() {
-        return (ShortCut[]) ArrayUtils.addAll(
+        return ArrayUtils.addAll(
                 super.shortcut4FileMenu(),
                 DesignerMode.isVcsMode() ? new ShortCut[0] : new ShortCut[]{this.createWorkBookExportMenu()}
         );
@@ -226,7 +224,6 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      * 取消格式
      */
     public void cancelFormat() {
-        return;
     }
 
     /**
@@ -292,30 +289,25 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      * 去除选择
      */
     public void removeTemplateSelection() {
-        return;
     }
 
     public void setSheetCovered(boolean isCovered) {
-        return;
     }
 
     /**
      * 刷新容器
      */
     public void refreshContainer() {
-        return;
     }
 
     /**
      * 去除参数面板选择
      */
     public void removeParameterPaneSelection() {
-        return;
     }
 
     @Override
     public void setScale(int resolution) {
-        return;
     }
 
     @Override
@@ -436,7 +428,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      */
     @Override
     public void copy() {
-        this.formDesign.copy();
+        DesignModeContext.doCopy(this.formDesign);
     }
 
 
@@ -447,7 +439,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      */
     @Override
     public boolean paste() {
-        return this.formDesign.paste();
+        return DesignModeContext.doPaste(this.formDesign);
     }
 
 
@@ -458,7 +450,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      */
     @Override
     public boolean cut() {
-        return this.formDesign.cut();
+        return DesignModeContext.doCut(this.formDesign);
     }
 
     // ////////////////////////////////////////////////////////////////////
@@ -469,6 +461,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
     public void setPictureElem(Elem elem, CellImage cellImage) {
         elem.setValue(cellImage.getImage());
     }
+
     /**
      * 目标菜单
      *
@@ -477,8 +470,8 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
     @Override
     public MenuDef[] menus4Target() {
         return this.index == FORM_TAB ?
-                (MenuDef[]) ArrayUtils.addAll(super.menus4Target(), this.formDesign.menus4Target()) :
-                (MenuDef[]) ArrayUtils.addAll(super.menus4Target(), this.elementCaseDesign.menus4Target());
+                ArrayUtils.addAll(super.menus4Target(), this.formDesign.menus4Target()) :
+                ArrayUtils.addAll(super.menus4Target(), this.elementCaseDesign.menus4Target());
     }
 
 
@@ -503,9 +496,9 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
     @Override
     public ShortCut[] shortcut4TemplateMenu() {
         if (this.index == FORM_TAB) {
-            return (ShortCut[]) ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new FormMobileAttrAction(this)}, new ShortCut[0]);
+            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new ReportFitAttrAction(this)}, new ShortCut[0]);
         } else {
-            return (ShortCut[]) ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new FormMobileAttrAction(this)}, this.elementCaseDesign.shortcut4TemplateMenu());
+            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new ReportFitAttrAction(this)}, this.elementCaseDesign.shortcut4TemplateMenu());
         }
     }
 
@@ -932,6 +925,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
     /**
      * 支持的预览模式
+     *
      * @return 预览模式
      */
     @Override