Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0

build.gradle

@@ -58,7 +58,6 @@ allprojects {
 
     dependencies {
         implementation 'com.fr.third:jxbrowser:6.23'
-        implementation 'com.fr.third:jxbrowser-swing:6.23'
         implementation 'com.fr.third:jxbrowser-mac:6.23'
         implementation 'com.fr.third:jxbrowser-win64:6.23'
         implementation 'com.fr.third.server:servlet-api:3.0'

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

@@ -0,0 +1,48 @@
+package com.fr.design.actions.community;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.locale.impl.BugNeedMark;
+import com.fr.design.menu.MenuKeySet;
+import com.fr.design.utils.BrowseUtils;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/7/28
+ */
+public class BugNeedAction extends UpdateAction {
+    public BugNeedAction() {
+        this.setMenuKeySet(BugAndNeed);
+        this.setName(getMenuKeySet().getMenuName());
+        this.setMnemonic(getMenuKeySet().getMnemonic());
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/need.png"));
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        LocaleMark<String> localeMark = LocaleCenter.getMark(BugNeedMark.class);
+        BrowseUtils.browser(localeMark.getValue());
+    }
+
+    public static final MenuKeySet BugAndNeed = new MenuKeySet() {
+        @Override
+        public char getMnemonic() {
+            return 0;
+        }
+
+        @Override
+        public String getMenuName() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_BugAndNeed");
+        }
+
+        @Override
+        public KeyStroke getKeyStroke() {
+            return null;
+        }
+    };
+}

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

@@ -0,0 +1,49 @@
+package com.fr.design.actions.community;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.locale.impl.TechSupportMark;
+import com.fr.design.menu.MenuKeySet;
+import com.fr.design.utils.BrowseUtils;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/7/28
+ */
+public class TechSupportAction extends UpdateAction {
+    public TechSupportAction() {
+        this.setMenuKeySet(TechSupport);
+        this.setName(getMenuKeySet().getMenuName());
+        this.setMnemonic(getMenuKeySet().getMnemonic());
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/support.png"));
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        LocaleMark<String> localeMark = LocaleCenter.getMark(TechSupportMark.class);
+        String str=localeMark.getValue();
+        BrowseUtils.browser(localeMark.getValue());
+    }
+
+    public static final MenuKeySet TechSupport = new MenuKeySet() {
+        @Override
+        public char getMnemonic() {
+            return 0;
+        }
+
+        @Override
+        public String getMenuName() {
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_TechSupport");
+        }
+
+        @Override
+        public KeyStroke getKeyStroke() {
+            return null;
+        }
+    };
+}

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -439,9 +439,14 @@ public abstract class DesignTableDataManager {
      * @throws Exception 异常
      */
     public static EmbeddedTableData previewTableDataNeedInputParameters(TableDataSource tableDataSource, TableData tabledata, int rowCount, boolean needLoadingBar) throws Exception {
-        return previewTableData(tableDataSource, tabledata, rowCount, true, needLoadingBar);
+        return previewTableDataNeedInputParameters(tableDataSource, tabledata, rowCount, needLoadingBar, null);
     }
 
+    public static EmbeddedTableData previewTableDataNeedInputParameters(TableDataSource tableDataSource, TableData tabledata, int rowCount, boolean needLoadingBar, AutoProgressBar progressBar) throws Exception {
+        return previewTableData(tableDataSource, tabledata, rowCount, true, needLoadingBar, progressBar);
+    }
+
+
     /**
      * 预览不需要参数的数据集
      *
@@ -478,7 +483,16 @@ public abstract class DesignTableDataManager {
      * @return
      */
     private static EmbeddedTableData previewTableData(TableDataSource tableDataSource, TableData tabledata, int rowCount, boolean isMustInputParameters, boolean needLoadingBar) throws Exception {
-        final AutoProgressBar loadingBar = PreviewTablePane.getInstance().getProgressBar();
+        return previewTableData(tableDataSource, tabledata, rowCount, isMustInputParameters, needLoadingBar, null);
+    }
+
+    private static EmbeddedTableData previewTableData(TableDataSource tableDataSource, TableData tabledata, int rowCount, boolean isMustInputParameters, boolean needLoadingBar, AutoProgressBar progressBar) throws Exception {
+        final AutoProgressBar loadingBar;
+        if (progressBar == null) {
+            loadingBar = PreviewTablePane.getInstance().getProgressBar();
+        } else {
+            loadingBar = progressBar;
+        }
         ParameterProvider[] parameters = DataOperator.getInstance().getTableDataParameters(tabledata);
         if (ArrayUtils.isEmpty(parameters)) {
             parameters = tabledata.getParameters(Calculator.createCalculator());

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@@ -372,7 +372,7 @@ public class PreviewTablePane extends BasicPane {
                     connectionBar.close();
                 }
                 TableDataSource dataSource = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getTarget();
-                previewTableData = DesignTableDataManager.previewTableDataNeedInputParameters(dataSource, tableData, (int) maxPreviewNumberField.getValue(), true);
+                previewTableData = DesignTableDataManager.previewTableDataNeedInputParameters(dataSource, tableData, (int) maxPreviewNumberField.getValue(), true, progressBar);
                 // parameterInputDialog
                 // update之后的parameters,转成一个parameterMap,用于预览TableData
                 PreviewTableModel previewModel = new PreviewTableModel(previewTableData.createDataModel(null), (int) maxPreviewNumberField.getValue());

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@@ -1,5 +1,6 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
+
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -11,6 +12,8 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.i18n.Toolkit;
+import com.fr.stable.StringUtils;
 
 
 public class MaxMemRowCountPanel extends UIToolbar {
@@ -19,7 +22,7 @@ public class MaxMemRowCountPanel extends UIToolbar {
 	private static final String[] CACHE_LIST = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"),
 												com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Mem_Row_Count") };
 	private static final int MAX_WIDTH = getMaxComBoBoxWidth() > 200 ? 350 : 250;
-
+	private static final int MAX_COMPONENT_COUNT_OF_MAX_MEMORY = 4;
 	private static int getMaxComBoBoxWidth() {
 		int maxWidth = GraphHelper.getWidth(CACHE_LIST[0]);
 		for (int i = 1; i < CACHE_LIST.length; i++) {
@@ -86,9 +89,13 @@ public class MaxMemRowCountPanel extends UIToolbar {
 		this.removeAll();
 		this.add(switchCache);
 		switchCache.setSelectedIndex(MAX_IN_MEMORY);
-		this.add(new UILabel(" "));
+		if (this.getComponentCount() == MAX_COMPONENT_COUNT_OF_MAX_MEMORY) {
+			//此处因为switchCache的setSelectedIndex可能会造成双层调用，然后因为重复添加组件产生bug，故而定义这个工具栏的正常最大组件数，做个判断
+			return;
+		}
+		this.add(new UILabel(StringUtils.BLANK));
 		this.add(numberSpinner);
-		this.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")));
+		this.add(new UILabel(StringUtils.BLANK + Toolkit.i18nText("Fine-Design_Basic_Row")));
 		this.validate();
 		this.repaint();
 	}

designer-base/src/main/java/com/fr/design/event/StateChangeListener.java

@@ -0,0 +1,9 @@
+package com.fr.design.event;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/7/29
+ */
+public interface StateChangeListener {
+    public void stateChange();
+}

designer-base/src/main/java/com/fr/design/gui/ipasswordfield/UIPassWordField.java

@@ -1,11 +1,12 @@
 package com.fr.design.gui.ipasswordfield;
 
 
+import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.constants.UIConstants;
 
-import javax.swing.*;
+import javax.swing.JPasswordField;
 import javax.swing.text.Document;
-import java.awt.*;
+import java.awt.Graphics;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
@@ -21,26 +22,34 @@ public class UIPassWordField extends JPasswordField {
 
     public UIPassWordField() {
         super();
-        addRollOverListener();
+        init();
     }
 
     public UIPassWordField(String text) {
         super(text);
-        addRollOverListener();
+        init();
     }
 
     public UIPassWordField(int columns) {
         super(columns);
-        addRollOverListener();
+        init();
     }
 
     public UIPassWordField(String text, int columns) {
         super(text, columns);
-        addRollOverListener();
+        init();
     }
 
     public UIPassWordField(Document doc, String txt, int columns) {
         super(doc, txt, columns);
+        init();
+    }
+
+    /**
+     * 每个构造方法里都需要做的一些操作
+     */
+    public void init() {
+        InputEventBaseOnOS.addBasicEditInputMap(this);
         addRollOverListener();
     }
 

designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java

@@ -96,4 +96,11 @@ public class ProgressDialog extends UIDialog {
     public void updateLoadingText(String text) {
         this.text.setText(text);
     }
+
+    public void updateLoadingText(String text, FRFont font) {
+        if (font != null) {
+            this.text.setFont(font);
+        }
+        this.text.setText(text);
+    }
 }

designer-base/src/main/java/com/fr/design/gui/itextfield/UITextField.java

@@ -9,11 +9,20 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.Document;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.awt.RenderingHints;
+
 
 /**
  * @author Jerry
@@ -33,31 +42,33 @@ public class UITextField extends JTextField implements UIObserver, GlobalNameObs
 
     public UITextField() {
         super();
-        InputEventBaseOnOS.addBasicEditInputMap(this);
+        init();
-        initListener();
     }
 
     public UITextField(int columns) {
         super(columns);
-        InputEventBaseOnOS.addBasicEditInputMap(this);
+        init();
-        initListener();
     }
 
     public UITextField(String text, int columns) {
         super(text, columns);
-        InputEventBaseOnOS.addBasicEditInputMap(this);
+        init();
-        initListener();
     }
 
     public UITextField(String text) {
         super(text);
-        InputEventBaseOnOS.addBasicEditInputMap(this);
+        init();
-
-        initListener();
     }
 
     public UITextField(Document doc, String text, int columns) {
         super(doc, text, columns);
+        init();
+    }
+
+    /**
+     * 每个构造方法里都需要做的一些操作
+     */
+    public void init() {
         InputEventBaseOnOS.addBasicEditInputMap(this);
         initListener();
     }

designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/TristateCheckBox.java

@@ -1,6 +1,7 @@
 package com.fr.design.gui.itree.checkboxtree;
 
 import com.fr.design.constants.UIConstants;
+import com.fr.design.event.StateChangeListener;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.stable.Constants;
@@ -75,6 +76,8 @@ public class TristateCheckBox extends UICheckBox {
 
     private final TristateDecorator model;
 
+    public StateChangeListener stateChangeListener;
+
     public TristateCheckBox(String text, Icon icon, State initial) {
         super(text, icon);
         setUI(new TristateCheckBoxUI());
@@ -83,7 +86,7 @@ public class TristateCheckBox extends UICheckBox {
             @Override
             public void mousePressed(MouseEvent e) {
                 grabFocus();
-                model.setState(getNextState(model.getState()));
+                setState(getNextState(model.getState()));
             }
         });
         // Reset the keyboard action map
@@ -92,7 +95,7 @@ public class TristateCheckBox extends UICheckBox {
             @Override
             public void actionPerformed(ActionEvent e) {
                 grabFocus();
-                model.setState(getNextState(model.getState()));
+                setState(getNextState(model.getState()));
             }
         });
         map.put("released", null);
@@ -125,12 +128,20 @@ public class TristateCheckBox extends UICheckBox {
     public void addMouseListener(MouseListener l) {
     }
 
+    public void addStateChangeListener(StateChangeListener stateChangeListener) {
+        this.stateChangeListener=stateChangeListener;
+    }
+
     /**
      * Set the new state to either SELECTED, NOT_SELECTED or
      * DO_NOT_CARE.  If state == null, it is treated as DO_NOT_CARE.
      */
     public void setState(State state) {
+        State old = getState();
         model.setState(state);
+        if (old != state) {
+            fireBoxStateChanged();
+        }
     }
 
     /**
@@ -141,6 +152,11 @@ public class TristateCheckBox extends UICheckBox {
         return model.getState();
     }
 
+    public void fireBoxStateChanged() {
+        if (stateChangeListener != null) {
+            stateChangeListener.stateChange();
+        }
+    }
 
     /**
      * Exactly which Design Pattern is this?  Is it an Adapter,

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

@@ -395,7 +395,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         // 自定义
         custom = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Custom"));
 
-        custom.setBorder(BorderFactory.createEmptyBorder(4, 20, 4, 5));
+        custom.setBorder(BorderFactory.createEmptyBorder(4, 15, 4, 5));
         ButtonGroup group = new ButtonGroup();
         group.setSelected(center.getModel(), true);
         group.add(center);
@@ -405,7 +405,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
 
         // 位置 距左
         final UILabel leftLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog_Position_Left"));
-        leftLabel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 10));
+        leftLabel.setBorder(BorderFactory.createEmptyBorder(0, 15, 0, 10));
         leftLocation = new UINumberField();
         leftLocation.setMinValue(0);
         leftLocation.setPreferredSize(new Dimension(40, 20));

designer-base/src/main/java/com/fr/design/locale/impl/BugNeedMark.java

@@ -0,0 +1,29 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.CloudCenter;
+import com.fr.general.GeneralContext;
+import com.fr.general.locale.LocaleMark;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/7/29
+ */
+public class BugNeedMark implements LocaleMark<String> {
+    private Map<Locale, String> map = new HashMap<>();
+    private static final String TW_BUG_AND_NEEDS = CloudCenter.getInstance().acquireUrlByKind("bbs.bug.needs.zh_TW");
+
+    public BugNeedMark() {
+        map.put(Locale.TAIWAN, TW_BUG_AND_NEEDS);
+    }
+
+    @Override
+    public String getValue() {
+        String result = map.get(GeneralContext.getLocale());
+        return result == null ? TW_BUG_AND_NEEDS : result;
+    }
+
+}

designer-base/src/main/java/com/fr/design/locale/impl/SupportLocaleImpl.java

@@ -10,6 +10,7 @@ import java.util.Set;
  * 某些国际化环境支持的操作
  * 需要增加/删除支持的语言 统一在这里修改 无须改动业务代码
  * 后续有新的不同语言下的差异操作 添加新的枚举
+ *
  * @author Hades
  * @date 2019/6/24
  */
@@ -38,6 +39,123 @@ public enum SupportLocaleImpl implements SupportLocale {
             set.add(Locale.TAIWAN);
             return set;
         }
+    },
+
+    /**
+     * 支持韩文
+     */
+    SUPPORT_KOREA {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.KOREA);
+            return set;
+        }
+    },
+
+    /**
+     * BUG反馈
+     */
+    BUG {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.CHINA);
+            set.add(Locale.US);
+            set.add(Locale.JAPAN);
+            set.add(Locale.KOREA);
+            return set;
+        }
+    },
+
+    /**
+     * 需求反馈
+     */
+    NEED {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.CHINA);
+            set.add(Locale.US);
+            set.add(Locale.JAPAN);
+            set.add(Locale.KOREA);
+            return set;
+        }
+    },
+
+    /**
+     * BUG需求反馈
+     */
+    BUG_AND_NEED {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.TAIWAN);
+            return set;
+        }
+    },
+
+    /**
+     * 视频
+     */
+    VIDEO {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.US);
+            return set;
+        }
+    },
+
+    /**
+     * 技术支持-帮助菜单下
+     */
+    TECH_SUPPORT_HELP {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.US);
+            return set;
+        }
+    },
+
+    /**
+     * 技术支持-社区菜单下
+     */
+    TECH_SUPPORT_COMMUNITY {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.TAIWAN);
+            return set;
+        }
+    },
+
+    /**
+     * 帮助文档-帮助菜单下
+     */
+    TUTORIAL_HELP {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.US);
+            set.add(Locale.KOREA);
+            set.add(Locale.JAPAN);
+            return set;
+        }
+    },
+
+    /**
+     * 帮助文档-社区菜单下
+     */
+    TUTORIAL_COMMUNITY {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<Locale>();
+            set.add(Locale.CHINA);
+            set.add(Locale.TAIWAN);
+            return set;
+        }
     }
 
 

designer-base/src/main/java/com/fr/design/locale/impl/TechSupportMark.java

@@ -0,0 +1,30 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.CloudCenter;
+import com.fr.general.GeneralContext;
+import com.fr.general.locale.LocaleMark;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/7/29
+ */
+public class TechSupportMark implements LocaleMark<String> {
+    private Map<Locale, String> map = new HashMap<>();
+    private static final String EN_TECH_SUPPORT = CloudCenter.getInstance().acquireUrlByKind("bbs.tech.support.en_US");
+    private static final String TW_TECH_SUPPORT = CloudCenter.getInstance().acquireUrlByKind("bbs.tech.support.zh_TW");
+
+    public TechSupportMark() {
+        map.put(Locale.US, EN_TECH_SUPPORT);
+        map.put(Locale.TAIWAN, TW_TECH_SUPPORT);
+    }
+
+    @Override
+    public String getValue() {
+        String result = map.get(GeneralContext.getLocale());
+        return result == null ? EN_TECH_SUPPORT : result;
+    }
+}

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

@@ -328,6 +328,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
                 if (DesignModeContext.isAuthorityEditing()) {
                     doResize();
                 }
+                //刷新FixedPopupPane的位置
+                EastRegionContainerPane.getInstance().freshCurrentPopupPane();
             }
         });
         this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
@@ -972,6 +974,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 添加的模板.
      */
     public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        //切换文件后清空FixedPopupPane面板
+        EastRegionContainerPane.getInstance().clearCurrentPopupPane();
         //释放模板对象
         ActionFactory.editorRelease();
         if (jt == null || jt.getEditingFILE() == null) {
@@ -991,6 +995,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 模板
      */
     public void activateJTemplate(JTemplate<?, ?> jt) {
+        //切换文件后清空FixedPopupPane面板
+        EastRegionContainerPane.getInstance().clearCurrentPopupPane();
         //释放模板对象
         ActionFactory.editorRelease();
         if (jt == null || jt.getEditingFILE() == null) {
@@ -1101,7 +1107,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @date 2014-10-14-下午6:31:05
      */
     private void openFile(FILE tplFile) {
-
+        //切换文件后清空FixedPopupPane面板
+        EastRegionContainerPane.getInstance().clearCurrentPopupPane();
         if (tplFile != null) {
             int index = HistoryTemplateListCache.getInstance().contains(tplFile);
             if (index != -1) {

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

@@ -67,6 +67,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private JPanel leftPane;
     private JPanel rightPane;
     private FixedPopupPane currentPopupPane;
+    private UIButton currentButton;
     private static final int CONTAINER_WIDTH = containerWidth();
     private static final int TAB_WIDTH = 38;
     private static final int TAB_BUTTON_WIDTH = 32;
@@ -929,6 +930,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             } else {
                 hideCurrentPopupPane();
                 currentPopupPane = popupPane;
+                currentButton = button;
                 GUICoreUtils.showPopupMenu(popupPane, button, -popupPane.getPreferredSize().width, 0);
             }
         }
@@ -1009,6 +1011,35 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
     }
 
+    /**
+     * @Description:刷新currentPopupPane面板位置，当设计器缩放时会调用这个函数
+     * @param
+     * @return:
+     * @Author: Henry.Wang
+     * @date: 2020/7/30 11:39
+     */
+    public void freshCurrentPopupPane() {
+        if (currentPopupPane != null && currentPopupPane.isVisible()) {
+            hideCurrentPopupPane();
+            if (currentButton != null && !isRightPaneVisible()) {
+                GUICoreUtils.showPopupMenu(currentPopupPane, currentButton, -currentPopupPane.getPreferredSize().width, 0);
+            }
+        }
+    }
+
+    /**
+     * @Description:清空currentPopupPane数据，当切换模板时会调用这个函数
+     * @param
+     * @return:
+     * @Author: Henry.Wang
+     * @date: 2020/7/30 11:42
+     */
+    public void clearCurrentPopupPane() {
+        hideCurrentPopupPane();
+        currentPopupPane = null;
+        currentButton = null;
+    }
+
     // 弹出属性面板的工具条
     private class PopupToolPane extends JPanel {
         private String title;

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

@@ -1,45 +1,27 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.ibutton.UIRadioButton;
-import com.fr.design.gui.ibutton.UISliderButton;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.islider.UISlider;
-import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.layout.TableLayout;
-import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
-
-
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.JFormattedTextField;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JRadioButton;
-import javax.swing.JSeparator;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.text.DefaultFormatterFactory;
+import javax.swing.text.AttributeSet;
-import javax.swing.text.NumberFormatter;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.PlainDocument;
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.FlowLayout;
-import java.awt.Font;
 import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
+import java.awt.event.KeyEvent;
-import java.awt.event.ItemListener;
+import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.math.BigDecimal;
 
@@ -51,72 +33,37 @@ public class JFormSliderPane extends JPanel {
     private static final double ONEPOINTEIGHT = 1.8;
     private static final int SIX = 6;
     private static final int TEN = 10;
-    private static final int ONE_EIGHT = 18;
-    private static final int FONT_SIZE = 12;
-    private static final int SPINNER_WIDTH = 45;
-    private static final int SPINNER_HEIGHT = 20;
     private static final int HALF_HUNDRED = 50;
     private static final int HUNDRED = 100;
     private static final int TWO_HUNDRED = 200;
-    private static final int THREE_HUNDRED = 300;
     private static final int FOUR_HUNDRED = 400;
-    private static final int DIALOG_WIDTH = 157;
-    private static final int DIALOG_HEIGHT = 172;
-    private static final int SLIDER_WIDTH = 220;
-    private static final int SLIDER_HEIGHT = 20;
     private static final int SHOWVALBUTTON_WIDTH = 40;
     private static final int SHOWVALBUTTON_HEIGHTH = 20;
-    private static final int SLIDER_GAP = 5;
+    private static final String SUFFIX = "%";
+    private static final String REGEX = "[\\d%]*";
     private static final int TOOLTIP_Y = 30;
     private static final Color BACK_COLOR = new Color(245, 245, 247);
     public int showValue = 100;
-    public double resolutionTimes = 1.0;
+    private UITextField showValField;
-    private UITextField showVal;
-    private JSpinner showValSpinner;
     private UISlider slider;
     private int times;
     private int sliderValue;
     private UIButton downButton;
     private UIButton upButton;
-    private UISliderButton showValButton;
-    private UIRadioButton twoHundredButton;
-    private UIRadioButton oneHundredButton;
-    private UIRadioButton sevenFiveButton;
-    private UIRadioButton fiveTenButton;
-    private UIRadioButton twoFiveButton;
-    private UIRadioButton selfAdaptButton;
-    private UIRadioButton customButton;
     //拖动条处理和button、直接输入不一样
     private boolean isButtonOrIsTxt = true;
-    //是否选中指定的几个缩放等级,避免触发不必要的事件
-    private boolean selectSpecified = false;
-    private FormPopupPane dialog;
-    private int upButtonX;
-    private JPanel dialogContentPanel;
 
 
     public JFormSliderPane() {
         this.setLayout(new BorderLayout());
         initSlider();
-        initShowValSpinner();
-        //MoMeak：控制只能输入10-400
-        JSpinner.NumberEditor editor = new JSpinner.NumberEditor(showValSpinner, "0");
-        showValSpinner.setEditor(editor);
-        JFormattedTextField textField = ((JSpinner.NumberEditor) showValSpinner.getEditor()).getTextField();
-        textField.setEditable(true);
-        DefaultFormatterFactory factory = (DefaultFormatterFactory) textField.getFormatterFactory();
-        NumberFormatter formatter = (NumberFormatter) factory.getDefaultFormatter();
-        formatter.setAllowsInvalid(false);
-
         initDownUpButton();
-        initShowValButton();
+        initShowValField();
-        initUIRadioButton();
-        initPane();
         JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
         panel.add(downButton);
         panel.add(slider);
         panel.add(upButton);
-        panel.add(showValButton);
+        panel.add(showValField);
         panel.setBackground(BACK_COLOR);
         this.add(panel, BorderLayout.NORTH);
     }
@@ -131,6 +78,7 @@ public class JFormSliderPane extends JPanel {
                 return new Point(event.getX(), event.getY() - TOOLTIP_Y);
             }
         };
+        slider.setValue(HALF_HUNDRED);
         slider.setUI(new JSliderPaneUI(slider));
         slider.addChangeListener(listener);
         slider.setPreferredSize(new Dimension(220, 20));
@@ -139,16 +87,6 @@ public class JFormSliderPane extends JPanel {
         slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Slider"));
     }
 
-    private void initShowValSpinner() {
-        showValSpinner = new UIBasicSpinner(new SpinnerNumberModel(HUNDRED, 0, FOUR_HUNDRED, 1)) {
-            public Point getToolTipLocation(MouseEvent event) {
-                return new Point(event.getX(), event.getY() - TOOLTIP_Y);
-            }
-        };
-        showValSpinner.setEnabled(true);
-        showValSpinner.addChangeListener(showValSpinnerChangeListener);
-        showValSpinner.setPreferredSize(new Dimension(SPINNER_WIDTH, SPINNER_HEIGHT));
-    }
 
     private void initDownUpButton() {
         downButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalDown20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverDown20.png")) {
@@ -173,128 +111,76 @@ public class JFormSliderPane extends JPanel {
         upButton.addActionListener(buttonActionListener);
     }
 
-    private void initShowValButton() {
+    private void initShowValField() {
-        showValButton = new UISliderButton(showValSpinner.getValue() + "%");
+        showValField = new UITextField(showValue + SUFFIX);
-        showValButton.setBackground(BACK_COLOR);
+        showValField.setBorderPainted(false);
-        showValButton.setBorderPainted(false);
+        showValField.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH));
-        showValButton.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH));
+        showValField.addKeyListener(new KeyListener() {
-        showValButton.addActionListener(showValButtonActionListener);
-        showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Grade"));
-    }
-
-    private void initUIRadioButton() {
-        twoHundredButton = new UIRadioButton("200%");
-        oneHundredButton = new UIRadioButton("100%");
-        sevenFiveButton = new UIRadioButton("75%");
-        fiveTenButton = new UIRadioButton("50%");
-        twoFiveButton = new UIRadioButton("25%");
-        selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Self_Adapt_Button"));
-        selfAdaptButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
-        customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Custom_Button"));
-        customButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
-        twoHundredButton.addItemListener(radioButtonItemListener);
-        oneHundredButton.addItemListener(radioButtonItemListener);
-        sevenFiveButton.addItemListener(radioButtonItemListener);
-        fiveTenButton.addItemListener(radioButtonItemListener);
-        twoFiveButton.addItemListener(radioButtonItemListener);
-        customButton.addItemListener(new ItemListener() {
             @Override
-            public void itemStateChanged(ItemEvent e) {
+            public void keyTyped(KeyEvent e) {
-                JRadioButton temp = (JRadioButton) e.getSource();
+
-                if (temp.isSelected()) {
-                    JFormattedTextField textField = ((JSpinner.NumberEditor) showValSpinner.getEditor()).getTextField();
-                    textField.requestFocus();
-                    textField.selectAll();
             }
+
+            @Override
+            public void keyPressed(KeyEvent e) {
+
+            }
+
+            @Override
+            public void keyReleased(KeyEvent evt) {
+                int code = evt.getKeyCode();
+
+                if (code == KeyEvent.VK_ENTER) {
+                    showValue = parseInputValue(showValField.getText());
+                    showValField.setText(showValue + SUFFIX);
+                    showValFieldChange();
+                }
+            }
+        });
+        showValField.setDocument(new PlainDocument() {
+            @Override
+            public void insertString(int offset, String s, AttributeSet a) throws BadLocationException {
+                if (!s.matches(REGEX)) {
+                    return;
+                }
+                super.insertString(offset, s, a);
             }
         });
 
-        ButtonGroup bg = new ButtonGroup();// 初始化按钮组
-        bg.add(twoHundredButton);// 加入按钮组
-        bg.add(oneHundredButton);
-        bg.add(sevenFiveButton);
-        bg.add(fiveTenButton);
-        bg.add(twoFiveButton);
-        bg.add(selfAdaptButton);
-        bg.add(customButton);
-        customButton.setSelected(true);
-    }
-
-    private void initPane() {
-        double p = TableLayout.PREFERRED;
-        double f = TableLayout.FILL;
-        double[] columnSize = {p, f};
-        double[] rowSize = {p, p, p, p, p, p, p, p};
-        UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce"));
-        upLabel.setOpaque(false);
-        JPanel septPane = new JPanel(new BorderLayout());
-        JSeparator sept = new JSeparator();
-        sept.setBackground(new Color(232, 232, 233));
-        septPane.add(sept, BorderLayout.NORTH);
-        septPane.setBorder(BorderFactory.createEmptyBorder(2, 5, 1, 10));
-        septPane.setBackground(BACK_COLOR);
-        twoHundredButton.setBackground(BACK_COLOR);
-        oneHundredButton.setBackground(BACK_COLOR);
-        sevenFiveButton.setBackground(BACK_COLOR);
-        fiveTenButton.setBackground(BACK_COLOR);
-        twoFiveButton.setBackground(BACK_COLOR);
-//        selfAdaptButton.setBackground(BACK_COLOR);
-        customButton.setBackground(BACK_COLOR);
-        Component[][] components = new Component[][]{
-                new Component[]{upLabel, null},
-                new Component[]{septPane, null},
-                new Component[]{twoHundredButton, null},
-                new Component[]{oneHundredButton, null},
-                new Component[]{sevenFiveButton, null},
-                new Component[]{fiveTenButton, null},
-                new Component[]{twoFiveButton, null},
-                new Component[]{customButton, createSpinnerPanel()}
-        };
-        dialogContentPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, LayoutConstants.VGAP_MEDIUM, 0);
-        dialogContentPanel.setBackground(BACK_COLOR);
-        dialogContentPanel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
     }
 
-    private JPanel createSpinnerPanel() {
+    private void showValFieldChange() {
-        JPanel spinnerPanel = new JPanel(new FlowLayout());
+        isButtonOrIsTxt = true;
-        spinnerPanel.add(showValSpinner);
+        showValue = getPreferredValue(showValue);
-        UILabel percent = new UILabel("%");
+        refreshShowValueFieldText();
-        percent.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE));
+        refreshSlider();
-        spinnerPanel.add(percent);
-        spinnerPanel.setBackground(BACK_COLOR);
-        return spinnerPanel;
     }
 
-    private ActionListener showValButtonActionListener = new ActionListener() {
+    private int getPreferredValue(int value){
-        @Override
+        if (value > FOUR_HUNDRED) {
-        public void actionPerformed(ActionEvent e) {
+            value = FOUR_HUNDRED;
-            popupDialog();
+        }
+        if (value < TEN) {
+            value = TEN;
+        }
+        return value;
     }
-    };
 
-    private ChangeListener showValSpinnerChangeListener = new ChangeListener() {
+    private void refreshShowValueFieldText(){
-        @Override
+        showValField.setText(showValue + SUFFIX);
-        public void stateChanged(ChangeEvent e) {
-            int val = (int) ((UIBasicSpinner) e.getSource()).getValue();
-            isButtonOrIsTxt = true;
-            resolutionTimes = divide(showValue, 100, 2);
-            if (val > FOUR_HUNDRED) {
-                showValSpinner.setValue(FOUR_HUNDRED);
-                val = FOUR_HUNDRED;
     }
-            if (val < TEN) {
+
-                showValSpinner.setValue(TEN);
+    private int parseInputValue(String text){
-                val = TEN;
+        if (text.endsWith(SUFFIX)){
+            text = text.substring(0, text.length() -1);
         }
-            refreshSlider(val);
+        try{
-            refreshBottun(val);
+            return Integer.parseInt(text);
-            JFormattedTextField textField = ((JSpinner.NumberEditor) showValSpinner.getEditor()).getTextField();
+        }catch (NumberFormatException e){
-            textField.setCaretPosition(showValSpinner.getValue().toString().length());
+            return HUNDRED;
-            if (!selectSpecified) {
-                customButton.setSelected(true);
         }
     }
-    };
+
 
 
     //定义一个监听器，用于监听所有滑动条
@@ -302,13 +188,12 @@ public class JFormSliderPane extends JPanel {
         public void stateChanged(ChangeEvent event) {
             //取出滑动条的值，并在文本中显示出来
             if (!isButtonOrIsTxt) {
-                customButton.setSelected(true);
                 EventQueue.invokeLater(new Runnable() {
                     public void run() {
                         sliderValue = slider.getValue();
                         getTimes(sliderValue);
                         showValue = times;
-                        showValSpinner.setValue(times);
+                        refreshShowValueFieldText();
                     }
                 });
             } else {
@@ -317,41 +202,23 @@ public class JFormSliderPane extends JPanel {
         }
     };
 
-    private ItemListener radioButtonItemListener = new ItemListener() {
-        @Override
-        public void itemStateChanged(ItemEvent e) {
-            JRadioButton temp = (JRadioButton) e.getSource();
-            if (temp.isSelected()) {
-                selectSpecified = true;
-                showValSpinner.setValue(Integer.valueOf(temp.getText().substring(0, temp.getText().indexOf("%"))));
-                selectSpecified = false;
-            }
-        }
-    };
 
-    private void refreshSlider(int val) {
+    private void refreshSlider() {
-        showValue = val;
+        slider.setValue(calSliderValue(showValue));
-        if (showValue > HUNDRED) {
-            slider.setValue((int) (showValue + TWO_HUNDRED) / SIX);
-        } else if (showValue < HUNDRED) {
-            slider.setValue((int) ((showValue - TEN) / ONEPOINTEIGHT));
-        } else {
-            slider.setValue(HALF_HUNDRED);
-        }
     }
 
-
+    private int calSliderValue(int value) {
-    private void refreshBottun(int val) {
+        int result;
-        showValButton.setText(val + "%");
+        if (value > HUNDRED) {
+            result = (value + TWO_HUNDRED) / SIX;
+        } else if (value < HUNDRED) {
+            result = (int) ((value - TEN) / ONEPOINTEIGHT);
+        } else {
+            result = HALF_HUNDRED;
         }
-
+        return result;
-    public double getResolutionTimes() {
-        return this.resolutionTimes;
     }
 
-    public int getshowValue() {
-        return this.showValue;
-    }
 
     public static double divide(double v1, double v2, int scale) {
         BigDecimal b1 = new BigDecimal(Double.toString(v1));
@@ -362,30 +229,28 @@ public class JFormSliderPane extends JPanel {
     private ActionListener buttonActionListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
-            showValue = (int) showValSpinner.getValue();
             isButtonOrIsTxt = true;
             if ("less".equals(e.getActionCommand())) {
                 int newDownVal = showValue - TEN;
                 if (newDownVal >= TEN) {
                     showValue = newDownVal;
-                    showValSpinner.setValue(newDownVal);
                 } else {
-                    showValue = newDownVal;
+                    showValue = TEN;
-                    showValSpinner.setValue(TEN);
                 }
+                refreshShowValueFieldText();
+                refreshSlider();
             }
             if ("more".equals(e.getActionCommand())) {
                 int newUpVal = showValue + TEN;
                 if (newUpVal <= FOUR_HUNDRED) {
                     showValue = newUpVal;
-                    showValSpinner.setValue(newUpVal);
                 } else {
-                    showValue = newUpVal;
+                    showValue = TEN;
-                    showValSpinner.setValue(FOUR_HUNDRED);
                 }
+                refreshShowValueFieldText();
+                refreshSlider();
             }
             isButtonOrIsTxt = true;
-            customButton.setSelected(true);
         }
     };
 
@@ -396,37 +261,26 @@ public class JFormSliderPane extends JPanel {
         } else if (value < HALF_HUNDRED) {
             times = (int) Math.round(ONEPOINTEIGHT * value + TEN);
         } else {
-            times = (int) (SIX * value - TWO_HUNDRED);
+            times = SIX * value - TWO_HUNDRED;
         }
     }
 
 
-    public JSpinner getShowVal() {
+    public int getShowValue() {
-        return this.showValSpinner;
+        return this.showValue;
     }
 
-    public UIRadioButton getSelfAdaptButton() {
+    public void setShowValue(int value) {
-        return this.selfAdaptButton;
+        showValue = value;
+        showValFieldChange();
     }
 
-    private void popupDialog() {
+
-        Point btnCoords = upButton.getLocationOnScreen();
+    public void addValueChangeListener(ChangeListener changeListener){
-        if (dialog == null) {
+        this.slider.addChangeListener(changeListener);
-            dialog = new FormPopupPane(upButton, dialogContentPanel);
-            if (upButtonX == 0) {
-                upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
-            }
-        } else {
-            if (upButtonX == 0) {
-                upButtonX = btnCoords.x;
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
-            } else {
-                GUICoreUtils.showPopupMenu(dialog, upButton, -DIALOG_WIDTH + upButton.getWidth() + SHOWVALBUTTON_WIDTH, -DIALOG_HEIGHT);
-            }
-        }
     }
 
+
     public static void main(String[] args) {
         JFrame jf = new JFrame("test");
         jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -440,16 +294,3 @@ public class JFormSliderPane extends JPanel {
     }
 }
 
-
-class FormPopupPane extends JPopupMenu {
-    private static final int DIALOG_WIDTH = 157;
-    private static final int DIALOG_HEIGHT = 172;
-
-    FormPopupPane(UIButton b, JPanel dialogContentPanel) {
-        this.add(dialogContentPanel, BorderLayout.CENTER);
-        this.setPreferredSize(new Dimension(DIALOG_WIDTH, DIALOG_HEIGHT));
-        this.setBackground(new Color(245, 245, 247));
-    }
-
-
-}

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

@@ -8,6 +8,7 @@ import com.fr.design.ui.util.UIUtil;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.log.Log4jConfig;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
 import com.fr.third.apache.log4j.Level;
 import com.fr.third.apache.log4j.spi.LoggingEvent;
 import com.fr.third.apache.log4j.spi.ThrowableInformation;
@@ -53,12 +54,14 @@ public class DesignerLogHandler {
 
     private static final int SERVER_GAP_Y = -20;
 
-    private static final String ERROR_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":";
+    private static final String ERROR_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":";
 
-    private static final String WARN_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":";
+    private static final String WARN_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":";
 
     private static final String NORMAL_MARK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Normal") + ":";
 
+    private static final String ACTION_MAP_KEY = "clear";
+
     public static DesignerLogHandler getInstance() {
 
         return HOLDER.singleton;
@@ -223,14 +226,14 @@ public class DesignerLogHandler {
             InputMap inputMap = resultPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
             inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER), DefaultEditorKit.copyAction);
             inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, DEFAULT_MODIFIER), DefaultEditorKit.selectAllAction);
-            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, DEFAULT_MODIFIER), "clear");
+            inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, DEFAULT_MODIFIER), ACTION_MAP_KEY);
             ActionMap actionMap = resultPane.getActionMap();
-            actionMap.put("clear", new AbstractAction() {
+            actionMap.put(ACTION_MAP_KEY, new AbstractAction() {
 
                 @Override
                 public void actionPerformed(ActionEvent evt) {
 
-                    resultPane.setText("");
+                    resultPane.setText(StringUtils.EMPTY);
                     caption.clearMessage();
                 }
             });
@@ -293,10 +296,10 @@ public class DesignerLogHandler {
 
             SimpleAttributeSet attrSet = new SimpleAttributeSet();
             if (style == DesignerLogger.ERROR_INT) {
-                StyleConstants.setForeground(attrSet, new Color(247, 148, 29));
+                StyleConstants.setForeground(attrSet, Color.RED);
                 StyleConstants.setBold(attrSet, true);
             } else if (style == DesignerLogger.WARN_INT) {
-                StyleConstants.setForeground(attrSet, Color.red);
+                StyleConstants.setForeground(attrSet, new Color(247, 148, 29));
                 StyleConstants.setBold(attrSet, true);
             } else if (style == DesignerLogger.INFO_INT) {
                 StyleConstants.setForeground(attrSet, Color.black);
@@ -330,9 +333,9 @@ public class DesignerLogHandler {
             LogMessageBar.getInstance().setMessage(message);
             if (level == DesignerLogger.INFO_INT && showInfo.isSelected()) {
                 caption.infoAdd();
-            } else if (level == DesignerLogger.ERROR_INT && showError.isSelected()) {
+            } else if (level == DesignerLogger.WARN_INT && showError.isSelected()) {
                 caption.errorAdd();
-            } else if (level == DesignerLogger.WARN_INT && showServer.isSelected()) {
+            } else if (level == DesignerLogger.ERROR_INT && showServer.isSelected()) {
                 caption.serverAdd();
             }
         }
@@ -343,7 +346,7 @@ public class DesignerLogHandler {
             this.copy.setEnabled(true);
             this.clear.setEnabled(true);
 
-            if (ComparatorUtils.equals(this.jTextArea.getText(), "")) {
+            if (ComparatorUtils.equals(this.jTextArea.getText(), StringUtils.EMPTY)) {
                 this.selectAll.setEnabled(false);
                 this.clear.setEnabled(false);
             }
@@ -367,7 +370,7 @@ public class DesignerLogHandler {
                 } else if (ComparatorUtils.equals(evt.getActionCommand(), LogHandlerArea.this.copy.getText())) {
                     LogHandlerArea.this.jTextArea.copy();
                 } else if (ComparatorUtils.equals(evt.getActionCommand(), LogHandlerArea.this.clear.getText())) {
-                    LogHandlerArea.this.jTextArea.setText("");
+                    LogHandlerArea.this.jTextArea.setText(StringUtils.EMPTY);
                     caption.clearMessage();
                 }
             }

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

@@ -11,12 +11,14 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.community.BBSAction;
 import com.fr.design.actions.community.BugAction;
+import com.fr.design.actions.community.BugNeedAction;
 import com.fr.design.actions.community.CenterAction;
 import com.fr.design.actions.community.FacebookFansAction;
 import com.fr.design.actions.community.NeedAction;
 import com.fr.design.actions.community.QuestionAction;
 import com.fr.design.actions.community.SignAction;
 import com.fr.design.actions.community.TechSolutionAction;
+import com.fr.design.actions.community.TechSupportAction;
 import com.fr.design.actions.community.VideoAction;
 import com.fr.design.actions.file.CloseCurrentTemplateAction;
 import com.fr.design.actions.file.ExitDesignerAction;
@@ -529,11 +531,30 @@ public abstract class ToolBarMenuDock {
      */
     public ShortCut[] createHelpShortCuts() {
         final java.util.List<ShortCut> shortCuts = new ArrayList<ShortCut>();
-        // 英文，把 video 和帮助文档放到 Help 下面
+
-        if (GeneralContext.getLocale().equals(Locale.US)) {
+        Locale locale = GeneralContext.getLocale();
+
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
                 shortCuts.add(new VideoAction());
+            }
+        }, SupportLocaleImpl.VIDEO);
+
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
                 shortCuts.add(new TutorialAction());
             }
+        }, SupportLocaleImpl.TUTORIAL_HELP);
+
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
+                shortCuts.add(new TechSupportAction());
+            }
+        }, SupportLocaleImpl.TECH_SUPPORT_HELP);
+
         //远程不使用更新升级，产品演示
         if (WorkContext.getCurrent().isLocal()) {
             shortCuts.add(new WebDemoAction());
@@ -571,14 +592,44 @@ public abstract class ToolBarMenuDock {
         shortCuts.add(SeparatorDef.DEFAULT);
         
         shortCuts.add(new VideoAction());
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
                 shortCuts.add(new TutorialAction());
+            }
+        }, SupportLocaleImpl.TUTORIAL_COMMUNITY);
         shortCuts.add(new QuestionAction());
         shortCuts.add(new TechSolutionAction());
         
         shortCuts.add(SeparatorDef.DEFAULT);
 
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
                 shortCuts.add(new BugAction());
+            }
+        }, SupportLocaleImpl.BUG);
+
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
                 shortCuts.add(new NeedAction());
+            }
+        }, SupportLocaleImpl.NEED);
+
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
+                shortCuts.add(new BugNeedAction());
+            }
+        }, SupportLocaleImpl.BUG_AND_NEED);
+
+        LocaleCenter.buildAction(new LocaleAction() {
+            @Override
+            public void execute() {
+                shortCuts.add(new TechSupportAction());
+            }
+        }, SupportLocaleImpl.TECH_SUPPORT_COMMUNITY);
         
         shortCuts.add(SeparatorDef.DEFAULT);
         

designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsCacheFileNodeFile.java

@@ -1,5 +1,6 @@
 package com.fr.design.mainframe.vcs.common;
 
+import com.fr.io.FineEncryptUtils;
 import com.fr.base.io.XMLEncryptUtils;
 import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
@@ -48,7 +49,7 @@ public class VcsCacheFileNodeFile extends FileNodeFILE {
         );
 
         return envPath.endsWith(".cpt") || envPath.endsWith(".frm")
-                ? XMLEncryptUtils.decodeInputStream(in) : in;
+                ? XMLEncryptUtils.decodeInputStream(FineEncryptUtils.decode(in)) : in;
     }
 
 

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

@@ -1,5 +1,6 @@
 package com.fr.file;
 
+import com.fr.io.FineEncryptUtils;
 import com.fr.base.io.XMLEncryptUtils;
 import com.fr.design.gui.itree.filetree.FileComparator;
 import com.fr.design.gui.itree.filetree.FileTreeIcon;
@@ -186,7 +187,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(EncryptUtils.decodeInputStream(in)) : in;
+                ? XMLEncryptUtils.decodeInputStream(EncryptUtils.decodeInputStream(FineEncryptUtils.decode(in))) : in;
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.fr.file;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
+import com.fr.io.FineEncryptUtils;
 import com.fr.base.io.XMLEncryptUtils;
 import com.fr.design.file.NodeAuthProcessor;
 import com.fr.design.gui.itree.filetree.FileNodeComparator;
@@ -388,7 +389,7 @@ public class FileNodeFILE implements FILE {
         );
 
         return envPath.endsWith(".cpt") || envPath.endsWith(".frm")
-                ? XMLEncryptUtils.decodeInputStream(EncryptUtils.decodeInputStream(in)) : in;
+                ? XMLEncryptUtils.decodeInputStream(EncryptUtils.decodeInputStream(FineEncryptUtils.decode(in))) : in;
     }
 
     /**

designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java

@@ -2,12 +2,18 @@ package com.fr.start.server;
 
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.gui.iprogressbar.ProgressDialog;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.locale.impl.SupportLocaleImpl;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
 import com.fr.event.Null;
+import com.fr.general.FRFont;
+import com.fr.general.locale.LocaleAction;
+import com.fr.general.locale.LocaleCenter;
 
+import javax.swing.plaf.ColorUIResource;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -27,6 +33,11 @@ public class FineEmbedServerMonitor {
     private static final int STEP_HEARTBEAT = 40;
     private static volatile FineEmbedServerMonitor monitor;
     private static ProgressDialog progressBar = DesignerContext.getDesignerFrame().getProgressDialog();
+    //由于默认值的字体不支持韩文，所以要对韩文单独生成字体
+    private FRFont font = null;
+    private static final int FONT_RGB = 333334;
+    private static final int FONT_SIZE = 14;
+    private static final String FONT_NAME = "Dialog";
 
     private FineEmbedServerMonitor() {
     }
@@ -86,8 +97,15 @@ public class FineEmbedServerMonitor {
                 }
                 if (!DesignerContext.getDesignerFrame().getProgressDialog().isVisible()) {
                     DesignerContext.getDesignerFrame().showProgressDialog();
-                    DesignerContext.getDesignerFrame().getProgressDialog()
+                    //如果为韩文则改变字体
-                            .updateLoadingText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server"));
+                    LocaleCenter.buildAction(new LocaleAction() {
+                        @Override
+                        public void execute() {
+                            font = FRFont.getInstance().applySize(FONT_SIZE).applyForeground(new ColorUIResource(FONT_RGB)).applyName(FONT_NAME);
+                        }
+                    }, SupportLocaleImpl.SUPPORT_KOREA);
+                    String text = Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server");
+                    DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text, font);
                 }
                 DesignerContext.getDesignerFrame().updateProgress(getProgress());
             }

designer-base/src/test/java/com/fr/design/mainframe/JFormSliderPaneTest.java

@@ -0,0 +1,51 @@
+package com.fr.design.mainframe;
+
+import com.fr.invoke.Reflect;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Created by kerry on 2020-07-28
+ */
+public class JFormSliderPaneTest {
+
+    @Test
+    public void testParseInputValue() {
+        JFormSliderPane sliderPane = new JFormSliderPane();
+        int result = Reflect.on(sliderPane).call("parseInputValue", "100%").get();
+        Assert.assertEquals(100, result);
+        result = Reflect.on(sliderPane).call("parseInputValue", "50%").get();
+        Assert.assertEquals(50, result);
+        result = Reflect.on(sliderPane).call("parseInputValue", "50").get();
+        Assert.assertEquals(50, result);
+        result = Reflect.on(sliderPane).call("parseInputValue", "50abc").get();
+        Assert.assertEquals(100, result);
+    }
+
+    @Test
+    public void testGetPreferredValue() {
+        JFormSliderPane sliderPane = new JFormSliderPane();
+        int result = Reflect.on(sliderPane).call("getPreferredValue", 100).get();
+        Assert.assertEquals(100, result);
+        result = Reflect.on(sliderPane).call("getPreferredValue", 0).get();
+        Assert.assertEquals(10, result);
+        result = Reflect.on(sliderPane).call("getPreferredValue", 1000).get();
+        Assert.assertEquals(400, result);
+    }
+
+    @Test
+    public void testCalSliderValue() {
+        JFormSliderPane sliderPane = new JFormSliderPane();
+        int result = Reflect.on(sliderPane).call("calSliderValue", 10).get();
+        Assert.assertEquals(0, result);
+        result = Reflect.on(sliderPane).call("calSliderValue", 90).get();
+        Assert.assertEquals(44, result);
+        result = Reflect.on(sliderPane).call("calSliderValue", 100).get();
+        Assert.assertEquals(50, result);
+        result = Reflect.on(sliderPane).call("calSliderValue", 200).get();
+        Assert.assertEquals(66, result);
+        result = Reflect.on(sliderPane).call("calSliderValue", 400).get();
+        Assert.assertEquals(100, result);
+
+    }
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java

@@ -13,21 +13,20 @@ import com.fr.design.formula.TinyFormulaPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
-
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Color;
 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;
 
 
 /**
@@ -72,14 +71,14 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor
 
 		catePane.add(boxPane, BorderLayout.SOUTH);
 
-		catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,6));
+		catePane.setBorder(BorderFactory.createEmptyBorder(0,24,10,20));
 
 		this.add(catePane, "0,0,2,0");
 		filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
 		JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
 		panel.setBorder(getSidesBorder());
 		filterPane.setBorder(getFilterPaneBorder());
-		this.add(panel, "0,6,2,4");
+		this.add(panel, "0,6,1,4");
 
 		addButton.addActionListener(new ActionListener() {
 			@Override

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@@ -11,7 +11,6 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
-
 import com.fr.stable.StringUtils;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 
@@ -19,9 +18,9 @@ import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.util.List;
 
 public class CategoryPlotReportDataContentPane extends AbstractReportDataContentPane {
 	protected static final int PRE_WIDTH = 210;
@@ -35,16 +34,28 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
 
     public CategoryPlotReportDataContentPane(ChartDataPane parent) {
         initEveryPane();
+<<<<<<< HEAD
         categoryName = initCategoryBox(Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
         categoryName.setPreferredSize(new Dimension(246,30));
         categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7));
         this.add(categoryName, "0,0,2,0");
+=======
+        categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
+        categoryName.setPreferredSize(new Dimension(236,30));
+        categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,20));
+        this.add(categoryName, "0,0,1,0");
+>>>>>>> e4e801e2792ee3f3f6cef022e6c646ff7ec97091
         filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
         JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), filterPane);
         panel.setBorder(getSidesBorder());
         filterPane.setBorder(getFilterPaneBorder());
+<<<<<<< HEAD
         this.add(panel, "0,6,2,4");    }
 
+=======
+        this.add(panel, "0,6,1,4");    }
+    
+>>>>>>> e4e801e2792ee3f3f6cef022e6c646ff7ec97091
 	protected TinyFormulaPane initCategoryBox(final String leftLabel) {
 		TinyFormulaPane categoryName = new TinyFormulaPane() {
             @Override

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java

@@ -24,6 +24,8 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JTable;
 import javax.swing.event.ChangeEvent;
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Container;
@@ -31,8 +33,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 属性表 数据集界面: 系列名 使用字段名.
@@ -129,7 +129,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
      * @return 标题
      */
     public String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Name");
+        return Toolkit.i18nText("Fine-Design_Basic_Chart_Field_Name");
     }
 
     /**

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java

@@ -14,15 +14,16 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.extended.chart.UIComboBoxWithNone;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.List;
 
 /**
  * 属性表 数据集 系列名使用 系列值  界面.
@@ -38,7 +39,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
     private boolean isNeedSummary = true;
 
     public SeriesNameUseFieldValuePane() {
-        seriesName = new UIComboBox();
+        seriesName = new UIComboBoxWithNone();
         seriesValue = new UIComboBox();
         calculateCombox = new CalculateComboBox();
         calculateCombox.reset();
@@ -184,7 +185,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
      * @return 界面标题
      */
     public String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Chart_Enable_Field_Value");
+        return Toolkit.i18nText("Fine-Design_Chart_Field_Value");
     }
 
     /**

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesTypeUseComboxPane.java

@@ -5,24 +5,25 @@ import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartdata.MoreNameCDDefinition;
 import com.fr.chart.chartdata.OneValueCDDefinition;
-import com.fr.design.beans.FurtherBasicBeanPane;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
-import com.fr.design.gui.frpane.UIComboBoxPane;
+import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.design.utils.gui.UIComponentUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import java.util.ArrayList;
 import java.util.List;
 import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * 属性表: 柱形, 饼图 数据集界面, "系列名使用"界面.
@@ -30,7 +31,7 @@ import java.awt.Dimension;
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2012-12-26 下午03:17:08
  */
-public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
+public class SeriesTypeUseComboxPane extends BasicBeanPane<ChartCollection> {
 
     private SeriesNameUseFieldValuePane nameFieldValuePane;
     private SeriesNameUseFieldNamePane nameFieldNamePane;
@@ -39,50 +40,100 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
 
     private ChartDataPane parent;
     private Plot initplot;
-    private boolean isNeedSummary = true;
+    private boolean isNeedSummary;
+
+    protected UIButtonGroup<Integer> content;
+    protected JPanel cardPane;
 
     public SeriesTypeUseComboxPane(ChartDataPane parent, Plot initplot) {
         this.initplot = initplot;
         this.parent = parent;
-        cards = initPaneList();
         this.isNeedSummary = true;
         initComponents();
     }
 
+    protected void initComponents() {
+        nameFieldValuePane = createValuePane();
+        nameFieldNamePane = createNamePane();
+
+        cardPane = new JPanel(new CardLayout()) {
+            @Override
+            public Dimension getPreferredSize() {
+                if (content.getSelectedIndex() == 0) {
+                    return nameFieldValuePane.getPreferredSize();
+                } else {
+                    return nameFieldNamePane.getPreferredSize();
+                }
+            }
+        };
+        cardPane.add(nameFieldValuePane, nameFieldValuePane.title4PopupWindow());
+        cardPane.add(nameFieldNamePane, nameFieldNamePane.title4PopupWindow());
+
+        content = new UIButtonGroup<>(new String[]{nameFieldValuePane.title4PopupWindow(), nameFieldNamePane.title4PopupWindow()});
+
+        addItemChangeEvent();
+
+        initLayout();
+        content.setSelectedIndex(0);
+    }
+
+    private void addItemChangeEvent() {
+        content.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                checkCardPane();
+
+            }
+        });
+    }
+
+    protected void checkCardPane() {
+        comboBoxItemStateChanged();
+        CardLayout cl = (CardLayout) cardPane.getLayout();
+        if (content.getSelectedIndex() == 0) {
+            cl.show(cardPane, nameFieldValuePane.title4PopupWindow());
+        } else {
+            cl.show(cardPane, nameFieldNamePane.title4PopupWindow());
+        }
+    }
+
     protected void initLayout() {
         this.setLayout(new BorderLayout(4, LayoutConstants.VGAP_MEDIUM));
         JPanel northPane = new JPanel(new BorderLayout(4, 0));
-        UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
+        UILabel label1 = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Series_Name_From"));
         label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT));
-        northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
+        JPanel borderLayoutPane = GUICoreUtils.createBorderLayoutPane(new Component[]{content, null, null, label1, null});
+        northPane.add(borderLayoutPane);
         northPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 0, 15));
         cardPane.setBorder(BorderFactory.createEmptyBorder(0, 24, 0, 15));
         this.add(northPane, BorderLayout.NORTH);
         this.add(cardPane, BorderLayout.CENTER);
         dataScreeningPane = new ChartDataFilterPane(this.initplot, parent);
-        JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 290, 24, dataScreeningPane);
+        JPanel panel = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"), 250, 24, dataScreeningPane);
-        panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
+        panel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 15));
-        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5));
+        dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         this.add(panel, BorderLayout.SOUTH);
     }
 
-    protected UIComboBox createComboBox() {
+    public Dimension getPreferredSize() {
-        UIComboBox uiComboBox = new UIComboBox();
+        Dimension preferredSize = super.getPreferredSize();
-        UIComponentUtils.setPreferedWidth(uiComboBox, 100);
+        return new Dimension(260, (int) preferredSize.getHeight());
-        return uiComboBox;
     }
+
     /**
      * 检查box 是否使用, hasUse, 表示上层已经使用, 否则, 则此界面都可使用
+     *
      * @param hasUse 是否使用
      */
     public void checkUseBox(boolean hasUse) {
-        jcb.setEnabled(hasUse);
+        content.setEnabled(hasUse);
         nameFieldValuePane.checkUse(hasUse);
         dataScreeningPane.checkBoxUse();
     }
 
     /**
      * 切换 变更数据集时, 刷新Box选中项目
+     *
      * @param list 列表
      */
     public void refreshBoxListWithSelectTableData(List list) {
@@ -93,28 +144,20 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
     /**
      * 清空所有的box设置
      */
-    public void clearAllBoxList(){
+    public void clearAllBoxList() {
         nameFieldValuePane.clearAllBoxList();
         nameFieldNamePane.clearAllBoxList();
     }
 
     /**
      * 界面标题
+     *
      * @return 界面标题
      */
     protected String title4PopupWindow() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name_From");
     }
 
-    @Override
-    protected List<FurtherBasicBeanPane<? extends ChartCollection>> initPaneList() {
-        nameFieldValuePane = createValuePane();
-        nameFieldNamePane = createNamePane();
-        List<FurtherBasicBeanPane<? extends ChartCollection>> paneList = new ArrayList<FurtherBasicBeanPane<? extends ChartCollection>>();
-        paneList.add(nameFieldValuePane);
-        paneList.add(nameFieldNamePane);
-        return paneList;
-    }
 
     protected SeriesNameUseFieldValuePane createValuePane() {
         return new SeriesNameUseFieldValuePane();
@@ -135,15 +178,17 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
             nameFieldNamePane.populateBean(ob, isNeedSummary);
         }
         dataScreeningPane.populateBean(ob, isNeedSummary);
+        checkCardPane();
     }
 
     /**
      * 重新布局整个面板
+     *
      * @param isNeedSummary 是否需要汇总
      */
     public void relayoutPane(boolean isNeedSummary) {
         this.isNeedSummary = isNeedSummary;
-        if (jcb.getSelectedIndex() == 0) {
+        if (this.getSelectedIndex() == 0) {
             nameFieldValuePane.relayoutPane(this.isNeedSummary);
         } else {
             nameFieldNamePane.relayoutPane(this.isNeedSummary);
@@ -152,9 +197,8 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
     }
 
 
-    @Override
     protected void comboBoxItemStateChanged() {
-        if (jcb.getSelectedIndex() == 0) {
+        if (this.getSelectedIndex() == 0) {
             nameFieldValuePane.relayoutPane(this.isNeedSummary);
         } else {
             nameFieldNamePane.relayoutPane(this.isNeedSummary);
@@ -178,4 +222,21 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane<ChartCollection> {
         dataScreeningPane.updateBean(ob);
     }
 
+    /**
+     * 保存数据
+     *
+     * @return 待保存的对象
+     */
+    public ChartCollection updateBean() {
+        return null;
+    }
+
+
+    public int getSelectedIndex() {
+        return content.getSelectedIndex();
+    }
+
+    public void setSelectedIndex(int index) {
+        content.setSelectedIndex(index);
+    }
 }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ThirdTabPane.java

@@ -10,6 +10,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
 
 import javax.swing.JPanel;
 import javax.swing.border.Border;
+import java.util.List;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
@@ -20,7 +21,6 @@ import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.List;
 
 
 public abstract class ThirdTabPane<T> extends BasicBeanPane<T>{
@@ -74,16 +74,6 @@ public abstract class ThirdTabPane<T> extends BasicBeanPane<T>{
 		}
 	}
 
-	@Override
-	public void paint(Graphics g) {
-		super.paint(g);
-		if (!paneList.isEmpty()) {
-			Graphics2D g2d = (Graphics2D)g;
-			g2d.setColor(UIConstants.LINE_COLOR);
-			g2d.drawLine(getWidth() - 2, tabPane.getPreferredSize().height, getWidth() - 2, getHeight() - 1);
-		}
-	}
-
 	protected void initLayout() {
 		this.setLayout(new BorderLayout());
 		if (!paneList.isEmpty()) {

designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java

@@ -109,7 +109,7 @@ public class ExtendedOtherPane<T extends AbstractChart> extends AbstractChartAtt
             }
         });
 
-        autoRefreshTime = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
+        autoRefreshTime = createIntervalTime();
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double[] columnSize = {p, f, 20};
@@ -129,6 +129,10 @@ public class ExtendedOtherPane<T extends AbstractChart> extends AbstractChartAtt
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Refresh"), gapPane);
     }
 
+    protected UISpinner createIntervalTime() {
+        return new UISpinner(1, Integer.MAX_VALUE, 5, 60);
+    }
+
     private JPanel createHyperlinkPane() {
         hyperLinkPane = new ExtendedChartHyperLinkPane();
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperLinkPane);

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRBorderLayoutAdapter.java

@@ -35,16 +35,17 @@ public class FRBorderLayoutAdapter extends AbstractLayoutAdapter {
      * @param creator 组件
      */
     public void fix(XCreator creator) {
-        FRBorderLayout layout = (FRBorderLayout)container.getFRLayout();
+        FRBorderLayout layout = (FRBorderLayout) container.getFRLayout();
         Object constraints = layout.getConstraints(creator);
+        double scale = container.getScale();
         if (ComparatorUtils.equals(constraints, BorderLayout.NORTH)) {
-            ((XWBorderLayout)container).toData().setNorthSize(creator.getHeight());
+            ((XWBorderLayout) container).toData().setNorthSize((int) (creator.getHeight() / scale));
         } else if (ComparatorUtils.equals(constraints, BorderLayout.SOUTH)) {
-            ((XWBorderLayout)container).toData().setSouthSize(creator.getHeight());
+            ((XWBorderLayout) container).toData().setSouthSize((int) (creator.getHeight() / scale));
         } else if (ComparatorUtils.equals(constraints, BorderLayout.EAST)) {
-            ((XWBorderLayout)container).toData().setEastSize(creator.getWidth());
+            ((XWBorderLayout) container).toData().setEastSize((int) (creator.getWidth() / scale));
         } else if (ComparatorUtils.equals(constraints, BorderLayout.WEST)) {
-            ((XWBorderLayout)container).toData().setWestSize(creator.getWidth());
+            ((XWBorderLayout) container).toData().setWestSize((int) (creator.getWidth() / scale));
         } else {
             return;
         }

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

@@ -147,7 +147,7 @@ public class XButton extends XWidgetCreator {
                            public void propertyChange() {
                                FreeButton button = (FreeButton) data;
                                if (button.getFont() != null) {
-                                   contentLabel.setFont(button.getFont().applyResolutionNP(
+                                   setContentLabelFont(button.getFont().applyResolutionNP(
 										   FontTransformUtil.getDesignerFontResolution()));
                                    contentLabel.setForeground(button.getFont().getForeground());
                                }
@@ -230,7 +230,7 @@ public class XButton extends XWidgetCreator {
 		if (!button.isCustomStyle()) {
 			l.setBorder(BorderFactory.createLineBorder(new Color(148, 148, 148)));
 			bg = DEFAULTBG;
-            contentLabel.setFont(DEFAULTFT);
+            setContentLabelFont(DEFAULTFT);
             contentLabel.setForeground(DEFAULTFOREGROUNDCOLOR);
             editor.setLayout(new BorderLayout());
 			editor.add(l, BorderLayout.CENTER);
@@ -239,7 +239,7 @@ public class XButton extends XWidgetCreator {
 			editor.setLayout(new BorderLayout());
 			editor.add(l,BorderLayout.CENTER);
             if (button.getFont() != null) {
-                contentLabel.setFont(button.getFont().applyResolutionNP(
+                setContentLabelFont(button.getFont().applyResolutionNP(
 						FontTransformUtil.getDesignerFontResolution()));
                 contentLabel.setForeground(button.getFont().getForeground());
             }
@@ -302,11 +302,26 @@ public class XButton extends XWidgetCreator {
 		setButtonText(button.getText());
 		checkButonType();
 		if (button.getFont() != null) {
-			contentLabel.setFont(button.getFont().applyResolutionNP(
+			setContentLabelFont(button.getFont().applyResolutionNP(
 					FontTransformUtil.getDesignerFontResolution()));
 			contentLabel.setForeground(button.getFont().getForeground());
 		}
 
 	}
 
+	private void setContentLabelFont(Font font) {
+		float size = (float) (font.getSize() * getScale());
+		contentLabel.setFont(font.deriveFont(size));
+	}
+
+	public void setScale(double scale){
+		super.setScale(scale);
+		FreeButton button = (FreeButton) data;
+		if (button.getFont() != null) {
+			setContentLabelFont(button.getFont().applyResolutionNP(
+					FontTransformUtil.getDesignerFontResolution()));
+		}else {
+			setContentLabelFont(DEFAULTFT);
+		}
+	}
 }

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

@@ -49,6 +49,7 @@ import java.util.Set;
  *
  */
 public abstract class XCreator extends JPanel implements XComponent, XCreatorTools {
+	private double scale = 1.0;
 
 	protected static final Border DEFALUTBORDER = BorderFactory.createLineBorder(new Color(210, 210, 210), 1);
 	public static final Dimension SMALL_PREFERRED_SIZE = new Dimension(80, 21);
@@ -102,6 +103,14 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 		}
 	}
 
+	public double getScale() {
+		return scale;
+	}
+
+	public void setScale(double scale) {
+		this.scale = scale;
+	}
+
 	/**
 	 * 初始化组件大小
 	 */

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

@@ -17,6 +17,7 @@ import com.fr.design.mainframe.widget.renderer.LabelHorizontalAlignmentRenderer;
 import com.fr.form.ui.Label;
 import com.fr.form.ui.container.WParameterLayout;
 
+import com.fr.general.FRFont;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.core.PropertyChangeAdapter;
@@ -94,8 +95,11 @@ public class XLabel extends XWidgetCreator {
         }
         if (label.getWidgetValue() != null) {
             Graphics2D g2d = (Graphics2D) g.create();
+            FRFont font = label.getFont();
+            float fontsize = (float) (font.getSize() * this.getScale());
             BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), label.getWidgetValue()
-                            .toString(), Style.getInstance(label.getFont()).deriveHorizontalAlignment(label.getTextalign())
+                            .toString(), Style.getInstance(font.applySize(fontsize))
+                            .deriveHorizontalAlignment(label.getTextalign())
                             .deriveVerticalAlignment(label.isVerticalCenter() ? SwingConstants.CENTER : SwingConstants.TOP)
                             .deriveTextStyle(label.isWrap() ? Style.TEXTSTYLE_WRAPTEXT : Style.TEXTSTYLE_SINGLELINE),
                     FontTransformUtil.getDesignerFontResolution());

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

@@ -59,8 +59,10 @@ public class XTextArea extends XFieldEditor {
         TextArea area = (TextArea) data;
         if (area.getWidgetValue() != null) {
             Graphics2D g2d = (Graphics2D) g.create();
+            FRFont font = FRFont.getInstance();
+            float fontsize = (float) (font.getSize() * this.getScale());
             BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), area.getWidgetValue()
-                    .toString(), Style.getInstance(FRFont.getInstance()).deriveHorizontalAlignment(Constants.LEFT)
+                    .toString(), Style.getInstance(font.applySize(fontsize)).deriveHorizontalAlignment(Constants.LEFT)
                     .deriveVerticalAlignment(SwingConstants.TOP)
                     .deriveTextStyle(Style.TEXTSTYLE_WRAPTEXT), ScreenResolution.getScreenResolution());
         }

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

@@ -67,8 +67,10 @@ public class XTextEditor extends XWrapperedFieldEditor {
         TextEditor area = (TextEditor) data;
         if (area.getWidgetValue() != null) {
             Graphics2D g2d = (Graphics2D) g.create();
+            FRFont font = FRFont.getInstance();
+            float fontsize = (float) (font.getSize() * this.getScale());
             BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), area.getWidgetValue()
-                    .toString(), Style.getInstance(FRFont.getInstance()).deriveHorizontalAlignment(Constants.LEFT)
+                    .toString(), Style.getInstance(font.applySize(fontsize)).deriveHorizontalAlignment(Constants.LEFT)
                     .deriveTextStyle(Style.TEXTSTYLE_SINGLELINE), ScreenResolution.getScreenResolution());
         }
     }

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

@@ -30,6 +30,8 @@ import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WLayout;
+import com.fr.form.ui.container.WParameterLayout;
+import com.fr.form.ui.widget.CRBoundsWidget;
 import com.fr.general.FRScreen;
 import com.fr.general.IOUtils;
 
@@ -397,6 +399,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             return;
         }
         XWidgetCreator creator = (XWidgetCreator) e.getChild();
+        creator.setScale(this.getScale());
         WAbsoluteLayout wabs = this.toData();
         if (!creator.acceptType(XWFitLayout.class)) {
             creator.setDirections(Direction.ALL);
@@ -602,4 +605,17 @@ public class XWAbsoluteLayout extends XLayoutContainer {
             return super.getWidgetPropertyUIProviders();
         }
     }
+
+    public void adjustCompSize(double percent) {
+        double p = percent + 1;
+        WAbsoluteLayout absoluteLayout = this.toData();
+        for (int i = 0; i < this.getComponentCount(); i++) {
+            XCreator component = (XCreator) this.getComponent(i);
+            CRBoundsWidget boundsWidget = absoluteLayout.getBoundsWidget(component.toData());
+            Rectangle rec = new Rectangle(boundsWidget.getBounds());
+            component.adjustCompSize(percent);
+            component.setBounds((int) (rec.x * p), (int) (rec.y * p), (int) (rec.width * p), (int) (rec.height * p));
+        }
+    }
+
 }

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

@@ -126,14 +126,14 @@ public class XWBorderLayout extends XLayoutContainer {
         WBorderLayout wlayout = this.toData();
         Object constraints = wlayout.getConstraints(wgt);
         Dimension d = new Dimension();
-        if (ComparatorUtils.equals(WBorderLayout.NORTH,constraints)) {
+        if (ComparatorUtils.equals(WBorderLayout.NORTH, constraints)) {
-            d.height = wlayout.getNorthSize();
+            d.height = (int) (wlayout.getNorthSize() * getScale());
-        } else if (ComparatorUtils.equals(WBorderLayout.SOUTH,constraints)) {
+        } else if (ComparatorUtils.equals(WBorderLayout.SOUTH, constraints)) {
-            d.height = wlayout.getSouthSize();
+            d.height = (int) (wlayout.getSouthSize() * getScale());
-        } else if (ComparatorUtils.equals(WBorderLayout.EAST,constraints)) {
+        } else if (ComparatorUtils.equals(WBorderLayout.EAST, constraints)) {
-            d.width = wlayout.getEastSize();
+            d.width = (int) (wlayout.getEastSize() * getScale());
-        } else if (ComparatorUtils.equals(WBorderLayout.WEST,constraints)) {
+        } else if (ComparatorUtils.equals(WBorderLayout.WEST, constraints)) {
-            d.width = wlayout.getWestSize();
+            d.width = (int) (wlayout.getWestSize() * getScale());
         }
         return d;
     }
@@ -207,4 +207,36 @@ public class XWBorderLayout extends XLayoutContainer {
     public LayoutAdapter getLayoutAdapter() {
         return new FRBorderLayoutAdapter(this);
     }
+
+
+    /**
+     * 自适应布局的缩放
+     *
+     * @param percent 百分比
+     */
+    public void adjustCompSize(double percent) {
+        for (int i = 0; i < this.getComponentCount(); i++) {
+            XCreator creator = this.getXCreator(i);
+            WBorderLayout wlayout = this.toData();
+            Object constraints = wlayout.getConstraints(creator.toData());
+            if (ComparatorUtils.equals(BorderLayout.NORTH, constraints)) {
+                int northSize = (int) (this.toData().getNorthSize() * this.getScale());
+                Dimension dim = creator.getSize();
+                creator.setPreferredSize(new Dimension(dim.width, northSize));
+            } else if (ComparatorUtils.equals(BorderLayout.SOUTH, constraints)) {
+                int southSize = (int) (this.toData().getSouthSize() * this.getScale());
+                Dimension dim = creator.getSize();
+                creator.setPreferredSize(new Dimension(dim.width, southSize));
+            } else if (ComparatorUtils.equals(BorderLayout.EAST, constraints)) {
+                int eastSize = (int) (this.toData().getEastSize() * this.getScale());
+                Dimension dim = creator.getSize();
+                creator.setPreferredSize(new Dimension(eastSize, dim.height));
+            } else if (ComparatorUtils.equals(BorderLayout.WEST, constraints)) {
+                int westSize = (int) (this.toData().getWestSize() * this.getScale());
+                Dimension dim = creator.getSize();
+                creator.setPreferredSize(new Dimension(westSize, dim.height));
+            }
+        }
+    }
 }
+

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

@@ -18,6 +18,7 @@ import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
 import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.form.ui.container.WLayout;
+import com.fr.form.ui.widget.CRBoundsWidget;
 import com.fr.general.FRLogger;
 import com.fr.general.FRScreen;
 import com.fr.stable.ArrayUtils;
@@ -129,6 +130,7 @@ public class XWFitLayout extends XLayoutContainer {
 		}
 	}
 
+
 	/**
 	 * 直接拖动滑条改变整体像素大小时，不用考虑控件的最小高度宽度，内部组件全部一起缩小放大
 	 * 只是界面显示大小改变，不改变对应的BoundsWidget大小
@@ -137,28 +139,24 @@ public class XWFitLayout extends XLayoutContainer {
 	public void adjustCreatorsWhileSlide(double percent) {
 		int count = this.getComponentCount();
 		if (count == 0) {
-			Dimension size = new Dimension(this.getSize());
+			Dimension size = new Dimension(this.toData().getContentWidth(), this.toData().getContentHeight());
-			size.width += size.width*percent;
+			size.width += size.width * percent;
-			size.height += size.height*percent;
+			size.height += size.height * percent;
 			this.setSize(size);
 			return;
 		}
-		// 初始化时还未加间隔
-		if (hasCalGap) {
-			moveContainerMargin();
-			moveCompInterval(backupGap);
-			LayoutUtils.layoutContainer(this);
-		}
 		int containerW = 0;
 		int containerH = 0;
-		int[] hors = getHors(false);
+		int[] hors = getDataHors();
-		int[] veris = getVeris(false);
+		int[] veris = getDataVeris();
-		PaddingMargin margin = toData().getMargin();
+		PaddingMargin margin = new PaddingMargin();
-		for (int i=0; i<count; i++) {
+		for (int i = 0; i < count; i++) {
 			XCreator creator = getXCreator(i);
+			WFitLayout fitLayout = this.toData();
+			CRBoundsWidget boundsWidget = fitLayout.getBoundsWidget(creator.toData());
 			// 百分比和updateBoundsWidget时都会调整大小
 			// 子组件非空时，调整界面大小、 撤销、再次打开表单，都会按屏幕百分比调整，此时必须考虑内边距
-			Rectangle rec = modifyCreatorPoint(creator.getBounds(), percent, hors, veris);
+			Rectangle rec = modifyCreatorPoint(boundsWidget.getBounds(), percent, hors, veris);
 			if (rec.x == margin.getLeft()) {
 				containerH += rec.height;
 			}
@@ -170,15 +168,12 @@ public class XWFitLayout extends XLayoutContainer {
 		}
 		// 布局内部组件放大缩小后，都是乘以百分比后取整，可能会产生空隙，此处调整容器
 		this.setSize(
-				containerW + (int)(margin.getLeft() * (1.0+percent) + margin.getRight() * (1.0+percent)),
+				containerW + (int) (margin.getLeft() * (1.0 + percent) + margin.getRight() * (1.0 + percent)),
-				containerH + (int)(margin.getTop() * (1.0+percent) + margin.getBottom() * (1.0+percent))
+				containerH + (int) (margin.getTop() * (1.0 + percent) + margin.getBottom() * (1.0 + percent))
 		);
 		updateCreatorsBackupBound();
 		// 间隔也按显示大小比例调整
-		if (!hasCalGap) {
-			moveContainerMargin();
 		addCompInterval(getAcualInterval());
-		}
 		LayoutUtils.layoutContainer(this);
 	}
 
@@ -186,6 +181,7 @@ public class XWFitLayout extends XLayoutContainer {
 	 * 调整控件的point和size,避免拖动滑块出现空隙
 	 */
 	private Rectangle modifyCreatorPoint(Rectangle rec, double percent, int[] hors, int[] veris) {
+	    rec = new Rectangle(rec);
 		int xIndex = 0, yIndex = 0;
 		PaddingMargin margin = toData().getMargin();
 		Rectangle bound = new Rectangle(rec);
@@ -264,6 +260,41 @@ public class XWFitLayout extends XLayoutContainer {
 		return ArrayUtils.toPrimitive(posX.toArray(new Integer[]{posX.size()}));
 	}
 
+	public int[] getDataHors() {
+		List<Integer> posX = new ArrayList<Integer>();
+		// 保存实际大小时,组件大小已经去除内边距，此处也判断下
+		posX.add(0);
+		int width = this.toData().getContainerWidth();
+		posX.add(width);
+		for (int i = 0, len = this.toData().getWidgetCount(); i < len; i++) {
+			CRBoundsWidget widget = (CRBoundsWidget) this.toData().getWidget(i);
+			Rectangle rec = widget.getBounds();
+			if (!posX.contains(rec.x)) {
+				posX.add(rec.x);
+			}
+		}
+		Collections.sort(posX);
+		return ArrayUtils.toPrimitive(posX.toArray(new Integer[]{posX.size()}));
+	}
+
+
+	public int[] getDataVeris() {
+		List<Integer> posY = new ArrayList<Integer>();
+		// 保存实际大小时,组件大小已经去除内边距，此处也判断下
+		posY.add(0);
+		int height = this.toData().getContainerHeight();
+		posY.add(height);
+		for (int i = 0, len = this.toData().getWidgetCount(); i < len; i++) {
+			CRBoundsWidget boundsWidget = (CRBoundsWidget) this.toData().getWidget(i);
+			Rectangle rec = boundsWidget.getBounds();
+			if (!posY.contains(rec.y)) {
+				posY.add(rec.y);
+			}
+		}
+		Collections.sort(posY);
+		return ArrayUtils.toPrimitive(posY.toArray(new Integer[]{posY.size()}));
+	}
+
 	/**
 	 * 获取内部组件纵坐标值
 	 * @param isActualSize 实际大小
@@ -290,6 +321,7 @@ public class XWFitLayout extends XLayoutContainer {
 		return ArrayUtils.toPrimitive(posY.toArray(new Integer[]{posY.size()}));
 	}
 
+
 	/**
 	 * 是否能缩小
 	 * @param percent 百分比
@@ -860,12 +892,14 @@ public class XWFitLayout extends XLayoutContainer {
 		}
 		super.add(comp, constraints);
 		XCreator creator = (XCreator) comp;
+		creator.setScale(this.getScale());
 		dealDirections(creator, false);
 	}
 
 	private void add(Component comp, Object constraints, boolean isInit) {
 		super.add(comp, constraints);
 		XCreator creator = (XCreator) comp;
+		creator.setScale(this.getScale());
 		dealDirections(creator, isInit);
 	}
 
@@ -1331,4 +1365,14 @@ public class XWFitLayout extends XLayoutContainer {
 			}
 		}
 	}
+
+	/**
+	 * 自适应布局的缩放
+	 *
+	 * @param percent 百分比
+	 */
+	@Override
+	public void adjustCompSize(double percent) {
+		this.adjustCreatorsWhileSlide(percent);
+	}
 }

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

@@ -237,6 +237,7 @@ public class XCardSwitchButton extends XButton {
 				layout.setIndex(--tabFitIndex);
 			}
 		}
+		tagLayout.setTabsAndAdjust();
 	}
 
 
@@ -337,7 +338,8 @@ public class XCardSwitchButton extends XButton {
 		String titleText = button.getText();
 		this.setButtonText(titleText);
         FRFont font = widgetTitle.getFrFont();
-        FRFont newFont = FRFont.getInstance(font.getName(),font.getStyle(),font.getSize() + FONT_SIZE_ADJUST);
+        int fontsize = font.getSize() + FONT_SIZE_ADJUST;
+        FRFont newFont = FRFont.getInstance(font.getName(),font.getStyle(), (float) (fontsize * getScale()));
 		UILabel label = this.getContentLabel();
 		label.setFont(newFont);
 		label.setForeground(font.getForeground());
@@ -459,7 +461,7 @@ public class XCardSwitchButton extends XButton {
 			TitlePacker title = getWidgetTitle();
 			FRFont font = title.getFrFont();
 			int fontSize = font.getSize() + FONT_SIZE_ADJUST;
-			FRFont newFont = FRFont.getInstance(font.getName(), font.getStyle(), fontSize);
+			FRFont newFont = FRFont.getInstance(font.getName(), font.getStyle(), (float) (fontSize * getScale()));
 			FontMetrics fm = GraphHelper.getFontMetrics(newFont);
 			for (int i = 0; i < titleText.length(); i++) {
 				titleStringBuf.append(titleText.charAt(i));

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

@@ -290,7 +290,6 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
 
     @Override
     public void doLayout() {
-        setTabsAndAdjust();
         //设置布局
         super.doLayout();
     }
@@ -382,7 +381,6 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         } else {
             adjustTabsV(parent, tabLength, cardWidth, cardHeight);
         }
-        fixTitleLayout(parent);
     }
 
     public void adjustTabsH(XLayoutContainer parent, int tabLength, Map<Integer, Integer> width, Map<Integer, Integer> height) {

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

@@ -8,15 +8,11 @@ import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWFitLayout;
-import com.fr.design.designer.properties.mobile.MobileBooKMarkUsePropertyUI;
-import com.fr.design.designer.properties.mobile.MobileBookMarkPropertyUI;
-import com.fr.design.form.util.FormDesignerUtils;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
-import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.editors.ButtonTypeEditor;
 import com.fr.design.mainframe.widget.editors.ImgBackgroundEditor;
 import com.fr.design.utils.gui.LayoutUtils;
@@ -361,14 +357,7 @@ public class XWTabFitLayout extends XWFitLayout {
     	return parent == null ? null : parent.findNearestFit();
     }
 
-	/**
+
-	 * 非顶层自适应布局的缩放
-	 * @param percent 百分比
-	 */
-	@Override
-	public void adjustCompSize(double percent) {
-		this.adjustCreatorsWhileSlide(percent);
-	}
 
 	/**
 	 * 该布局需要隐藏，无需对边框进行操作

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

@@ -2,16 +2,13 @@ package com.fr.design.mainframe;
 
 import com.fr.base.ScreenResolution;
 import com.fr.common.inputevent.InputEventBaseOnOS;
-import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWBorderLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.fun.FormAdaptiveConfigUIProcessor;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.itextfield.UINumberField;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -28,8 +25,10 @@ import com.fr.general.FRScreen;
 import com.fr.stable.AssistUtils;
 
 
+import javax.swing.AbstractAction;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
+import javax.swing.KeyStroke;
 import javax.swing.border.LineBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -46,13 +45,17 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
-import java.awt.event.MouseEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 
+import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
+
 public class FormArea extends JComponent implements ScrollRulerComponent {
     private static final double SLIDER_FLOAT = 400.0;
     private static final double SLIDER_MIN = 10.0;
+    private static final String SCALE_PLUS_COMMAND = "scale_plus";
+    private static final String SCALE_MINUS_COMMAND = "scale_minus";
     public static final double DEFAULT_SLIDER = 100.0;
     private static final int ROTATIONS = 50;
     private static final int SHOWVALMAX = 400;
@@ -72,8 +75,6 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
     private UINumberField heightPane;
     private JFormSliderPane slidePane;
     private boolean isValid = true;
-    // 初始时滑块值为100，托动后的值设为START_VALUE;
-    private double START_VALUE = DEFAULT_SLIDER;
     private int resolution = ScreenResolution.getScreenResolution();
     private double screenValue;
 
@@ -112,16 +113,33 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
             addFormRuler();
         }
         this.setFocusTraversalKeysEnabled(false);
-        this.designer.addMouseWheelListener(showValSpinnerMouseWheelListener);
+        this.addMouseWheelListener(showValSpinnerMouseWheelListener);
+        registerShortCutKey();
+
     }
 
-    private boolean openSliderZoom(){
+    /**
-        FormAdaptiveConfigUIProcessor adaptiveConfigUI = ExtraDesignClassManager.getInstance().getSingle(FormAdaptiveConfigUIProcessor.MARK_STRING);
+     * 注册缩放快捷键
-        if (adaptiveConfigUI != null) {
+     * mac: command + 和 command -
-            return adaptiveConfigUI.openFormSliderZoom();
+     * windows: ctr + 和 ctr -
+     */
+    private void registerShortCutKey() {
+        this.registerKeyboardAction(new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                int old_resolution = slidePane.getShowValue();
+                slidePane.setShowValue(old_resolution + SHOWVALMIN);
             }
-        return false;
+        }, SCALE_PLUS_COMMAND, KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, DEFAULT_MODIFIER), WHEN_IN_FOCUSED_WINDOW);
+        this.registerKeyboardAction(new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                int old_resolution = slidePane.getShowValue();
+                slidePane.setShowValue(old_resolution - SHOWVALMIN);
             }
+        }, SCALE_MINUS_COMMAND, KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, DEFAULT_MODIFIER), WHEN_IN_FOCUSED_WINDOW);
+    }
+
     public void onMobileAttrModified() {
         FormMobileAttr formMobileAttr = designer.getTarget().getFormMobileAttr();
         if (formMobileAttr.isMobileOnly()) {
@@ -138,12 +156,14 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         public void mouseWheelMoved(MouseWheelEvent e) {
             if (InputEventBaseOnOS.isControlDown(e)) {
                 int dir = e.getWheelRotation();
-                int old_resolution = (int) slidePane.getShowVal().getValue();
+                int old_resolution = slidePane.getShowValue();
-                slidePane.getShowVal().setValue(old_resolution - (dir * SHOWVALMIN));
+                slidePane.setShowValue(old_resolution - (dir * SHOWVALMIN));
             }
         }
     };
 
+
+
     /**
      * 增加表单的页面大小控制界面，包括手动修改和滑块拖动
      */
@@ -151,9 +171,9 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
         double[] rowSize = {f};
-        double[] columnSize = {p, f, p, p, p, p, p, p};
+        double[] columnSize = {p, f, p, p, p, p, p, f, p};
         UILabel tipsPane = new UILabel("form");
-        tipsPane.setPreferredSize(new Dimension(200, 0));
+        tipsPane.setPreferredSize(new Dimension(375, 0));
         widthPane = new UINumberField();
         widthPane.setPreferredSize(new Dimension(60, 0));
         heightPane = new UINumberField();
@@ -167,17 +187,15 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
                         new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel")),
                         new UILabel("x"), heightPane,
                         new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel")),
+                        new UILabel(),
                         slidePane}}, rowSize, columnSize, RESIZE_PANE_GAP);
         this.add(FormRulerLayout.BOTTOM, resizePane);
         setWidgetsConfig();
-        boolean needOpenSliderZoom = openSliderZoom();
         // 先初始话滑块及对应事件，然后获取分辨率调整容器的显示大小
-        slidePane.setEnabled(needOpenSliderZoom);
+        slidePane.setEnabled(true);
-        slidePane.setVisible(needOpenSliderZoom);
+        slidePane.setVisible(true);
-        if (needOpenSliderZoom) {
-            initTransparent();
-        }
         initCalculateSize();
+        slidePane.addValueChangeListener(showValSpinnerChangeListener);
     }
 
     private void setWidgetsConfig() {
@@ -192,21 +210,14 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         addHeightPaneListener();
     }
 
-    private void initTransparent() {
-        initCalculateSize();
-        slidePane.getShowVal().addChangeListener(showValSpinnerChangeListener);
-    }
 
     ChangeListener showValSpinnerChangeListener = new ChangeListener() {
         @Override
         public void stateChanged(ChangeEvent e) {
-            double value = (int) ((UIBasicSpinner) e.getSource()).getValue();
+            double value = slidePane.getShowValue();
             value = value > SHOWVALMAX ? SHOWVALMAX : value;
             value = value < SHOWVALMIN ? SHOWVALMIN : value;
-            JForm jf = (JForm) HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+            scale((int) value);
-            jf.getFormDesign().setResolution((int) value);
-            jf.getFormDesign().getArea().resolution = (int) value;
-            reCalculateRoot(value, true);
             JTemplate form = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
             if (form != null) {
                 form.fireTargetModified();
@@ -214,6 +225,12 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         }
     };
 
+    private void scale(int value){
+        this.designer.setResolution(value);
+        this.designer.getArea().resolution =  value;
+        reCalculateRoot(value, true);
+    }
+
     /**
      * 返回当前的屏幕分辨率对应的百分比值
      *
@@ -238,7 +255,6 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
         this.screenValue = FRScreen.getDesignScreenByDimension(scrnsize).getValue();
         XLayoutContainer root = FormArea.this.designer.getRootComponent();
         // 7.1.1不放缩放滑块，但表单大小仍按屏幕分辨率调整
-//        slidePane.populateBean(screenValue);
         if (root.acceptType(XWFitLayout.class)) {
             XWFitLayout layout = (XWFitLayout) root;
             if ( !AssistUtils.equals(screenValue, DEFAULT_SLIDER) ) {
@@ -246,7 +262,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
             } else {
                 // 组件间隔啊
                 // REPORT-2585 原有的逻辑导致嵌套的tab中的间隔加不上去，会在后续拖动的过程中出问题
-                reCalculateDefaultRoot(screenValue, true);
+                reCalculateDefaultRoot();
             }
         }
         LayoutUtils.layoutContainer(root);
@@ -366,16 +382,14 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
      * 修改大小后，再根据屏幕分辨率调整下
      */
     private void doReCalculateRoot(int width, int height, XWFitLayout layout) {
-//    	double value = slidePane.updateBean();
         //重置滑块的值为默认值100
-        START_VALUE = DEFAULT_SLIDER;
         if ( AssistUtils.equals(screenValue, DEFAULT_SLIDER) ) {
             layout.getParent().setSize(width, height + designer.getParaHeight());
-            FormArea.this.validate();
         } else {
             layout.setBackupGap(screenValue / DEFAULT_SLIDER);
-            reCalculateRoot(screenValue, false);
         }
+        reCalculateRoot(slidePane.getShowValue(), true);
+
     }
 
     /**
@@ -385,71 +399,60 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
      * @param value
      */
     private void reCalculateRoot(double value, boolean needCalculateParaHeight) {
-        if ( AssistUtils.equals(value, START_VALUE) ) {
+        double percent = (value - DEFAULT_SLIDER) / DEFAULT_SLIDER;
-            return;
+        double scale = value / DEFAULT_SLIDER;
-        }
-        double percent = (value - START_VALUE) / START_VALUE;
         XLayoutContainer root = FormArea.this.designer.getRootComponent();
         if (root.acceptType(XWFitLayout.class)) {
             XWFitLayout layout = (XWFitLayout) root;
-            layout.setContainerPercent(value / DEFAULT_SLIDER);
+            layout.setContainerPercent(scale);
+            layout.adjustCompSize(percent);
             traverAndAdjust(layout, percent);
-            layout.adjustCreatorsWhileSlide(percent);
-
             // 拖动滑块，先将内部组件百分比大小计算，再计算容器大小
-
             Dimension d = new Dimension(layout.getWidth(), layout.getHeight());
-            // 自适应布局的父层是border
-            if (layout.getParent() != null) {
-                int paraHeight = designer.getParaHeight();
-                if (needCalculateParaHeight && paraHeight > 0) {
-                    designer.setParaHeight(paraHeight);
             XWBorderLayout parent = (XWBorderLayout) layout.getParent();
-                    parent.toData().setNorthSize(paraHeight);
+            root.setScale(scale);
+            // 自适应布局的父层是border
+            if (parent != null) {
+                parent.setScale(scale);
+                int paraHeight = parent.toData().getNorthSize();
+                XLayoutContainer paraComponent = designer.getParaComponent();
+                if (needCalculateParaHeight && paraComponent != null) {
+                    paraComponent.setScale(scale);
+                    this.designer.setParaHeight(paraHeight);
+                    paraComponent.setPreferredSize(new Dimension(d.width, this.designer.getParaHeight()));
+                    paraComponent.adjustCompSize( percent);
                     parent.removeAll();
-                    parent.add(designer.getParaComponent(), WBorderLayout.NORTH);
+                    parent.add(paraComponent, WBorderLayout.NORTH);
-                    parent.add(designer.getRootComponent(), WBorderLayout.CENTER);
+                    parent.add(root, WBorderLayout.CENTER);
+                    root.setBounds(0, this.designer.getParaHeight(), d.width, d.height);
                 }
-                layout.getParent().setSize(d.width, d.height + paraHeight);
+                parent.setSize(d.width, d.height + this.designer.getParaHeight());
+
                 // 调整自适应布局大小后，同步调整参数界面和border大小，此时刷新下formArea
                 FormArea.this.validate();
+                LayoutUtils.layoutRootContainer(designer.getRootComponent());
             }
-            START_VALUE = value;
         }
     }
 
     /**
      * 按照界面大小的百分比值调整root大小
      *
-     * @param needCalculateParaHeight 是否需要调整参数界面高度
-     * @param value
      */
-    private void reCalculateDefaultRoot(double value, boolean needCalculateParaHeight) {
+    private void reCalculateDefaultRoot() {
         XLayoutContainer root = FormArea.this.designer.getRootComponent();
         if (root.acceptType(XWFitLayout.class)) {
             XWFitLayout layout = (XWFitLayout) root;
-            layout.setContainerPercent(1.0);
+            Dimension dimension = layout.getSize();
-            traverAndAdjust(layout, 0.0);
+            double widthScale = 960D / dimension.width;
-            layout.adjustCreatorsWhileSlide(0.0);
+            double heightScale = 960D / dimension.height;
-
+            final double scaleValue = Math.min(widthScale, heightScale);
-            // 拖动滑块，先将内部组件百分比大小计算，再计算容器大小
+            int value = (int) (scaleValue * 100);
-
+            slidePane.setShowValue(value);
-            Dimension d = new Dimension(layout.getWidth(), layout.getHeight());
+            if (value == 100) {
-            // 自适应布局的父层是border
+                return;
-            if (layout.getParent() != null) {
-                int paraHeight = designer.getParaHeight();
-                if (needCalculateParaHeight && paraHeight > 0) {
-                    designer.setParaHeight(paraHeight);
-                    XWBorderLayout parent = (XWBorderLayout) layout.getParent();
-                    parent.toData().setNorthSize(paraHeight);
-                    parent.removeAll();
-                    parent.add(designer.getParaComponent(), WBorderLayout.NORTH);
-                    parent.add(designer.getRootComponent(), WBorderLayout.CENTER);
-                }
-                layout.getParent().setSize(d.width, d.height + paraHeight);
-                // 调整自适应布局大小后，同步调整参数界面和border大小，此时刷新下formArea
-                FormArea.this.validate();
             }
+            scale(value);
         }
     }
 
@@ -459,6 +462,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
             Object object = creator.getComponent(i);
             if (object instanceof XCreator) {
                 XCreator temp = (XCreator) object;
+                temp.setScale(1 + percent);
                 temp.adjustCompSize(percent);
                 traverAndAdjust(temp, percent);
             }
@@ -480,17 +484,17 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
      * 鼠标滚轮事件
      * 由于表单设计界面要求： 容器大小大于界面时，滚动条才可以拖动，所以不支持滚动无限往下滚
      */
-    @Override
+//    @Override
-    protected void processMouseWheelEvent(java.awt.event.MouseWheelEvent evt) {
+//    protected void processMouseWheelEvent(java.awt.event.MouseWheelEvent evt) {
-        int id = evt.getID();
+//        int id = evt.getID();
-        switch (id) {
+//        switch (id) {
-            case MouseEvent.MOUSE_WHEEL: {
+//            case MouseEvent.MOUSE_WHEEL: {
-                onMouseWheelScroll(evt);
+//                onMouseWheelScroll(evt);
-                break;
+//                break;
-            }
+//            }
-            default:
+//            default:
-        }
+//        }
-    }
+//    }
 
     private void onMouseWheelScroll(MouseWheelEvent evt) {
         int value = this.verScrollBar.getValue() + evt.getWheelRotation() * ROTATIONS;
@@ -723,9 +727,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
      * @return 百分比值
      */
     public double getSlideValue() {
-//    	return slidePane.updateBean();
+        return slidePane.getShowValue();
-        //7.1.1不加缩放滑块
-        return this.screenValue;
     }
 
     /**
@@ -763,7 +765,6 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
             layout.moveContainerMargin();
             layout.addCompInterval(layout.getAcualInterval());
         } else if (designer.getRootComponent().acceptType(XWFitLayout.class)) {
-            START_VALUE = DEFAULT_SLIDER;
             reCalculateRoot(slide, true);
 //    		slidePane.populateBean(slide);
         }
@@ -840,7 +841,8 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
                     DESIGNERWIDTH = DESIGNERWIDTH > maxWidth ? maxWidth : DESIGNERWIDTH;
                     DESIGNERHEIGHT = DESIGNERHEIGHT > maxHeight ? maxHeight : DESIGNERHEIGHT;
                     int designerLeft = left + (verScrollBar.getX() - DESIGNERWIDTH) / 2;
-                    rec = new Rectangle(designerLeft, TOPGAP, DESIGNERWIDTH, DESIGNERHEIGHT);
+                    int designerTop = top + (horScrollBar.getY() - DESIGNERHEIGHT) / 2;
+                    rec = new Rectangle(designerLeft, designerTop, DESIGNERWIDTH, DESIGNERHEIGHT);
                 }
                 // designer是整个表单设计界面中的面板部分，目前只放自适应布局和参数界面。
                 designer.setBounds(rec);

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

@@ -493,10 +493,12 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     public void setParaHeight(int height) {
         XWBorderLayout container = (XWBorderLayout) getTopContainer();
         container.toData().setNorthSize(height);
-        container.setSize(container.getWidth(), container.getHeight() + height - getParaHeight());
+        int displayHeight = (int) (height * container.getScale());
-        paraHeight = height;
+        container.setSize(container.getWidth(), container.getHeight() + displayHeight - getParaHeight());
+        paraHeight = displayHeight;
     }
 
+
     /**
      * 删除参数界面
      */

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

@@ -15,6 +15,8 @@ import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.Widget;
+import com.fr.form.ui.container.WBorderLayout;
+import com.fr.form.ui.container.WParameterLayout;
 import com.fr.log.FineLoggerFactory;
 
 import java.awt.LayoutManager;
@@ -232,12 +234,13 @@ public class FormSelection {
         int size = selection.size();
         if (size == 1) {
             XCreator creator = selection.get(0);
-            if(creator.acceptType(XWCardTagLayout.class)){
+            if (creator.acceptType(XWCardTagLayout.class)) {
-                creator = (XCreator)selection.get(0).getParent();
+                creator = (XCreator) selection.get(0).getParent();
             }
             creator.setBounds(rec);
             if (creator.acceptType(XWParameterLayout.class)) {
-                designer.setParaHeight((int) rec.getHeight());
+                double height = rec.getHeight() / creator.getScale();
+                designer.setParaHeight((int) height);
                 designer.getArea().doLayout();
             }
             LayoutUtils.layoutContainer(creator);

designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java

@@ -8,6 +8,7 @@ import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.design.widget.WidgetBoundsPaneFactory;
 import com.fr.form.ui.container.WLayout;
+import com.fr.form.ui.widget.CRBoundsWidget;
 
 
 import java.awt.Rectangle;
@@ -42,15 +43,13 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane {
         FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         formDesigner.getSelectionModel().getSelection().backupBounds();
         super.update();
-        Rectangle bounds = new Rectangle(creator.getBounds());
+        Rectangle bounds = new Rectangle((int) x.getValue(), (int) y.getValue(), (int) width.getValue(), (int) height.getValue());
-        bounds.x = (int) x.getValue();
-        bounds.y = (int) y.getValue();
         if (parent == null) {
             return;
         }
         WLayout wabs = parent.toData();
         wabs.setBounds(creator.toData(), bounds);
-        creator.setBounds(bounds);
+        parent.adjustCompSize(parent.getScale() -1);
         LayoutUtils.layoutContainer(creator);
         XWAbsoluteLayout layout = (XWAbsoluteLayout) parent;
         layout.updateBoundsWidget(creator);
@@ -59,14 +58,13 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane {
     @Override
     public void limitWidth(WLayout wabs, int w, Rectangle bounds, Rectangle rec){
         bounds.width = w;
-        creator.setBounds(bounds);
     }
 
     @Override
     public void limitHeight(WLayout wabs, int h, Rectangle bounds, Rectangle rec){
         bounds.height = h;
-        creator.setBounds(bounds);
     }
+
     @Override
     protected String title4PopupWindow() {
         return "absoluteBound";
@@ -75,7 +73,12 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane {
     @Override
     public void populate() {
         super.populate();
-        Rectangle bounds = new Rectangle(creator.getBounds());
+        WLayout wabs = parent.toData();
+        CRBoundsWidget boundsWidget =  wabs.getBoundsWidget(creator.toData());
+        if (boundsWidget == null){
+            return;
+        }
+        Rectangle bounds = boundsWidget.getBounds();
         x.setValue(bounds.x);
         y.setValue(bounds.y);
     }

designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java

@@ -20,9 +20,8 @@ import com.fr.design.widget.WidgetBoundsPaneFactory;
 import com.fr.form.ui.PaddingMargin;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.form.ui.container.WLayout;
+import com.fr.form.ui.widget.CRBoundsWidget;
 
-
-import javax.swing.JOptionPane;
 import java.awt.Rectangle;
 
 
@@ -46,8 +45,8 @@ public class WidgetBoundPane extends BasicPane {
     }
 
     public XLayoutContainer getParent(XCreator source) {
-        if(source.acceptType(XWCardTagLayout.class)){
+        if (source.acceptType(XWCardTagLayout.class)) {
-            return (XLayoutContainer)source.getParent();
+            return (XLayoutContainer) source.getParent();
         }
         XLayoutContainer container = XCreatorUtils.getParentXLayoutContainer(source);
         if (source.acceptType(XWFitLayout.class) || source.acceptType(XWParameterLayout.class)) {
@@ -79,18 +78,24 @@ public class WidgetBoundPane extends BasicPane {
     }
 
     public void populate() {
-        Rectangle bounds = new Rectangle(creator.getBounds());
+        WLayout wabs = parent.toData();
+        CRBoundsWidget boundsWidget = wabs.getBoundsWidget(creator.toData());
+        if (boundsWidget == null){
+            return;
+        }
+        Rectangle bounds = new Rectangle(boundsWidget.getBounds());
         width.setValue(bounds.width);
         height.setValue(bounds.height);
     }
 
     public void fix() {
-        Rectangle bounds = new Rectangle(creator.getBounds());
+        WLayout wabs = parent.toData();
+        CRBoundsWidget boundsWidget = wabs.getBoundsWidget(creator.toData());
+        Rectangle bounds = new Rectangle(boundsWidget.getBounds());
         creator.setBackupBound(creator.getBounds());
         int w = (int) width.getValue();
         int h = (int) height.getValue();
         Rectangle rec = ComponentUtils.getRelativeBounds(parent);
-        WLayout wabs = parent.toData();
         if (bounds.width != w) {
             limitWidth(wabs, w, bounds, rec);
         }
@@ -101,25 +106,27 @@ public class WidgetBoundPane extends BasicPane {
 
 
     public void adjustComponents(Rectangle bounds, int difference, int row) {
+        double scale = parent.getScale();
         FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         Rectangle backupBounds = getBound();
         FRFitLayoutAdapter layoutAdapter = (FRFitLayoutAdapter) AdapterBus.searchLayoutAdapter(formDesigner, creator);
         if (layoutAdapter != null) {
             layoutAdapter.setEdit(true);
-            layoutAdapter.calculateBounds(backupBounds, bounds, creator, row, difference);
+            layoutAdapter.calculateBounds(backupBounds, new Rectangle((int) (bounds.x * scale), (int) (bounds.y * scale), (int) (bounds.width * scale), (int) (bounds.height * scale)), creator, row, difference);
         }
     }
 
     public void limitWidth(WLayout wabs, int w, Rectangle bounds, Rectangle rec) {
         int difference = 0;
+        double scale = parent.getScale();
         int minWidth = (int) (MINWIDTH * ((WFitLayout) wabs).getResolutionScaling());
         PaddingMargin margin = wabs.getMargin();
         if (bounds.width != w) {
-            if (bounds.width == rec.width - margin.getLeft() - margin.getRight()) {
+            if ((int) (bounds.width * scale) == rec.width - margin.getLeft() - margin.getRight()) {
                 FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Bounds"));
                 width.setValue(bounds.width);
                 return;
-            } else if (w < minWidth) {
+            } else if (w * scale < minWidth) {
                 FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Width") + Integer.toString(minWidth));
                 width.setValue(bounds.width);
                 return;
@@ -132,15 +139,16 @@ public class WidgetBoundPane extends BasicPane {
     }
 
     public void limitHeight(WLayout wabs, int h, Rectangle bounds, Rectangle rec) {
+        double scale = parent.getScale();
         int difference = 0;
         PaddingMargin margin = wabs.getMargin();
         int minHeight = (int) (MINHEIGHT * ((WFitLayout) wabs).getResolutionScaling());
         if (bounds.height != h) {
-            if (bounds.height == rec.height - margin.getTop() - margin.getBottom()) {
+            if ((int) (bounds.height * scale) == rec.height - margin.getTop() - margin.getBottom()) {
                 FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Bounds"));
                 height.setValue(bounds.height);
                 return;
-            } else if (h < minHeight) {
+            } else if (h * scale < minHeight) {
                 FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Height") + Integer.toString(minHeight));
                 height.setValue(bounds.height);
                 return;

designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java

@@ -10,11 +10,9 @@ import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.widget.WidgetBoundsPaneFactory;
 import com.fr.form.ui.container.WTabDisplayPosition;
+import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.ComparatorUtils;
-
-
-import javax.swing.JOptionPane;
 import java.awt.Rectangle;
 
 /**
@@ -39,6 +37,7 @@ public class WidgetCardTagBoundPane extends WidgetBoundPane {
         if (parent == null) {
             return;
         }
+        double scale = parent.getScale();
         FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
         Rectangle parentBounds = new Rectangle(parent.getBounds());
 
@@ -48,17 +47,17 @@ public class WidgetCardTagBoundPane extends WidgetBoundPane {
         XLayoutContainer tabLayout = creator.getTopLayout();
         Rectangle rectangle = tabLayout.getBounds();
         if(ComparatorUtils.equals(displayPosition, WTabDisplayPosition.TOP_POSITION) || ComparatorUtils.equals(displayPosition, WTabDisplayPosition.BOTTOM_POSITION)){
-            if(rectangle.height < size){
+            if(rectangle.height < size* scale){
                 FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
                 return;
             }
-            parentBounds.height = size;
+            parentBounds.height = (int) (size * scale);
         }else{
-            if(rectangle.width < size){
+            if(rectangle.width < size*scale){
                 FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
                 return;
             }
-            parentBounds.width = size;
+            parentBounds.width = (int) (size * scale);
         }
 
         parent.setBounds(parentBounds);
@@ -76,15 +75,8 @@ public class WidgetCardTagBoundPane extends WidgetBoundPane {
 
     @Override
     public void populate() {
-        WCardTagLayout tagLayout = (WCardTagLayout)creator.toData();
+        WCardMainBorderLayout wCardMainBorderLayout = (WCardMainBorderLayout)creator.getTopLayout().toData();
-        Rectangle bounds = new Rectangle(creator.getBounds());
+        cardTagWidth.setValue(wCardMainBorderLayout.getTitleSize());
-        WTabDisplayPosition displayPosition = tagLayout.getDisplayPosition();
-        if( ComparatorUtils.equals(displayPosition, WTabDisplayPosition.TOP_POSITION) || ComparatorUtils.equals(displayPosition, WTabDisplayPosition.BOTTOM_POSITION)){
-            cardTagWidth.setValue(bounds.height);
-        }else{
-            cardTagWidth.setValue(bounds.width);
-        }
-
     }
 
 }

designer-realize/src/main/java/com/fr/design/actions/server/ServerConfigManagerAction.java

@@ -18,12 +18,15 @@ import com.fr.transaction.Worker;
 import com.fr.web.attr.ReportWebAttr;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 
 /**
  * Server Config Manager
  */
 public class ServerConfigManagerAction extends UpdateAction {
+    public static final Dimension DEFAULT = new Dimension(700, 630);
+
     public ServerConfigManagerAction() {
         this.setMenuKeySet(SERVER_CONFIG_MANAGER);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
@@ -48,8 +51,8 @@ public class ServerConfigManagerAction extends UpdateAction {
             }
         };
 
-        final BasicDialog editReportServerParameterDialog = editReportServerParameterPane.showWindow(
+        final BasicDialog editReportServerParameterDialog = editReportServerParameterPane.showWindowWithCustomSize(
-                DesignerContext.getDesignerFrame()
+                DesignerContext.getDesignerFrame(), null,  DEFAULT
         );
 
         editReportServerParameterDialog.addDialogActionListener(new DialogActionAdapter() {

designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java

@@ -15,6 +15,7 @@ import com.fr.report.cell.cellattr.highlight.HighlightAction;
 import com.fr.report.cell.cellattr.highlight.HyperlinkHighlightAction;
 
 import javax.swing.*;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -30,6 +31,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
     protected UIButton hyperlinkButton;
     protected HyperlinkGroupPane pane;
     protected BasicDialog dialog;
+    private static final Dimension WINDOW_CUSTOM_SIZE = new Dimension(730, 600);
 
     public HyperlinkPane(final ConditionAttributesPane conditionAttributesPane) {
         super(conditionAttributesPane);
@@ -39,7 +41,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
                 NameJavaScriptGroup nameHyperlinks = jsGroup;
                 pane = DesignerContext.getDesignerFrame().getSelectedJTemplate().getHyperLinkPaneNoPop(HyperlinkGroupPaneActionImpl.getInstance());
                 pane.populate(nameHyperlinks);
-                dialog = pane.showWindow(SwingUtilities.getWindowAncestor(conditionAttributesPane));
+                dialog = pane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(conditionAttributesPane), null, WINDOW_CUSTOM_SIZE);
                 dialog.addDialogActionListener(new DialogActionAdapter() {
                     @Override
                     public void doOk() {

designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java

@@ -12,10 +12,12 @@ import com.fr.design.widget.WidgetManageCardPane;
 import com.fr.design.widget.WidgetPane;
 import com.fr.form.ui.*;
 
+import com.fr.form.ui.TextArea;
 import com.fr.report.cell.cellattr.highlight.HighlightAction;
 import com.fr.report.cell.cellattr.highlight.WidgetHighlightAction;
 
 import javax.swing.*;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -27,6 +29,7 @@ import java.awt.event.ActionListener;
 public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<HighlightAction> {
     private static final int DIALOG_WIDTH = 700;
     private static final int DIALOG_HEIGHT = 400;
+    private static final Dimension WINDOW_CUSTOM_SIZE = new Dimension(720, 600);
 
     private Widget widget;
     private UIComboBox box;
@@ -45,8 +48,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
                     }
                 };
                 widgetPane.populate(widget);
-                BasicDialog dialog = widgetPane.showWindow(
+                BasicDialog dialog = widgetPane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(conditionAttributesPane), null, WINDOW_CUSTOM_SIZE);
-                        SwingUtilities.getWindowAncestor(conditionAttributesPane));
                 dialog.addDialogActionListener(new DialogActionAdapter() {
                     public void doOk() {
                         widget = widgetPane.update();

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -760,6 +760,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
                 if (centerPane.isUpEditMode()) {
                     if (hasParameterPane()) {
                         parameterPane.populate(u.getApplyTarget());
+                        setAutoHeightForCenterPane();
                         DesignModuleFactory.getFormHierarchyPane().refreshRoot();
                     }
                 } else {
@@ -782,6 +783,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     private void applyAll(WorkBookUndoState u) {
         if (hasParameterPane()) {
             parameterPane.populate(u.getApplyTarget());
+            setAutoHeightForCenterPane();
             DesignModuleFactory.getFormHierarchyPane().refreshRoot();
         }
         //报表主体