解决冲突

build.gradle

@@ -49,8 +49,8 @@ allprojects {
     idea {
         module {
             inheritOutputDirs = false
-            outputDir = file(outputPath +"/classes")
+            outputDir = file(outputPath + "/classes")
-            testOutputDir = file(outputPath +"/test-classes")
+            testOutputDir = file(outputPath + "/test-classes")
             languageLevel = new IdeaLanguageLevel(sourceCompatibility)
             targetBytecodeVersion = targetCompatibility
         }
@@ -68,7 +68,7 @@ allprojects {
         implementation 'org.swingexplorer:swexpl:2.0.1'
         implementation 'org.swingexplorer:swag:1.0'
         implementation 'net.java.dev.jna:jna:5.4.0'
-        implementation 'org.apache.tomcat:tomcat-catalina:8.5.57'
+        implementation 'org.apache.tomcat:tomcat-catalina:8.5.69'
         implementation 'io.socket:socket.io-client:0.7.0'
         implementation 'com.fr.third:fine-third:' + frVersion
         implementation 'com.fr.core:fine-core:' + frDevVersion

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

@@ -195,6 +195,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     private static List<SwingWorker> mapWorkerList = new ArrayList<SwingWorker>();
     private boolean imageCompress = false;//图片压缩
     private boolean showImageCompressMoveTip = true;
+    private boolean showServerDatasetAuthTip = true;
     // 开启内嵌web页面的调试窗口
     private boolean openDebug = false;
 
@@ -403,9 +404,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
 
         File envHome = new File(userHome + File.separator + "." + ProductConstants.APP_NAME + version);
-        if (!envHome.exists()) {
-            StableUtils.mkdirs(envHome);
-        }
 
         return envHome.getAbsolutePath();
     }
@@ -1677,6 +1675,13 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.showImageCompressMoveTip = showImageCompressMoveTip;
     }
 
+    public boolean isShowServerDatasetAuthTip() {
+        return showServerDatasetAuthTip;
+    }
+
+    public void setShowServerDatasetAuthTip(boolean showServerDatasetAuthTip) {
+        this.showServerDatasetAuthTip = showServerDatasetAuthTip;
+    }
 
     public boolean isOpenDebug() {
         return openDebug;
@@ -1855,6 +1860,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
         this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false));
         this.setShowTemplateMissingPlugin(reader.getAttrAsBoolean("showTemplateMissingPlugin", true));
+        this.setShowServerDatasetAuthTip(reader.getAttrAsBoolean("showServerDatasetAuthTip", true));
     }
 
     private void readReportPaneAttributions(XMLableReader reader) {
@@ -2128,6 +2134,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (!this.isShowTemplateMissingPlugin()) {
             writer.attr("showTemplateMissingPlugin", this.isShowTemplateMissingPlugin());
         }
+        writer.attr("showServerDatasetAuthTip", this.isShowServerDatasetAuthTip());
         writer.end();
     }
 

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

@@ -345,6 +345,17 @@ public abstract class UpdateAction extends ShortCut implements Action {
 		return (JComponent) object;
 	}
 
+	public JComponent createToolBarComponentByName(String componentName) {
+		Object object = this.getValue(componentName);
+		if (!(object instanceof AbstractButton)) {
+			UIButton button = null;
+			button = new UIButton();
+			object = initButton(button, componentName);
+		}
+
+		return (JComponent) object;
+	}
+
 	protected JComponent initButton(UIButton button, String name) {
 		// 添加一个名字作为自动化测试用
 		button.setName(getName());

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

@@ -1,5 +1,6 @@
 package com.fr.design.actions.help;
 
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.CloudCenter;
@@ -27,7 +28,7 @@ public class TutorialAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind(createDocKey());
+        return CloudCenter.getInstance().acquireUrlByKind(createDocKey(), "http://help.finereport.com");
     }
 
     // 生成帮助文档 sitecenter key, help.zh_CN.10
@@ -52,6 +53,10 @@ public class TutorialAction extends AbstractDesignerSSO {
         }
     }
 
+    public String getOffLineWarnMessage() {
+        return Toolkit.i18nText("Fine-Design_Offline_Helptutorial_Msg");
+    }
+
     public static final MenuKeySet HELP_TUTORIAL = new MenuKeySet() {
         @Override
         public char getMnemonic() {

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

@@ -25,9 +25,6 @@ import com.fr.esd.event.DsNameTarget;
 import com.fr.esd.event.StrategyEventsNotifier;
 import com.fr.file.TableDataConfig;
 
-import com.fr.transaction.CallBackAdaptor;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.WorkerFacade;
 import com.fr.report.LockItem;
 
 import javax.swing.KeyStroke;
@@ -106,34 +103,18 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
                     globalTableDataDialog.setDoOKSucceed(false);
                     return;
                 }
+                globalTableDataPane.update(tableDataConfig);
                 DesignTableDataManager.clearGlobalDs();
                 // 保存时 移除服务器数据集列名缓存
                 for (String name : tableDataConfig.getTableDatas().keySet()) {
                     DesignTableDataManager.removeSelectedColumnNames(name);
                 }
-
-                Configurations.modify(new WorkerFacade(TableDataConfig.class) {
-                    @Override
-                    public void run() {
-                        globalTableDataPane.update(tableDataConfig);
-                    }
-                }.addCallBack(new CallBackAdaptor() {
-                    @Override
-                    public boolean beforeCommit() {
-                        //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
-                        return doWithDatasourceManager(tableDataConfig, globalTableDataPane, globalTableDataDialog);
-                    }
-
-                    @Override
-                    public void afterCommit() {
                 // 刷新共有数据集
                 TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                 fireDSChanged(globalTableDataPane.getDsChangedNameMap());
                 // 关闭服务器数据集页面，为其解锁
                 EditLockUtils.unlock(LockItem.SERVER_TABLE_DATA);
             }
-                }));
-            }
 
             @Override
             public void doCancel() {

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

@@ -10,7 +10,15 @@ public class DesignModeContext {
     private static DesignerMode mode = DesignerMode.NORMAL;
 
     public static void switchTo(DesignerMode mode) {
-        DesignModeContext.mode = mode;
+        changeMode(DesignModeContext.mode, mode);
+    }
+
+    private static void changeMode(DesignerMode oldMode, DesignerMode newMode) {
+        if (oldMode != newMode) {
+            DesignModeContext.mode = newMode;
+            oldMode.closeMode();
+            newMode.openMode();
+        }
     }
 
     public static DesignerMode getMode() {

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

@@ -1,9 +1,25 @@
 package com.fr.design.base.mode;
 
+
+import com.fr.design.mainframe.DesignerContext;
+
 public enum DesignerMode {
     NORMAL,
     BAN_COPY_AND_CUT,
     VCS,
-    AUTHORITY,
+    AUTHORITY {
-    DUCHAMP
+        @Override
+        public void closeMode() {
+            DesignerContext.getDesignerFrame().closeAuthorityMode();
+        }
+    },
+    DUCHAMP;
+
+    public void openMode() {
+
+    }
+
+    public void closeMode() {
+    }
+
 }

designer-base/src/main/java/com/fr/design/border/UITitledBorder.java

@@ -22,24 +22,7 @@ public class UITitledBorder extends TitledBorder {
     }
 
     private UITitledBorder(String title) {
-        super(
+        this(title, 10);
-                BorderFactory.createCompoundBorder(
-                        BorderFactory.createEmptyBorder(
-                                0,
-                                0,
-                                5,
-                                0),
-                        new UIRoundedBorder(
-                                UIConstants.TITLED_BORDER_COLOR,
-                                1,
-                                10)
-                ),
-                title,
-                TitledBorder.LEADING,
-                TitledBorder.TOP,
-                null,
-                new Color(1, 159, 222)
-        );
     }
 
     /**

designer-base/src/main/java/com/fr/design/border/UITitledMatteBorder.java

@@ -0,0 +1,32 @@
+package com.fr.design.border;
+
+import com.fr.design.constants.UIConstants;
+
+import javax.swing.BorderFactory;
+import javax.swing.border.TitledBorder;
+import java.awt.Color;
+
+public class UITitledMatteBorder extends TitledBorder {
+    public static UITitledMatteBorder createTitledTopBorder(String title, Color color) {
+        return new UITitledMatteBorder(title, 1, 0, 0, 0, color);
+    }
+
+    public static UITitledMatteBorder createTitledBorder(String title, Color color) {
+        return new UITitledMatteBorder(title, 1, 1, 1, 1, color);
+    }
+
+    public static UITitledMatteBorder createTitledBorder(String title, int top, int left, int bottom, int right, Color color) {
+        return new UITitledMatteBorder(title, top, left, bottom, right, color);
+    }
+
+    private UITitledMatteBorder(String title, int top, int left, int bottom, int right, Color color) {
+        super(
+                BorderFactory.createMatteBorder(top, left, bottom, right, UIConstants.TITLED_BORDER_COLOR),
+                title,
+                TitledBorder.LEADING,
+                TitledBorder.TOP,
+                null,
+                color
+        );
+    }
+}

designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@@ -0,0 +1,102 @@
+package com.fr.design.cell;
+
+import com.fr.base.NameStyle;
+import com.fr.base.ScreenResolution;
+import com.fr.base.Style;
+import com.fr.general.IOUtils;
+
+import javax.swing.JPanel;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/9/3
+ */
+public class CellStylePreviewPane extends JPanel {
+
+    private static final BufferedImage transparentBackgroundImage = IOUtils.readImage("/com/fr/design/images/transparent_background.png");
+    private final float transparentBackgroundWidth;
+    private final float transparentBackgroundHeight;
+    private String paintText = "Report";
+    private Style style = Style.DEFAULT_STYLE;
+
+    public CellStylePreviewPane() {
+        transparentBackgroundWidth = transparentBackgroundImage.getWidth(null);
+        transparentBackgroundHeight = transparentBackgroundImage.getHeight(null);
+    }
+
+    public void setStyle(Style style) {
+        this.style = style;
+        if (style instanceof NameStyle) {
+            paintText = ((NameStyle) style).getName();
+        }
+        repaint();
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        Graphics2D g2d = (Graphics2D) g;
+        g.clearRect(0, 0, getWidth(), getHeight());
+
+        paintTransparentBackground(g2d, style);
+
+        paintCellStyle(g2d, style);
+    }
+
+    private void paintTransparentBackground(Graphics2D g2d, Style style) {
+        Color fontColor = style.getFRFont().getForeground();
+        float g = fontColor.getRed() * 0.299F + fontColor.getGreen() * 0.587F * fontColor.getBlue() * 0.114F;
+        float alpha = 1.0F;
+        if (g < 50) {
+            alpha = 0.2F;
+        } else if (g < 160){
+            alpha = 0.5F;
+        }
+
+        float scaleWidth = 1.0F * getWidth() / transparentBackgroundWidth;
+        float scaleHeight = 1.0F * getHeight() / transparentBackgroundHeight;
+        float maxScale = Math.max(scaleWidth, scaleHeight);
+
+        if (maxScale <= 1) {
+            scaleWidth = scaleHeight = 1;
+        } else {
+            scaleHeight = scaleWidth = maxScale;
+        }
+
+        Composite oldComposite = g2d.getComposite();
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+        g2d.drawImage(transparentBackgroundImage, 0, 0, (int) (transparentBackgroundWidth * scaleWidth), (int) (transparentBackgroundHeight * scaleHeight), null);
+        g2d.setComposite(oldComposite);
+    }
+
+    private void paintCellStyle(Graphics2D g2d, Style style) {
+        int resolution = ScreenResolution.getScreenResolution();
+
+        int width = getWidth();
+        int height = getHeight();
+
+        if (style == Style.DEFAULT_STYLE) {
+            // 如果是默认的style,就只写"Report"上去
+            Style.paintContent(g2d, paintText, style, width, height, resolution);
+            return;
+        }
+
+        Style.paintBackground(g2d, style, width, height);
+
+        Style.paintContent(g2d, paintText, style, width, height, resolution);
+
+        Style.paintBorder(g2d, style, width, height);
+    }
+
+    @Override
+    public Dimension getMinimumSize() {
+        return getPreferredSize();
+    }
+}

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

@@ -25,6 +25,7 @@ import com.fr.design.gui.icombobox.UIComboBoxEditor;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -39,7 +40,16 @@ import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
 
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.util.Collections;
+import java.util.concurrent.CancellationException;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTree;
+import javax.swing.SwingWorker;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.PopupMenuEvent;
@@ -50,7 +60,6 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.*;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
@@ -70,6 +79,9 @@ import java.util.concurrent.FutureTask;
  * @since 2012-7-11下午4:49:39
  */
 public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refreshable, Previewable, Prepare4DataSourceChange {
+
+    private static final List<String> PENDING_CONTENT = new ArrayList<>(Collections.singletonList(Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."));
+
     private static final double COLUMN_SIZE = 24;
 
     /**
@@ -91,6 +103,8 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
 
     private SwingWorker populateWorker;
 
+    private SwingWorker<List<String>, Void> initWorker;
+
     private PopupMenuListener popupMenuListener = new PopupMenuListener() {
 
         @Override
@@ -213,10 +227,34 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
 
     @SuppressWarnings("unchecked")
     protected void initDsNameComboBox() {
+        if (initWorker != null && !initWorker.isDone()) {
+            initWorker.cancel(true);
+        }
         dsNameComboBox.setRefreshingModel(true);
-        FilterableComboBoxModel dsNameComboBoxModel = new FilterableComboBoxModel(getHasAuthConnections());
+        dsNameComboBox.setModel(new FilterableComboBoxModel(PENDING_CONTENT));
+        initWorker = new SwingWorker<List<String>, Void>() {
+
+            @Override
+            protected List<String> doInBackground() throws Exception {
+                return getHasAuthConnections();
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    FilterableComboBoxModel dsNameComboBoxModel = new FilterableComboBoxModel(get());
+                    String selected = dsNameComboBox.getSelectedItem();
                     dsNameComboBox.setModel(dsNameComboBoxModel);
+                    dsNameComboBox.setSelectedItem(selected);
                     dsNameComboBox.setRefreshingModel(false);
+                } catch (Exception e) {
+                    if (!(e instanceof CancellationException)) {
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    }
+                }
+            }
+        };
+        initWorker.execute();
     }
 
     protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) {

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

@@ -1,6 +1,8 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.TableData;
+import com.fr.base.TableDataBean;
+import com.fr.config.RemoteConfigEvent;
 import com.fr.data.TableDataSource;
 import com.fr.data.api.StoreProcedureAssist;
 import com.fr.data.impl.storeproc.StoreProcedure;
@@ -12,22 +14,26 @@ import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.i18n.Toolkit;
+import com.fr.event.EventDispatcher;
 import com.fr.file.ProcedureConfig;
 import com.fr.file.TableDataConfig;
+import com.fr.file.TableDataOperator;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
+import com.fr.third.org.apache.commons.collections4.MapUtils;
+import com.fr.workspace.WorkContext;
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -231,15 +237,25 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
 
     @Override
     public void update(TableDataConfig tableDataConfig) {
-        tableDataConfig.removeAllTableData();
-        ProcedureConfig.getInstance().removeAllProcedure();
         Nameable[] tableDataArray = this.update();
-        Map<String, TableData> tableDataMap = new LinkedHashMap<String, TableData>();
+        List<TableDataBean> tableDataBeans = new ArrayList<>();
+        Map<String, String> map = MapUtils.invertMap(getDsNameChangedMap());
         for (int i = 0; i < tableDataArray.length; i++) {
             NameObject nameObject = (NameObject) tableDataArray[i];
-            tableDataMap.put(nameObject.getName(), (TableData) nameObject.getObject());
+            String oldName = map.get(nameObject.getName());
+            if (oldName == null) {
+                oldName = StringUtils.EMPTY;
+            }
+            tableDataBeans.add(new TableDataBean(nameObject.getName(), oldName, (TableData) nameObject.getObject()));
+        }
+        try {
+            WorkContext.getCurrent().get(TableDataOperator.class).saveTableData(tableDataBeans);
+            if (!WorkContext.getCurrent().isLocal()) {
+                EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.class.getSimpleName());
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
-        tableDataConfig.setTableDatas(tableDataMap);
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import com.fr.data.TableDataSource;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.TableDataSourceDependent;
 import com.fr.design.DesignModelAdapter;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.constants.UIConstants;
@@ -53,10 +54,12 @@ import com.fr.plugin.manage.PluginFilter;
 import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.core.PropertyChangeAdapter;
+import com.fr.workspace.WorkContext;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
@@ -64,6 +67,7 @@ import javax.swing.SwingWorker;
 import javax.swing.ToolTipManager;
 import javax.swing.tree.TreePath;
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.GridLayout;
 import java.awt.dnd.DnDConstants;
 import java.awt.event.ActionEvent;
@@ -106,6 +110,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
     private EsdOnAction esdAction;
     private EsdOffAction esdOffAction;
     private PreviewTableDataAction previewTableDataAction;
+    private JPanel serverDatasetAuthTipJPanel = new JPanel();
 
     private TableDataTreePane() {
         initPane();
@@ -149,10 +154,12 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
         UIScrollPane scrollPane = new UIScrollPane(tableDataTree);
         scrollPane.setBorder(null);
+        initServerDatasetAuthTipJPanel();
         initButtonGroup();
         JPanel jPanel = new JPanel(new BorderLayout(0, 0));
-        JPanel buttonPane = new JPanel(new GridLayout());
+        JPanel buttonPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
         buttonPane.add(buttonGroup, BorderLayout.CENTER);
+        buttonPane.add(serverDatasetAuthTipJPanel, BorderLayout.SOUTH);
         jPanel.add(buttonPane, BorderLayout.NORTH);
         jPanel.add(scrollPane, BorderLayout.CENTER);
         this.add(jPanel, BorderLayout.CENTER);
@@ -172,6 +179,38 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         checkButtonEnabled();
     }
 
+    private void initServerDatasetAuthTipJPanel() {
+        String[] lineTips = Toolkit.i18nText("Fine-Design_Server_Dataset_Auth_Tip").split("\n");
+        serverDatasetAuthTipJPanel = new JPanel();
+        serverDatasetAuthTipJPanel.setLayout(new GridLayout(lineTips.length, 1));
+        for (int i = 0; i < lineTips.length; i++) {
+            String lineTip = lineTips[i];
+            List<JLabel> jLabels = new ArrayList<>();
+            jLabels.add(new JLabel(lineTip));
+            if (i == (lineTips.length - 1)) {
+                JLabel jLabel = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Alphafine_No_Remind"));
+                jLabel.setForeground(Color.lightGray);
+                jLabel.addMouseListener(new MouseAdapter() {
+                    @Override
+                    public void mouseClicked(MouseEvent e) {
+                        DesignerEnvManager.getEnvManager().setShowServerDatasetAuthTip(false);
+                        serverDatasetAuthTipJPanel.setVisible(false);
+                    }
+                });
+                jLabels.add(jLabel);
+            }
+            serverDatasetAuthTipJPanel.add(getLineTipJPanel(jLabels));
+        }
+    }
+
+    private JPanel getLineTipJPanel(List<JLabel> jLabels) {
+        JPanel jPanel = new JPanel(FRGUIPaneFactory.createLabelFlowLayout());
+        for (JLabel jLabel : jLabels) {
+            jPanel.add(jLabel);
+        }
+        return jPanel;
+    }
+
     private void createPluginListener() {
         //菜单栏监听
         GeneralContext.listenPluginRunningChanged(new PluginEventListener(PLUGIN_LISTENER_PRIORITY) {
@@ -532,6 +571,11 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         String[] textArray = {Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData")};
         buttonGroup = new UIHeadGroup(textArray) {
             public void tabChanged(int index) {
+                if (isShowServerDatasetAuthTipJPanel(textArray[index])) {
+                    serverDatasetAuthTipJPanel.setVisible(true);
+                } else {
+                    serverDatasetAuthTipJPanel.setVisible(false);
+                }
                 if (op != null) {
                     op.setDataMode(modeArray[buttonGroup.getSelectedIndex()]);
                     addMenuDef.setEnabled(modeArray[buttonGroup.getSelectedIndex()] == TEMPLATE_TABLE_DATA);
@@ -539,6 +583,15 @@ public class TableDataTreePane extends BasicTableDataTreePane {
 
                 }
             }
+
+            private boolean isShowServerDatasetAuthTipJPanel(String name) {
+                if (ComparatorUtils.equals(name, Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"))
+                        && DesignerEnvManager.getEnvManager().isShowServerDatasetAuthTip()
+                        && !WorkContext.getCurrent().isLocal()) {
+                    return true;
+                }
+                return false;
+            }
         };
         buttonGroup.setNeedLeftRightOutLine(false);
     }

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

@@ -5,20 +5,13 @@ import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.actions.server.ConnectionListAction;
-import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.editlock.ConnectionLockChangeChecker;
 import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UILockButton;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.StringUtils;
-import com.fr.transaction.CallBackAdaptor;
-import com.fr.transaction.Configurations;
-import com.fr.transaction.WorkerFacade;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
 import com.fr.report.LockItem;
@@ -87,12 +80,13 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
      * 刷新ComboBox.items
      */
     protected Iterator<String> items() {
-        nameList = new ArrayList<String>();
-
         ConnectionConfig mgr = ConnectionConfig.getInstance();
         Iterator<String> nameIt = mgr.getConnections().keySet().iterator();
 
         Collection<String> noAuthConnections = WorkContext.getCurrent().get(DBConnectAuth.class).getNoAuthConnections();
+
+        nameList = new ArrayList<>();
+
         if (noAuthConnections == null) {
             return nameList.iterator();
         }
@@ -132,48 +126,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
             return;
         }
         // 锁定成功，执行后续操作
-        final ConnectionListPane connectionListPane = new ConnectionListPane();
+        ConnectionListPane.showDialog(SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this));
-        final ConnectionConfig connectionConfig = ConnectionConfig.getInstance();
-        ConnectionConfig cloned = connectionConfig.mirror();
-        connectionListPane.populate(cloned);
-        final BasicDialog connectionListDialog = connectionListPane.showLargeWindow(
-                SwingUtilities.getWindowAncestor(ConnectionComboBoxPanel.this), null);
-        connectionListDialog.addDialogActionListener(new DialogActionAdapter() {
-            public void doOk() {
-                if (!connectionListPane.isNamePermitted()) {
-                    connectionListDialog.setDoOKSucceed(false);
-                    return;
-                }
-                Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
-                    @Override
-                    public void run() {
-                        connectionListPane.update(connectionConfig);
-                    }
-                }.addCallBack(new CallBackAdaptor() {
-                    @Override
-                    public boolean beforeCommit() {
-                        //如果更新失败，则不关闭对话框，也不写xml文件，并且将对话框定位在请重命名的那个对象页面
-                        return ConnectionListAction.doWithDatasourceManager(connectionConfig, connectionListPane, connectionListDialog);
-                    }
-
-                    @Override
-                    public void afterCommit() {
-                        DesignerContext.getDesignerBean("databasename").refreshBeanElement();
-                        // 关闭定义数据连接页面，为其解锁
-                        EditLockUtils.unlock(LockItem.CONNECTION);
-                    }
-                }));
-
-            }
-
-            @Override
-            public void doCancel() {
-                // 关闭定义数据连接页面，为其解锁
-                super.doCancel();
-                EditLockUtils.unlock(LockItem.CONNECTION);
-            }
-        });
-        connectionListDialog.setVisible(true);
         refreshItems();
     }
 

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

@@ -0,0 +1,48 @@
+package com.fr.design.data.datapane.connect;
+
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.editlock.EditLockUtils;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.file.ConnectionConfig;
+import com.fr.report.LockItem;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2021/9/8
+ */
+public class ConnectionListDialogActionAdapter extends DialogActionAdapter {
+
+    private final ConnectionManagerPane connectionManagerPane;
+    private final BasicDialog connectionListDialog;
+    private final ConnectionConfig connectionConfig;
+
+    public ConnectionListDialogActionAdapter(ConnectionManagerPane connectionManagerPane,
+                                             BasicDialog connectionListDialog,
+                                             ConnectionConfig connectionConfig) {
+        this.connectionManagerPane = connectionManagerPane;
+        this.connectionListDialog = connectionListDialog;
+        this.connectionConfig = connectionConfig;
+    }
+
+    @Override
+    public void doOk() {
+        if (!connectionManagerPane.isNamePermitted()) {
+            connectionListDialog.setDoOKSucceed(false);
+            return;
+        }
+        connectionManagerPane.update(connectionConfig);
+        DesignerContext.getDesignerBean("databasename").refreshBeanElement();
+        // 关闭定义数据连接页面，为其解锁
+        EditLockUtils.unlock(LockItem.CONNECTION);
+
+    }
+
+    @Override
+    public void doCancel() {
+        // 关闭定义数据连接页面，为其解锁
+        super.doCancel();
+        EditLockUtils.unlock(LockItem.CONNECTION);
+    }
+}

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

@@ -1,23 +1,32 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.config.RemoteConfigEvent;
 import com.fr.data.impl.Connection;
+import com.fr.data.impl.ConnectionBean;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.i18n.Toolkit;
+import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
+import com.fr.third.org.apache.commons.collections4.MapUtils;
+import com.fr.workspace.WorkContext;
+import com.fr.file.ConnectionOperator;
+import java.awt.Window;
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -67,8 +76,19 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
 
 
     protected void rename(String oldName, String newName) {
-        renameMap.remove(selectedName);
+        //如果a改成了b,b又被改成了c,就认为是a改成了c
-        renameMap.put(selectedName, newName);
+        for (Map.Entry<String, String> entry : renameMap.entrySet()) {
+            if (StringUtils.equals(oldName, entry.getValue())) {
+                oldName = entry.getKey();
+                break;
+            }
+        }
+        if (StringUtils.equals(oldName, newName)) {
+            //a -> b;b -> a,说明没改
+            renameMap.remove(oldName);
+        } else {
+            renameMap.put(oldName, newName);
+        }
     }
 
     /**
@@ -149,14 +169,42 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     public void update(ConnectionConfig connectionConfig) {
         // Nameable[]居然不能强转成NameObject[],一定要这么写...
         Nameable[] res = this.update();
-        NameObject[] res_array = new NameObject[res.length];
+        List<ConnectionBean> connectionBeans = new ArrayList<>();
-        java.util.Arrays.asList(res).toArray(res_array);
+        Map<String, String> map = MapUtils.invertMap(getRenameMap());
+        for (int i = 0; i < res.length; i++) {
+            NameObject nameObject = (NameObject) res[i];
+            String oldName = map.get(nameObject.getName());
+            if (oldName == null) {
+                oldName = StringUtils.EMPTY;
+            }
+            connectionBeans.add(new ConnectionBean(nameObject.getName(), oldName, (Connection) nameObject.getObject()));
+        }
+        try {
+            WorkContext.getCurrent().get(ConnectionOperator.class).saveConnection(connectionBeans);
+            if (!WorkContext.getCurrent().isLocal()) {
+                EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.class.getSimpleName());
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+    }
 
-        connectionConfig.removeAllConnection();
+    public static void showDialog(Window parent) {
+        final ConnectionConfig connectionConfig = ConnectionConfig.getInstance();
+        final ConnectionManagerPane connectionManagerPane = new ConnectionManagerPane() {
+            @Override
+            public void complete() {
+                ConnectionConfig cloned = connectionConfig.mirror();
+                populate(cloned);
+            }
 
-        for (int i = 0; i < res_array.length; i++) {
+            @Override
-            NameObject nameObject = res_array[i];
+            protected void renameConnection(String oldName, String newName) {
-            connectionConfig.addConnection(nameObject.getName(), (Connection) nameObject.getObject());
+                connectionConfig.renameConnection(oldName, newName);
             }
+        };
+        final BasicDialog connectionListDialog = connectionManagerPane.showLargeWindow(parent, null);
+        connectionListDialog.addDialogActionListener(new ConnectionListDialogActionAdapter(connectionManagerPane, connectionListDialog, connectionConfig));
+        connectionListDialog.setVisible(true);
     }
 }

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

@@ -3,12 +3,19 @@ package com.fr.design.data.datapane.connect;
 import com.fr.base.BaseUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 
-import javax.swing.*;
+import com.fr.log.FineLoggerFactory;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.util.Iterator;
+import java.util.concurrent.CancellationException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JPanel;
+import javax.swing.SwingWorker;
 
 public abstract class ItemEditableComboBoxPanel extends JPanel {
 	/**
@@ -16,6 +23,8 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	 */
 	private static final long serialVersionUID = 1L;
 
+	private static final String PENDING = Toolkit.i18nText("Fine-Design_Basic_Loading") + "...";
+
 	protected static final Object EMPTY = new Object() {
 		public String toString() {
 			return "";
@@ -26,6 +35,8 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	protected UIButton editButton;
     protected UIButton refreshButton;
 
+    private SwingWorker<Iterator<String>, Void> refreshWorker;
+
 	public ItemEditableComboBoxPanel() {
 		super();
 
@@ -75,6 +86,11 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	 * 刷新itemComboBox的内容
 	 */
 	protected void refreshItems() {
+
+		if (refreshWorker != null && !refreshWorker.isDone()) {
+			refreshWorker.cancel(true);
+		}
+
 		// 记录原来选中的Item,重新加载后需要再次选中
 		Object lastSelectedItem = itemComboBox.getSelectedItem();
 
@@ -83,18 +99,43 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 
 		// 先加EMPTY,再加items
 		model.addElement(EMPTY);
+		model.addElement(PENDING);
+
+		// 存在两种场景之前只考虑了填充场景 有populate会填充下 把这边的填充逻辑删了 所以没有问题
+		// 如果是纯通过刷新按钮 没有populate 需要手动设置下上次选中的内容
+		if (lastSelectedItem != null) {
+			model.setSelectedItem(lastSelectedItem);
+		}
 
-		java.util.Iterator<String> itemIt = items();
+		refreshWorker = new SwingWorker<Iterator<String>, Void>() {
+			@Override
+			protected Iterator<String> doInBackground() throws Exception {
+				return items();
+			}
+
+			@Override
+			protected void done() {
+				try {
+					Iterator<String> itemIt = get();
+					model.removeElement(PENDING);
 					while(itemIt.hasNext()) {
 						model.addElement(itemIt.next());
 					}
+					// 如果加载成功 但是下拉框是可见的 下拉框高度是会固定为原始高度 不会因为填充了更多下拉项而变化
+					// 需要重新设置下拉框高度 但值一样时相关事件不会生效 所以先加再减下
+					if (itemComboBox.isPopupVisible()) {
+						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() + 1);
+						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() - 1);
+					}
+				} catch (Exception e) {
+					if (!(e instanceof CancellationException)) {
+						FineLoggerFactory.getLogger().error(e.getMessage(), e);
+					}
+				}
 
-		// 再次选中之前选中的Item
-		int idx = model.getIndexOf(lastSelectedItem);
-		if(idx < 0) {
-			idx = 0;
 			}
-		itemComboBox.setSelectedIndex(idx);
+		};
+		refreshWorker.execute();
 	}
 
 	/*

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

@@ -647,10 +647,12 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         public StrategyConfig find() {
             StrategyConfig strategyConfig = null;
             if (getTableData() != null) {
-                try {
+                strategyConfig = getTableData().getStrategyConfig();
-                    strategyConfig = getTableData().getStrategyConfig() == null ? null : getTableData().getStrategyConfig().clone();
+                if (strategyConfig == null) {
-                } catch (CloneNotSupportedException e) {
+                    //共享数据集
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    if (getTableData().isShare()) {
+                        strategyConfig = StrategyConfigHelper.createStrategyConfig(true, false, true);
+                    }
                 }
             }
 
@@ -710,7 +712,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                 strategyConfig = StrategyConfigAttrUtils.getStrategyConfig(dsName);
 
 
-                if (useGlobal(getTableData(), strategyConfig, tplPath)) {
+                if (useGlobal(getTableData(), strategyConfig)) {
                     //使用全局配置
                     strategyConfig = StrategyConfigHelper.createStrategyConfig(true);
                 } else if (getTableData().isShare()) {
@@ -722,14 +724,13 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             return strategyConfig;
         }
 
-        private boolean useGlobal(DBTableData dbTableData, StrategyConfig strategyConfig, String tplPath) {
+        private boolean useGlobal(DBTableData dbTableData, StrategyConfig strategyConfig) {
             //非共享且配置为空或者指定使用全局配置时，检查是否全局开启
-            if (!dbTableData.isShare() && (strategyConfig == null || strategyConfig.isUseGlobal())) {
+            if (strategyConfig == null) {
-                //模版里面没有配置，检查模版是否被开启
+                return !dbTableData.isShare();
-                return StrategyConfigService.isTemplateEnabled(tplPath);
+            } else {
+                return strategyConfig.isUseGlobal();
             }
-
-            return false;
         }
 
         @Override

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java

@@ -26,6 +26,8 @@ import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.authority.user.UserAuthority;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -175,7 +177,8 @@ public abstract class TableDataFactory {
     public static String[] getSortOfChineseNameOfServerData(TableDataConfig tableDataConfig) {
         clearAll();
         try {
-            java.util.Iterator<String> nameIt = tableDataConfig.getTableDatas().keySet().iterator();
+            UserAuthority userAuthority = WorkContext.getCurrent().get(UserAuthority.class);
+            Iterator<String> nameIt = userAuthority.getAuthServerDataSetNames().iterator();
             while (nameIt.hasNext()) {
                 String name = nameIt.next();
                 addName(name, tableDataConfig.getTableData(name));

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

@@ -4,6 +4,7 @@ import com.fr.base.chart.chartdata.CallbackEvent;
 import com.fr.base.io.BaseBook;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.base.mode.DesignerMode;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.file.filter.ClassFilter;
 import com.fr.design.i18n.Toolkit;
@@ -69,7 +70,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
         DesignTableDataManager.closeTemplate(selected);
         //直接关闭模板的时候(当且仅当设计器tab上只剩一个模板)退出权限编辑
         if (DesignModeContext.isAuthorityEditing() && historyList.size() <= 1) {
-            DesignerContext.getDesignerFrame().closeAuthorityEditing();
+            DesignModeContext.switchTo(DesignerMode.NORMAL);
         }
         if (contains(selected) == -1) {
             return;
@@ -436,7 +437,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
     /**
      * 重绘当前模板
      */
-    public void repaintCurrentEditingTemplate(){
+    public void repaintCurrentEditingTemplate() {
         UIUtil.invokeLaterIfNeeded(new Runnable() {
             @Override
             public void run() {

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

@@ -4,6 +4,7 @@ package com.fr.design.file;
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.vcs.DesignerMode;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.imenu.UIMenuItem;
@@ -763,7 +764,7 @@ public class MutilTempalteTabPane extends JComponent {
     /**
      * 关闭掉一个模板之后激活新的待显示模板
      */
-    private void activePrevTemplateAfterClose() {
+    public void activePrevTemplateAfterClose() {
         if (openedTemplate.isEmpty()) {
             //新建并激活模板
             DesignerContext.getDesignerFrame().addAndActivateJTemplate();

designer-base/src/main/java/com/fr/design/formula/FormulaChecker.java

@@ -0,0 +1,88 @@
+package com.fr.design.formula;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.log.FineLoggerFactory;
+import com.fr.parser.FRLexer;
+import com.fr.parser.FRParser;
+import com.fr.script.checker.FunctionCheckerDispatcher;
+import com.fr.script.checker.exception.ConditionCheckWrongException;
+import com.fr.script.checker.exception.FunctionCheckWrongException;
+import com.fr.script.rules.FunctionParameterType;
+import com.fr.script.rules.FunctionRule;
+import com.fr.stable.StringUtils;
+import com.fr.stable.script.Expression;
+import com.fr.stable.script.Node;
+
+import java.io.StringReader;
+import java.util.List;
+
+/**
+ * @author Hoky
+ * @date 2021/9/28
+ */
+public class FormulaChecker {
+    private static final String VALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula");
+    private static final String INVALID_FORMULA = Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula");
+    public static final String COLON = ":";
+
+    public static String check(String formulaText) {
+        StringReader in = new StringReader(formulaText);
+
+        FRLexer lexer = new FRLexer(in);
+        FRParser parser = new FRParser(lexer);
+
+        try {
+            Expression expression = parser.parse();
+            Node node = expression.getConditionalExpression();
+            return FunctionCheckerDispatcher.getInstance()
+                    .getFunctionChecker(node)
+                    .checkFunction(node) ? VALID_FORMULA : INVALID_FORMULA;
+        } catch (ConditionCheckWrongException cce) {
+            String functionName = cce.getFunctionName();
+            return functionName + Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Condition_Tips") + COLON;
+        } catch (FunctionCheckWrongException ce) {
+            List<FunctionRule> rules = ce.getRules();
+            String functionName = ce.getFunctionName();
+            StringBuilder errorMsg = new StringBuilder(functionName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Error_Tips") + COLON);
+            for (int i = 0; i < rules.size(); i++) {
+                errorMsg.append("(");
+                if (rules.get(i).getParameterList().isEmpty()) {
+                    errorMsg.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_No_Param"));
+                }
+                for (FunctionParameterType functionParameterType : rules.get(i).getParameterList()) {
+                    errorMsg.append(getTypeString(functionParameterType)).append(",");
+                }
+                if (",".equals(errorMsg.charAt(errorMsg.length() - 1) + "")) {
+                    errorMsg.deleteCharAt(errorMsg.length() - 1);
+                }
+                errorMsg.append(")");
+                if (i != rules.size() - 1) {
+                    errorMsg.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Or"));
+                }
+            }
+            return errorMsg.toString();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return INVALID_FORMULA;
+            // alex:继续往下面走,expression为null时告知不合法公式
+        }
+    }
+
+    private static String getTypeString(FunctionParameterType type) {
+        switch (type) {
+            case NUMBER:
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Number");
+            case STRING:
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_String");
+            case ANY:
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Any");
+            case DATE:
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Date");
+            case BOOLEAN:
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Boolean");
+            case ARRAY:
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Array");
+        }
+        return StringUtils.EMPTY;
+    }
+}

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -5,6 +5,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
 import com.fr.base.ParameterMapNameSpace;
 import com.fr.base.TableDataNameSpace;
+import com.fr.base.Utils;
 import com.fr.base.io.IOFile;
 import com.fr.data.TableDataSource;
 import com.fr.design.actions.UpdateAction;
@@ -37,23 +38,17 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.parser.ArrayExpression;
 import com.fr.parser.BlockIntervalLiteral;
 import com.fr.parser.ColumnRowRangeInPage;
-import com.fr.parser.FRLexer;
+import com.fr.parser.NumberLiteral;
-import com.fr.parser.FRParser;
-import com.fr.parser.FunctionCall;
 import com.fr.parser.SheetIntervalLiteral;
 import com.fr.report.core.namespace.SimpleCellValueNameSpace;
 import com.fr.script.Calculator;
 import com.fr.script.ScriptConstants;
-import com.fr.script.checker.FunctionCheckerDispatcher;
-import com.fr.script.checker.exception.ConditionCheckWrongException;
-import com.fr.script.checker.exception.FunctionCheckWrongException;
-import com.fr.script.rules.FunctionParameterType;
-import com.fr.script.rules.FunctionRule;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.EssentialUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 import com.fr.stable.UtilEvalError;
+import com.fr.stable.script.CRAddress;
 import com.fr.stable.script.ColumnRowRange;
 import com.fr.stable.script.Expression;
 import com.fr.stable.script.Node;
@@ -99,6 +94,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -654,7 +650,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         public void actionPerformed(ActionEvent evt) {
             // Execute Formula default cell element.
             String formulaText = formulaTextArea.getText().trim();
-            String formulaValidMessage = getFormulaValidMessage(formulaText);
+            String formulaValidMessage = FormulaChecker.check(formulaText);
             FineJOptionPane.showMessageDialog(
                     FormulaPane.this,
                     formulaValidMessage + ".",
@@ -663,81 +659,21 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
     };
 
-    private static String getFormulaValidMessage(String formulaText) {
-        StringReader in = new StringReader(formulaText);
-
-        FRLexer lexer = new FRLexer(in);
-        FRParser parser = new FRParser(lexer);
-
-        try {
-            Expression expression = parser.parse();
-            Node node = expression.getConditionalExpression();
-            return FunctionCheckerDispatcher.getInstance()
-                    .getFunctionChecker(node)
-                    .checkFunction(node) ? VALID_FORMULA : INVALID_FORMULA;
-        } catch (ConditionCheckWrongException cce) {
-            String functionName = cce.getFunctionName();
-            StringBuilder errorMsg = new StringBuilder(functionName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Condition_Tips") + ":");
-            return errorMsg.toString();
-        } catch (FunctionCheckWrongException ce) {
-            List<FunctionRule> rules = ce.getRules();
-            String functionName = ce.getFunctionName();
-            StringBuilder errorMsg = new StringBuilder(functionName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Error_Tips") + ":");
-            for (int i = 0; i < rules.size(); i++) {
-                errorMsg.append("(");
-                if (rules.get(i).getParameterList().isEmpty()) {
-                    errorMsg.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_No_Param"));
-                }
-                for (FunctionParameterType functionParameterType : rules.get(i).getParameterList()) {
-                    errorMsg.append(getTypeString(functionParameterType)).append(",");
-                }
-                if (",".equals(errorMsg.charAt(errorMsg.length() - 1) + "")) {
-                    errorMsg.deleteCharAt(errorMsg.length() - 1);
-                }
-                errorMsg.append(")");
-                if (i != rules.size() - 1) {
-                    errorMsg.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Or"));
-                }
-            }
-            return errorMsg.toString();
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            return INVALID_FORMULA;
-            // alex:继续往下面走,expression为null时告知不合法公式
-        }
-    }
-
-    private static String getTypeString(FunctionParameterType type) {
-        switch (type) {
-            case NUMBER:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Number");
-            case STRING:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_String");
-            case ANY:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Any");
-            case DATE:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Date");
-            case BOOLEAN:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Boolean");
-            case ARRAY:
-                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Check_ParamType_Array");
-        }
-        return "";
-    }
-
     private final ActionListener calculateActionListener = new ActionListener() {
         @Override
         public void actionPerformed(ActionEvent e) {
             String formulaText = formulaTextArea.getText().trim();
-            if (containsUnsupportedSimulationFormulas(formulaText)) {
+            String formulaValidMessage = FormulaChecker.check(formulaText);
+            ;
+            String unSupportFormula = containsUnsupportedSimulationFormulas(formulaText);
+            if (unSupportFormula != null) {
                 FineJOptionPane.showMessageDialog(
                         FormulaPane.this,
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Unsupported_Formulas"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_Unsupported_Formulas") + ":" + unSupportFormula,
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                         JOptionPane.INFORMATION_MESSAGE);
                 return;
             }
-            String formulaValidMessage = getFormulaValidMessage(formulaText);
             String messageTips;
             if (formulaValidMessage.equals(INVALID_FORMULA)) {
                 messageTips = INVALID_FORMULA;
@@ -777,20 +713,21 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
     };
 
-    private boolean containsUnsupportedSimulationFormulas(String formulaText) {
+    private String containsUnsupportedSimulationFormulas(String formulaText) {
         try {
             Expression expression = Calculator.createCalculator().parse(formulaText);
-            String name = ((FunctionCall) expression.getConditionalExpression()).getName();
+            UnsupportedFormulaScanner scanner = new UnsupportedFormulaScanner();
-            if (UnsupportedSimulationFormulaHunter.isUnsupportedFomula(name)) {
+            if (!scanner.travelFormula(expression.getConditionalExpression())) {
-                return true;
+                return scanner.getUnSupportFormula();
             }
-            UnsupportedSimulationFormulaHunter unsupportedSimulationFormulaHunter = new UnsupportedSimulationFormulaHunter();
+
+            UnsupportedSimulationNodeHunter unsupportedSimulationFormulaHunter = new UnsupportedSimulationNodeHunter();
             expression.traversal4Tiny(unsupportedSimulationFormulaHunter);
-            return !unsupportedSimulationFormulaHunter.isSupported();
+            return unsupportedSimulationFormulaHunter.isSupported() ? null : unsupportedSimulationFormulaHunter.getUnSupportedNode();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error("", e);
         }
-        return true;
+        return null;
     }
 
     private Map<String, Object> setParamsIfExist(String formulaText) {
@@ -817,8 +754,24 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 if (entry.getValue().toString().startsWith("[") && entry.getValue().toString().endsWith("]")) {
                     Expression parse = calculator.parse(entry.getValue());
                     ArrayExpression arrayExpression = (ArrayExpression) parse.getConditionalExpression();
-                    FArray<Node> fArray = new FArray<>(arrayExpression.getArrays());
+                    Node[] arrays = arrayExpression.getArrays();
+                    List<Object> arrayList = new ArrayList<>();
+                    for (Node array : arrays) {
+                        if (array instanceof NumberLiteral) {
+                            arrayList.add(NumberFormat.getInstance().parse(array.toString()));
+                        } else {
+                            arrayList.add(array);
+                        }
+                    }
+                    FArray<Object> fArray = new FArray<>(arrayList);
                     parameterMap.put(entry.getKey(), fArray);
+                } else if (Utils.isNumeric(entry.getValue().toString())) {
+                    try {
+                        Number number = NumberFormat.getInstance().parse(entry.getValue().toString());
+                        parameterMap.put(entry.getKey(), number);
+                    } catch (Exception e) {
+                        FineLoggerFactory.getLogger().warn("", e);
+                    }
                 }
             }
         } catch (Exception e) {
@@ -838,34 +791,45 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         public void hunter4Tiny(Tiny tiny) {
             String statement = tiny.getStatement();
             if (StringUtils.isNotBlank(statement) && statement.startsWith(ScriptConstants.DETAIL_TAG)) {
+                if (statement.startsWith(ScriptConstants.SUMMARY_TAG)) {
+                    parameterList.add(new Parameter(statement));
+                } else {
                     parameterList.add(new Parameter(statement.substring(1)));
-            } else if (tiny.getClass() == ColumnRowRange.class || tiny.getClass() == ColumnRowRangeInPage.class ||
+                }
+            } else if (tiny.getClass() == ColumnRowRange.class ||
                     tiny.getClass() == SheetIntervalLiteral.class || tiny.getClass() == BlockIntervalLiteral.class) {
                 parameterList.add(new Parameter(tiny.toString()));
             }
         }
     }
 
-    private static class UnsupportedSimulationFormulaHunter extends TinyHunter {
+    private static class UnsupportedSimulationNodeHunter extends TinyHunter {
-        public final static String[] UNSUPPORTED_FORMULAS = new String[]{"PROPORTION", "TOIMAGE",
-                "WEBIMAGE", "SORT", "CROSSLAYERTOTAL", "CIRCULAR", "LAYERTOTAL", "MOM", "HIERARCHY"};
 
         private boolean supported = true;
 
+        private String unSupportedNode;
+
+        private String[] curReportVariables;
+
+        public UnsupportedSimulationNodeHunter() {
+            curReportVariables = VariableResolver.DEFAULT.resolveCurReportVariables();
+        }
+
         public boolean isSupported() {
             return supported;
         }
 
+        public String getUnSupportedNode() {
+            return unSupportedNode;
+        }
+
         public void hunter4Tiny(Tiny tiny) {
-            String statement = tiny.getStatement().toUpperCase();
+            if (tiny.getClass() == ColumnRowRangeInPage.class || tiny.getClass() == CRAddress.class
-            if (Arrays.asList(UNSUPPORTED_FORMULAS).contains(statement)) {
+                    || Arrays.asList(curReportVariables).contains(tiny.toString())) {
                 supported = false;
+                unSupportedNode = tiny.toString();
             }
         }
-
-        public static boolean isUnsupportedFomula(String formula) {
-            return Arrays.asList(UNSUPPORTED_FORMULAS).contains(formula);
-        }
     }
 
     public class VariableTreeAndDescriptionArea extends JPanel {

designer-base/src/main/java/com/fr/design/formula/UnsupportedFormulaScanner.java

@@ -0,0 +1,54 @@
+package com.fr.design.formula;
+
+import com.fr.parser.BinaryExpression;
+import com.fr.parser.DatasetFunctionCall;
+import com.fr.parser.FunctionCall;
+import com.fr.stable.script.Node;
+
+import java.util.Arrays;
+
+/**
+ * @author Hoky
+ * @date 2021/8/30
+ */
+public class UnsupportedFormulaScanner {
+    public final static String[] UNSUPPORTED_FORMULAS = new String[]{"PROPORTION", "TOIMAGE",
+            "WEBIMAGE", "SORT", "CROSSLAYERTOTAL", "CIRCULAR", "LAYERTOTAL", "MOM", "HIERARCHY",
+            "FILENAME", "FILESIZE", "FILETYPE", "TREELAYER", "GETUSERDEPARTMENTS", "GETUSERJOBTITLES"};
+
+    private String unSupportFormula = "";
+
+    public boolean travelFormula(Node node) {
+        if (node instanceof FunctionCall) {
+            if (isUnsupportedFomula(((FunctionCall) node).getName())) {
+                unSupportFormula = ((FunctionCall) node).getName();
+                return false;
+            } else {
+                for (Node argument : ((FunctionCall) node).getArguments()) {
+                    if (!travelFormula(argument)) {
+                        return false;
+                    }
+                }
+            }
+        } else if (node instanceof BinaryExpression) {
+            for (Node array : ((BinaryExpression) node).getNodes()) {
+                if (!travelFormula(array)) {
+                    return false;
+                }
+            }
+        } else if (node instanceof DatasetFunctionCall) {
+            DatasetFunctionCall datasetFunctionCall = (DatasetFunctionCall) node;
+            unSupportFormula = datasetFunctionCall.getSourceName() + "." + datasetFunctionCall.getFnName() + "()";
+            return false;
+        }
+        return true;
+    }
+
+    public String getUnSupportFormula() {
+        return unSupportFormula;
+    }
+
+    private static boolean isUnsupportedFomula(String formula) {
+        return Arrays.asList(UNSUPPORTED_FORMULAS).contains(formula.toUpperCase());
+    }
+}

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

@@ -0,0 +1,19 @@
+package com.fr.design.fun;
+
+import com.fr.stable.fun.mark.Mutable;
+
+
+public interface PcFitProvider extends Mutable {
+    String XML_TAG = "PcFitProvider";
+    int CURRENT_LEVEL = 1;
+
+    //设计器上看到的选项
+    String getContentDisplayValue();
+
+    //返回给前端的值
+    int getContentDisplayKey();
+
+    //设计器上的提示信息
+    String getContentDisplayTip();
+
+}

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

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

designer-base/src/main/java/com/fr/design/gui/chart/ChartEditPaneProvider.java

@@ -16,4 +16,7 @@ public interface ChartEditPaneProvider {
     default void removeChartEditPaneActionListener(ChartEditPaneActionListener l) {
     }
 
+    default void resetLastChartCollection() {
+    }
+
 }

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

@@ -23,12 +23,12 @@ import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import java.util.Collection;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.util.Collection;
 
 public abstract class JListControlPane extends JControlPane implements ListControlPaneProvider {
     private static final String LIST_NAME = "JControl_List";
@@ -335,7 +335,7 @@ public abstract class JListControlPane extends JControlPane implements ListContr
         getHelper().checkButtonEnabled();
     }
 
-    private class NameableListCellRenderer extends
+    protected class NameableListCellRenderer extends
             DefaultListCellRenderer {
         @Override
         public Component getListCellRendererComponent(JList list, Object value,

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

@@ -387,8 +387,6 @@ public abstract class UIControlPane extends JControlPane {
             contentPane.setBackground(originColor);
             contentPane.setLayout(new BorderLayout());
             titleLabel = new UILabel(title);
-            Font font = new Font("SimSun", Font.PLAIN, 12);
-            titleLabel.setFont(font);
             contentPane.add(titleLabel, BorderLayout.WEST);
             contentPane.setBorder(new EmptyBorder(5, 14, 6, 0));
 

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

@@ -329,7 +329,7 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li
             width = Math.max(width, calculateUIListMaxCellWidth(uiList.getModel(), uiList.getFontMetrics(uiList.getFont())));
         }
         iterator = nameEdListMap.entrySet().iterator();
-        width += 40;
+        width += 30;
         while (iterator.hasNext()) {
             Map.Entry<String, ListWrapperPane> entry = iterator.next();
             ListWrapperPane wrapperPane = entry.getValue();
@@ -349,7 +349,8 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li
                 } else {
                     text = element.toString();
                 }
-                width = Math.max(width, fontMetrics.stringWidth(text));
+                //增加 10px 的左右间隔
+                width = Math.max(width, fontMetrics.stringWidth(text) + 10);
             }
         }
         return width;
@@ -539,7 +540,8 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li
             label.setBackground(Color.WHITE);
             label.setForeground(Color.decode("#333334"));
             label.setFont(label.getFont().deriveFont(11F));
-            label.setPreferredSize(new Dimension(224, 26));
+            //预留 10px 的纵向滚动条的宽度
+            label.setPreferredSize(new Dimension(214, 26));
             this.nameEdList = nameEdList;
             this.add(label, BorderLayout.NORTH);
             this.add(this.nameEdList, BorderLayout.CENTER);

designer-base/src/main/java/com/fr/design/gui/ibutton/UIColorButton.java

@@ -136,6 +136,7 @@ public class UIColorButton extends UIButton implements PopupHider, UIObserver, G
         }
 
         popupWin = this.getColorControlWindow();
+        popupWin.setColor(color);
 
         GUICoreUtils.showPopupMenu(popupWin, this, POPUP_MENU_SHIFT, this.getSize().height);
     }

designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java

@@ -67,6 +67,9 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
                     fileChooserParent = DesignerContext.getDesignerFrame();
                 }
                 Stage stage = showCoverStage(fileChooserParent);
+                if (stage != null) {
+                    stage.setAlwaysOnTop(true);
+                }
                 try {
                     if (fileSelectionMode == FileSelectionMode.FILE || fileSelectionMode == FileSelectionMode.MULTIPLE_FILE) {
                         FileChooser fileChooser = new FileChooser();

designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java

@@ -1,25 +1,22 @@
 package com.fr.design.gui.ilist;
 
 import com.fr.design.gui.NameInspector;
+import com.fr.design.gui.itextfield.UITextField;
 import com.fr.general.GeneralUtils;
 import com.fr.general.NameObject;
-import com.fr.base.Utils;
-import com.fr.design.gui.itextfield.UITextField;
-
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
+import javax.swing.ListModel;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
-import java.awt.*;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Vector;
+import java.awt.Component;
+import java.awt.Rectangle;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 
 public class JNameEdList extends UIList implements CellEditorListener {
     private static final int ICON_WIDTH = 20;
@@ -38,6 +35,8 @@ public class JNameEdList extends UIList implements CellEditorListener {
      */
     private String oldName;
 
+    private boolean replaceEmptyName = true;
+
     public JNameEdList(ListModel dataModel) {
         super(dataModel);
     }
@@ -70,6 +69,10 @@ public class JNameEdList extends UIList implements CellEditorListener {
         return this.editable;
     }
 
+    public void setReplaceEmptyName(boolean replaceEmptyName) {
+        this.replaceEmptyName = replaceEmptyName;
+    }
+
     public void setNameShouldNumber(boolean isNameShouldNumber) {
         this.isNameShouldNumber = isNameShouldNumber;
     }
@@ -301,7 +304,7 @@ public class JNameEdList extends UIList implements CellEditorListener {
         ListCellEditor editor = getCellEditor();
         if (editor != null && editorComp != null) {
             Object value = editor.getCellEditorValue();
-            String name = StringUtils.isBlank(value.toString()) ? oldName : value.toString();
+            String name = StringUtils.isBlank(value.toString()) && replaceEmptyName ? oldName : value.toString();
             setNameAt(name, editingIndex);
             removeComp();
             doAfterStopEditing();

designer-base/src/main/java/com/fr/design/gui/ispinner/UISpinner.java

@@ -73,6 +73,12 @@ public class UISpinner extends JPanel implements UIObserver, GlobalNameObserver
         textField.setValue(defaultValue);
     }
 
+    public UISpinner(double minValue, double maxValue, double dierta, double defaultValue, boolean fillNegativeNumber) {
+        init(minValue, maxValue, dierta);
+        textField.setValue(defaultValue);
+        textField.canFillNegativeNumber(fillNegativeNumber);
+    }
+
     protected void init(double minValue, double maxValue, double dierta) {
         this.minValue = minValue;
         this.maxValue = maxValue;

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

@@ -1,18 +1,20 @@
 package com.fr.design.gui.itextfield;
 
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Toolkit;
-
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Toolkit;
 
 
 /**
  * Number Field.
  */
 public class EditTextField extends UIGridTextField {
+
+	private static final String I18NProperty = "i18n";
+
 	private int maxLength = 24;
 
 	public EditTextField() {
@@ -39,7 +41,11 @@ public class EditTextField extends UIGridTextField {
 	}
 
 	class TextDocument extends PlainDocument {
+
+		private Object defaultI18NProperty;
+
 		public TextDocument() {
+			defaultI18NProperty = getProperty(I18NProperty);
 		}
 
 		@Override
@@ -49,6 +55,7 @@ public class EditTextField extends UIGridTextField {
 				Toolkit.getDefaultToolkit().beep();
 				return;
 			}
+			putProperty(I18NProperty, defaultI18NProperty);
 			super.insertString(offset, s, a);
 		}
 	}

designer-base/src/main/java/com/fr/design/gui/itoolbar/UIToolbar.java

@@ -2,9 +2,12 @@ package com.fr.design.gui.itoolbar;
 
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.JTemplate;
+
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 import javax.swing.JToolBar;
 
 public class UIToolbar extends JToolBar {
@@ -35,13 +38,18 @@ public class UIToolbar extends JToolBar {
         }
     }
 
-    public void refreshUIToolBar() {
+    public Map<Component, Boolean> getComponentState() {
-        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        Map<Component, Boolean> componentState = new HashMap<>();
-        if (template != null) {
         for (int i = 0; i < getComponentCount(); i++) {
-                Component component = getComponents()[i];
+            Component component = getComponent(i);
-                component.setEnabled(template.checkEnable());
+            componentState.put(component, component.isEnabled());
         }
+        return componentState;
+    }
+
+    public static void resetComponentState(Map<Component, Boolean> componentState) {
+        for (Component component : componentState.keySet()) {
+            component.setEnabled(componentState.get(component));
         }
     }
 }

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

@@ -2,13 +2,13 @@ package com.fr.design.gui.style;
 
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.dialog.BasicScrollPane;
 import com.fr.design.gui.frpane.UIPercentDragPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.backgroundpane.GradientBackgroundQuickPane;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.Background;
 import com.fr.general.act.BackgroundPacker;
 
@@ -51,8 +51,8 @@ public abstract class AbstractTranslucentBackgroundSpecialPane<T extends Backgro
 
         // 确保BackgroundSpecialPane高度变化时，Label依然保持与其顶部对齐
         JPanel backgroundLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        backgroundLabelPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        backgroundLabelPane.setBorder(BorderFactory.createEmptyBorder(7, 0, 0, 0));
-        backgroundLabelPane.add(new UILabel(backgroundName), BorderLayout.NORTH);
+        backgroundLabelPane.add(FRWidgetFactory.createLineWrapLabel(backgroundName), BorderLayout.NORTH);
 
         JPanel backgroundComposedPane = TableLayoutHelper.createGapTableLayoutPane(
                 new JComponent[][]{
@@ -62,7 +62,7 @@ public abstract class AbstractTranslucentBackgroundSpecialPane<T extends Backgro
 
         JPanel opacityComposedPane = TableLayoutHelper.createGapTableLayoutPane(
                 new JComponent[][]{
-                        {new UILabel(""), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
+                        {new UILabel(""), FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
                         {new UILabel(""), opacityPane}
                 },
                 new double[]{p, p}, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);

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

@@ -17,6 +17,7 @@ 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.gui.ispinner.UISpinner;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -56,11 +57,11 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private static final int GAP = 23;
     private static final int VERGAP = 3;
     private static final Dimension SPINNER_DIMENSION = new Dimension(75, 20);
-    private static final String[] TEXT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Wrap_Text"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Single_Line"),
+    private static final String[] TEXT = {Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Wrap_Text"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Single_Line"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Multi_Line(Adjust_Font)")};
+            Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"), Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Multi_Line(Adjust_Font)")};
 
-    private static final String[] LAYOUT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"),
+    private static final String[] LAYOUT = {Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust")};
+            Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust")};
 
     private JPanel hPaneContainer;
     private JPanel vPaneContainer;
@@ -103,8 +104,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
                 {IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png")}};
         Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
         hAlignmentPane = new UIButtonGroup<>(hAlignmentIconArray, hAlignment);
-        hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Right"),
+        hAlignmentPane.setAllToolTips(new String[]{Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Left"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Right"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Distributed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_DEFAULT")});
+                Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Distributed"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_DEFAULT")});
         hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
         vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
 
@@ -113,7 +114,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
                 {IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png"), IOUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png")}};
         Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM};
         vAlignmentPane = new UIButtonGroup<>(vAlignmentIconArray, vAlignment);
-        vAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Bottom")});
+        vAlignmentPane.setAllToolTips(new String[]{Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Top"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Bottom")});
         initOtherComponent();
         initAllNames();
 
@@ -175,7 +176,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 
     private void initTextRotationCombox() {
         ArrayList<String> selectOption = new ArrayList<>();
-        selectOption.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Angle"));
+        selectOption.add(Toolkit.i18nText("Fine-Design_Basic_Custom_Angle"));
         VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class);
         selectOption.addAll(Arrays.asList(processor.getComboxOption()));
 
@@ -183,25 +184,25 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     }
 
     private void initAllNames() {
-        hAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"));
+        hAlignmentPane.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"));
-        vAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"));
+        vAlignmentPane.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"));
-        imageLayoutComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout"));
+        imageLayoutComboBox.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Image_Layout"));
-        textComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style"));
+        textComboBox.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style"));
-        textRotationComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
+        textRotationComboBox.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
-        rotationPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
+        rotationPane.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
-        leftIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent"));
+        leftIndentSpinner.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent"));
-        rightIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent"));
+        rightIndentSpinner.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent"));
-        spaceBeforeSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before"));
+        spaceBeforeSpinner.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before"));
-        spaceAfterSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After"));
+        spaceAfterSpinner.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After"));
-        lineSpaceSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing"));
+        lineSpaceSpinner.setGlobalName(Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing"));
     }
 
     private JPanel createPane() {
         JPanel jp1 = new JPanel(new BorderLayout());
         basicPane = new JPanel();
         seniorPane = new JPanel();
-        basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane());
+        basicPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane());
-        seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane());
+        seniorPane = new UIExpandablePane(Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane());
 
         jp1.add(basicPane, BorderLayout.NORTH);
         jp1.add(seniorPane, BorderLayout.CENTER);
@@ -212,13 +213,13 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     private JPanel basicPane() {
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        UILabel horizontalLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal") + "   ", SwingConstants.LEFT);
+        UILabel horizontalLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal") + "   ", SwingConstants.LEFT);
         UIComponentUtils.setLineWrap(horizontalLabel);
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{horizontalLabel, hPaneContainer},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical") + "   ", SwingConstants.RIGHT), vPaneContainer},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical") + "   ", SwingConstants.RIGHT), vPaneContainer},
                 new Component[]{null, null}
         };
         double[] rowSize = {p, p, p, p, p, p};
@@ -233,11 +234,11 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout")) + "   ", SwingConstants.LEFT), imageLayoutComboBox},
+                new Component[]{new UILabel((Toolkit.i18nText("Fine-Design_Basic_Image_Layout")) + "   ", SwingConstants.LEFT), imageLayoutComboBox},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style") + "   ", SwingConstants.LEFT), textComboBox},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style") + "   ", SwingConstants.LEFT), textComboBox},
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation") + "   ", SwingConstants.LEFT), textRotationComboBox},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation") + "   ", SwingConstants.LEFT), textRotationComboBox},
                 new Component[]{null, rotationBarCC},
                 new Component[]{null, null},
         };
@@ -261,23 +262,23 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
         lineSpaceSpinner.setPreferredSize(SPINNER_DIMENSION);
 
         JPanel indentationPane = new JPanel(new BorderLayout());
-        indentationPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Indentation")), SwingConstants.LEFT));
+        indentationPane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Indentation")), SwingConstants.LEFT));
         indentationPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP));
         JPanel partSpacingPane = new JPanel(new BorderLayout());
-        partSpacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Part_Spacing")), SwingConstants.LEFT));
+        partSpacingPane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Part_Spacing")), SwingConstants.LEFT));
         partSpacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP));
         JPanel spacingPane = new JPanel(new BorderLayout());
-        spacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Spacing")), SwingConstants.LEFT));
+        spacingPane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing")), SwingConstants.LEFT));
         spacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP));
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null, null},
                 new Component[]{indentationPane, creatSpinnerPane(leftIndentSpinner), creatSpinnerPane(rightIndentSpinner)},
-                new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Right")), SwingConstants.CENTER)},
+                new Component[]{null, new UILabel((Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER), new UILabel((Toolkit.i18nText("Fine-Design_Basic_Right")), SwingConstants.CENTER)},
                 new Component[]{null, null, null},
                 new Component[]{null, null, null},
                 new Component[]{partSpacingPane, creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)},
-                new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Front")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Behind")), SwingConstants.CENTER)},
+                new Component[]{null, new UILabel((Toolkit.i18nText("Fine-Design_Basic_Front")), SwingConstants.CENTER), new UILabel((Toolkit.i18nText("Fine-Design_Basic_Behind")), SwingConstants.CENTER)},
                 new Component[]{null, null, null},
                 new Component[]{null, null, null},
                 new Component[]{spacingPane, creatSpinnerPane(lineSpaceSpinner), null},
@@ -300,7 +301,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
      * @return 标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Alignment");
+        return Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Alignment");
     }
 
     /**
@@ -363,18 +364,18 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
             return null;
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"))) {
             Integer h = this.hAlignmentPane.getSelectedItem();
             style = style.deriveHorizontalAlignment(h == null ? -1 : h);
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"))) {
             Integer vAlign = this.vAlignmentPane.getSelectedItem();
             if (vAlign != null) {
                 style = style.deriveVerticalAlignment(vAlign);
             }
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style"))) {
             if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[0])) {
                 style = style.deriveTextStyle(Style.TEXTSTYLE_WRAPTEXT);
             } else if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[1])) {
@@ -394,7 +395,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 
 
     private Style updateImageLayout(Style style) {
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Image_Layout"))) {
             if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[1])) {
                 style = style.deriveImageLayout(Constants.IMAGE_TILED);
             } else if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[2])) {
@@ -410,7 +411,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
 
 
     private Style updateTextRotation(Style style) {
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"))) {
             if (this.textRotationComboBox.getSelectedIndex() != 0) {
                 style = style.deriveVerticalText(Style.VERTICALTEXT);
                 style = style.deriveRotation(0);
@@ -424,21 +425,21 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
     }
 
     private Style updateOther(Style style) {
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent"))) {
             style = style.derivePaddingLeft(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.leftIndentSpinner.getValue())));
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent"))) {
             style = style.derivePaddingRight(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.rightIndentSpinner.getValue())));
         }
         //间距
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before"))) {
             style = style.deriveSpacingBefore((int) (this.spaceBeforeSpinner.getValue()));
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After"))) {
             style = style.deriveSpacingAfter((int) (this.spaceAfterSpinner.getValue()));
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing"))) {
             style = style.deriveLineSpacing((int) (this.lineSpaceSpinner.getValue()));
         }
         return style;

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

@@ -2,11 +2,11 @@ package com.fr.design.gui.style;
 
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.act.BorderPacker;
 
 import javax.swing.JComponent;
@@ -72,9 +72,9 @@ public class ComponentIntegralStylePane extends AbstractBorderPackerPane {
         double[] columnSize = {this.uiLabelWidth, this.uiSettingWidth > 0 ? this.uiSettingWidth : f};
 
         JPanel content = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
-                        {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), borderStyleCombo},
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(borderStyleCombo)},
                         {this.borderPane, null},
-                        {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")), cornerSpinner},
+                        {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")), cornerSpinner},
                 },
                 rowSize, columnSize, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L1);
 

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

@@ -9,10 +9,10 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.FRWidgetFactory;
 import com.fr.form.ui.LayoutBorderStyle;
 import com.fr.form.ui.WidgetTitle;
 import com.fr.general.FRFont;
@@ -168,7 +168,7 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
         visibleCheckbox.setSelected(false);
 
         container.add(visibleCheckbox, BorderLayout.WEST);
-        container.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Visible")), BorderLayout.CENTER);
+        container.add(FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Visible")), BorderLayout.CENTER);
 
         visibleCheckbox.addChangeListener(new ChangeListener() {
             @Override
@@ -192,7 +192,7 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
         double[] columnSize = {this.uiLabelWidth, this.uiSettingWidth > 0 ? this.uiSettingWidth : f};
 
         return TableLayoutHelper.createCommonTableLayoutPane(
-                new JComponent[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), textContentPane}},
+                new JComponent[][]{{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), textContentPane}},
                 rowSize, columnSize, IntervalConstants.INTERVAL_L1);
     }
 
@@ -203,10 +203,10 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
         double[] columnSize = {this.uiLabelWidth, this.uiSettingWidth > 0 ? this.uiSettingWidth : f};
 
         JComponent[][] components = new JComponent[][]{
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), fontFamilyComboBox},
+                {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(fontFamilyComboBox)},
                 {null, createTitleFontButtonPane()},
                 {insetImagePane, null},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Text_Align")), alignPane},
+                {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Text_Align")), alignPane},
                 {backgroundPane, null}
         };
 
@@ -303,16 +303,19 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
             return;
         }
         JPanel container = this;
-        for (JComponent component: components) {
+        for (int i = 0; i < components.length; i++) {
+            JComponent component = components[i];
             if (component != null) {
                 container.add(component, BorderLayout.NORTH);
+                component.setBorder(BorderFactory.createEmptyBorder(i == 0 ? 0 : IntervalConstants.INTERVAL_L1, 0, 0, 0));
+                if (i < components.length - 1) {
                     JPanel nextContainer = new JPanel(FRGUIPaneFactory.createBorderLayout());
-                component.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
                     container.add(nextContainer, BorderLayout.CENTER);
                     container = nextContainer;
                 }
             }
         }
+    }
 
 
     public void setSupportTitleVisible(boolean supporting) {

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

@@ -1,10 +1,7 @@
 package com.fr.design.gui.style;
 
-import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.TemplateTheme;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.event.GlobalNameListener;
-import com.fr.design.event.GlobalNameObserver;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.file.HistoryTemplateListCache;
@@ -15,12 +12,12 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.widget.FRWidgetFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -66,12 +63,12 @@ public class FollowingThemePane extends BasicPane implements UIObserver {
             }
         });
 
-        UILabel followingThemeLabel = new UILabel(name);
+        UILabel followingThemeLabel = FRWidgetFactory.createLineWrapLabel(name);
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         JPanel followingThemePane =
-                TableLayoutHelper.createGapTableLayoutPane( new Component[][]{new Component[] { followingThemeLabel, followingThemeButtonGroup}},
+                TableLayoutHelper.createGapTableLayoutPane( new Component[][]{new Component[] { followingThemeLabel, FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(followingThemeButtonGroup)}},
                         new double[] { p }, new double[] { SETTING_LABEL_WIDTH, f }, 10, 0);
         followingThemePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         followingThemePane.setVisible(false);
@@ -114,10 +111,7 @@ public class FollowingThemePane extends BasicPane implements UIObserver {
     public TemplateTheme getUsingTheme() {
         JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         if (template != null) {
-            TemplateTheme theme = template.getTemplateTheme();
+            return template.getTemplateTheme();
-            if (theme instanceof FormTheme) {
-                return theme;
-            }
         }
         return null;
     }

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

@@ -0,0 +1,88 @@
+package com.fr.design.gui.style;
+
+import com.fr.base.Style;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.theme.edit.ui.LabelUtils;
+import com.fr.design.widget.FRWidgetFactory;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/9/29
+ */
+public class TextFontTippedPane extends AbstractBasicStylePane {
+
+    private FRFontPane fontPane;
+
+    public TextFontTippedPane(boolean showFormatTip) {
+        this.initializePane(showFormatTip);
+    }
+
+    private void initializePane(boolean showFormatTip) {
+        setLayout(new BorderLayout());
+        setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+
+        fontPane = new FRFontPane();
+        this.add(createLabeledPane(Toolkit.i18nText("Fine-Design_Form_FR_Font"), fontPane), BorderLayout.NORTH);
+
+        if (showFormatTip) {
+            JPanel formatTipPane = createFormatTipPane();
+            this.add(formatTipPane, BorderLayout.CENTER);
+        }
+    }
+
+    private JPanel createLabeledPane(String text, JPanel panel) {
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = { p };
+        double[] columnSize = {p, f};
+
+        UILabel uiLabel = new UILabel(text);
+        JPanel uiLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        uiLabelPane.add(uiLabel, BorderLayout.NORTH);
+
+        return TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[] { uiLabelPane, panel },
+        }, rowSize, columnSize, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM);
+    }
+
+    private JPanel createFormatTipPane() {
+        JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        container.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        UILabel formatMigratedTip = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Report_Format_Style_Migrated_Tip"));
+        formatMigratedTip.setForeground(new Color(153, 153, 153));
+
+        container.add(formatMigratedTip, BorderLayout.NORTH);
+        return container;
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Report_Text");
+    }
+
+    @Override
+    public void populateBean(Style style) {
+        this.fontPane.populateBean(style);
+    }
+
+    @Override
+    public Style update(Style style) {
+        return this.fontPane.update(style);
+    }
+}
+

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

@@ -0,0 +1,485 @@
+package com.fr.design.gui.style;
+
+import com.fr.base.CoreDecimalFormat;
+import com.fr.base.GraphHelper;
+import com.fr.base.Style;
+import com.fr.base.TextFormat;
+import com.fr.data.core.FormatField;
+import com.fr.data.core.FormatField.FormatContents;
+import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.LayoutConstants;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.event.GlobalNameListener;
+import com.fr.design.event.GlobalNameObserver;
+import com.fr.design.event.UIObserverListener;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.icombobox.TextFontComboBox;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icombobox.UIComboBoxRenderer;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.general.ComparatorUtils;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.UIManager;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.math.RoundingMode;
+import java.text.Format;
+import java.text.SimpleDateFormat;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/9/29
+ * 包含格式相关的设置
+ */
+public class TextFormatPane extends AbstractBasicStylePane implements GlobalNameObserver {
+    private static final long serialVersionUID = 724330854437726751L;
+
+    private static final int LABEL_X = 4;
+    private static final int LABEL_Y = 18;
+    private static final int LABEL_DELTA_WIDTH = 8;
+    private static final int LABEL_HEIGHT = 15; //标签背景的范围
+    private static final int CURRENCY_FLAG_POINT = 6;
+    private static final Border LEFT_BORDER = BorderFactory.createEmptyBorder(0, 30, 0, 0);
+
+    private static final Integer[] TYPES = new Integer[]{
+            FormatContents.NULL, FormatContents.NUMBER,
+            FormatContents.CURRENCY, FormatContents.PERCENT,
+            FormatContents.SCIENTIFIC, FormatContents.DATE,
+            FormatContents.TIME, FormatContents.TEXT};
+
+    private static final Integer[] DATE_TYPES = new Integer[]{FormatContents.NULL, FormatContents.DATE, FormatContents.TIME};
+
+    private Format format;
+
+    private UIComboBox typeComboBox;
+    private TextFontComboBox textField;
+    private UILabel sampleLabel;
+    private JPanel contentPane;
+    private JPanel txtCenterPane;
+    private JPanel centerPane;
+    private JPanel optionPane;
+    private UICheckBox roundingBox;
+    private JPanel formatFontPane;
+    private boolean isRightFormat;
+    private boolean isDate = false;
+    private GlobalNameListener globalNameListener = null;
+
+    /**
+     * Constructor.
+     */
+    public TextFormatPane() {
+        this.initComponents(TYPES);
+    }
+
+    protected UIComboBox getTypeComboBox() {
+        return typeComboBox;
+    }
+
+    protected void initComponents(Integer[] types) {
+        this.setLayout(new BorderLayout(0, 4));
+        initSampleLabel();
+        contentPane = new JPanel(new BorderLayout(0, 4)) {
+            @Override
+            public Dimension getPreferredSize() {
+                return new Dimension(super.getPreferredSize().width, 65);
+            }
+        };
+        typeComboBox = new UIComboBox(types);
+        UIComboBoxRenderer render = createComBoxRender();
+        typeComboBox.setRenderer(render);
+        typeComboBox.addItemListener(itemListener);
+        typeComboBox.setGlobalName("typeComboBox");
+        contentPane.add(sampleLabel, BorderLayout.NORTH);
+
+        txtCenterPane = new JPanel(new BorderLayout());
+        textField = new TextFontComboBox();
+        textField.addItemListener(textFieldItemListener);
+        textField.setEditable(true);
+        textField.setGlobalName("textField");
+        txtCenterPane.add(textField, BorderLayout.NORTH);
+
+        contentPane.add(txtCenterPane, BorderLayout.CENTER);
+
+        centerPane = new JPanel(new CardLayout());
+        centerPane.add(new JPanel(), "hide");
+        centerPane.setPreferredSize(new Dimension(0, 0));
+        centerPane.add(contentPane, "show");
+
+        typeComboBox.setPreferredSize(new Dimension(155,20));
+        JPanel typePane = new JPanel(new BorderLayout());
+        typePane.add(typeComboBox, BorderLayout.CENTER);
+        typePane.setBorder(LEFT_BORDER);
+//        centerPane.setBorder(LEFT_BORDER);
+
+        JPanel option = new JPanel(new BorderLayout());
+        option.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Option"), SwingConstants.LEFT), BorderLayout.WEST);
+        roundingBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_Base_Option_Half_Up"));
+        roundingBox.setBorder(BorderFactory.createEmptyBorder(0, 40, 0, 0));
+        roundingBox.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+            }
+        });
+        roundingBox.setGlobalName("roundingBox");
+        option.add(roundingBox, BorderLayout.CENTER);
+        optionPane = new JPanel(new CardLayout());
+        optionPane.add(new JPanel(), "hide");
+        optionPane.setPreferredSize(new Dimension(0, 0));
+        optionPane.add(option, "show");
+
+        Component[][] components = getComponent(centerPane, typePane);
+        this.add(createContentPane(components), BorderLayout.CENTER);
+    }
+
+    protected JPanel createContentPane (Component[][] components) {
+        double f = TableLayout.FILL;
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = {p, p, p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM);
+    }
+
+
+    protected Component[][] getComponent (JPanel centerPane, JPanel typePane) {
+        return new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane},
+                new Component[]{centerPane, null},
+                new Component[]{optionPane, null},
+        };
+    }
+
+    protected UIComboBoxRenderer createComBoxRender() {
+        return new UIComboBoxRenderer() {
+            @Override
+            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                if (value instanceof Integer) {
+                    label.setText(" " + FormatField.getInstance().getName((Integer) value));
+                }
+                return label;
+            }
+        };
+    }
+
+    private void initSampleLabel() {
+        Border interBorder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4);
+        String title = Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample");
+        Border border = BorderFactory.createTitledBorder(interBorder, title, TitledBorder.LEFT, 0, null, UIConstants.LINE_COLOR);
+        sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) {
+
+            @Override
+            public void paint(Graphics g) {
+                super.paint(g);
+                int width = getWidth();
+                Color original = g.getColor();
+                g.setColor(getBackground());
+                g.fillRect(LABEL_X, LABEL_Y, width - LABEL_DELTA_WIDTH, LABEL_HEIGHT);
+                g.setColor(UIConstants.LINE_COLOR);
+                FontMetrics cellFM = g.getFontMetrics();
+                int textWidth = cellFM.stringWidth(getText());
+                GraphHelper.drawString(g, getText(), (width - textWidth) / 2, 26);
+                g.setColor(original);
+            }
+        };
+        sampleLabel.setHorizontalAlignment(UILabel.CENTER);
+        sampleLabel.setBorder(border);
+    }
+
+
+    @Override
+    /**
+     * 得到合适的大小
+     */
+    public Dimension getPreferredSize() {
+        if (this.typeComboBox.getSelectedIndex() == FormatContents.NULL) {
+            return typeComboBox.getPreferredSize();
+        }
+        return super.getPreferredSize();
+    }
+
+    /**
+     * 弹出框标题
+     *
+     * @return 标题
+     */
+    public String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Report_Text");
+    }
+
+    /**
+     * Populate
+     */
+    public void populateBean(Format format) {
+        this.format = format;
+
+        if (format == null) {
+            this.typeComboBox.setSelectedIndex(FormatContents.NULL);
+        } else {
+            if (format instanceof CoreDecimalFormat) {
+                // check all value
+                String pattern = ((CoreDecimalFormat) format).toPattern();
+                if (isCurrencyFormatStyle(pattern)) {
+                    setPatternComboBoxAndList(FormatContents.CURRENCY, pattern);
+                } else if (pattern.indexOf("%") > 0) {
+                    setPatternComboBoxAndList(FormatContents.PERCENT, pattern);
+                    this.roundingBox.setSelected(((CoreDecimalFormat) format).getRoundingMode().equals(RoundingMode.HALF_UP));
+                } else if (pattern.indexOf("E") > 0) {
+                    setPatternComboBoxAndList(FormatContents.SCIENTIFIC, pattern);
+                } else {
+                    setPatternComboBoxAndList(FormatContents.NUMBER, pattern);
+                }
+            } else if (format instanceof SimpleDateFormat) { // date and time
+                String pattern = ((SimpleDateFormat) format).toPattern();
+                if (!isTimeType(pattern)) {
+                    setPatternComboBoxAndList(FormatContents.DATE, pattern);
+                } else {
+                    setPatternComboBoxAndList(FormatContents.TIME, pattern);
+                }
+            } else if (format instanceof TextFormat) { // Text
+                this.typeComboBox.setSelectedItem(FormatContents.TEXT);
+            }
+        }
+    }
+
+    private boolean isCurrencyFormatStyle(String pattern) {
+        if (pattern.length() == 0) {
+            return false;
+        }
+
+        if (pattern.charAt(0) == '¤' || pattern.charAt(0) == '$') {
+            return true;
+        }
+
+        return pattern.length() > CURRENCY_FLAG_POINT && pattern.startsWith("#,##0;");
+    }
+
+    /**
+     * 判断是否是数组有模式
+     *
+     * @param stringArray 字符串数组
+     * @param pattern     格式
+     * @return 是否是数组有模式
+     */
+    public static int isArrayContainPattern(String[] stringArray, String pattern) {
+        for (int i = 0; i < stringArray.length; i++) {
+            if (ComparatorUtils.equals(stringArray[i], pattern)) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    private void setPatternComboBoxAndList(int formatStyle, String pattern) {
+        this.typeComboBox.setSelectedItem(formatStyle);
+        this.textField.setSelectedItem(pattern);
+    }
+
+    private boolean isTimeType(String pattern) {
+        return pattern.matches(".*[Hhmsa].*");
+    }
+
+    /**
+     * update
+     */
+    public Format update() {
+        String patternString = String.valueOf(textField.getSelectedItem());
+        if (getFormatContents() == FormatContents.TEXT) {
+            return FormatField.getInstance().getFormat(getFormatContents(), patternString);
+        }
+        if (isRightFormat) {
+            if (StringUtils.isNotEmpty(patternString)) {
+                RoundingMode roundingMode = roundingBox.isSelected() ? RoundingMode.HALF_UP : RoundingMode.HALF_EVEN;
+                return FormatField.getInstance().getFormat(getFormatContents(), patternString, roundingMode);
+            }
+        }
+        return null;
+    }
+
+    private int getFormatContents() {
+        return (Integer) typeComboBox.getSelectedItem();
+    }
+
+    /**
+     * Refresh preview label.
+     */
+    private void refreshPreviewLabel() {
+        this.sampleLabel.setText(FormatField.getInstance().getFormatValue());
+        this.sampleLabel.setForeground(UIManager.getColor("Label.foreground"));
+        try {
+            isRightFormat = true;
+            if (StringUtils.isEmpty(String.valueOf(textField.getSelectedItem()))) {
+                return;
+            }
+            this.sampleLabel.setText(FormatField.getInstance().getFormatValue(getFormatContents(), String.valueOf(textField.getSelectedItem())));
+        } catch (Exception e) {
+            this.sampleLabel.setForeground(Color.red);
+            this.sampleLabel.setText(e.getMessage());
+            isRightFormat = false;
+        }
+    }
+
+    private boolean isTextOrNull() {
+        int contents = getFormatContents();
+        return contents == FormatContents.TEXT || contents == FormatContents.NULL;
+    }
+
+    /**
+     * Radio selection listener.
+     */
+    ItemListener itemListener = new ItemListener() {
+
+        @Override
+        public void itemStateChanged(ItemEvent e) {
+            if (e.getStateChange() == ItemEvent.SELECTED) {
+                int contents = getFormatContents();
+                String[] items = FormatField.getInstance().getFormatArray(contents, false);
+                CardLayout cardLayout = (CardLayout) centerPane.getLayout();
+
+                if (isTextOrNull()) {
+                    centerPane.setPreferredSize(new Dimension(0, 0));
+                    cardLayout.show(centerPane, "hide");
+                } else {
+                    textField.removeAllItems();
+                    textField.setItemArray(items);
+                    textField.setSelectedIndex(0);
+                    centerPane.setPreferredSize(new Dimension(270, 65));
+                    cardLayout.show(centerPane, "show");
+                }
+                CardLayout optionLayout = ((CardLayout) optionPane.getLayout());
+                if (getFormatContents() == FormatContents.PERCENT) {
+                    optionPane.setPreferredSize(new Dimension(100, 20));
+                    optionLayout.show(optionPane, "show");
+                } else {
+                    optionPane.setPreferredSize(new Dimension(0, 0));
+                    optionLayout.show(optionPane, "hide");
+                    roundingBox.setSelected(false);
+                }
+            }
+
+        }
+    };
+
+    ItemListener textFieldItemListener = new ItemListener() {
+        @Override
+        public void itemStateChanged(ItemEvent e) {
+            if (e.getStateChange() == ItemEvent.SELECTED) {
+                refreshPreviewLabel();
+            }
+        }
+    };
+
+    @Override
+    /**
+     * populate
+     */
+    public void populateBean(Style style) {
+        this.populateBean(style.getFormat());
+    }
+
+    @Override
+    /**
+     * update
+     */
+    public Style update(Style style) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), "textField")
+                || ComparatorUtils.equals(globalNameListener.getGlobalName(), "typeComboBox")
+                || ComparatorUtils.equals(globalNameListener.getGlobalName(), "roundingBox")) {
+            return style.deriveFormat(this.update());
+        }
+        return style;
+    }
+
+    /**
+     * 默认只显示百分比的编辑下拉.
+     */
+    public void justUsePercentFormat() {
+        typeComboBox.setEnabled(false);
+        this.typeComboBox.setSelectedItem(FormatContents.PERCENT);
+    }
+
+    public void setForDataSheet() {
+        Integer[] otherTypes = new Integer[]{FormatContents.NULL, FormatContents.NUMBER, FormatContents.CURRENCY, FormatContents.PERCENT, FormatContents.SCIENTIFIC,};
+        this.typeComboBox = new UIComboBox(otherTypes);
+        UIComboBoxRenderer render = new UIComboBoxRenderer() {
+            @Override
+            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                if (value instanceof Integer) {
+                    label.setText(" " + FormatField.getInstance().getName((Integer) value));
+                }
+                return label;
+            }
+        };
+        typeComboBox.setRenderer(render);
+        typeComboBox.addItemListener(itemListener);
+        setTypeComboBoxPane(typeComboBox);
+    }
+
+    protected void setTypeComboBoxPane (UIComboBox typeComboBox) {
+        this.add(typeComboBox, BorderLayout.NORTH);
+    }
+
+    public void setComboBoxModel(boolean isDate) {
+        if (this.isDate != isDate) {
+            this.isDate = isDate;
+            this.typeComboBox.setSelectedIndex(0);
+            if (isDate) {
+                for (int i = 0; i < DATE_TYPES.length; i++) {
+                    this.typeComboBox.addItem(DATE_TYPES[i]);
+                }
+                for (int i = 0; i < TYPES.length; i++) {
+                    this.typeComboBox.removeItemAt(1);
+                }
+            } else {
+                for (int i = 0; i < TYPES.length; i++) {
+                    this.typeComboBox.addItem(TYPES[i]);
+                }
+                for (int i = 0; i < DATE_TYPES.length; i++) {
+                    this.typeComboBox.removeItemAt(1);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void registerNameListener(GlobalNameListener listener) {
+        globalNameListener = listener;
+    }
+
+    public void registerChangeListener(UIObserverListener listener) {
+        typeComboBox.registerChangeListener(listener);
+        textField.registerChangeListener(listener);
+    }
+
+    @Override
+    public boolean shouldResponseNameListener() {
+        return false;
+    }
+
+    @Override
+    public void setGlobalName(String name) {
+
+    }
+}

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

@@ -299,15 +299,16 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
         Background borderImage = style.getBorderImage();
         if (borderImage instanceof ImageBackground) {
             // 图片类型边框
-            Image image = ((ImageBackground) borderImage).getImage();
+            ImageBackground imageBackground = (ImageBackground) borderImage;
-            int[] ninePoint = ((ImageBackground) borderImage).getNinePoint();
+            Image image = imageBackground.getImage();
 
             if (image != null) {
                 this.borderLineCombo.selectBorderImage();
                 this.imagePreviewPane.setImageWithSuffix(((ImageBackground) borderImage).getImageWithSuffix());
                 this.tweakNinePointButton.setEnabled(true);
                 this.borderImageOpacityPane.populateBean(style.getBorderImageOpacity());
-                if (ninePoint != null && ninePoint.length == 4 && ninePoint[0] > 0 && ninePoint[1] > 0 && ninePoint[2] > 0 && ninePoint[3] > 0) {
+                int[] ninePoint = ((ImageBackground) borderImage).getNinePoint();
+                if (ninePoint != null && ninePoint.length == 4 && ninePoint[0] >= 0 && ninePoint[1] >= 0 && ninePoint[2] >= 0 && ninePoint[3] >= 0) {
                     this.ninePoint = Arrays.copyOf(ninePoint, 4);
                 } else {
                     this.ninePoint = new int[4];
@@ -487,6 +488,7 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
         private int ninePointBottom = -1;
 
         private static final int MIN_NINE_POINT = 0;
+        private static final int MIN_GAP_PARALLEL_LINES = 1;
 
         private int imgWidth;
         private int imgHeight;
@@ -757,8 +759,8 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
         private void onNinePointTopChanged(int value) {
             if (value < MIN_NINE_POINT) {
                 value = MIN_NINE_POINT;
-            } else if (value >= imgHeight - ninePointBottom) {
+            } else if (value >= imgHeight - ninePointBottom - MIN_GAP_PARALLEL_LINES) {
-                value = imgHeight - ninePointBottom - MIN_NINE_POINT;
+                value = imgHeight - ninePointBottom - MIN_GAP_PARALLEL_LINES;
             }
             this.ninePointTop = value;
             repaint();
@@ -767,8 +769,8 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
         private void onNinePointBottomChanged(int value) {
             if (value < MIN_NINE_POINT) {
                 value = MIN_NINE_POINT;
-            } else if (value >= imgHeight - ninePointTop) {
+            } else if (value >= imgHeight - ninePointTop - MIN_GAP_PARALLEL_LINES) {
-                value = imgHeight - ninePointTop - MIN_NINE_POINT;
+                value = imgHeight - ninePointTop - MIN_GAP_PARALLEL_LINES;
             }
             this.ninePointBottom = value;
             repaint();
@@ -777,8 +779,8 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
         private void onNinePointLeftChanged(int value) {
             if (value < MIN_NINE_POINT) {
                 value = MIN_NINE_POINT;
-            } else if (value >= imgWidth - ninePointRight) {
+            } else if (value >= imgWidth - ninePointRight - MIN_GAP_PARALLEL_LINES) {
-                value = imgWidth - ninePointRight - MIN_NINE_POINT;
+                value = imgWidth - ninePointRight - MIN_GAP_PARALLEL_LINES;
             }
             this.ninePointLeft = value;
             repaint();
@@ -787,8 +789,8 @@ public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane imple
         private void onNinePointRightChanged(int value) {
             if (value < MIN_NINE_POINT) {
                 value = MIN_NINE_POINT;
-            } else if (value >= imgWidth - ninePointLeft) {
+            } else if (value >= imgWidth - ninePointLeft - MIN_GAP_PARALLEL_LINES) {
-                value = imgWidth - ninePointLeft - MIN_NINE_POINT;
+                value = imgWidth - ninePointLeft - MIN_GAP_PARALLEL_LINES;
             }
             this.ninePointRight = value;
             repaint();

designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

@@ -2,6 +2,8 @@ package com.fr.design.javascript;
 
 import com.fr.base.BaseFormula;
 import com.fr.base.Parameter;
+import com.fr.base.extension.FileExtension;
+import com.fr.design.border.UITitledBorder;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -14,6 +16,10 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itableeditorpane.ParameterTableModel;
+import com.fr.design.gui.itableeditorpane.UITableEditAction;
+import com.fr.design.gui.itableeditorpane.UITableEditorPane;
+import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
 import com.fr.design.hyperlink.AbstractHyperLinkPane;
@@ -22,32 +28,40 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.file.filetree.IOFileNodeFilter;
 import com.fr.general.GeneralUtils;
 import com.fr.js.ExportJavaScript;
+import com.fr.js.SingleJavaScript;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
 
 import javax.swing.AbstractButton;
+import javax.swing.AbstractCellEditor;
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTable;
 import javax.swing.SwingUtilities;
+import javax.swing.event.CellEditorListener;
+import javax.swing.event.ChangeEvent;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.table.TableCellEditor;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
+import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -58,21 +72,20 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
     private ExportRadioGroup templateRadioGroup;
     private UIRadioButton currentTemplateRadio;
     private UIRadioButton otherTemplateRadio;
-    private UITextField reportPathTextField;
-    private UIButton browserButton;
     private UIComboBox exportTypeComboBox;
-    private ExportRadioGroup fileNameRadioGroup;
+    private CardLayout card;
-    private UIRadioButton defaultNameRadio;
+    private JPanel templatePanel;
-    private UIRadioButton customNameRadio;
+    private CurrentTemplatePane currentTemplatePane;
-    private FormulaEditor fileNameFormulaEditor;
+    private OtherTemplatePane otherTemplatePane;
-    private UICheckBox extendParametersCheckBox;
-    private ReportletParameterViewPane parameterViewPane;
 
     private static final double p = TableLayout.PREFERRED;
     private static final Map<String, String> EXPORT_TYPES_MAP = new HashMap<>();
-    private static final String CURRENT_TEMPLATE = "current";
+    private static final Map<String, String> FILENAME_TYPE_MAP = new HashMap<>();
-    private static final String DEFAULT_FILENAME = "default";
+    private static final Map<String, String> PARAMETER_TYPE_MAP = new HashMap<>();
-
+    private static final String DEFAULT = "default";
+    private static final String CUSTOM = "custom";
+    private static final String CURRENT_TEMPLATE = "cur";
+    private static final String OTHER_TEMPLATE = "other";
 
     static {
         EXPORT_TYPES_MAP.put(ExportJavaScript.EXPORT_PDF, Toolkit.i18nText("Fine-Design_Basic_Export_JS_PDF"));
@@ -81,23 +94,27 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         EXPORT_TYPES_MAP.put(ExportJavaScript.EXPORT_EXCEL_SHEET, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Excel_Sheet"));
         EXPORT_TYPES_MAP.put(ExportJavaScript.EXPORT_WORD, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Word"));
         EXPORT_TYPES_MAP.put(ExportJavaScript.EXPORT_IMAGE, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Image"));
+        FILENAME_TYPE_MAP.put(DEFAULT, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Default"));
+        FILENAME_TYPE_MAP.put(CUSTOM, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Custom"));
+        PARAMETER_TYPE_MAP.put(DEFAULT, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Extend_Parameters"));
+        PARAMETER_TYPE_MAP.put(CUSTOM, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Custom"));
     }
 
-    public ExportJavaScriptPane() {
+    // 当前模板
-        initComponents();
+    class CurrentTemplatePane extends BasicPane {
-    }
 
-    private void initComponents() {
+        private ExportRadioGroup fileNameRadioGroup;
+        private UIRadioButton defaultNameRadio;
+        private UIRadioButton customNameRadio;
+        private FormulaEditor fileNameFormulaEditor;
+        private UICheckBox extendParametersCheckBox;
+        private ReportletParameterViewPane parameterViewPane;
+
+        public CurrentTemplatePane() {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        this.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Toolkit.i18nText("Fine-Design_Basic_Export_JS_Setting")));
+            this.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Current")));
 
-        //导出模板+导出方式+导出文件名
             JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-
-        //导出模板
-        JPanel chooseTemplatePane = initChooseTemplatePane();
-        northPane.add(chooseTemplatePane, BorderLayout.NORTH);
-
             //导出方式
             JPanel exportTypePane = initExportTypePane();
             northPane.add(exportTypePane, BorderLayout.CENTER);
@@ -116,27 +133,12 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         }
 
         private JPanel initParamsPane() {
-        extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
+            UILabel parameterLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Parameters_Setting") + ':');
+            extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Extend_Parameters"));
             extendParametersCheckBox.setSelected(true);
             parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
             parameterViewPane.setVisible(false);
-        parameterViewPane.addTableEditorListener(new TableModelListener() {
+            addListener(parameterViewPane);
-            public void tableChanged(TableModelEvent e) {
-                List<ParameterProvider> list = parameterViewPane.update();
-                HashSet<String> tempSet = new HashSet<>();
-                for (int i = 0; i < list.size(); i++) {
-                    if (StringUtils.isEmpty(list.get(i).getName())) {
-                        continue;
-                    }
-                    if (tempSet.contains(list.get(i).toString())) {
-                        list.remove(i);
-                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Duplicate_Name") + "!");
-                        return;
-                    }
-                    tempSet.add(list.get(i).toString());
-                }
-            }
-        });
             extendParametersCheckBox.addItemListener(new ItemListener() {
                 @Override
                 public void itemStateChanged(ItemEvent e) {
@@ -144,10 +146,12 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
                 }
             });
             JPanel paramsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        paramsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Toolkit.i18nText("Fine-Design_Basic_Parameters")));
+            Component[][] components = new Component[][]{{parameterLabel, extendParametersCheckBox}};
-        paramsPane.add(extendParametersCheckBox, BorderLayout.NORTH);
+            JPanel paramsCheckPane = TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{p, p});
+            paramsCheckPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 5, 2));
             JPanel dynamicPaneWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
             dynamicPaneWrapper.add(parameterViewPane);
+            paramsPane.add(paramsCheckPane, BorderLayout.NORTH);
             paramsPane.add(dynamicPaneWrapper, BorderLayout.CENTER);
             return paramsPane;
         }
@@ -157,17 +161,24 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             fileNameRadioGroup = new ExportRadioGroup();
             defaultNameRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Default"));
             defaultNameRadio.setSelected(true);
-        customNameRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Custom"));
+            customNameRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Custom"));
             addRadioToGroup(fileNameRadioGroup, defaultNameRadio, customNameRadio);
             fileNameFormulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
+            fileNameFormulaEditor.setVisible(false);
             fileNameFormulaEditor.setEnabled(false);
+            UILabel fileNameTipLabel = new UILabel("<html><body style=\"color:rgb(147,147,147)\">" + Toolkit.i18nText("Fine-Design_Basic_Export_JS_Title_Tip_Front") + "\\/:*?\"<>|" + Toolkit.i18nText("Fine-Design_Basic_Export_JS_Title_Tip_Back") + "</html>");
+            fileNameTipLabel.setVisible(false);
             fileNameRadioGroup.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
                     if (defaultNameRadio.isSelected()) {
+                        fileNameFormulaEditor.setVisible(false);
                         fileNameFormulaEditor.setEnabled(false);
+                        fileNameTipLabel.setVisible(false);
                     } else {
+                        fileNameFormulaEditor.setVisible(true);
                         fileNameFormulaEditor.setEnabled(true);
+                        fileNameTipLabel.setVisible(true);
                     }
                 }
             });
@@ -175,73 +186,155 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             JPanel fileNameRadioPane = TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{p, p, p, p});
 
             JPanel fileNameTipPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        UILabel fileNameTipLabel = new UILabel("<html><body style=\"color:red\">" + Toolkit.i18nText("Fine-Design_Basic_Export_JS_Title_Tip_Front") + "\\/:*?\"<>|" + Toolkit.i18nText("Fine-Design_Basic_Export_JS_Title_Tip_Back") + "</html>");
             fileNameTipPane.add(fileNameTipLabel);
 
             JPanel fileNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
             fileNamePane.add(fileNameRadioPane, BorderLayout.NORTH);
             fileNamePane.add(fileNameTipPane, BorderLayout.CENTER);
-        fileNameTipPane.setBorder(BorderFactory.createEmptyBorder(5,2,5,2));
+            fileNameTipPane.setBorder(BorderFactory.createEmptyBorder(5, 2, 5, 2));
-        fileNamePane.setBorder(BorderFactory.createEmptyBorder(5,2,5,2));
+            fileNamePane.setBorder(BorderFactory.createEmptyBorder(5, 2, 5, 2));
             return fileNamePane;
         }
 
-    private JPanel initExportTypePane() {
+        @Override
-        UILabel typeLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Type") + ":");
+        protected String title4PopupWindow() {
-        exportTypeComboBox = new UIComboBox(new DefaultComboBoxModel<String>());
+            return Toolkit.i18nText("Fine-Design_Basic_Export_JS_Setting");
-        DefaultComboBoxModel<String> comboBoxModel = (DefaultComboBoxModel<String>) exportTypeComboBox.getModel();
+        }
-        String[] allExportTypes = new String[]{ExportJavaScript.EXPORT_PDF, ExportJavaScript.EXPORT_EXCEL_PAGE, ExportJavaScript.EXPORT_EXCEL_SIMPLE, ExportJavaScript.EXPORT_EXCEL_SHEET, ExportJavaScript.EXPORT_WORD, ExportJavaScript.EXPORT_IMAGE};
+
-        for (int i = 0; i < allExportTypes.length; i++) {
+    }
-            comboBoxModel.addElement(allExportTypes[i]);
+
+    // 其他模板
+    class OtherTemplatePane extends BasicPane {
+
+        private UITableEditorPane<SingleJavaScript> editorPane;
+
+        public OtherTemplatePane() {
+            this.setLayout(FRGUIPaneFactory.createBorderLayout());
+            this.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Other")));
+
+            editorPane = new UITableEditorPane<>(new ExportJSTableModel());
+
+            this.add(editorPane, BorderLayout.CENTER);
         }
-        this.exportTypeComboBox.setRenderer(new UIComboBoxRenderer() {
 
         @Override
-            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        protected String title4PopupWindow() {
-                super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+            return Toolkit.i18nText("Fine-Design_Basic_Export_JS_Setting");
-                if (value instanceof String) {
-                    this.setText(EXPORT_TYPES_MAP.get(value));
         }
-                return this;
+
     }
+
+    class ExportJSTableModel extends UITableModelAdapter<SingleJavaScript> {
+
+        private static final long serialVersionUID = -3697206557955735642L;
+
+        public ExportJSTableModel() {
+            super(new String[]{
+                    Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_File"),
+                    Toolkit.i18nText("Fine-Design_Basic_Export_JS_Type"),
+                    Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename"),
+                    Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Custom"),
+                    Toolkit.i18nText("Fine-Design_Basic_Export_JS_Parameters_Setting"),
+                    StringUtils.EMPTY});
+            this.setColumnClass(new Class[]{
+                    ExportTemplateChooser.class,
+                    ExportTypeCombobox.class,
+                    FileNameCombobox.class,
+                    FileNameFormulaEditor.class,
+                    ParameterCombobox.class,
+                    ParameterSettingButton.class
             });
-        Component[][] components = new Component[][]{{typeLabel, exportTypeComboBox}};
+            this.setDefaultEditor(ExportTemplateChooser.class, new ExportTemplateChooser());
+            this.setDefaultEditor(ExportTypeCombobox.class, new ExportTypeCombobox());
+            this.setDefaultEditor(FileNameCombobox.class, new FileNameCombobox());
+            this.setDefaultEditor(FileNameFormulaEditor.class, new FileNameFormulaEditor());
+            this.setDefaultEditor(ParameterCombobox.class, new ParameterCombobox());
+            this.setDefaultEditor(ParameterSettingButton.class, new ParameterSettingButton());
+            this.createTable().getColumnModel().getColumn(2).setMaxWidth(60);
+            this.createTable().getColumnModel().getColumn(4).setMaxWidth(60);
+            this.createTable().getColumnModel().getColumn(5).setMaxWidth(40);
+        }
+
+        @Override
+        public UITableEditAction[] createAction() {
+            return new UITableEditAction[] {new AddJSAction(), new DeleteAction()};
+        }
+
+        @Override
+        public Object getValueAt(int rowIndex, int columnIndex) {
+            SingleJavaScript js = this.getList().get(rowIndex);
+            switch (columnIndex) {
+                case 0:
+                    return js.getTemplatePath();
+                case 1:
+                    return EXPORT_TYPES_MAP.get(js.getExportType());
+                case 2:
+                    return js.isDefaultFileName() ? Toolkit.i18nText("Fine-Design_Basic_Export_JS_Filename_Default") : Toolkit.i18nText("Fine-Design_Basic_Export_JS_Custom");
+                case 3:
+                    return js.getFileName();
+                case 4:
+                    return js.isExtendParameters() ? Toolkit.i18nText("Fine-Design_Basic_Export_JS_Extend_Parameters") : Toolkit.i18nText("Fine-Design_Basic_Export_JS_Custom");
+                case 5:
+                    return js.getParameters();
+            }
+            return null;
+        }
+
+        @Override
+        public boolean isCellEditable(int row, int col) {
+            if(col == 3) {
+                // 命名详情
+                return this.getList().get(row) != null && !this.getList().get(row).isDefaultFileName();
+            }
+            if (col == 5) {
+                // 参数设置按钮
+                return this.getList().get(row) != null && !this.getList().get(row).isExtendParameters();
+            }
+            return true;
+        }
+
+        private class AddJSAction extends AddTableRowAction {
+
+            public AddJSAction() {
 
-        JPanel exportTypePane = TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{p, p});
-        exportTypePane.setBorder(BorderFactory.createEmptyBorder(5,2,5,2));
-        return exportTypePane;
             }
 
-    private JPanel initChooseTemplatePane() {
-        UILabel templateLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template") + ":");
-        templateRadioGroup = new ExportRadioGroup();
-        currentTemplateRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Current"));
-        currentTemplateRadio.setSelected(true);
-        otherTemplateRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Other"));
-        addRadioToGroup(templateRadioGroup, currentTemplateRadio, otherTemplateRadio);
-        templateRadioGroup.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                if (currentTemplateRadio.isSelected()) {
+                super.actionPerformed(e);
-                    browserButton.setEnabled(false);
+                if (otherTemplatePane.editorPane.getTableModel().getList().size() <= 50) {
+                    addJS();
                 } else {
-                    browserButton.setEnabled(true);
+                    FineJOptionPane.showMessageDialog(otherTemplatePane, Toolkit.i18nText("Fine-Design_Basic_Export_JS_Batch_Export_Limit"));
                 }
             }
-        });
+        }
-        Component[][] components = new Component[][]{{templateLabel, currentTemplateRadio, otherTemplateRadio}};
+
-        JPanel reportletRadioPane = TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{p, p, p});
+        private void addJS() {
+            SingleJavaScript js = new SingleJavaScript();
+            addRow(js);
+            fireTableDataChanged();
+            table.getSelectionModel().setSelectionInterval(table.getRowCount() - 1, table.getRowCount() - 1);
+        }
+
+        // 导出文件选择
+        class ExportTemplateChooser extends AbstractCellEditor implements TableCellEditor {
+
+            private static final long serialVersionUID = -9112506131272704717L;
+            private JPanel reportletNamePane;
+            private UITextField reportPathTextField;
+            private UIButton browserButton;
 
-        JPanel reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            public ExportTemplateChooser() {
+                reportletNamePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
                 // 路径输入框
-        reportPathTextField = new UITextField(20);
+                reportPathTextField = new UITextField(7);
                 reportPathTextField.setEnabled(false);
-        reportletNamePane.add(reportPathTextField, BorderLayout.CENTER);
+                reportletNamePane.add(reportPathTextField, BorderLayout.WEST);
 
                 // 选择路径按钮
-        browserButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Select"));
+                browserButton = new UIButton("...");
-        browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
+                browserButton.setVisible(true);
-        browserButton.setEnabled(false);
                 reportletNamePane.add(browserButton, BorderLayout.EAST);
                 browserButton.addActionListener(new ActionListener() {
                     @Override
@@ -259,11 +352,375 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
                         reportletDialog.setVisible(true);
                     }
                 });
+                this.addCellEditorListener(new CellEditorListener() {
+
+                    @Override
+                    public void editingCanceled(ChangeEvent e) {
+
+                    }
+
+                    @Override
+                    public void editingStopped(ChangeEvent e) {
+                        if (table.getSelectedRow() == -1){
+                            return;
+                        }
+                        SingleJavaScript js = getList().get(table.getSelectedRow());
+                        String value = StringUtils.trimToNull(reportPathTextField.getText());
+                        js.setTemplatePath(value);
+                        js.setCurrentTemplate(false);
+                        fireTableDataChanged();
+                    }
+                });
+
+            }
+
+            @Override
+            public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+                reportPathTextField.setText((String) value);
+                return reportletNamePane;
+            }
+
+            @Override
+            public Object getCellEditorValue() {
+                return reportPathTextField.getText();
+            }
+        }
+
+        // 导出方式下拉框
+        class ExportTypeCombobox extends AbstractCellEditor implements TableCellEditor {
+
+            private static final long serialVersionUID = -6564079764032351372L;
+
+            public ExportTypeCombobox() {
+                exportTypeComboBox = getComboBoxWithModel(new String[]{ExportJavaScript.EXPORT_PDF, ExportJavaScript.EXPORT_EXCEL_PAGE, ExportJavaScript.EXPORT_EXCEL_SIMPLE, ExportJavaScript.EXPORT_EXCEL_SHEET, ExportJavaScript.EXPORT_WORD, ExportJavaScript.EXPORT_IMAGE}
+                                                    , EXPORT_TYPES_MAP);
+                this.addCellEditorListener(new CellEditorListener() {
+
+                    @Override
+                    public void editingCanceled(ChangeEvent e) {
+
+                    }
+
+                    @Override
+                    public void editingStopped(ChangeEvent e) {
+                        if (table.getSelectedRow() == -1){
+                            return;
+                        }
+                        SingleJavaScript js = getList().get(table.getSelectedRow());
+                        Object ob = exportTypeComboBox.getSelectedItem();
+                        if (ob != null) {
+                            String value = ob.toString();
+                            js.setExportType(value);
+                        }
+                        fireTableDataChanged();
+                    }
+                });
+            }
+
+            @Override
+            public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+                exportTypeComboBox.setSelectedItem(value);
+                return exportTypeComboBox;
+            }
+
+            @Override
+            public Object getCellEditorValue() {
+                Object ob = exportTypeComboBox.getSelectedItem();
+                if (ob != null) {
+                    return ob.toString();
+                }
+                return ExportJavaScript.EXPORT_PDF;
+            }
+        }
+
+        // 命名方式下拉框
+        class FileNameCombobox extends AbstractCellEditor implements TableCellEditor {
+
+            private static final long serialVersionUID = 1829005772744444269L;
+            private UIComboBox fileNameComboBox;
+
+            public FileNameCombobox() {
+                fileNameComboBox = getComboBoxWithModel(new String[]{DEFAULT, CUSTOM}, FILENAME_TYPE_MAP);
+                this.addCellEditorListener(new CellEditorListener() {
+
+                    @Override
+                    public void editingCanceled(ChangeEvent e) {
+
+                    }
+
+                    @Override
+                    public void editingStopped(ChangeEvent e) {
+                        if (table.getSelectedRow() == -1){
+                            return;
+                        }
+                        SingleJavaScript js = getList().get(table.getSelectedRow());
+                        Object ob = fileNameComboBox.getSelectedItem();
+                        if (ob != null) {
+                            String value = ob.toString();
+                            js.setDefaultFileName(StringUtils.equals(value, DEFAULT));
+                        }
+                        fireTableDataChanged();
+                    }
+                });
+            }
+
+            @Override
+            public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+                fileNameComboBox.setSelectedItem(value);
+                return fileNameComboBox;
+            }
+
+            @Override
+            public Object getCellEditorValue() {
+                return fileNameComboBox.getSelectedItem().toString();
+            }
+        }
+
+        // 命名方式公式框
+        class FileNameFormulaEditor extends AbstractCellEditor implements TableCellEditor {
+
+            private static final long serialVersionUID = 7120075192535645493L;
+            private FormulaEditor fileNameFormulaEditor;
+
+            public FileNameFormulaEditor() {
+                fileNameFormulaEditor = new FormulaEditor(Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
+                this.addCellEditorListener(new CellEditorListener() {
+
+                    @Override
+                    public void editingCanceled(ChangeEvent e) {
+
+                    }
 
-        JPanel chooseTemplatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+                    @Override
+                    public void editingStopped(ChangeEvent e) {
+                        if (table.getSelectedRow() == -1){
+                            return;
+                        }
+                        SingleJavaScript js = getList().get(table.getSelectedRow());
+                        String value = fileNameFormulaEditor.getUITextField().getText();
+                        js.setFileName(value);
+                        fireTableDataChanged();
+                    }
+                });
+            }
+
+            @Override
+            public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+                fileNameFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build());
+                return fileNameFormulaEditor;
+            }
+
+            @Override
+            public Object getCellEditorValue() {
+                return fileNameFormulaEditor.getUITextField().getText();
+            }
+
+            public FormulaEditor getFileNameEditor() {
+                return fileNameFormulaEditor;
+            }
+        }
+
+        //参数设置下拉框
+        class ParameterCombobox extends AbstractCellEditor implements TableCellEditor  {
+
+            private static final long serialVersionUID = 2630964402770993584L;
+            private UIComboBox parameterSetting;
+
+            public ParameterCombobox() {
+                parameterSetting = getComboBoxWithModel(new String[]{DEFAULT, CUSTOM}, PARAMETER_TYPE_MAP);
+                this.addCellEditorListener(new CellEditorListener() {
+
+                    @Override
+                    public void editingCanceled(ChangeEvent e) {
+
+                    }
+
+                    @Override
+                    public void editingStopped(ChangeEvent e) {
+                        if (table.getSelectedRow() == -1){
+                            return;
+                        }
+                        SingleJavaScript js = getList().get(table.getSelectedRow());
+                        Object ob = parameterSetting.getSelectedItem();
+                        if (ob != null) {
+                            String value = ob.toString();
+                            js.setExtendParameters(StringUtils.equals(value, DEFAULT));
+                        }
+                        fireTableDataChanged();
+                    }
+                });
+            }
+
+            @Override
+            public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+                parameterSetting.setSelectedItem(value);
+                return parameterSetting;
+            }
+
+            @Override
+            public Object getCellEditorValue() {
+                return parameterSetting.getSelectedItem().toString();
+            }
+        }
+
+        // 参数设置按钮
+        class ParameterSettingButton extends AbstractCellEditor implements TableCellEditor {
+
+            private static final long serialVersionUID = 4021592871993049137L;
+            private UIButton paraButton;
+            private ParameterSettingPane paraSettingPane;
+            ParameterProvider[] parameterArr;
+
+            public ParameterSettingButton() {
+                paraSettingPane = new ParameterSettingPane();
+                paraButton = new UIButton();
+                paraButton.setBackground(Color.GRAY);
+                paraButton.addMouseListener(new MouseAdapter() {
+
+                    @Override
+                    public void mousePressed(MouseEvent e) {
+                        BasicDialog dialog = paraSettingPane.showWindow(SwingUtilities.getWindowAncestor(ExportJavaScriptPane.this));
+                        dialog.addDialogActionListener(new DialogActionAdapter() {
+                            @Override
+                            public void doOk() {
+                                List<ParameterProvider> parameterList = paraSettingPane.getParameterList();
+                                parameterArr = parameterList.toArray(new Parameter[parameterList.size()]);
+                            }
+                        });
+                        dialog.setVisible(true);
+                    }
+
+                });
+                this.addCellEditorListener(new CellEditorListener() {
+
+                    @Override
+                    public void editingCanceled(ChangeEvent e) {
+
+                    }
+
+                    @Override
+                    public void editingStopped(ChangeEvent e) {
+                        if (table.getSelectedRow() == -1){
+                            return;
+                        }
+                        SingleJavaScript js = getList().get(table.getSelectedRow());
+                        js.setParameters(parameterArr);
+                        fireTableDataChanged();
+                    }
+                });
+
+            }
+
+            @Override
+            public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+                paraSettingPane.refresh(new ArrayList<>(Arrays.asList((ParameterProvider[]) value)));
+                return paraButton;
+            }
+
+            @Override
+            public Object getCellEditorValue() {
+                return paraSettingPane.getParameterList();
+            }
+        }
+
+        // 参数设置弹出框
+        class ParameterSettingPane extends BasicPane {
+
+            private ReportletParameterViewPane parameterViewPane;
+
+            public ParameterSettingPane() {
+                this.setLayout(FRGUIPaneFactory.createBorderLayout());
+                parameterViewPane = new ReportletParameterViewPane(ParameterTableModel.NO_CHART_USE, getValueEditorPane(), getValueEditorPane());
+                addListener(parameterViewPane);
+                this.add(parameterViewPane);
+            }
+
+            @Override
+            protected String title4PopupWindow() {
+                return Toolkit.i18nText("Fine-Design_Basic_Export_JS_Parameters_Setting");
+            }
+
+            public List<ParameterProvider> getParameterList() {
+                return parameterViewPane.update();
+            }
+
+            public void refresh(List list) {
+                parameterViewPane.update(list);
+            }
+
+        }
+
+    }
+
+    public ExportJavaScriptPane() {
+        initComponents();
+    }
+
+    private void initComponents() {
+        JPanel totalPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        totalPanel.setBorder(UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Setting")));
+
+        // 导出模板
+        JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        JPanel chooseTemplatePane = initChooseTemplatePane();
+        northPane.add(chooseTemplatePane, BorderLayout.NORTH);
+
+        // 默认当前模板
+        currentTemplatePane = new CurrentTemplatePane();
+        otherTemplatePane = new OtherTemplatePane();
+        templatePanel = FRGUIPaneFactory.createCardLayout_S_Pane();
+        card = new CardLayout();
+        templatePanel.setLayout(card);
+        templatePanel.add(CURRENT_TEMPLATE, currentTemplatePane);
+        templatePanel.add(OTHER_TEMPLATE, otherTemplatePane);
+
+        totalPanel.add(northPane, BorderLayout.NORTH);
+        totalPanel.add(templatePanel, BorderLayout.CENTER);
+
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.add(totalPanel);
+    }
+
+    private JPanel initExportTypePane() {
+        UILabel typeLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Type") + ":");
+        exportTypeComboBox = getComboBoxWithModel(new String[]{ExportJavaScript.EXPORT_PDF, ExportJavaScript.EXPORT_EXCEL_PAGE, ExportJavaScript.EXPORT_EXCEL_SIMPLE, ExportJavaScript.EXPORT_EXCEL_SHEET, ExportJavaScript.EXPORT_WORD, ExportJavaScript.EXPORT_IMAGE}
+                , EXPORT_TYPES_MAP);
+        Component[][] components = new Component[][]{{typeLabel, exportTypeComboBox}};
+
+        JPanel exportTypePane = TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{p, p});
+        exportTypePane.setBorder(BorderFactory.createEmptyBorder(5, 2, 5, 2));
+        return exportTypePane;
+    }
+
+    private JPanel initChooseTemplatePane() {
+        UILabel templateLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template") + ":");
+        templateRadioGroup = new ExportRadioGroup();
+        currentTemplateRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Current"));
+        currentTemplateRadio.setSelected(true);
+        otherTemplateRadio = new UIRadioButton(Toolkit.i18nText("Fine-Design_Basic_Export_JS_Template_Other"));
+        addRadioToGroup(templateRadioGroup, currentTemplateRadio, otherTemplateRadio);
+        currentTemplateRadio.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    card.show(templatePanel, CURRENT_TEMPLATE);
+                }
+            }
+        });
+        otherTemplateRadio.addItemListener(new ItemListener() {
+            @Override
+            public void itemStateChanged(ItemEvent e) {
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    card.show(templatePanel, OTHER_TEMPLATE);
+                }
+            }
+        });
+        Component[][] components = new Component[][]{{templateLabel, currentTemplateRadio, otherTemplateRadio}};
+        JPanel reportletRadioPane = TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, new double[]{p, p, p});
+
+        JPanel chooseTemplatePane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
         chooseTemplatePane.add(reportletRadioPane, BorderLayout.NORTH);
-        chooseTemplatePane.add(reportletNamePane, BorderLayout.CENTER);
+        chooseTemplatePane.setBorder(BorderFactory.createEmptyBorder(0, 7, 5, 2));
-        chooseTemplatePane.setBorder(BorderFactory.createEmptyBorder(0,2,5,2));
 
         return chooseTemplatePane;
     }
@@ -275,28 +732,27 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
         }
         this.templateRadioGroup.selectIndexButton(ob.isCurrentTemplate() ? 0 : 1);
         if (ob.isCurrentTemplate()) {
-            this.browserButton.setEnabled(false);
+            SingleJavaScript js = ob.getJavaScript();
-        } else {
+            exportTypeComboBox.setSelectedItem(js.getExportType());
-            this.browserButton.setEnabled(true);
+            currentTemplatePane.fileNameRadioGroup.selectIndexButton(js.isDefaultFileName() ? 0 : 1);
-            this.reportPathTextField.setText(ob.getTemplatePath());
+            if (!js.isDefaultFileName()) {
-        }
+                currentTemplatePane.fileNameFormulaEditor.setEnabled(true);
-        this.exportTypeComboBox.setSelectedItem(ob.getExportType());
+                currentTemplatePane.fileNameFormulaEditor.setVisible(true);
-        this.fileNameRadioGroup.selectIndexButton(ob.isDefaultFileName() ? 0 : 1);
+                currentTemplatePane.fileNameFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build(js.getFileName()));
-        if (ob.isDefaultFileName()) {
+            }
-            this.fileNameFormulaEditor.setEnabled(false);
+            if (js.isExtendParameters()) {
+                currentTemplatePane.extendParametersCheckBox.setSelected(true);
             } else {
-            this.fileNameFormulaEditor.setEnabled(true);
+                currentTemplatePane.extendParametersCheckBox.setSelected(false);
-            this.fileNameFormulaEditor.setValue(BaseFormula.createFormulaBuilder().build(ob.getFileName()));
-        }
-        if (ob.isExtendParameters()) {
-            this.extendParametersCheckBox.setSelected(true);
-        } else {
-            this.extendParametersCheckBox.setSelected(false);
                 List<ParameterProvider> parameterList = this.parameterViewPane.update();
                 parameterList.clear();
-            ParameterProvider[] parameters = ob.getParameters();
+                ParameterProvider[] parameters = js.getParameters();
                 this.parameterViewPane.populate(parameters);
             }
+        } else {
+            OtherTemplatePane pane = (OtherTemplatePane) this.templatePanel.getComponent(1);
+            pane.editorPane.populate(ob.getJsList().toArray(new SingleJavaScript[ob.getJsList().size()]));
+        }
     }
 
     @Override
@@ -308,32 +764,78 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
 
     @Override
     public void updateBean(ExportJavaScript exportJavaScript) {
-        exportJavaScript.setCurrentTemplate(this.currentTemplateRadio.isSelected());
+        boolean selected = currentTemplateRadio.isSelected();
-        exportJavaScript.setTemplatePath(getTemplatePath());
+        exportJavaScript.setCurrentTemplate(selected);
-        exportJavaScript.setExportType(GeneralUtils.objectToString(this.exportTypeComboBox.getSelectedItem()));
+        if (selected) {
-        exportJavaScript.setDefaultFileName(this.defaultNameRadio.isSelected());
+            SingleJavaScript js = new SingleJavaScript();
-        exportJavaScript.setFileName(getFileName());
+            js.setCurrentTemplate(true);
-        exportJavaScript.setExtendParameters(this.extendParametersCheckBox.isSelected());
+            js.setTemplatePath(DEFAULT);
-        if (extendParametersCheckBox.isSelected()) {
+            js.setExportType(GeneralUtils.objectToString(exportTypeComboBox.getSelectedItem()));
+            js.setDefaultFileName(currentTemplatePane.defaultNameRadio.isSelected());
+            js.setFileName(getFileName());
+            js.setExtendParameters(currentTemplatePane.extendParametersCheckBox.isSelected());
+            if (currentTemplatePane.extendParametersCheckBox.isSelected()) {
                 exportJavaScript.setParameters(null);
             } else {
-            List<ParameterProvider> parameterList = this.parameterViewPane.update();
+                List<ParameterProvider> parameterList = parameterViewPane.update();
                 if (!parameterList.isEmpty()) {
                     Parameter[] parameters = new Parameter[parameterList.size()];
                     parameterList.toArray(parameters);
-                exportJavaScript.setParameters(parameters);
+                    js.setParameters(parameters);
                 }
             }
+            exportJavaScript.addJS(js);
+        } else {
+            List<SingleJavaScript> javaScripts = otherTemplatePane.editorPane.update();
+            for (SingleJavaScript js : javaScripts) {
+                exportJavaScript.addJS(js);
+            }
         }
-
-    private String getTemplatePath() {
-        return currentTemplateRadio.isSelected() ? CURRENT_TEMPLATE : reportPathTextField.getText();
     }
 
     private String getFileName() {
-        return defaultNameRadio.isSelected() ? DEFAULT_FILENAME : fileNameFormulaEditor.getUITextField().getText();
+        return currentTemplatePane.defaultNameRadio.isSelected() ? DEFAULT : currentTemplatePane.fileNameFormulaEditor.getUITextField().getText();
+    }
+
+    private UIComboBox getComboBoxWithModel(String[] itemTextArr, Map<String, String> itemTextDic) {
+        UIComboBox comboBox = new UIComboBox(new DefaultComboBoxModel<String>());
+        DefaultComboBoxModel<String> comboBoxModel = (DefaultComboBoxModel<String>) comboBox.getModel();
+        for (int i = 0; i < itemTextArr.length; i++) {
+            comboBoxModel.addElement(itemTextArr[i]);
+        }
+        comboBox.setRenderer(new UIComboBoxRenderer() {
+
+            @Override
+            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+                super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+                if (value instanceof String) {
+                    this.setText(itemTextDic.get(value));
+                }
+                return this;
+            }
+        });
+        return comboBox;
     }
 
+    private void addListener(ReportletParameterViewPane paraPane) {
+        paraPane.addTableEditorListener(new TableModelListener() {
+            public void tableChanged(TableModelEvent e) {
+                List<ParameterProvider> list = paraPane.update();
+                HashSet<String> tempSet = new HashSet<>();
+                for (int i = 0; i < list.size(); i++) {
+                    if (StringUtils.isEmpty(list.get(i).getName())) {
+                        continue;
+                    }
+                    if (tempSet.contains(list.get(i).toString())) {
+                        list.remove(i);
+                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Parameter_Duplicate_Name") + "!");
+                        return;
+                    }
+                    tempSet.add(list.get(i).toString());
+                }
+            }
+        });
+    }
 
     @Override
     public boolean accept(Object ob) {
@@ -417,6 +919,9 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             if (path == null) {
                 throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_The_Selected_File_Cannot_Be_Null"));
             }
+            if (path.endsWith(FileExtension.CPTX.getExtension())) {
+                throw new Exception(Toolkit.i18nText("Fine-Design_Basic_Function_Cptx_Unsupported"));
+            }
         }
 
         /**

designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java

@@ -7,6 +7,7 @@ import com.fr.stable.AssistUtils;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.Icon;
+import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import java.awt.BorderLayout;
@@ -631,6 +632,12 @@ public class FRGUIPaneFactory {
         return iconRadioPane;
     }
 
+    public static JPanel createBorderLayoutNorthPaneWithComponent(JComponent content) {
+        JPanel jPanel = new JPanel(new BorderLayout());
+        jPanel.add(content, BorderLayout.NORTH);
+        return jPanel;
+    }
+
     /**
      * 计算宽度
      *

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

@@ -0,0 +1,33 @@
+package com.fr.design.locale.impl;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.general.locale.LocaleMark;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/9/2
+ */
+public class DoubleSplashMark implements LocaleMark<String> {
+
+    private final Map<Locale, String> map = new HashMap<Locale, String>();
+    private static final String SPLASH_PATH_X2 = "/com/fr/design/images/splash@2x.png";
+    private static final String SPLASH_PATH_EN_X2 = "/com/fr/design/images/splash_en@2x.png";
+
+    public DoubleSplashMark() {
+        map.put(Locale.CHINA, SPLASH_PATH_X2);
+        map.put(Locale.KOREA, SPLASH_PATH_EN_X2);
+        map.put(Locale.JAPAN, SPLASH_PATH_EN_X2);
+        map.put(Locale.US, SPLASH_PATH_EN_X2);
+        map.put(Locale.TAIWAN, SPLASH_PATH_EN_X2);
+    }
+
+    @Override
+    public String getValue() {
+        String result = map.get(DesignerEnvManager.getEnvManager().getLanguage());
+        return result == null ? SPLASH_PATH_EN_X2 : result;
+    }
+}

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

@@ -15,8 +15,8 @@ import java.util.Map;
 public class SplashMark implements LocaleMark<String> {
 
     private Map<Locale, String> map = new HashMap<Locale, String>();
-    private static final String SPLASH_PATH = "/com/fr/design/images/splash_10.png";
+    private static final String SPLASH_PATH = "/com/fr/design/images/splash.png";
-    private static final String SPLASH_EN_PATH = "/com/fr/design/images/splash_10_en.png";
+    private static final String SPLASH_EN_PATH = "/com/fr/design/images/splash_en.png";
 
     public SplashMark() {
         map.put(Locale.CHINA, SPLASH_PATH);

designer-base/src/main/java/com/fr/design/login/AbstractDesignerSSO.java

@@ -6,6 +6,9 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.login.utils.DesignerLoginUtils;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.utils.BrowseUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Map;
@@ -21,6 +24,10 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
     public void actionPerformed(ActionEvent event) {
         String url = getJumpUrl();
         if (!DesignerLoginUtils.isOnline()) {
+            String message = getOffLineWarnMessage();
+            if (StringUtils.isNotEmpty(message)) {
+                FineLoggerFactory.getLogger().warn(message);
+            }
             BrowseUtils.browser(url);
             return;
         }
@@ -47,4 +54,8 @@ public abstract class AbstractDesignerSSO extends UpdateAction {
     }
 
     public abstract String getJumpUrl();
+
+    public String getOffLineWarnMessage() {
+        return StringUtils.EMPTY;
+    }
 }

designer-base/src/main/java/com/fr/design/login/service/DesignerPassportManager.java

@@ -5,6 +5,7 @@ import com.fr.design.login.DesignerLoginType;
 import com.fr.design.upm.event.CertificateEvent;
 import com.fr.event.EventDispatcher;
 import com.fr.json.JSONObject;
+import com.fr.stable.StringUtils;
 
 /**
  * @author Lanlan
@@ -96,6 +97,14 @@ public class DesignerPassportManager {
         return uid;
     }
 
+    /**
+     * 登出帆软通行证
+     */
+    public void logout() {
+        saveUserInfo(-1, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, DesignerLoginType.UNKNOWN, StringUtils.EMPTY);
+        EventDispatcher.fire(CertificateEvent.LOGOUT, StringUtils.EMPTY);
+    }
+
     /**
      * 保存登录信息
      */

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

@@ -19,10 +19,14 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.border.MatteBorder;
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Insets;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * @author shine
@@ -96,7 +100,7 @@ public class CenterRegionContainerPane extends JPanel {
 
     }
 
-    private ToolBarMenuDock getToolBarMenuDock() {
+    public ToolBarMenuDock getToolBarMenuDock() {
         return DesignerContext.getDesignerFrame().getToolBarMenuDock();
     }
 
@@ -267,12 +271,13 @@ public class CenterRegionContainerPane extends JPanel {
         return centerTemplateCardPane;
     }
 
-    protected void refreshUIToolBar() {
+    public Map<Component, Boolean> getToolbarComponentState() {
+        Map<Component, Boolean> toolbarComponentState = new HashMap<>();
         if (toolbarComponent instanceof UIToolbar) {
-            ((UIToolbar ) toolbarComponent).refreshUIToolBar();
+            toolbarComponentState.putAll(((UIToolbar) toolbarComponent).getComponentState());
         }
-        combineUp.refreshUIToolBar();
+        toolbarComponentState.putAll(combineUp.getComponentState());
-        getToolBarMenuDock().updateEnable();
+        return toolbarComponentState;
     }
 
 }

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

@@ -9,6 +9,7 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.base.mode.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
@@ -221,7 +222,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         @Override
         public void mouseReleased(MouseEvent e) {
             if (DesignModeContext.isAuthorityEditing()) {
-                closeAuthorityEditing();
+                DesignModeContext.switchTo(DesignerMode.NORMAL);
             }
         }
 
@@ -301,8 +302,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().doResize();
     }
 
+    @Deprecated
     public void closeAuthorityEditing() {
-        DesignModeContext.switchTo(com.fr.design.base.mode.DesignerMode.NORMAL);
+        DesignModeContext.switchTo(DesignerMode.NORMAL);
+    }
+
+    public void closeAuthorityMode() {
         WestRegionContainerPane.getInstance().replaceDownPane(
                 TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()));
         HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().refreshEastPropertiesPane();
@@ -314,6 +319,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         EventDispatcher.fire(DesignAuthorityEventType.StopEdit, DesignerFrame.this);
     }
 
+
     /**
      * 注册app.
      *
@@ -361,14 +367,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     }
 
     public DesktopCardPane getCenterTemplateCardPane() {
-
         return CenterRegionContainerPane.getInstance().getCenterTemplateCardPane();
     }
 
-    public void refreshUIToolBar() {
-        CenterRegionContainerPane.getInstance().refreshUIToolBar();
-    }
-
     /**
      * 初始menuPane的方法 方便OEM时修改该组件
      */
@@ -798,6 +799,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 添加的模板.
      */
     public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        DesignModeContext.switchTo(DesignerMode.NORMAL);
         JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         if (currentEditingTemplate != null) {
             currentEditingTemplate.stopEditing();

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

@@ -3,6 +3,7 @@ package com.fr.design.mainframe;
 import com.fr.base.BaseUtils;
 import com.fr.base.extension.FileExtension;
 import com.fr.base.vcs.DesignerMode;
+import com.fr.chartx.TwoTuple;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -35,6 +36,8 @@ import com.fr.design.menu.ToolBarDef;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
 import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
@@ -78,6 +81,8 @@ import java.util.Set;
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
 
 public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarStateChangeListener, ResponseDataSourceChange {
+    public static final Event<TwoTuple<String, String>> TEMPLATE_RENAME = new Event<TwoTuple<String, String>>() {
+    };
 
     private static final String FILE = "file";
     private static volatile DesignerFrameFileDealerPane THIS;
@@ -690,6 +695,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             boolean success = selectedOperation.rename(fnf, path, newPath);
 
             if (success) {
+                EventDispatcher.fire(TEMPLATE_RENAME, new TwoTuple<>(path, newPath));
                 HistoryTemplateListCache.getInstance().rename(fnf, path, newPath);
                 DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(fnf.isDirectory(), path, newPath);
                 selectedOperation.refresh();

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

@@ -10,11 +10,14 @@ import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
+import com.fr.design.gui.itoolbar.UIToolbar;
 
 import javax.swing.JComponent;
 import javax.swing.JLayeredPane;
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -33,6 +36,9 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
     private TransparentPane transparentPane = new TransparentPane();
     private OpenLoadingPane loadingPane = new OpenLoadingPane();
     private OpenFailedPane failedPane = new OpenFailedPane();
+
+    Map<Component, Boolean> backUpToolbarComponentState = new HashMap<>();
+
     private JLayeredPane layeredPane = new JLayeredPane() {
         @Override
         public void doLayout() {
@@ -86,7 +92,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         } else if (jt.isOpening()) {
             showOpenStatus();
         } else if (jt.isOpenFailed()) {
-            showOpenFailedCover();
+            showOpenFailedCover(jt.getTemplateOpenFailedTip());
         } else {
             hideCover();
         }
@@ -103,7 +109,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
     }
 
     private void showOpenStatus() {
-        DesignerContext.getDesignerFrame().refreshUIToolBar();
+        forbidToolBar();
         DesignerFrameFileDealerPane.getInstance().stateChange();
         EastRegionContainerPane.getInstance().updateAllPropertyPane();
         JComponent downPane = WestRegionContainerPane.getInstance().getDownPane();
@@ -115,14 +121,15 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         layeredPane.moveToFront(loadingPane);
     }
 
-    public void showOpenFailedCover() {
+    public void showOpenFailedCover(String text) {
+        failedPane.setFailedTip(text);
         layeredPane.moveToFront(failedPane);
     }
 
     public void showCover() {
+        forbidToolBar();
         transparentPane.start();
         layeredPane.moveToFront(transparentPane);
-        DesignerContext.getDesignerFrame().refreshUIToolBar();
         EastRegionContainerPane.getInstance().updateAllPropertyPane();
         JComponent downPane = WestRegionContainerPane.getInstance().getDownPane();
         if (downPane instanceof BasicTableDataTreePane) {
@@ -132,6 +139,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
     }
 
     public void hideCover() {
+        recoverToolBar();
         transparentPane.stop();
         layeredPane.moveToFront(component);
         EastRegionContainerPane.getInstance().updateAllPropertyPane();
@@ -142,6 +150,22 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         }
     }
 
+    private void forbidToolBar() {
+        CenterRegionContainerPane centerRegionContainerPane = CenterRegionContainerPane.getInstance();
+        backUpToolbarComponentState = centerRegionContainerPane.getToolbarComponentState();
+        for (Component component : backUpToolbarComponentState.keySet()) {
+            component.setEnabled(false);
+        }
+        centerRegionContainerPane.getToolBarMenuDock().updateEnable();
+    }
+
+    private void recoverToolBar() {
+        UIToolbar.resetComponentState(backUpToolbarComponentState);
+        backUpToolbarComponentState.clear();
+        CenterRegionContainerPane centerRegionContainerPane = CenterRegionContainerPane.getInstance();
+        centerRegionContainerPane.getToolBarMenuDock().updateEnable();
+    }
+
     protected JTemplate<?, ?> getSelectedJTemplate() {
         return component;
     }

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

@@ -458,6 +458,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         for (PropertyItem item : propertyItemMap.values()) {
             item.onResize();
         }
+        super.onResize();
     }
 
     public EastRegionContainerPane(JPanel leftPane, JPanel rightPane) {
@@ -1004,9 +1005,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 button.addActionListener(actionListener);
             }
             button.setToolTipText(title);
+            button.setName(name);
         }
 
-        public void processSnapChat(){
+        public void processSnapChat() {
             if (snapChat != null && !snapChat.hasRead()) {
                 snapChat.markRead();
                 if (promptWindow != null) {

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

@@ -19,7 +19,6 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.TableDataSourceAction;
 import com.fr.design.actions.edit.RedoAction;
 import com.fr.design.actions.edit.UndoAction;
-import com.fr.design.actions.file.BatchCompileAction;
 import com.fr.design.actions.file.SaveAsTemplateAction;
 import com.fr.design.actions.file.SaveTemplateAction;
 import com.fr.design.actions.file.WebPreviewUtils;
@@ -43,6 +42,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.authority.JTemplateAuthorityChecker;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
 import com.fr.design.mainframe.check.CheckButton;
 import com.fr.design.mainframe.template.info.TemplateProcessInfo;
@@ -54,6 +54,7 @@ import com.fr.design.menu.NameSeparator;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.ui.util.UIUtil;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.design.worker.save.EmptyCallBackSaveWorker;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
@@ -66,7 +67,12 @@ import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
+import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
+import com.fr.nx.app.designer.utils.CptAndCptxCompatibilityUtil;
+import com.fr.nx.app.designer.utils.CptCompileUtil;
+import com.fr.nx.cptx.entry.metadata.CptxMetadata;
+import com.fr.nx.cptx.utils.CptxFileUtils;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginRuntime;
 import com.fr.nx.app.designer.toolbar.CompileAction;
@@ -128,6 +134,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     private JComponent centerPane;
     private DesignModelAdapter<T, ?> designModel;
     private PreviewProvider previewType;
+    private String templateOpenFailedTip;
+
     /**
      * 统计模板制作耗时
      *
@@ -189,13 +197,13 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             designModel = createDesignModel(parameters);
         }
         addCenterPane();
-        this.undoState = createUndoState();
-
-        initAndStartPlugin();
-
         if (isNewFile) {
+            // REPORT-58486: 必须在初始的UndoState创建前设置主题，使得初始的UndoState就包含了主题效果
             setUpTheme4NewTemplate();
         }
+        this.undoState = createUndoState();
+
+        initAndStartPlugin();
         startListenThemeConfig();
     }
 
@@ -246,11 +254,12 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             }
         }
     }
+
     private void stopListenThemeConfig() {
         if (themeConfigChangeListener != null) {
             TemplateThemeConfig<? extends TemplateTheme> config = getUsingTemplateThemeConfig();
             if (config != null) {
-                config.addThemeConfigChangeListener(themeConfigChangeListener);
+                config.removeThemeConfigChangeListener(themeConfigChangeListener);
             }
         }
     }
@@ -624,8 +633,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      */
     public void redo() {
         this.getUndoManager().redo();
-        // 重做前模版使用主题可能已经被删除或修改，需要重置模版样式
-        checkAndResetTheme();
         fireSuperTargetModified();
     }
 
@@ -950,7 +957,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     protected boolean export() throws Exception {
-        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(getEditingFILE()));
 
     }
 
@@ -968,7 +975,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         } else if (DesignerMode.isAuthorityEditing()) {
             return new ShortCut[]{new SaveTemplateAction(this), new UndoAction(this), new RedoAction(this)};
         } else {
-            return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new BatchCompileAction(), new UndoAction(this), new RedoAction(this)};
+            return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new UndoAction(this), new RedoAction(this)};
         }
 
     }
@@ -1124,35 +1131,49 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     /**
      * 判断是否是新版设计器
      *
+     * @param showTipPane 是否需要展示弹窗
      * @return 是返回true
      */
-    public boolean isNewDesigner() {
+    public boolean isNewDesigner(boolean showTipPane) {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isLowerThanHBB(xmlDesignerVersion)) {
             String info = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open-New_Form_Tip");
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
+            if (showTipPane) {
                 new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
+            }
             return true;
         }
         return false;
     }
 
+    public boolean isNewDesigner() {
+        return isNewDesigner(true);
+    }
+
     /**
      * 是否是就版本设计器
      *
+     * @param showTipPane 是否需要展示弹窗
      * @return 是就返回true
      */
-    public boolean isOldDesigner() {
+    public boolean isOldDesigner(boolean showTipPane) {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isHigherThanCurrent(xmlDesignerVersion)) {
-            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
+            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", DesignUtils.parseVersion(xmlDesignerVersion));
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
+            if (showTipPane) {
                 new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
+            }
             return true;
         }
         return false;
     }
 
+    public boolean isOldDesigner() {
+        return isOldDesigner(true);
+    }
+
     /**
      *
      */
@@ -1405,9 +1426,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * @return 按钮组
      */
     public UIButton[] createExtraButtons() {
-        UIButton[] uiButtons = new UIButton[] {
+        UIButton[] uiButtons = new UIButton[0];
-                (UIButton) new CompileAction().createToolBarComponent()
-        };
         Set<DesignerFrameUpButtonProvider> providers = ExtraDesignClassManager.getInstance().getArray(DesignerFrameUpButtonProvider.XML_TAG);
         for (DesignerFrameUpButtonProvider provider : providers) {
             uiButtons = ArrayUtils.addAll(uiButtons, provider.getUpButtons(getMenuState()));
@@ -1433,6 +1452,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         };
         button.setToolTipText(getTemplateTheme().getName());
         button.setText(getTemplateTheme().getName());
+        button.setName(getTemplateTheme().getName());
         button.setAlignmentX(SwingConstants.LEFT);
         button.set4ToolbarButton();
         button.setEnabled(true);
@@ -1459,7 +1479,27 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public abstract String route();
 
     public String getTemplateName() {
-        return getEditingFILE().getName();
+        return getEditingFILE().getName() + compatibilityTip();
+    }
+
+    /**
+     * 设置新引擎后，有不支持的功能时，设计器中模板的标题需要加上“兼容模式”或者“不支持分页引擎”来提示用户
+     * */
+    private String compatibilityTip() {
+        if (!CptAndCptxCompatibilityUtil.isEngineXEnable(this.getTarget(), getEditingFILE().getPath())){
+            return StringUtils.EMPTY;
+        }
+        String path = this.getEditingFILE().getPath();
+        CptxMetadata metadata = CptxFileUtils.getMetadata(path);
+        //是否是兼容模式，兼容模式下，设置了新引擎的cpt和cptx的后缀不同
+        if (metadata != null && metadata.isForceCpt()) {
+            if (path.endsWith(".cptx")){
+                return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Compatibility_Mode");
+            } else if (path.endsWith(".cpt")){
+                return InterProviderFactory.getProvider().getLocText("Fine-Plugin_Engine_Paging_Engine_Not_Work");
+            }
+        }
+        return StringUtils.EMPTY;
     }
 
     public String getTemplatePredefinedStyle() {
@@ -1528,6 +1568,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             @Override
             public void run() {
                 callBackForSave();
+                //在保存后的回调中执行预编译流程
+                CptCompileUtil.compile(JTemplate.this);
             }
         });
 
@@ -1550,13 +1592,19 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     private boolean saveRealFile() throws Exception {
+        JTemplateAuthorityChecker jTemplateAuthorityChecker = new JTemplateAuthorityChecker(this);
+        if (jTemplateAuthorityChecker.isAuthority()) {
             FILE editingFILE = this.getEditingFILE();
             if (editingFILE == null || editingFILE instanceof MemFILE) {
                 return false;
             }
-        this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+            export();
             this.editingFILE = editingFILE;
             return true;
+        } else {
+            jTemplateAuthorityChecker.showAuthorityFailPromptDialog();
+            return false;
+        }
     }
 
     private CallbackSaveWorker saveAs(boolean showLoc) {
@@ -1592,6 +1640,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         worker.addSuccessCallback(new Runnable() {
             @Override
             public void run() {
+                boolean isChangedFile = !JTemplate.this.saved;
+                if (isChangedFile){
+                    CptCompileUtil.compile(JTemplate.this);
+                }
                 callBackForSave();
                 // 当前打开的是正在保存的模板才刷新
                 if (ComparatorUtils.equals(JTemplate.this.template.getTemplateID(),
@@ -1601,7 +1653,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 DesignerFrameFileDealerPane.getInstance().refresh();
             }
         });
-
         return worker;
 
     }
@@ -1652,6 +1703,14 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             result = result || provider.saveToNewFile(this.editingFILE.getPath(), this);
         }
         if (!result) {
+            /*
+             * 1.在CptCompileUtil::haveChanged改变报表引擎属性
+             * 2.在这三种情况下：1.cptx文件另存为cpt文件 2.cptx另存为cptx文件 3.设置了新引擎的cpt文件另存为cpt文件，
+             *   因为文件的编译目录改变了，需要重新预编译，因此设置jTemplate的保存状态为false
+             * */
+            if (CptAndCptxCompatibilityUtil.needRecompile(oldName, this)){
+                this.saved = false;
+            }
             result = this.saveRealFile();
             // 更换最近打开
             DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getPath());
@@ -1734,6 +1793,14 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         themeAttrMark.setDark(theme.isDark());
     }
 
+    public String getTemplateOpenFailedTip() {
+        return templateOpenFailedTip;
+    }
+
+    public void setTemplateOpenFailedTip(String templateOpenFailedTip) {
+        this.templateOpenFailedTip = templateOpenFailedTip;
+    }
+
     @Override
     public void setTemplateTheme(TemplateTheme newTheme, TemplateThemeCompatible compatible) {
         ThemedTemplate.super.setTemplateTheme(newTheme, compatible);

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

@@ -116,6 +116,7 @@ public class NorthRegionContainerPane extends JPanel {
         if (!DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isEnabled()) {
             ad.createAlphaFinePane().setVisible(false);
         }
+        northEastPane.add(ad.createGuideEntryPane());
         northEastPane.add(ad.createNotificationCenterPane());
 
         OSSupportCenter.buildAction(new OSBasedAction() {

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

@@ -24,6 +24,7 @@ public class OpenFailedPane extends JPanel {
 
     private  UILabel label;
     private MessageWithLink link;
+    private String defaultFailedText;
 
     public OpenFailedPane() {
         this.setLayout(new LayoutManager() {
@@ -83,11 +84,18 @@ public class OpenFailedPane extends JPanel {
                 });
             }
         };
+        this.defaultFailedText = link.getText();
         link.setBackground(Color.WHITE);
         this.add(label);
         this.add(link);
     }
 
-
+    public void setFailedTip(String text) {
+        if (StringUtils.isEmpty(text)) {
+            this.link.setText(defaultFailedText);
+        } else {
+            this.link.setText(text);
+        }
+    }
 
 }

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

@@ -0,0 +1,20 @@
+package com.fr.design.mainframe.authority;
+
+import com.fr.report.cell.cellattr.core.group.DSColumn;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class DSColumnAuthorityChecker extends ElementAuthorityChecker<DSColumn> {
+
+    @Override
+    @Nullable
+    Set<String> getNoAuthDatasetNames(DSColumn dsColumn, Set<String> authDatasetNames) {
+        if (!authDatasetNames.contains(dsColumn.getDSName())) {
+            return new HashSet<>(Arrays.asList(dsColumn.getDSName()));
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.fr.design.mainframe.authority;
+
+import org.jetbrains.annotations.Nullable;
+import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
+
+import java.lang.reflect.Type;
+import java.util.Set;
+
+
+public abstract class ElementAuthorityChecker<T> {
+
+
+    /**
+     * @Description 获取越权的数据连接
+     * @param: t 待检查的对象
+     * @param: authConnectionNames 有权限的数据连接名
+     * @return 如果有返回名称，没有返回null
+     */
+    @Nullable
+    Set<String> getNoAuthConnectionNames(T t, Set<String> authConnectionNames) {
+        return null;
+    }
+
+
+    /**
+     * @Description 获取越权的服务器数据集
+     * @param: t 待检查的对象
+     * @param: authDatasetNames 有权限的服务器数据集名
+     * @return 如果有返回名称，没有返回null
+     */
+    @Nullable
+    Set<String> getNoAuthDatasetNames(T t, Set<String> authDatasetNames) {
+        return null;
+    }
+
+    /**
+     * @Description 要检查对象的className
+     * @return className
+     */
+    String getCheckClassName() {
+        ParameterizedTypeImpl parameterizedType = (ParameterizedTypeImpl) this.getClass().getGenericSuperclass();
+        Type type = parameterizedType.getActualTypeArguments()[0];
+        return type.getTypeName();
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.authority;
+
+import com.fr.base.Formula;
+import com.fr.general.ComparatorUtils;
+import com.fr.parser.FunctionCall;
+import com.fr.parser.StringLiteral;
+import com.fr.script.Calculator;
+import com.fr.stable.script.Node;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class FormulaAuthorityChecker extends ElementAuthorityChecker<Formula> {
+    private static final Set<FormulaParser> CONNECTION_NAME_FORMULA_PARSER = new HashSet<>();
+    private static final Set<FormulaParser> DATASET_NAME_FORMULA_PARSER = new HashSet<>();
+
+    static {
+        CONNECTION_NAME_FORMULA_PARSER.add(new FormulaParser("SQL", 0));
+        DATASET_NAME_FORMULA_PARSER.add(new FormulaParser("VALUE", 0));
+    }
+
+    @Override
+    @Nullable
+    public Set<String> getNoAuthConnectionNames(Formula formula, Set<String> authConnectionNames) {
+        return getNoAuthNames(formula, CONNECTION_NAME_FORMULA_PARSER, authConnectionNames);
+    }
+
+
+    @Override
+    @Nullable
+    Set<String> getNoAuthDatasetNames(Formula formula, Set<String> authDatasetNames) {
+        return getNoAuthNames(formula, DATASET_NAME_FORMULA_PARSER, authDatasetNames);
+    }
+
+    private Set<String> getNoAuthNames(Formula formula, Set<FormulaParser> formulaParsers, Set<String> authNames) {
+        Set<String> noAuthNames = new HashSet<>();
+        try {
+            FunctionCall functionCall = (FunctionCall) Calculator.createCalculator().parse(formula.getContent()).getConditionalExpression();
+            handleNoAuthNames(functionCall, formulaParsers, authNames, noAuthNames);
+        } catch (Exception ignore) {
+
+        } finally {
+            return noAuthNames;
+        }
+    }
+
+    private void handleNoAuthNames(FunctionCall functionCall, Set<FormulaParser> formulaParsers, Set<String> authNames, Set<String> noAuthNames) {
+        for (FormulaParser formulaPattern : formulaParsers) {
+            String noAuthName = formulaPattern.getNoAuthName(functionCall, authNames);
+            if (noAuthName != null) {
+                noAuthNames.add(noAuthName);
+            }
+        }
+        Node[] nodes = functionCall.getArguments();
+        if (nodes != null) {
+            for (int i = 0; i < nodes.length; i++) {
+                Node node = nodes[i];
+                if (node instanceof FunctionCall) {
+                    handleNoAuthNames((FunctionCall) node, formulaParsers, authNames, noAuthNames);
+                }
+            }
+        }
+
+    }
+
+
+    static class FormulaParser {
+        //函数的名称
+        public String name;
+        //要检测的位置
+        public int index;
+
+
+        FormulaParser(String name, int index) {
+            this.name = name;
+            this.index = index;
+        }
+
+        String getNoAuthName(FunctionCall functionCall, Set<String> authNames) {
+            if (functionCall.getName() != null && ComparatorUtils.equals(functionCall.getName().toUpperCase(), name)) {
+                Node node = functionCall.getArguments()[index];
+                if (node instanceof StringLiteral) {
+                    String stringLiteral = node.toString();
+                    if (stringLiteral.length() > 2) {
+                        String value = stringLiteral.substring(1, stringLiteral.length() - 1);
+                        if (!authNames.contains(value)) {
+                            return value;
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+}

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

@@ -0,0 +1,188 @@
+package com.fr.design.mainframe.authority;
+
+
+import com.fr.design.dialog.FineJOptionPane;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mod.ModClassFilter;
+import com.fr.file.ConnectionConfig;
+import com.fr.file.TableDataConfig;
+import com.fr.invoke.ClassHelper;
+
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.Filter;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.authority.user.UserAuthority;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+
+import static javax.swing.JOptionPane.WARNING_MESSAGE;
+
+
+public class JTemplateAuthorityChecker {
+    JTemplate<?, ?> jTemplate;
+    Set<String> allConnectionNames;
+    Set<String> authConnectionNames;
+    Set<String> allDatasetNames;
+    Set<String> authDatasetNames;
+    Map<String, ElementAuthorityChecker> checkerMap = new HashMap<>();
+    Set<String> authFailConnectionNames = new HashSet<>();
+    Set<String> authFailDatasetNames = new HashSet<>();
+
+
+    public JTemplateAuthorityChecker(JTemplate<?, ?> jTemplate) {
+        long s = System.currentTimeMillis();
+        this.jTemplate = jTemplate;
+        this.initAuthNames();
+        this.initChecker();
+        FineLoggerFactory.getLogger().info("JTemplateAuthorityChecker init time consume:" + (System.currentTimeMillis() - s));
+    }
+
+    private void initAuthNames() {
+        allDatasetNames = new HashSet<>();
+        for (String authServerDataSetName : TableDataConfig.getInstance().getTableDatas().keySet()) {
+            allDatasetNames.add(authServerDataSetName);
+        }
+
+        allConnectionNames = ConnectionConfig.getInstance().getConnections().keySet();
+
+        UserAuthority templateAuthority = WorkContext.getCurrent().get(UserAuthority.class);
+        Map<String, Set<String>> authNamesMap = templateAuthority.getAuthServerDataSetAndConnectionNames();
+        if (authNamesMap != null) {
+            //有权限的数据连接名称
+            authConnectionNames = authNamesMap.get(UserAuthority.AUTH_CONNECTION_NAMES);
+            //有权限的数据集名称
+            authDatasetNames = authNamesMap.get(UserAuthority.AUTH_SERVER_DATASET_NAMES);
+        }
+    }
+
+    private void initChecker() {
+        registerChecker(new NameDatabaseConnectionAuthorityChecker());
+        registerChecker(new DSColumnAuthorityChecker());
+        registerChecker(new FormulaAuthorityChecker());
+        registerChecker(new NameTableDataAuthorityChecker());
+    }
+
+    private void registerChecker(ElementAuthorityChecker checker) {
+        checkerMap.put(checker.getCheckClassName(), checker);
+    }
+
+
+    public boolean isAuthority() {
+        long s = System.currentTimeMillis();
+        //遍历模板对象，根据checkerMap.keySet()把感兴趣的对象找出来
+        Map<String, Collection<Object>> targetObjects = ClassHelper.searchObject(jTemplate.getTarget(), checkerMap.keySet(), ClassFilter.getInstance());
+
+        //找到对应的checker，对对象进行检查
+        for (String name : targetObjects.keySet()) {
+            ElementAuthorityChecker checker = checkerMap.get(name);
+            for (Object object : targetObjects.get(name)) {
+                if (authConnectionNames != null) {
+                    Set<String> noAuthName = checker.getNoAuthConnectionNames(object, authConnectionNames);
+                    if (noAuthName != null) {
+                        authFailConnectionNames.addAll(noAuthName);
+                    }
+                }
+                if (authDatasetNames != null) {
+                    Set<String> noAuthName = checker.getNoAuthDatasetNames(object, authDatasetNames);
+                    if (noAuthName != null) {
+                        authFailDatasetNames.addAll(noAuthName);
+                    }
+                }
+            }
+        }
+        authFailConnectionNames.retainAll(allConnectionNames);
+        authFailDatasetNames.retainAll(allDatasetNames);
+        FineLoggerFactory.getLogger().info("JTemplateAuthorityChecker check time consume:" + (System.currentTimeMillis() - s));
+        return authFailConnectionNames.size() == 0 && authFailDatasetNames.size() == 0;
+    }
+
+    public void showAuthorityFailPromptDialog() {
+        StringBuffer stringBuffer = new StringBuffer();
+        stringBuffer.append(Toolkit.i18nText("Fine-Design-Basic_Save_Failure"));
+        stringBuffer.append("\n");
+        stringBuffer.append(getPromptInfo(authFailDatasetNames,
+                Toolkit.i18nText("Fine-Design_Template_Authority_Check_Server_Dataset_Authority")));
+        stringBuffer.append(getPromptInfo(authFailConnectionNames,
+                Toolkit.i18nText("Fine-Design_Template_Authority_Check_Data_Connection_Authority")));
+        FineJOptionPane.showMessageDialog(
+                DesignerContext.getDesignerFrame(),
+                stringBuffer.toString(),
+                Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                WARNING_MESSAGE);
+    }
+
+    private String getPromptInfo(Set<String> authFailNames, String message) {
+        StringBuffer stringBuffer = new StringBuffer();
+        if (authFailNames.size() > 0) {
+            stringBuffer.append(Toolkit.i18nText("Fine-Design_Template_Authority_Check_Current_Operator_Miss"));
+            stringBuffer.append(authFailNames.size());
+            stringBuffer.append(Toolkit.i18nText("Fine-Design_Report_Ge"));
+            stringBuffer.append(message);
+            stringBuffer.append("\n");
+            stringBuffer.append(getNoAuthNameSequence(authFailNames));
+        }
+        return stringBuffer.toString();
+    }
+
+    private String getNoAuthNameSequence(Set<String> names) {
+        StringBuffer stringBuffer = new StringBuffer();
+        int showMaxCount = 3;
+        int count = 0;
+        for (String name : names) {
+            if (count == showMaxCount) {
+                stringBuffer.append(Toolkit.i18nText("Fine-Design_Template_Authority_Check_Etc"));
+                break;
+            }
+            stringBuffer.append(name);
+            if (count != names.size() - 1 && count != showMaxCount - 1) {
+                stringBuffer.append(";");
+            }
+            count++;
+        }
+        stringBuffer.append("\n");
+        return stringBuffer.toString();
+    }
+
+    static class ClassFilter implements Filter<String> {
+
+        private static final Set<String> FILTER_SET = new HashSet<>();
+        private static final Set<String> START_WITH_SET = new HashSet<>();
+        private static final Filter<String> INSTANCE = new ModClassFilter();
+
+        public static Filter<String> getInstance() {
+            return INSTANCE;
+        }
+
+        static {
+            FILTER_SET.add("java.awt.image.BufferedImage");
+            FILTER_SET.add("sun.awt.AppContext");
+            FILTER_SET.add("com.fr.poly.creator.ECBlockCreator");
+            FILTER_SET.add("io.netty.channel.nio.SelectedSelectionKeySet");
+            FILTER_SET.add("com.fr.form.ui.ElementCaseImage");
+            FILTER_SET.add("this$0");
+            START_WITH_SET.add("com.fr.design");
+        }
+
+        @Override
+        public boolean accept(String s) {
+            if (FILTER_SET.contains(s)) {
+                return true;
+            }
+            for (String start : START_WITH_SET) {
+                if (s.startsWith(start)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
+

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

@@ -0,0 +1,22 @@
+package com.fr.design.mainframe.authority;
+
+import com.fr.data.impl.NameDatabaseConnection;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class NameDatabaseConnectionAuthorityChecker extends ElementAuthorityChecker<NameDatabaseConnection> {
+    @Override
+    @Nullable
+    Set<String> getNoAuthConnectionNames(NameDatabaseConnection nameDatabaseConnection, Set<String> authConnectionNames) {
+        String name = nameDatabaseConnection.getName();
+        if (!authConnectionNames.contains(name)) {
+            return new HashSet<>(Arrays.asList(name));
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.fr.design.mainframe.authority;
+
+import com.fr.data.impl.NameTableData;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class NameTableDataAuthorityChecker extends ElementAuthorityChecker<NameTableData> {
+    @Override
+    @Nullable
+    Set<String> getNoAuthDatasetNames(NameTableData nameTableData, Set<String> authDatasetNames) {
+        if (!authDatasetNames.contains(nameTableData.getName())) {
+            return new HashSet<>(Arrays.asList(nameTableData.getName()));
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,199 @@
+package com.fr.design.mainframe.guide.base;
+
+import com.fr.design.mainframe.guide.collect.GuideCollector;
+import com.fr.design.mainframe.guide.scene.GuideScene;
+import com.fr.design.mainframe.guide.ui.GuideCompleteDialog;
+import com.fr.design.mainframe.guide.ui.GuideManageDialog;
+import com.fr.stable.StringUtils;
+
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+
+public class Guide {
+    public enum GuideState {
+        NONE, DONE
+    }
+    private String id;
+    private String name;
+    private String description;
+    private String completeMessage;
+    private GuideState state;
+    private GuideView guideView;
+    private GuideLifecycle lifecycle;
+    private boolean isComplete;
+    private GuideScene scene;
+
+    public Guide() {
+        this(null, null, null);
+    }
+
+    public Guide(String id, String name, String description) {
+        this.id = id;
+        this.name = name;
+        this.description = description;
+        this.state = GuideState.NONE;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        if (StringUtils.isNotEmpty(description)) {
+            return description;
+        }
+        return name;
+    }
+
+    public String getCompleteMessage() {
+        return completeMessage;
+    }
+
+    public void setCompleteMessage(String completeMessage) {
+        this.completeMessage = completeMessage;
+    }
+
+    public GuideState getState() {
+        return state;
+    }
+
+    public void setState(GuideState state) {
+        this.state = state;
+    }
+
+    public void setGuideView(GuideView guideView) {
+        this.guideView = guideView;
+    }
+
+    public GuideView getGuideView() {
+        return guideView;
+    }
+
+    public void setComplete(boolean complete) {
+        isComplete = complete;
+    }
+
+    public boolean isComplete() {
+        return isComplete;
+    }
+
+    public void setScene(GuideScene scene) {
+        this.scene = scene;
+    }
+
+    public GuideScene getScene() {
+        return scene;
+    }
+
+    /**
+     * 开启引导流程
+     */
+    public void go() {
+        // 同时只能启动一个引导
+        if (GuideManager.getInstance().getCurrentGuide() != null) {
+            return;
+        }
+        GuideManager.getInstance().setCurrentGuide(this);
+        guideView.showLoading();
+
+        new SwingWorker<Boolean, Void>() {
+            @Override
+            protected Boolean doInBackground() {
+                try {
+                    if (lifecycle != null && !lifecycle.prepared()) {
+                        return false;
+                    }
+                    return true;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    guideView.hideLoading();
+                    terminate();
+                    return false;
+                }
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    if (get()) {
+                        start();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    guideView.hideLoading();
+                    terminate();
+                }
+            }
+        }.execute();
+    }
+
+    public void start() {
+        guideView.hideLoading();
+        if (scene != null) {
+            guideView.setScene(scene);
+            guideView.showGuide();
+            if (lifecycle != null) {
+                lifecycle.onStart();
+            }
+        } else {
+            complete();
+        }
+    }
+
+    public void complete() {
+        if (lifecycle != null) {
+            lifecycle.onComplete();
+        }
+        setComplete(true);
+        GuideCollector.getInstance().saveInfo();
+        guideView.dismissGuide();
+        GuideCompleteDialog.getInstance().showDialog(getCompleteMessage());
+        end();
+    }
+
+    public void terminate() {
+        if (lifecycle != null) {
+            lifecycle.onTerminate();
+        }
+        end();
+    }
+
+    public void end() {
+        guideView.dismissGuide();
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                if (lifecycle != null) {
+                    lifecycle.onEnd();
+                }
+                GuideManager.getInstance().setCurrentGuide(null);
+                GuideManageDialog.getInstance().showDialog();
+            }
+        });
+
+    }
+
+    public void registerLifecycle(GuideLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    public void removeGuideLifecycle() {
+        this.lifecycle = null;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.fr.design.mainframe.guide.base;
+
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.guide.scene.GuideScene;
+
+public class GuideBuilder {
+    private Guide guide;
+
+    public static GuideBuilder newInstance() {
+        return new GuideBuilder();
+    }
+
+    public GuideBuilder() {
+        guide = new Guide();
+        guide.setGuideView(new GuideView(DesignerContext.getDesignerFrame(), guide));
+    }
+
+    public GuideBuilder setID(String id) {
+        guide.setId(id);
+        return this;
+    }
+
+    public GuideBuilder setName(String name) {
+        guide.setName(name);
+        return this;
+    }
+
+    public GuideBuilder setDescription(String description) {
+        guide.setDescription(description);
+        return this;
+    }
+
+    public GuideBuilder setCompleteMessage(String message) {
+        guide.setCompleteMessage(message);
+        return this;
+    }
+
+    public GuideBuilder addScene(GuideScene scene) {
+        guide.setScene(scene);
+        return this;
+    }
+
+    public GuideBuilder registerLifecycle(GuideLifecycle lifecycle) {
+        guide.registerLifecycle(lifecycle);
+        return this;
+    }
+
+    public Guide getGuide() {
+        return guide;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.fr.design.mainframe.guide.base;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GuideGroup {
+    private List<Guide> guideList;
+    private String id;
+    private String name;
+
+    public GuideGroup(String id, String name) {
+        this.id = id;
+        this.name = name;
+        guideList = new ArrayList<>();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void addGuide(Guide guide) {
+        guideList.add(guide);
+    }
+
+    public List<Guide> getGuideList() {
+        return guideList;
+    }
+
+    public List<Guide> getCompleteGuideList() {
+        List<Guide> complete = new ArrayList<>();
+        for (Guide guide : getGuideList()) {
+            if (guide.isComplete()) {
+                complete.add(guide);
+            }
+        }
+        return complete;
+    }
+
+    public boolean isCompleteAll() {
+        return getCompleteGuideList().size() == getGuideList().size();
+    }
+
+    public boolean isCompleteSome() {
+        List<Guide> completeGuides = getCompleteGuideList();
+        return completeGuides.size() > 0 && completeGuides.size() < getGuideList().size();
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.fr.design.mainframe.guide.base;
+
+public interface GuideLifecycle{
+    /**
+     * 准备环境
+     * @return 返回true引导可继续执行
+     */
+    boolean prepared();
+
+    /**
+     * 开始引导教程
+     */
+    void onStart();
+
+    /**
+     * 完成引导教程
+     */
+
+    void onComplete();
+
+    /**
+     * 终止引导教程
+     */
+
+    void onTerminate();
+
+    /**
+     * 结束引导教程
+     */
+    void onEnd();
+
+}

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

@@ -0,0 +1,28 @@
+package com.fr.design.mainframe.guide.base;
+
+public abstract class GuideLifecycleAdaptor implements GuideLifecycle{
+    @Override
+    public boolean prepared() {
+        return true;
+    }
+
+    @Override
+    public void onStart() {
+
+    }
+
+    @Override
+    public void onComplete() {
+
+    }
+
+    @Override
+    public void onTerminate() {
+
+    }
+
+    @Override
+    public void onEnd() {
+
+    }
+}

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

@@ -0,0 +1,109 @@
+package com.fr.design.mainframe.guide.base;
+
+import com.fr.design.mainframe.guide.collect.GuideCollector;
+import com.fr.stable.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GuideManager {
+    private static GuideManager guideManager;
+
+    private Guide currentGuide;
+    private List<GuideVersion> guideVersionList;
+
+    public static GuideManager getInstance() {
+        if (guideManager == null) {
+            guideManager = new GuideManager();
+        }
+        return guideManager;
+    }
+
+    public GuideManager() {
+        guideVersionList = new ArrayList<>();
+    }
+
+    public Guide getCurrentGuide() {
+        return currentGuide;
+    }
+
+    public void setCurrentGuide(Guide currentGuide) {
+        this.currentGuide = currentGuide;
+    }
+
+    public void addGuideGroup(String version, GuideGroup guideGroup) {
+        GuideVersion guideVersion = getGuideVersion(version);
+        if (guideVersion == null) {
+            guideVersion = new GuideVersion(version);
+            guideVersionList.add(guideVersion);
+        }
+        guideVersion.addGuideGroup(guideGroup);
+    }
+
+    public void addGuide(String groupId, Guide guide) {
+        GuideGroup guideGroup = getGuideGroup(groupId);
+        if (guideGroup != null) {
+            guideGroup.addGuide(guide);
+        }
+    }
+
+    public List<GuideVersion> getGuideVersionList() {
+        return guideVersionList;
+    }
+
+    public List<Guide> getAllGuide() {
+        List<Guide> guideList = new ArrayList<>();
+        for (GuideVersion version : guideVersionList) {
+            for (GuideGroup group : version.getGuideGroupList()) {
+                for (Guide guide : group.getGuideList()) {
+                    guideList.add(guide);
+                }
+            }
+        }
+        return guideList;
+    }
+
+    public GuideVersion getGuideVersion(String version) {
+        for (GuideVersion guideVersion : guideVersionList) {
+            if (StringUtils.equals(version, guideVersion.getVersion())) {
+                return guideVersion;
+            }
+        }
+        return null;
+    }
+
+    public GuideGroup getGuideGroup(String groupId) {
+        for (GuideVersion version : guideVersionList) {
+            for (GuideGroup group : version.getGuideGroupList()) {
+                if (StringUtils.equals(groupId, group.getId())) {
+                    return group;
+                }
+            }
+        }
+        return null;
+    }
+
+    public Guide getGuide(String guideId) {
+        for (GuideVersion version : guideVersionList) {
+            for (GuideGroup group : version.getGuideGroupList()) {
+                for (Guide guide : group.getGuideList()) {
+                    if (StringUtils.equals(guideId, guide.getId())) {
+                        return guide;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    public void completeAll() {
+        for (GuideVersion version : guideVersionList) {
+            for (GuideGroup group : version.getGuideGroupList()) {
+                for (Guide guide : group.getGuideList()) {
+                    guide.setComplete(true);
+                }
+            }
+        }
+        GuideCollector.getInstance().saveInfo();
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.fr.design.mainframe.guide.base;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GuideVersion {
+    private String version;
+    private List<GuideGroup> guideGroupList;
+    public GuideVersion(String version) {
+        guideGroupList = new ArrayList<>();
+        this.version = version;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public List<GuideGroup> getGuideGroupList() {
+        return guideGroupList;
+    }
+
+    public void addGuideGroup(GuideGroup guideGroup) {
+        guideGroupList.add(guideGroup);
+    }
+}

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

@@ -0,0 +1,144 @@
+package com.fr.design.mainframe.guide.base;
+
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.guide.scene.AbstractGuideScene;
+import com.fr.design.mainframe.guide.scene.GuideScene;
+import com.fr.design.mainframe.guide.ui.GuideLoadingGlassPane;
+
+import javax.swing.JDialog;
+import javax.swing.SwingUtilities;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Window;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowFocusListener;
+
+public class GuideView extends JDialog {
+    private static GuideView guideView;
+    private Guide invoker;
+    private GuideScene scene;
+    private Color modalColor;
+    private float modalOpacity;
+    private Window window;
+
+    public static GuideView getInstance(Guide guide) {
+        if (guideView == null) {
+            guideView = new GuideView(DesignerContext.getDesignerFrame(), guide);
+        }
+        return guideView;
+    }
+
+    public GuideView(Window window) {
+        super(window);
+        this.setUndecorated(true);
+        this.window = window;
+        this.modalColor = Color.BLACK;
+        this.modalOpacity = 0.6f;
+        this.setPreferredSize(window.getSize());
+        this.setSize(window.getSize());
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        setBg();
+        this.setGlassPane(new GuideLoadingGlassPane());
+    }
+
+    private WindowFocusListener windowFocusListener = new WindowFocusListener() {
+        @Override
+        public void windowGainedFocus(WindowEvent e) {
+            requestFocus();
+            setLocationRelativeTo(window);
+        }
+
+        @Override
+        public void windowLostFocus(WindowEvent e) {
+
+        }
+    };
+
+    private ComponentListener componentListener = new ComponentAdapter() {
+        @Override
+        public void componentResized(ComponentEvent e) {
+            setLocationRelativeTo(window);
+        }
+
+        @Override
+        public void componentMoved(ComponentEvent e) {
+            setLocation(window.getLocation());
+        }
+    };
+
+    public GuideView(Window window, Guide guide) {
+        this(window);
+        this.invoker = guide;
+    }
+
+    public void setModalColor(Color color) {
+        modalColor = color;
+        setBg();
+    }
+
+    public void setModalOpacity(float opacity){
+        modalOpacity = opacity;
+        setBg();
+    }
+
+    private void setBg() {
+        Color newColor = new Color(modalColor.getRed(), modalColor.getGreen(), modalColor.getBlue(), (int) (255 * modalOpacity));
+        this.setBackground(newColor);
+    }
+
+    public void setScene(GuideScene scene) {
+        if (scene instanceof AbstractGuideScene) {
+            ((AbstractGuideScene) scene).setContainer(this);
+        }
+        this.scene = scene;
+    }
+
+    public void showGuide() {
+        window.addComponentListener(componentListener);
+        window.addWindowFocusListener(windowFocusListener);
+        this.setLocationRelativeTo(window);
+        this.setSize(window.getSize());
+        this.setLocation(window.getLocation());
+        this.setVisible(true);
+        if (scene != null) {
+            scene.start();
+        } else {
+            GuideManager.getInstance().getCurrentGuide().complete();
+        }
+    }
+
+    public void dismissGuide() {
+        window.removeComponentListener(componentListener);
+        window.removeWindowFocusListener(windowFocusListener);
+        this.getLayeredPane().removeAll();
+        revalidate();
+        repaint();
+        setVisible(false);
+        dispose();
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+    }
+
+    public void showLoading() {
+        this.setVisible(true);
+        this.getGlassPane().setVisible(true);
+    }
+
+    public void hideLoading() {
+        this.getGlassPane().setVisible(false);
+        repaint();
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                setVisible(false);
+            }
+        });
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/collect/GuideCollector.java

@@ -0,0 +1,155 @@
+package com.fr.design.mainframe.guide.collect;
+
+import com.fr.base.io.XMLReadHelper;
+import com.fr.design.mainframe.guide.base.Guide;
+import com.fr.design.mainframe.guide.base.GuideManager;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLReadable;
+import com.fr.stable.xml.XMLTools;
+import com.fr.stable.xml.XMLable;
+import com.fr.stable.xml.XMLableReader;
+import com.fr.third.javax.xml.stream.XMLStreamException;
+import com.fr.third.org.apache.commons.io.FileUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GuideCollector implements XMLable {
+    private static final String ROOT_XML = "GuideCollector";
+    private static final String GUIDE_XML = "Guide";
+    private static final String FILE_NAME = "guide.info";
+    private static GuideCollector collector;
+
+    private boolean showHint;
+    private List<Guide> cacheGuides;
+
+    public static GuideCollector getInstance() {
+        if (collector == null) {
+            collector = new GuideCollector();
+        }
+        return collector;
+    }
+
+    public GuideCollector() {
+        cacheGuides = new ArrayList<>();
+    }
+
+    public boolean isShowHint() {
+        return showHint;
+    }
+
+    public void setShowHint(boolean showHint) {
+        this.showHint = showHint;
+        saveInfo();
+    }
+
+    public void load() {
+        for(Guide cacheGuide : cacheGuides) {
+            Guide guide = GuideManager.getInstance().getGuide(cacheGuide.getId());
+            if (guide != null) {
+                guide.setComplete(cacheGuide.isComplete());
+            }
+        }
+    }
+
+    public void saveInfo() {
+        cacheGuides = GuideManager.getInstance().getAllGuide();
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            XMLTools.writeOutputStreamXML(this, out);
+            out.flush();
+            out.close();
+            String fileContent = new String(out.toByteArray(), StandardCharsets.UTF_8);
+            FileUtils.writeStringToFile(getInfoFile(), fileContent, StandardCharsets.UTF_8);
+        } catch (Exception ex) {
+            FineLoggerFactory.getLogger().error(ex.getMessage());
+        }
+    }
+
+    private File getInfoFile() {
+        File file = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FILE_NAME));
+        try {
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+        } catch (Exception ex) {
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+        }
+        return file;
+    }
+
+    public void loadFromFile() {
+        if (!getInfoFile().exists()) {
+            return;
+        }
+        XMLableReader reader = null;
+        try (InputStream in = new FileInputStream(getInfoFile())) {
+            reader = XMLReadHelper.createXMLableReader(in, XMLPrintWriter.XML_ENCODER);
+            if (reader == null) {
+                return;
+            }
+            reader.readXMLObject(this);
+        } catch (FileNotFoundException e) {
+        } catch (XMLStreamException | IOException e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        } finally {
+            try {
+                if (reader != null) {
+                    reader.close();
+                }
+            } catch (XMLStreamException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+    }
+
+    @Override
+    public void readXML(XMLableReader xmLableReader) {
+        String tagName = xmLableReader.getTagName();
+        if (tagName.equals(ROOT_XML)) {
+            showHint = xmLableReader.getAttrAsBoolean("showHint", false);
+            xmLableReader.readXMLObject(new XMLReadable() {
+                public void readXML(XMLableReader reader) {
+                    String tagName = reader.getTagName();
+                    if (tagName.equals(GUIDE_XML)) {
+                        Guide guide = new Guide();
+                        guide.setId(reader.getAttrAsString("id", null));
+                        guide.setComplete(reader.getAttrAsBoolean("isComplete", false));
+                        cacheGuides.add(guide);
+                    }
+
+                }
+            });
+        }
+    }
+
+    @Override
+    public void writeXML(XMLPrintWriter writer) {
+        writer.startTAG(ROOT_XML);
+        writer.attr("showHint", showHint);
+        for(Guide guide : GuideManager.getInstance().getAllGuide()) {
+            writer.startTAG(GUIDE_XML);
+            writer.attr("id", guide.getId());
+            writer.attr("isComplete", guide.isComplete());
+            writer.end();
+        }
+        writer.end();
+
+
+    }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return null;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/AbstractGuideScene.java

@@ -0,0 +1,479 @@
+package com.fr.design.mainframe.guide.scene;
+
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.mainframe.guide.base.GuideManager;
+import com.fr.design.mainframe.guide.base.GuideView;
+import com.fr.design.mainframe.guide.utils.ScreenImage;
+import com.fr.design.mainframe.guide.tip.BubbleTip;
+import com.fr.design.mainframe.guide.tip.GuideTip;
+import com.fr.stable.StringUtils;
+
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import java.awt.AWTException;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Composite;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class AbstractGuideScene extends JPanel implements GuideScene {
+    private static final int DEFAULT_ARROW_HEIGHT = 12;
+    private static final int DEFAULT_ARROW_WIDTH = 18;
+
+    private GuideScene nextScene;
+    private SceneFilter sceneFilter;
+    private GuideSceneLifecycle lifecycle;
+    private GuideView container;
+    private List<Component> targetList;
+    private List<Component> highlightList;
+    private Component nextButton;
+    private List<Point[]> pointsList;
+
+
+    public AbstractGuideScene() {
+        this.setLayout(null);
+        this.setOpaque(false);
+        targetList = new ArrayList<>();
+        highlightList = new ArrayList<>();
+        pointsList = new ArrayList<>();
+    }
+
+    /**
+     * 根据设计器上组件添加高亮区域视图，
+     * JComponent 采用组件绘制方式
+     * Component 采用屏幕截图方式
+     * @param component 设计器组件对象
+     * @return
+     */
+    public boolean addTarget(Component component) {
+        try {
+            if (component == null || container == null) {
+                return false;
+            }
+
+            Point point = SwingUtilities.convertPoint(component,0,0, container.getRootPane());
+            Rectangle rectangle = new Rectangle(point, component.getSize());
+            BufferedImage image;
+
+            if (component instanceof JComponent) {
+                JComponent jComponent = (JComponent) component;
+                image = ScreenImage.createImage(jComponent);
+            } else if (component instanceof Window) {
+                image = ScreenImage.createImage(component);
+            } else {
+                image = captureImage(component);
+            }
+            targetList.add(component);
+            highlightList.add(getTargetComponentWithImage(image, rectangle));
+            return true;
+        } catch (AWTException e) {
+            e.printStackTrace();
+            GuideManager.getInstance().getCurrentGuide().terminate();
+            return false;
+        }
+    }
+
+    /**
+     * 根据设计器上选定区域获取高亮视图，采用截屏的方式
+     * @param rectangle 选定区域，相对屏幕
+     * @return
+     */
+    public boolean addTarget(Rectangle rectangle) {
+        try {
+            targetList.add(null);
+            BufferedImage image = captureImage(rectangle);
+            highlightList.add(getTargetComponentWithImage(image, rectangle));
+            return true;
+        } catch (AWTException e) {
+            e.printStackTrace();
+            GuideManager.getInstance().getCurrentGuide().terminate();
+            return false;
+        }
+    }
+
+    /**
+     * 根据设计器组件，选定其中某个区域，添加高亮视图
+     * @param component 设计器组件
+     * @param origin 相对组件的区域
+     * @return
+     */
+    public boolean addTarget(Component component, Rectangle origin) {
+        try {
+            if (component == null) {
+                return false;
+            }
+            Point point = SwingUtilities.convertPoint(component,0,0, container.getRootPane());
+
+            origin = origin.intersection(new Rectangle(0,0,component.getWidth(), component.getHeight()));
+            Rectangle rectangle = new Rectangle(point.x + origin.x, point.y + origin.y, origin.width, origin.height);
+
+            BufferedImage image;
+
+            if (component instanceof JComponent) {
+                JComponent jComponent = (JComponent) component;
+                image = ScreenImage.createImage(jComponent, origin);
+            } else {
+                image = ScreenImage.createImage(component).getSubimage(origin.x, origin.y, origin.width, origin.height);
+            }
+            targetList.add(component);
+            highlightList.add(getTargetComponentWithImage(image, rectangle));
+            return true;
+        } catch (AWTException e) {
+            e.printStackTrace();
+            GuideManager.getInstance().getCurrentGuide().terminate();
+            return false;
+        }
+    }
+
+    /**
+     * 添加自定义组件
+     * @param component 自定义组件
+     * @param rectangle 相对引导页的区域
+     * @return
+     */
+    public boolean addCustomTarget(Component component, Rectangle rectangle) {
+        if (component == null) {
+            return false;
+        }
+        component.setBounds(rectangle);
+        targetList.add(component);
+        highlightList.add(component);
+        return true;
+    }
+
+    public boolean addCustomTarget(Component component, Point location) {
+        return addCustomTarget(component, new Rectangle(location, component.getPreferredSize()));
+    }
+
+    protected List<Component> getTargetList() {
+        return targetList;
+    }
+
+    public List<Component> getHighlightList() {
+        return highlightList;
+    }
+
+    private UILabel getTargetComponentWithImage(BufferedImage image, Rectangle rectangle) {
+        ImageIcon ic = new ImageIcon(image);
+        UILabel label = new UILabel(ic);
+        label.setOpaque(true);
+        label.setBounds(rectangle);
+        return label;
+    }
+
+    private BufferedImage captureImage(Rectangle rectangle) throws AWTException {
+        container.setVisible(false);
+        BufferedImage image = ScreenImage.createImage(rectangle);
+        showContainer();
+        return image;
+    }
+
+    private BufferedImage captureImage(Component component) throws AWTException {
+        container.setVisible(false);
+        BufferedImage image = ScreenImage.createImage(component);
+        showContainer();
+        return image;
+    }
+
+    private void showContainer() {
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                container.setVisible(true);
+                container.toFront();
+                container.requestFocus();
+            }
+        });
+    }
+
+
+    /**
+     * 自定义位置添加气泡提示组件
+     * @param title 提示标题
+     * @param content 提示内容
+     * @param direction 气泡窗口位置方向
+     * @param anchor 气泡窗口箭头坐标
+     * @param bubbleTailStart 气泡窗口箭头坐标相对于位置方向交叉轴的比例（从左到右，从上到下）
+     */
+    public void addBubbleTip(String title, String content, GuideTip.Direction direction, Point anchor, float bubbleTailStart) {
+        BubbleTip bt = new BubbleTip(title, content, direction, bubbleTailStart);
+        bt.setAnchor(anchor);
+        this.add(bt.getTip());
+    }
+
+    /**
+     * 以上一个添加的引导目标窗口为基础，添加对应的气泡窗
+     * @param title 提示标题
+     * @param content 提示内容
+     * @param direction
+     * @param anchorStart
+     * @param bubbleTailStart
+     */
+    public void addBubbleTip(String title, String content, GuideTip.Direction direction, float anchorStart, float bubbleTailStart) {
+        if (highlightList.size() == 0) {
+            return;
+        }
+        Component lastTarget = highlightList.get(highlightList.size() - 1);
+        Rectangle bounds = lastTarget.getBounds();
+        Point anchor = new Point(0,0);
+        if (direction == GuideTip.Direction.TOP) {
+            anchor = new Point(bounds.x + (int)(bounds.width * anchorStart), bounds.y);
+        } else if (direction == GuideTip.Direction.BOTTOM) {
+            anchor = new Point(bounds.x + (int)(bounds.width * anchorStart), bounds.y + bounds.height);
+        } else if (direction == GuideTip.Direction.LEFT) {
+            anchor = new Point(bounds.x, bounds.y + (int)(bounds.height * anchorStart));
+        } else if (direction == GuideTip.Direction.RIGHT) {
+            anchor = new Point(bounds.x + bounds.width, bounds.y + (int) (bounds.height * anchorStart));
+        }
+        addBubbleTip(title, content, direction, anchor, bubbleTailStart);
+    }
+
+    public void addBubbleTip(String title, String content, GuideTip.Direction direction) {
+        addBubbleTip(title, content, direction, 0.5f, 0.5f);
+    }
+
+    public void addBubbleTip(String title, GuideTip.Direction direction) {
+        addBubbleTip(title, StringUtils.EMPTY, direction);
+    }
+
+    public void addTip(GuideTip tip) {
+        this.add(tip.getTip());
+    }
+
+    public void addLineArrow(Point... points) {
+        pointsList.add(points);
+    }
+
+    public void setContainer(GuideView container) {
+        this.container = container;
+    }
+
+    public GuideView getContainer() {
+        return container;
+    }
+
+    @Override
+    public GuideScene nextScene(GuideScene scene) {
+        nextScene = scene;
+        return nextScene;
+    }
+
+    @Override
+    public void addSceneFilter(SceneFilter filter) {
+        sceneFilter = filter;
+    }
+
+    @Override
+    public void start() {
+        clear();
+        if (lifecycle != null && !lifecycle.prepared()) {
+            return;
+        }
+
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                showScene();
+            }
+        });
+    }
+
+    @Override
+    public void showScene() {
+        if (container != null) {
+            container.setContentPane(AbstractGuideScene.this);
+            setBounds(0, 0 , getSceneWidth(), getSceneWidth());
+
+            // show target
+            for (int index = highlightList.size() - 1; index >= 0; index--) {
+                add(highlightList.get(index));
+            }
+            // show next button
+            if (nextButton != null) {
+                nextButton.setBounds((getSceneWidth() - 60) / 2, getSceneHeight() - 100, 60, 30);
+                add(nextButton);
+            }
+
+            container.revalidate();
+            container.repaint();
+        }
+        showContainer();
+        if (lifecycle != null) {
+            lifecycle.onShow();
+        }
+    }
+
+    @Override
+    public void complete() {
+        container.getLayeredPane().remove(this);
+        container.repaint();
+        if (lifecycle != null) {
+            lifecycle.onComplete();
+        }
+        if (sceneFilter != null) {
+            nextScene = sceneFilter.getFilterScene();
+        }
+        if (nextScene != null) {
+            if (nextScene instanceof AbstractGuideScene) {
+                ((AbstractGuideScene) nextScene).setContainer(container);
+            }
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    nextScene.start();
+                }
+            });
+        } else {
+            GuideManager.getInstance().getCurrentGuide().complete();
+        }
+    }
+
+    @Override
+    public void registerLifecycle(GuideSceneLifecycle lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    @Override
+    public void removeLifecycle() {
+        this.lifecycle = null;
+    }
+
+    public void showNextButton() {
+        UIButton nextButton = new UIButton("Next");
+        nextButton.setPreferredSize(new Dimension(60, 30));
+        nextButton.setOpaque(false);
+        nextButton.setFont(nextButton.getFont().deriveFont(20));
+        nextButton.setRoundBorder(true, 8);
+        nextButton.setForeground(Color.WHITE);
+        nextButton.setNormalPainted(false);
+        nextButton.setPressedPainted(false);
+        nextButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                complete();
+            }
+        });
+        this.nextButton = nextButton;
+    }
+
+    private int getSceneWidth() {
+        if (container == null) {
+            return 0;
+        }
+        return container.getLayeredPane().getWidth();
+
+    }
+
+    private int getSceneHeight() {
+        if (container == null) {
+            return 0;
+        }
+        return container.getLayeredPane().getHeight();
+    }
+
+    private void clear() {
+        targetList = new ArrayList<>();
+        highlightList = new ArrayList<>();
+        this.nextButton = null;
+        this.removeAll();
+        invalidate();
+        repaint();
+    }
+
+    @Override
+    public void paint(Graphics g) {
+        super.paint(g);
+        if (pointsList.isEmpty()) {
+            return;
+        }
+        Graphics2D g2d = (Graphics2D) g;
+        Composite oldComposite = g2d.getComposite();
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+        g2d.setColor(Color.WHITE);
+        for (Point[] points : pointsList) {
+            if (points.length <= 1) {
+                continue;
+            }
+            Point startPoint = points[0];
+            Point endPoint = startPoint;
+            for (int index = 1; index < points.length; index++) {
+                startPoint = endPoint;
+                endPoint = points[index];
+                g2d.drawLine(startPoint.x, startPoint.y, endPoint.x, endPoint.y);
+            }
+
+            drawArrow(g2d, startPoint, endPoint);
+        }
+        g2d.setComposite(oldComposite);
+    }
+
+    /**
+     * 根据最后两点坐标计算出三角箭头的三个点坐标，绘制箭头
+     * 这里实现以终点坐标为坐标轴圆点计算
+     * @param start 起始点坐标
+     * @param end 重点坐标
+     */
+    private void drawArrow(Graphics2D g2d, Point start, Point end) {
+        try{
+            double dealtPointX = start.x - end.x;
+            double dealtPointY = -(start.y - end.y);
+
+            double pointDistance = calDistance(dealtPointX, dealtPointY);
+            double triangleHeight = Math.min(DEFAULT_ARROW_HEIGHT, pointDistance);
+            double triangleWidth = triangleHeight * (DEFAULT_ARROW_WIDTH / 2) / DEFAULT_ARROW_WIDTH;
+            if (triangleHeight < 1 || triangleWidth < 1 || pointDistance < 1) {
+                return;
+            }
+
+            double pointAngle;
+            double abs = 1;
+            if (dealtPointX == 0) {
+                pointAngle = Math.PI / 2;
+            } else {
+                pointAngle = Math.atan(dealtPointY / dealtPointX);
+            }
+            if (dealtPointY < 0) {
+                pointAngle += Math.PI;
+                abs = -1;
+            }
+
+            double deltaAngle = Math.atan(triangleWidth / triangleHeight);
+            double triangleDistance = calDistance(triangleWidth, triangleHeight);
+
+            Point p1 =calPoint(end, triangleDistance, pointAngle - deltaAngle, abs);
+            Point p2 = calPoint(end, triangleDistance, pointAngle + deltaAngle, abs);
+
+            int xPoints[] = {end.x, p1.x, p2.x};
+            int yPoints[] = {end.y, p1.y, p2.y};
+
+            g2d.fillPolygon(xPoints, yPoints, 3);
+        } catch (Exception e) {
+            e.printStackTrace();
+            GuideManager.getInstance().getCurrentGuide().terminate();
+        }
+    }
+
+    private double calDistance(double x, double y) {
+        return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+    }
+
+    private Point calPoint(Point relativePoint, double distance, double angle, double abs) {
+        int x = (int)(relativePoint.x + abs * distance * Math.cos(angle));
+        int y = (int)(relativePoint.y - abs * distance * Math.sin(angle));
+        return new Point(x, y);
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/ClickScene.java

@@ -0,0 +1,108 @@
+package com.fr.design.mainframe.guide.scene;
+
+import com.fr.design.mainframe.guide.base.GuideManager;
+
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.SwingUtilities;
+import java.awt.Component;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class ClickScene extends AbstractGuideScene{
+    public enum ClickType {
+        LEFT, LEFT_DOUBLE, RIGHT
+    }
+
+    public void addClickTarget(Component component, ClickType clickType) {
+        addClickTarget(component, clickType, false);
+    }
+
+    public void addClickTarget(Component component, ClickType clickType, boolean isDispatch) {
+        if (super.addTarget(component)) {
+            addTargetClickListener(clickType, isDispatch);
+        }
+    }
+
+    public void addClickTarget(Rectangle rectangle, ClickType clickType) {
+        if (super.addTarget(rectangle)) {
+            addTargetClickListener(clickType,false);
+        }
+    }
+
+    public void addClickTarget(Component component, Rectangle rectangle, ClickType clickType) {
+        if (super.addTarget(component, rectangle)) {
+            addTargetClickListener(clickType, false);
+        }
+    }
+
+    public void addCustomClickTarget(Component component, Rectangle rectangle, ClickType clickType) {
+        if (super.addCustomTarget(component, rectangle)) {
+            addTargetClickListener(clickType, false);
+        }
+    }
+
+    public void addCustomClickTarget(Component component, Point location, ClickType clickType) {
+        if (super.addCustomTarget(component, location)) {
+            addTargetClickListener(clickType, false);
+        }
+    }
+
+    private void addTargetClickListener(ClickType clickType, boolean isDispatch) {
+        Component highlight = getHighlightList().get(getHighlightList().size() - 1);
+        Component target = getTargetList().get(getTargetList().size() - 1);
+        highlight.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getButton() == MouseEvent.BUTTON1) {
+                    if ((e.getClickCount() == 1 && clickType == ClickType.LEFT) || (e.getClickCount() == 2 && clickType == ClickType.LEFT_DOUBLE)) {
+                        if (isDispatch) {
+                            redispatchMouseEvent(e, target);
+                        }
+                        complete();
+                    }
+                } else if (e.getButton() == MouseEvent.BUTTON3 && clickType == ClickType.RIGHT) {
+                    if (isDispatch) {
+                        redispatchMouseEvent(e, target);
+                    }
+                    complete();
+                }
+            }
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+                if (isDispatch) {
+                    if (target instanceof AbstractButton) {
+                        AbstractButton b = (AbstractButton) target;
+                        b.setFocusable(false);
+                    }
+                    redispatchMouseEvent(e, target);
+                }
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if (isDispatch) {
+                    redispatchMouseEvent(e, target);
+                }
+            }
+        });
+    }
+
+    private void redispatchMouseEvent(MouseEvent e, Component component) {
+        component.dispatchEvent(new MouseEvent(component, e.getID(), e
+                .getWhen(), e.getModifiers(), e.getX(),
+                e.getY(), e.getClickCount(), e.isPopupTrigger()));
+    }
+
+    @Override
+    public void showScene() {
+        super.showScene();
+        // 交互类的 scene 如果没有高亮内容块载，需要及时终止Guide，否则就没法去掉模态框影响到设计器主功能的使用了
+        if (this.getComponentCount() == 0) {
+            GuideManager.getInstance().getCurrentGuide().terminate();
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/DisplayScene.java

@@ -0,0 +1,37 @@
+package com.fr.design.mainframe.guide.scene;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class DisplayScene extends AbstractGuideScene {
+    private long delay;
+    private static final long DEFAULT_DELAY = 1000;
+    private static Timer displayTimer = new Timer();
+
+    public DisplayScene() {
+        this(DEFAULT_DELAY);
+    }
+
+    public DisplayScene(long delay) {
+        super();
+        this.delay = delay;
+    }
+
+    public void setDelay(long delay) {
+        this.delay = delay;
+    }
+
+    @Override
+    public void showScene() {
+        super.showScene();
+        // 实例化Timer类
+        displayTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                complete();
+                displayTimer.purge();
+            }
+        }, delay);
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/DragScene.java

@@ -0,0 +1,64 @@
+package com.fr.design.mainframe.guide.scene;
+
+import com.fr.design.mainframe.guide.scene.drag.DragAndDropDragGestureListener;
+
+import java.awt.Component;
+import java.awt.Rectangle;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DragSourceDropEvent;
+import java.awt.dnd.DropTarget;
+import java.awt.dnd.DropTargetDropEvent;
+
+public class DragScene extends AbstractGuideScene{
+    public enum DragType{
+        NONE, FROM, TO
+    }
+
+    public void addDragTarget(Component component, DragType type) {
+         if (super.addTarget(component)) {
+             addDragTargetListener(type);
+         }
+    }
+
+    public void addDragTarget(Rectangle rectangle, DragType type) {
+        if (super.addTarget(rectangle)) {
+            addDragTargetListener(type);
+        }
+    }
+
+    public void addDragTarget(Component component, Rectangle rectangle, DragType type) {
+        if (super.addTarget(component, rectangle)) {
+            addDragTargetListener(type);
+        }
+    }
+
+    public void addCustomDragTarget(Component component, Rectangle rectangle, DragType type) {
+        if (super.addCustomTarget(component, rectangle)) {
+            addDragTargetListener(type);
+        }
+    }
+
+    private void addDragTargetListener(DragType dragType) {
+        Component target = getHighlightList().get(getHighlightList().size() - 1);
+
+        if (dragType == DragType.FROM) {
+            new DragAndDropDragGestureListener(target, DnDConstants.ACTION_COPY_OR_MOVE){
+                @Override
+                public void dragDropEnd(DragSourceDropEvent dsde) {
+                    if (dsde.getDropSuccess()) {
+                        complete();
+                    }
+                }
+            };
+        } else if (dragType == DragType.TO) {
+            target.setDropTarget(new DropSceneTarget());
+        }
+    }
+
+    private class DropSceneTarget extends DropTarget {
+        @Override
+        public synchronized void drop(DropTargetDropEvent dtde) {
+            dtde.dropComplete(true);
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/GuideScene.java

@@ -0,0 +1,18 @@
+package com.fr.design.mainframe.guide.scene;
+
+
+public interface GuideScene {
+    GuideScene nextScene(GuideScene scene);
+
+    void addSceneFilter(SceneFilter filter);
+
+    void start();
+
+    void showScene();
+
+    void complete();
+
+    void registerLifecycle(GuideSceneLifecycle lifecycle);
+
+    void removeLifecycle();
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/GuideSceneLifecycle.java

@@ -0,0 +1,20 @@
+package com.fr.design.mainframe.guide.scene;
+
+public interface GuideSceneLifecycle {
+    /**
+     * 引导场景准备工作
+     * 给 scene 添加 target 应该在这个阶段处理
+     * @return
+     */
+    boolean prepared();
+
+    /**
+     * scene 显示后
+     */
+    void onShow();
+
+    /**
+     * scene 完成后
+     */
+    void onComplete();
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/GuideSceneLifecycleAdaptor.java

@@ -0,0 +1,18 @@
+package com.fr.design.mainframe.guide.scene;
+
+public abstract class GuideSceneLifecycleAdaptor implements GuideSceneLifecycle {
+    @Override
+    public boolean prepared() {
+        return true;
+    }
+
+    @Override
+    public void onShow() {
+
+    }
+
+    @Override
+    public void onComplete() {
+
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/SceneFilter.java

@@ -0,0 +1,5 @@
+package com.fr.design.mainframe.guide.scene;
+
+public interface SceneFilter {
+    GuideScene getFilterScene();
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/scene/drag/DragAndDropDragGestureListener.java

@@ -0,0 +1,60 @@
+package com.fr.design.mainframe.guide.scene.drag;
+
+import com.fr.general.ComparatorUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.Component;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DragGestureEvent;
+import java.awt.dnd.DragGestureListener;
+import java.awt.dnd.DragSource;
+import java.awt.dnd.DragSourceAdapter;
+
+public class DragAndDropDragGestureListener extends DragSourceAdapter implements DragGestureListener {
+    private Component component;
+
+    public DragAndDropDragGestureListener(Component component, int actions) {
+        this.component = component;
+        DragSource source = new DragSource();
+        source.createDefaultDragGestureRecognizer(component, actions, this);
+    }
+
+    public void dragGestureRecognized(DragGestureEvent dge) {
+        if (component != null) {
+            try {
+                DragAndDropTransferable dragAndDropTransferable = new DragAndDropTransferable(component);
+                dge.startDrag(DragSource.DefaultCopyDrop, dragAndDropTransferable, this);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private static class DragAndDropTransferable implements Transferable {
+        private Component component;
+
+        public DragAndDropTransferable(Component component) {
+            this.component = component;
+        }
+
+        DataFlavor[] flavors = {new DataFlavor(Component.class, "Component")};
+
+        public DataFlavor[] getTransferDataFlavors() {
+            return flavors;
+        }
+
+        public boolean isDataFlavorSupported(DataFlavor flavor) {
+            for (DataFlavor df : flavors) {
+                if (ComparatorUtils.equals(df, flavor)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        @NotNull
+        public Object getTransferData(DataFlavor df) {
+            return component;
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/tip/BubbleTip.java

@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.guide.tip;
+
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrame;
+import com.fr.design.mainframe.guide.base.Guide;
+import com.fr.design.mainframe.guide.base.GuideManager;
+import com.fr.design.mainframe.guide.ui.bubble.Bubble;
+import com.fr.design.mainframe.guide.ui.bubble.BubbleWithClose;
+
+import javax.swing.JComponent;
+import javax.swing.JOptionPane;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class BubbleTip implements GuideTip {
+    private BubbleWithClose bubbleBox;
+    private Point anchor;
+
+    /**
+     *
+     * @param title 标题
+     * @param content 内容
+     * @param direction 气泡提示相对anchor的方向，这里方向会和气泡组件箭头方向相反
+     * @param tailStart 气泡尾巴相对当前边垂直方向偏移位置比例，值在0-1范围
+     */
+    public BubbleTip(String title, String content, Direction direction, float tailStart) {
+        bubbleBox = new BubbleWithClose(title, content, getBubbleBoxTailDirection(direction), tailStart);
+        bubbleBox.addCloseActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                Guide currentGuide = GuideManager.getInstance().getCurrentGuide();
+                if (currentGuide != null) {
+
+                    int returnVal = FineJOptionPane.showConfirmDialog(
+                            currentGuide.getGuideView(),
+                            Toolkit.i18nText("Fine-Design_Guide_Option_Warning_Terminal"),
+                            Toolkit.i18nText("Fine-Design_Basic_Confirm"),
+                            JOptionPane.YES_NO_OPTION,
+                            JOptionPane.QUESTION_MESSAGE);
+                    if (returnVal == JOptionPane.YES_OPTION) {
+                        currentGuide.terminate();
+                    }
+                }
+            }
+        });
+    }
+    @Override
+    public JComponent getTip() {
+        if(anchor == null) {
+            return new BubbleWithClose(bubbleBox.getTitle(), bubbleBox.getContent(), Bubble.TailDirection.TOP, 0);
+        } else {
+            setBubbleBoxBound();
+            return bubbleBox;
+        }
+    }
+
+    /**
+     * 设置锚点坐标
+     * 这里可以指定气泡组件箭头坐标的箭头坐标
+     * @param anchor
+     */
+    public void setAnchor(Point anchor) {
+        this.anchor = anchor;
+    }
+
+    private void setBubbleBoxBound() {
+        int bubbleW = bubbleBox.getPreferredSize().width;
+        int bubbleH = bubbleBox.getPreferredSize().height;
+        if (bubbleBox.isTailHorizontal()) {
+            int x = bubbleBox.isTailLeft() ? anchor.x : anchor.x - bubbleW;
+            int y = anchor.y - (int) (bubbleH * bubbleBox.getTailStart());
+            bubbleBox.setBounds(x, y, bubbleW, bubbleH);
+        } else if (bubbleBox.isTailVertical()) {
+            int x = anchor.x - (int) (bubbleW * bubbleBox.getTailStart());
+            int y = bubbleBox.isTailTop() ? anchor.y : anchor.y - bubbleH;
+            bubbleBox.setBounds(x, y, bubbleW, bubbleH);
+        }
+    }
+
+    private Bubble.TailDirection getBubbleBoxTailDirection(Direction direction) {
+        switch (direction) {
+            case TOP:
+                return Bubble.TailDirection.BOTTOM;
+            case BOTTOM:
+                return Bubble.TailDirection.TOP;
+            case LEFT:
+                return Bubble.TailDirection.RIGHT;
+            case RIGHT:
+            default:
+                return Bubble.TailDirection.LEFT;
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/tip/GuideTip.java

@@ -0,0 +1,14 @@
+package com.fr.design.mainframe.guide.tip;
+
+import javax.swing.JComponent;
+import java.awt.Point;
+
+public interface GuideTip {
+    enum Direction {
+        TOP, BOTTOM, LEFT, RIGHT
+    }
+
+    JComponent getTip();
+
+    void setAnchor(Point anchor);
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/BubbleHint.java

@@ -0,0 +1,74 @@
+package com.fr.design.mainframe.guide.ui;
+
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.design.mainframe.guide.ui.bubble.Bubble;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.event.ActionListener;
+
+public class BubbleHint extends Bubble {
+    private UIButton confirmButton;
+
+    public BubbleHint() {
+        super(TailDirection.TOP, 0.9f);
+        initComponent();
+    }
+
+    private void initComponent() {
+        this.setLayout(new BorderLayout());
+        this.setBorder(BorderFactory.createEmptyBorder(10 + Bubble.TAIL_HEIGHT, 15, 10, 15));
+        this.setPreferredSize(new Dimension(220, 140));
+
+        JPanel contentPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(false, VerticalFlowLayout.CENTER, 0, 0);
+        contentPane.setOpaque(false);
+
+        UILabel title = new UILabel(Toolkit.i18nText("Fine-Design_Guide_Tips_Title"));
+        title.setFont(title.getFont().deriveFont(16.0f));
+        title.setForeground(new Color(62, 155, 249));
+        title.setPreferredSize(new Dimension(190, 30));
+        title.setHorizontalAlignment(SwingConstants.CENTER);
+        title.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+
+        UILabel content1 = new UILabel(Toolkit.i18nText("Fine-Design_Guide_Tips_Content1"));
+        content1.setPreferredSize(new Dimension(190,20));
+        content1.setHorizontalAlignment(SwingConstants.CENTER);
+
+        UILabel content2 = new UILabel(Toolkit.i18nText("Fine-Design_Guide_Tips_Content2"));
+        content2.setPreferredSize(new Dimension(190,20));
+        content2.setHorizontalAlignment(SwingConstants.CENTER);
+
+        JPanel buttonContainer= FRGUIPaneFactory.createCenterFlowZeroGapBorderPane();
+        buttonContainer.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0));
+        buttonContainer.setPreferredSize(new Dimension(190,40));
+        buttonContainer.setOpaque(false);
+
+        confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Guide_Tips_Know"));
+        confirmButton.setPreferredSize(new Dimension(78, 24));
+        buttonContainer.add(confirmButton);
+
+        contentPane.add(title);
+        contentPane.add(content1);
+        contentPane.add(content2);
+        contentPane.add(buttonContainer);
+
+        this.add(contentPane, BorderLayout.CENTER);
+    }
+
+    public void addConfirmAction(ActionListener listener) {
+        confirmButton.addActionListener(listener);
+    }
+
+    public void removeConfirmAction(ActionListener listener) {
+        confirmButton.removeActionListener(listener);
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/BubbleHintDialog.java

@@ -0,0 +1,47 @@
+package com.fr.design.mainframe.guide.ui;
+
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrame;
+import com.fr.design.mainframe.guide.collect.GuideCollector;
+
+import javax.swing.JDialog;
+import java.awt.Color;
+import java.awt.Point;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class BubbleHintDialog extends JDialog {
+    private static final int DIALOG_WIDTH = 220;
+    private static final int DIALOG_HEIGHT = 140;
+    private static BubbleHintDialog dialog;
+
+    public static BubbleHintDialog getInstance(){
+        if (dialog == null) {
+            dialog = new BubbleHintDialog(DesignerContext.getDesignerFrame());
+        }
+        return dialog;
+    }
+
+    public BubbleHintDialog(Window parent) {
+        super(parent);
+        setUndecorated(true);
+        this.setBackground(new Color(0,0,0,0));
+        setSize(DIALOG_WIDTH, DIALOG_HEIGHT);
+        BubbleHint bubbleHint = new BubbleHint();
+        bubbleHint.addConfirmAction(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setVisible(false);
+                dispose();
+                GuideCollector.getInstance().setShowHint(true);
+            }
+        });
+        this.setContentPane(bubbleHint);
+    }
+
+    public void showDialog(Point location) {
+        dialog.setLocation(location);
+        dialog.setVisible(true);
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/ExpandPane.java

@@ -0,0 +1,78 @@
+package com.fr.design.mainframe.guide.ui;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.general.IOUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+public class ExpandPane extends JPanel {
+    private static final Icon downIcon = IOUtils.readIcon("/com/fr/design/mainframe/guide/arrow_down.png");
+    private static final Icon rightIcon = IOUtils.readIcon("/com/fr/design/mainframe/guide/arrow_right.png");
+    private String title;
+    private boolean expand;
+    private UILabel arrow;
+    private JPanel headerPane;
+    private JPanel contentPane;
+
+    public ExpandPane(String title, JPanel contentPane) {
+        this.title = title;
+        this.expand = true;
+        this.contentPane = contentPane;
+        initComponent();
+    }
+
+    private void initComponent() {
+        VerticalFlowLayout layout = new VerticalFlowLayout(VerticalFlowLayout.TOP, 10, 5);
+        layout.setAlignLeft(true);
+        this.setLayout(layout);
+
+        JPanel headerPane = createHeader();
+        this.add(headerPane);
+        this.add(contentPane);
+        headerPane.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                setExpand(!expand);
+            }
+        });
+    }
+
+    private JPanel createHeader() {
+        headerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        headerPane.setPreferredSize(new Dimension(200, 24));
+        UILabel headerTitle = new UILabel(this.title);
+        headerTitle.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+        arrow = new UILabel(downIcon);
+        arrow.setOpaque(false);
+        arrow.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        headerPane.add(headerTitle, BorderLayout.CENTER);
+        headerPane.add(arrow, BorderLayout.WEST);
+        return headerPane;
+    }
+
+    @Override
+    public void setPreferredSize(Dimension preferredSize) {
+        super.setPreferredSize(preferredSize);
+        headerPane.setPreferredSize(new Dimension(preferredSize.width, headerPane.getPreferredSize().height));
+        contentPane.setPreferredSize(new Dimension(preferredSize.width, contentPane.getPreferredSize().height));
+    }
+
+    public void setExpand(boolean isExpand) {
+        this.expand = isExpand;
+        arrow.setIcon(isExpand ? downIcon : rightIcon);
+        contentPane.setVisible(isExpand);
+    }
+
+    public boolean isExpand() {
+        return expand;
+    }
+}
+

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/GuideCompleteDialog.java

@@ -0,0 +1,117 @@
+package com.fr.design.mainframe.guide.ui;
+
+import com.fr.design.gui.frpane.UITextPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.general.IOUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyledDocument;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class GuideCompleteDialog extends JDialog {
+    private static final int DIALOG_WIDTH = 340;
+    private static final int DIALOG_HEIGHT = 367;
+    private static final Icon SUCCESS_ICON = IOUtils.readIcon("/com/fr/design/mainframe/guide/success.png");
+    private static final int ICON_HEIGHT = 182;
+    private static final Color FONT_COLOR = new Color(51, 51, 52);
+    private static final Color BUTTON_BG_COLOR = new Color(65, 155,249);
+    private static GuideCompleteDialog dialog;
+
+    public static GuideCompleteDialog getInstance() {
+        if (dialog == null) {
+            dialog = new GuideCompleteDialog(DesignerContext.getDesignerFrame());
+        }
+        return dialog;
+    }
+
+    private UITextPane textArea;
+
+    public GuideCompleteDialog(Window window) {
+        super(window);
+        setSize(DIALOG_WIDTH, DIALOG_HEIGHT);
+        setUndecorated(true);
+        setModal(true);
+        setLocationRelativeTo(window);
+        this.setContentPane(getContentPane());
+    }
+
+    @Override
+    public Container getContentPane() {
+        JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+
+        UILabel completeImage = new UILabel(SUCCESS_ICON);
+        completeImage.setPreferredSize(new Dimension(DIALOG_WIDTH, ICON_HEIGHT));
+
+        JPanel container = new JPanel(new BorderLayout(0, 10));
+        container.setBorder(BorderFactory.createEmptyBorder(15, 52, 25, 52));
+
+        UILabel title = new UILabel(Toolkit.i18nText("Fine-Design_Guide_Complete_Confirm"));
+        title.setFont(title.getFont().deriveFont(22.0f));
+        title.setPreferredSize(new Dimension(190, 30));
+        title.setHorizontalAlignment(SwingConstants.CENTER);
+        title.setForeground(FONT_COLOR);
+
+        textArea = new UITextPane();
+        textArea.setEnabled(false);
+        textArea.setOpaque(false);
+        textArea.setFont(textArea.getFont().deriveFont(18.0f));
+        textArea.setPreferredSize(new Dimension(236, 52));
+        textArea.setBorder(null);
+        textArea.setDisabledTextColor(FONT_COLOR);
+        StyledDocument doc = textArea.getStyledDocument();
+        SimpleAttributeSet center = new SimpleAttributeSet();
+        StyleConstants.setAlignment(center, StyleConstants.ALIGN_CENTER);
+        doc.setParagraphAttributes(0, doc.getLength(), center, false);
+
+        JPanel buttonContainer= FRGUIPaneFactory.createCenterFlowZeroGapBorderPane();
+        buttonContainer.setPreferredSize(new Dimension(190,38));
+        buttonContainer.setOpaque(false);
+
+        JButton button = new JButton(Toolkit.i18nText("Fine-Design_Guide_Complete_End"));
+        button.setPreferredSize(new Dimension(122, 38));
+        button.setBackground(BUTTON_BG_COLOR);
+        button.setForeground(Color.WHITE);
+        button.setBorder(null);
+        button.setContentAreaFilled(false);
+        button.setOpaque(true);
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setVisible(false);
+                dispose();
+            }
+        });
+
+        buttonContainer.add(button);
+        container.add(title, BorderLayout.NORTH);
+        container.add(textArea, BorderLayout.CENTER);
+        container.add(buttonContainer,BorderLayout.SOUTH);
+
+        contentPane.add(completeImage, BorderLayout.NORTH);
+        contentPane.add(container, BorderLayout.CENTER);
+
+        return contentPane;
+    }
+
+    public void showDialog(String str) {
+        textArea.setText(str);
+        repaint();
+        this.setVisible(true);
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/GuideLoadingGlassPane.java

@@ -0,0 +1,53 @@
+package com.fr.design.mainframe.guide.ui;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+public class GuideLoadingGlassPane extends JPanel {
+    private static final String loadingImagePath = "/com/fr/design/mainframe/guide/loading.gif";
+    private static GuideLoadingGlassPane loadingPane;
+
+    public static GuideLoadingGlassPane getInstance() {
+        if (loadingPane == null) {
+            loadingPane = new GuideLoadingGlassPane();
+        }
+        return loadingPane;
+    }
+
+    public GuideLoadingGlassPane() {
+        this.setLayout(new GridBagLayout());
+        this.setOpaque(false);
+        initComponent();
+    }
+
+    public void initComponent() {
+        JPanel loadingView = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        loadingView.setOpaque(false);
+        loadingView.setPreferredSize(new Dimension(130, 120));
+
+        JPanel imageContainer = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
+        imageContainer.setOpaque(false);
+        ImagePanel imagePanel = new ImagePanel(loadingImagePath);
+        imagePanel.setOpaque(false);
+        imagePanel.setPreferredSize(new Dimension(84, 84));
+        imageContainer.add(imagePanel);
+
+        UILabel hintLabel = new UILabel(Toolkit.i18nText("Fine-Design_Guide_Loading_Wait"));
+        hintLabel.setHorizontalAlignment(SwingConstants.CENTER);
+        hintLabel.setForeground(Color.WHITE);
+
+        loadingView.add(imageContainer, BorderLayout.NORTH);
+        loadingView.add(hintLabel, BorderLayout.SOUTH);
+
+        this.add(loadingView, new GridBagConstraints());
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/GuideManageDialog.java

@@ -0,0 +1,233 @@
+package com.fr.design.mainframe.guide.ui;
+
+
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.guide.base.Guide;
+import com.fr.design.mainframe.guide.base.GuideGroup;
+import com.fr.design.mainframe.guide.base.GuideManager;
+import com.fr.design.mainframe.guide.base.GuideVersion;
+import com.fr.design.mainframe.guide.collect.GuideCollector;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.IOUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.border.Border;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class GuideManageDialog extends JDialog {
+    private static final int DEFAULT_HEIGHT = 400;
+    private static final int DEFAULT_WIDTH = 600;
+    private static final Icon GROUP_COMPLETE_NONE = IOUtils.readIcon("/com/fr/design/mainframe/guide/complete_none.png");
+    private static final Icon GROUP_COMPLETE_SOME = IOUtils.readIcon("/com/fr/design/mainframe/guide/complete_some.png");
+    private static final Icon GROUP_COMPLETE_ALL = IOUtils.readIcon("/com/fr/design/mainframe/guide/complete_all.png");
+    private static final Color BORDER_COLOR = new Color(224, 224, 225);
+    private static final Color UNCOMPLETE_FONT_COLOR = new Color(51, 51, 52);
+    private static final Color COMPLETE_FONT_COLOR =  new Color(51,51,52,128);
+    private static GuideManageDialog dialog;
+
+    private JPanel scrollContent;
+
+    public static GuideManageDialog getInstance() {
+        if (dialog == null) {
+            dialog = new GuideManageDialog(DesignerContext.getDesignerFrame());
+        }
+        return dialog;
+    }
+
+    public GuideManageDialog(Window parent) {
+        super(parent);
+        GuideCollector.getInstance().load();
+        initComponent();
+    }
+
+    private void initComponent() {
+        this.setTitle(Toolkit.i18nText("Fine-Design_Guide_Manager_Dialog_Title"));
+        setResizable(false);
+        setModal(true);
+        setLayout(FRGUIPaneFactory.createBorderLayout());
+        setSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
+        GUICoreUtils.centerWindow(this);
+        JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        contentPane.add(createContentPanel(), BorderLayout.CENTER);
+        contentPane.add(createActionsPane(), BorderLayout.SOUTH);
+        setContentPane(contentPane);
+    }
+
+    private UIScrollPane createContentPanel() {
+        scrollContent = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, VerticalFlowLayout.TOP, 0, 5);
+        UIScrollPane scrollPane = new UIScrollPane(scrollContent);
+        return scrollPane;
+    }
+
+    private JPanel createGuideVersionPane(GuideVersion guideVersion) {
+        JPanel expandContent = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, VerticalFlowLayout.TOP, 0, 5);
+        for (GuideGroup guideGroup : guideVersion.getGuideGroupList()) {
+            JPanel guideGroupCard = createGuideGroupCard(guideGroup);
+            expandContent.add(guideGroupCard);
+        }
+        ExpandPane expandPane = new ExpandPane(Toolkit.i18nText("Fine-Design_Guide_Manager_Dialog_Version_Title", guideVersion.getVersion()), expandContent);
+        return expandPane;
+    }
+
+
+    private JPanel createGuideGroupCard(GuideGroup guideGroup) {
+        JPanel card = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        card.setBorder(BorderFactory.createLineBorder(BORDER_COLOR));
+        card.setBackground(Color.WHITE);
+
+        JPanel cardContainer = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        cardContainer.setOpaque(false);
+        cardContainer.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
+        card.add(cardContainer, BorderLayout.CENTER);
+
+        cardContainer.add(createGroupTitlePane(guideGroup), BorderLayout.NORTH);
+        cardContainer.add(createGroupContentPane(guideGroup), BorderLayout.CENTER);
+        return card;
+    }
+
+    private JPanel createGroupTitlePane(GuideGroup guideGroup) {
+        JPanel titleContainer = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, VerticalFlowLayout.CENTER, 0, 0);
+        titleContainer.setBorder(getBottomBorder());
+        titleContainer.setOpaque(false);
+
+        titleContainer.setPreferredSize(new Dimension(500, 40));
+        JPanel titlePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 8,0 );
+        titlePane.setOpaque(false);
+
+        UILabel iconLabel = new UILabel(getGroupStateIcon(guideGroup));
+        iconLabel.setPreferredSize(new Dimension(16, 16));
+        iconLabel.setOpaque(false);
+
+        UILabel titleLabel = new UILabel(guideGroup.getName());
+        titleLabel.setPreferredSize(new Dimension(200, 16));
+        titleLabel.setForeground(new Color(65, 155, 249));
+        titleLabel.setOpaque(false);
+
+        titlePane.add(iconLabel);
+        titlePane.add(titleLabel);
+        titleContainer.add(titlePane);
+        return titleContainer;
+    }
+
+    private JPanel createGroupContentPane(GuideGroup guideGroup) {
+        JPanel groupContainer = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, VerticalFlowLayout.TOP, 0, 0);
+        groupContainer.setBorder(BorderFactory.createEmptyBorder(0,10,0,0));
+        groupContainer.setOpaque(false);
+        for (int index = 0; index < guideGroup.getGuideList().size(); index++) {
+            JPanel guidePane = createGuidePane(guideGroup.getGuideList().get(index), index);
+            if (index != guideGroup.getGuideList().size() - 1) {
+                guidePane.setBorder(getBottomBorder());
+            }
+            groupContainer.add(guidePane);
+        }
+        return groupContainer;
+    }
+
+
+
+    private JPanel createGuidePane(Guide guide, int index) {
+        JPanel guidePaneContainer = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, VerticalFlowLayout.CENTER, 0, 0);
+        guidePaneContainer.setPreferredSize(new Dimension(540, 40));
+        guidePaneContainer.setOpaque(false);
+
+        JPanel guidePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 50,0 );
+        guidePane.setOpaque(false);
+
+        UILabel title = new UILabel((index + 1) + "、" + guide.getDescription());
+        title.setPreferredSize(new Dimension(440, 20));
+        title.setForeground(guide.isComplete() ? COMPLETE_FONT_COLOR : UNCOMPLETE_FONT_COLOR);
+        title.setOpaque(false);
+
+
+        UIButton button = new UIButton(guide.isComplete() ? Toolkit.i18nText("Fine-Design_Guide_Manager_Dialog_Retry") : Toolkit.i18nText("Fine-Design_Guide_Manager_Dialog_Show"));
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setVisible(false);
+                guide.go();
+            }
+        });
+
+        button.setPreferredSize(new Dimension(48, 20));
+        guidePane.add(title);
+        guidePane.add(button);
+
+        guidePaneContainer.add(guidePane);
+        return guidePaneContainer;
+    }
+
+    private Border getBottomBorder() {
+        return BorderFactory.createMatteBorder(
+                0,0,1, 0, BORDER_COLOR
+        );
+    }
+
+    public void showDialog() {
+        resetScrollContent();
+        this.setVisible(true);
+    }
+
+    private Icon getGroupStateIcon(GuideGroup guideGroup) {
+        if (guideGroup.isCompleteAll()) {
+            return GROUP_COMPLETE_ALL;
+        } else if (guideGroup.isCompleteSome()) {
+            return GROUP_COMPLETE_SOME;
+        } else {
+            return GROUP_COMPLETE_NONE;
+        }
+    }
+
+    private UIButton createCompleteAllButton() {
+        UIButton button = new UIButton(Toolkit.i18nText(Toolkit.i18nText("Fine-Design_Guide_Manager_Dialog_Complete_All")));
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                GuideManager.getInstance().completeAll();
+                resetScrollContent();
+            }
+        });
+        return button;
+    }
+
+    private UIButton createCloseButton() {
+        UIButton button = new UIButton(Toolkit.i18nText(Toolkit.i18nText("Fine-Design_Guide_Manager_Dialog_Close")));
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setVisible(false);
+            }
+        });
+        return button;
+    }
+
+    private JPanel createActionsPane() {
+        JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        container.setBorder(BorderFactory.createEmptyBorder(7, 10, 7, 10));
+        container.add(createCompleteAllButton(), BorderLayout.WEST);
+        container.add(createCloseButton(), BorderLayout.EAST);
+        return container;
+    }
+
+    private void resetScrollContent() {
+        scrollContent.removeAll();
+        for (GuideVersion guideVersion : GuideManager.getInstance().getGuideVersionList()) {
+            scrollContent.add(createGuideVersionPane(guideVersion));
+        }
+        revalidate();
+        repaint();
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/ImagePanel.java

@@ -0,0 +1,28 @@
+package com.fr.design.mainframe.guide.ui;
+
+import javax.swing.JPanel;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Toolkit;
+
+/**
+ * Created by kerry on 2020-10-23
+ */
+public class ImagePanel extends JPanel {
+
+
+    private Image image;
+
+    public ImagePanel(String imagePath) {
+        image = Toolkit.getDefaultToolkit().createImage(ImagePanel.class
+                .getResource(imagePath));
+    }
+
+    @Override
+    public void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        if (image != null) {
+            g.drawImage(image, 0, 0, getWidth(), getHeight(), this);
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/bubble/Bubble.java

@@ -0,0 +1,152 @@
+package com.fr.design.mainframe.guide.ui.bubble;
+
+import javax.swing.JComponent;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+
+public class Bubble extends JComponent {
+    public enum TailDirection {
+        TOP, BOTTOM, LEFT, RIGHT
+    }
+    protected static final int TAIL_HEIGHT = 7;
+    protected static final int TAIL_WIDTH = 14;
+    protected static final int BUBBLE_WIDTH = 170;
+    protected static final Color BG_COLOR = new Color(240,240,241);
+    protected static final int BORDER_RADIUS = 10;
+
+
+    private TailDirection tailDirection;
+    private float tailStart;
+
+    public Bubble() {
+        this(TailDirection.LEFT, 0.5f);
+    }
+
+    public Bubble(TailDirection tailDirection, float tailStart) {
+        this.tailDirection = tailDirection;
+        this.tailStart = tailStart;
+        this.setOpaque(false);
+    }
+
+    public void setTailDirection(TailDirection tailDirection) {
+        this.tailDirection = tailDirection;
+    }
+
+    public TailDirection getTailDirection() {
+        return tailDirection;
+    }
+
+    public void setTailStart(float tailStart) {
+        this.tailStart = tailStart;
+    }
+
+    public float getTailStart() {
+        return tailStart;
+    }
+
+
+    @Override
+    public Dimension getPreferredSize() {
+        if (isPreferredSizeSet()) {
+            return super.getPreferredSize();
+        }
+        return new Dimension(getDefaultWidth(), getDefaultHeight());
+
+    }
+
+    protected int getDefaultWidth() {
+        return (isTailHorizontal() ? TAIL_HEIGHT : 0) + BUBBLE_WIDTH;
+    }
+
+    protected int getDefaultHeight() {
+        return (isTailVertical() ? TAIL_HEIGHT : 0);
+    }
+
+    @Override
+    protected void paintComponent(Graphics g) {
+        Graphics2D g2 = (Graphics2D) g;
+        Composite oldComposite = g2.getComposite();
+        paintBubbleBg(g2);
+        g2.setComposite(oldComposite);
+        super.paintComponent(g);
+    }
+
+    protected void paintBubbleBg(Graphics2D g2) {
+        g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+        paintRectBg(g2);
+        paintTailBg(g2);
+    }
+
+    protected void paintRectBg(Graphics2D g2) {
+        g2.setColor(BG_COLOR);
+        Rectangle bounds = getRectBounds();
+        g2.fillRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, BORDER_RADIUS, BORDER_RADIUS);
+    }
+
+    protected void paintTailBg(Graphics2D g2) {
+        int width = getWidth();
+        int height = getHeight();
+        if (isTailVertical()) {
+            int tailX = (int) (width * tailStart);
+            int startX = Math.max(tailX - TAIL_WIDTH / 2, 0);
+            int endX = startX + TAIL_WIDTH;
+            int[] xPoints = {startX, endX, tailX};
+            int[] yPoints = isTailTop() ? new int[]{TAIL_HEIGHT, TAIL_HEIGHT, 0} : new int[]{height - TAIL_HEIGHT, height - TAIL_HEIGHT, height};
+            g2.fillPolygon(xPoints, yPoints, 3);
+        } else if (isTailHorizontal()) {
+            int tailY = (int) (height * tailStart);
+            int startY = Math.max(tailY - TAIL_WIDTH / 2, 0);
+            int endY = startY + TAIL_WIDTH;
+            int[] xPoints = isTailLeft() ? new int[]{TAIL_HEIGHT, TAIL_HEIGHT, 0} : new int[]{width - TAIL_HEIGHT, width - TAIL_HEIGHT, width};
+            int[] yPoints = {startY, endY, tailY};
+            g2.fillPolygon(xPoints, yPoints, 3);
+        }
+    }
+
+    public Rectangle getRectBounds() {
+        int width = getWidth();
+        int height = getHeight();
+        switch (tailDirection) {
+            case TOP:
+                return new Rectangle(0, TAIL_HEIGHT, width, height - TAIL_HEIGHT);
+            case LEFT:
+                return new Rectangle(TAIL_HEIGHT, 0, width - TAIL_HEIGHT, height);
+            case RIGHT:
+                return new Rectangle(0, 0 , width - TAIL_HEIGHT, height);
+            case BOTTOM:
+                return new Rectangle(0, 0, width, height - TAIL_HEIGHT);
+            default:
+                return new Rectangle(0,0,0,0);
+        }
+    }
+
+    public boolean isTailHorizontal() {
+        return isTailLeft() || isTailRight();
+    }
+
+    public boolean isTailVertical() {
+        return isTailTop() || isTailBottom();
+    }
+
+    public boolean isTailLeft() {
+        return tailDirection == TailDirection.LEFT;
+    }
+
+    public boolean isTailRight() {
+        return tailDirection == TailDirection.RIGHT;
+    }
+
+    public boolean isTailTop() {
+        return tailDirection == TailDirection.TOP;
+    }
+
+    public boolean isTailBottom() {
+        return tailDirection == TailDirection.BOTTOM;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/ui/bubble/BubbleWithClose.java

@@ -0,0 +1,267 @@
+package com.fr.design.mainframe.guide.ui.bubble;
+
+
+import com.fr.base.GraphHelper;
+import com.fr.design.gui.frpane.UITextPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.general.IOUtils;
+import com.fr.stable.StringUtils;
+
+import javax.swing.Icon;
+import javax.swing.JTextPane;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyledDocument;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.awt.Rectangle;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.font.FontRenderContext;
+import java.awt.font.LineBreakMeasurer;
+import java.awt.font.TextAttribute;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+
+public class BubbleWithClose extends Bubble {
+    private static final Font FONT = new Font(Font.SANS_SERIF, Font.PLAIN, 14);
+    private static final Icon ICON = IOUtils.readIcon("/com/fr/design/mainframe/guide/close.png");
+    private static final int HEADER_HEIGHT = 24;
+    private static final Color HEADER_COLOR = new Color(245, 245, 246);
+    private static final Color TITLE_COLOR = new Color(51, 51, 52);
+    private static final Color CONTENT_COLOR =  new Color(51,51,52,128);
+    private static final Insets DEFAULT_INSET = new Insets(10, 15, 10, 15);
+
+
+    private String title;
+    private String content;
+    private UITextPane titleTextArea;
+    private UITextPane contentTextArea;
+    private UIButton closeButton;
+
+    public BubbleWithClose(String title, String content) {
+        this(title, content, TailDirection.LEFT, 0.5f);
+    }
+
+    public BubbleWithClose(String title, String content, TailDirection tailDirection, float tailStart)  {
+        super(tailDirection, tailStart);
+        this.title = title;
+        this.content = content;
+        this.initComponent();
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    protected void initComponent() {
+        this.setLayout(getLayoutManager());
+        createCloseButton();
+        createContentPane();
+        this.addComponentListener(new ComponentAdapter() {
+            @Override
+            public void componentShown(ComponentEvent e) {
+                super.componentShown(e);
+            }
+
+            @Override
+            public void componentResized(ComponentEvent e) {
+                Rectangle rectBounds = getRectBounds();
+                Dimension buttonSize = closeButton.getPreferredSize();
+
+                closeButton.setBounds(getWidth() - 10 - buttonSize.width, rectBounds.y + (HEADER_HEIGHT - buttonSize.height) / 2, buttonSize.width, buttonSize.height);
+
+                Dimension titleSize = new Dimension(0,0);
+                Dimension contentSize = new Dimension(0, 0);
+                if (titleTextArea != null) {
+                    titleSize = calTextSize(titleTextArea, getTextAreaMaxWidth());
+                    int x = rectBounds.x + (rectBounds.width - getHorizontalInsets() - titleSize.width) / 2 + DEFAULT_INSET.left;
+                    int y = rectBounds.y + HEADER_HEIGHT + DEFAULT_INSET.top;
+                    titleTextArea.setBounds(x, y, titleSize.width, titleSize.height);
+                }
+
+                if (contentTextArea != null) {
+                    contentSize = calTextSize(contentTextArea, getTextAreaMaxWidth());
+                    int x = rectBounds.x + (rectBounds.width - getHorizontalInsets() - contentSize.width) / 2 + DEFAULT_INSET.left;
+                    int y = rectBounds.y = HEADER_HEIGHT + DEFAULT_INSET.top + (titleSize.height == 0 ? 0 : titleSize.height + 10);
+                    contentTextArea.setBounds(x,y, contentSize.width, contentSize.height);
+                }
+                setSize(getPreferredSize().width, getPreferredSize().height);
+                repaint();
+            }
+        });
+    }
+
+    private void createCloseButton() {
+        closeButton = new UIButton();
+        closeButton.setIcon(ICON);
+        closeButton.set4ToolbarButton();
+        closeButton.setPreferredSize(new Dimension(12, 12));
+        closeButton.setRolloverEnabled(false);
+        closeButton.setPressedPainted(false);
+        this.add(closeButton);
+    }
+
+    public void addCloseActionListener(ActionListener actionListener) {
+        closeButton.addActionListener(actionListener);
+
+    }
+
+    public void removeCloseActionListener(ActionListener actionListener){
+        closeButton.removeActionListener(actionListener);
+    }
+
+    private void createContentPane() {
+        createTitleTextArea();
+        createContentTextArea();
+    }
+
+    private void createTitleTextArea() {
+        if (StringUtils.isNotEmpty(title)) {
+            titleTextArea = createTextArea(title, FONT, TITLE_COLOR);
+            this.add(titleTextArea);
+        }
+
+    }
+
+    private void createContentTextArea() {
+        if (StringUtils.isNotEmpty(content)) {
+            contentTextArea = createTextArea(content, FONT, CONTENT_COLOR);
+            this.add(contentTextArea);
+        }
+    }
+
+    private UITextPane createTextArea(String str, Font font, Color foreground) {
+        UITextPane textArea= new UITextPane(){
+            @Override
+            public Insets getInsets() {
+                return new Insets(0, 0, 0, 0);
+            }
+        };
+        textArea.setText(str);
+        textArea.setEnabled(false);
+        textArea.setDisabledTextColor(foreground);
+        textArea.setBorder(null);
+        textArea.setFont(font);
+        textArea.setOpaque(false);
+        textArea.setForeground(foreground);
+        StyledDocument doc = textArea.getStyledDocument();
+        SimpleAttributeSet center = new SimpleAttributeSet();
+        StyleConstants.setAlignment(center, StyleConstants.ALIGN_CENTER);
+        doc.setParagraphAttributes(0, doc.getLength(), center, false);
+        return textArea;
+    }
+
+    protected int getDefaultHeight() {
+        Dimension titleSize = calTextSize(titleTextArea, getDefaultTextAreaMaxWidth());
+        Dimension contentSize = calTextSize(contentTextArea, getDefaultTextAreaMaxWidth());
+        return (isTailVertical() ? TAIL_HEIGHT : 0) + HEADER_HEIGHT + titleSize.height + (titleSize.height == 0 ? 0 : 5) + contentSize.height + getVerticalInsets();
+    }
+
+    private LayoutManager getLayoutManager() {
+        return new LayoutManager() {
+            @Override
+            public void addLayoutComponent(String name, Component comp) {
+            }
+
+            @Override
+            public void removeLayoutComponent(Component comp) {
+
+            }
+
+            @Override
+            public Dimension preferredLayoutSize(Container parent) {
+                return parent.getPreferredSize();
+            }
+
+            @Override
+            public Dimension minimumLayoutSize(Container parent) {
+                return null;
+            }
+
+            @Override
+            public void layoutContainer(Container parent) {
+
+            }
+        };
+    }
+
+    @Override
+    protected void paintBubbleBg(Graphics2D g2) {
+        super.paintBubbleBg(g2);
+        paintHeaderBg(g2);
+    }
+
+    private void paintHeaderBg(Graphics2D g2) {
+        g2.setColor(HEADER_COLOR);
+        Rectangle bounds = getRectBounds();
+        g2.fillRoundRect(bounds.x, bounds.y, bounds.width, HEADER_HEIGHT, 10, 10);
+    }
+
+    private int countLines(JTextPane textArea, int max_width) {
+        AttributedString text = new AttributedString(textArea.getText());
+        text.addAttribute(TextAttribute.FONT, textArea.getFont());
+        FontRenderContext frc = textArea.getFontMetrics(textArea.getFont())
+                .getFontRenderContext();
+        AttributedCharacterIterator charIt = text.getIterator();
+        LineBreakMeasurer lineMeasurer = new LineBreakMeasurer(charIt, frc);
+        lineMeasurer.setPosition(charIt.getBeginIndex());
+        int lines = 0;
+        while (lineMeasurer.getPosition() < charIt.getEndIndex()) {
+            lineMeasurer.nextLayout(max_width);
+            lines++;
+        }
+        return lines;
+    }
+
+    private Dimension calTextSize(JTextPane textArea, int maxWidth) {
+        if (textArea == null) {
+            return new Dimension(0, 0);
+        }
+        FontMetrics fontMetrics = GraphHelper.getFontMetrics(textArea.getFont());
+        int line = countLines(textArea, maxWidth);
+        int width = maxWidth;
+        if (line == 1) {
+            width = fontMetrics.stringWidth(textArea.getText());
+        }
+        int height = fontMetrics.getHeight() * line;
+        return new Dimension(width, height);
+    }
+
+    private int getTextAreaMaxWidth() {
+        return getWidth() - (isTailHorizontal() ? TAIL_HEIGHT : 0) -getHorizontalInsets();
+    }
+
+    private int getDefaultTextAreaMaxWidth() {
+        return BUBBLE_WIDTH - getHorizontalInsets();
+    }
+
+    private int getHorizontalInsets() {
+        return DEFAULT_INSET.left + DEFAULT_INSET.right;
+    }
+
+    private int getVerticalInsets() {
+        return DEFAULT_INSET.top + DEFAULT_INSET.bottom;
+    }
+
+}

designer-base/src/main/java/com/fr/design/mainframe/guide/utils/ScreenImage.java

@@ -0,0 +1,98 @@
+package com.fr.design.mainframe.guide.utils;
+
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import java.awt.AWTException;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.image.BufferedImage;
+
+public class ScreenImage {
+
+    public static BufferedImage createImage(JComponent component) {
+        return ScreenImage.createImage(component, getRegion(component));
+    }
+
+    public static BufferedImage createImage(JComponent component, Rectangle region) {
+        if (! component.isDisplayable()) {
+            Dimension d = component.getSize();
+
+            if (d.width == 0 || d.height == 0) {
+                d = component.getPreferredSize();
+                component.setSize( d );
+            }
+
+            layoutComponent( component );
+        }
+
+        BufferedImage image = new BufferedImage(region.width, region.height, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = image.createGraphics();
+
+        if (! component.isOpaque()) {
+            g2d.setColor( component.getBackground() );
+            g2d.fillRect(region.x, region.y, region.width, region.height);
+        }
+
+        g2d.translate(-region.x, -region.y);
+        component.print( g2d );
+        g2d.dispose();
+        return image;
+    }
+
+    public static BufferedImage createImage(Component component)
+            throws AWTException {
+        Point p = new Point(0, 0);
+        SwingUtilities.convertPointToScreen(p, component);
+        Rectangle region = component.getBounds();
+        region.x = p.x;
+        region.y = p.y;
+        return ScreenImage.createImage(region);
+    }
+
+    public static BufferedImage createImageWithModal(JComponent component) {
+        Rectangle region = getRegion(component);
+        BufferedImage image = new BufferedImage(region.width, region.height, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = image.createGraphics();
+        g2d.drawImage(createImage(component), 0, 0, null);
+        g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.6f));
+        g2d.setColor(Color.BLACK);
+        g2d.fillRect(0, 0, region.width, region.height);
+        g2d.dispose();
+        return image;
+    }
+
+    public static BufferedImage createImage(Rectangle region)
+            throws AWTException {
+        BufferedImage image = new Robot().createScreenCapture( region );
+        return image;
+    }
+
+    private static Rectangle getRegion(Component component) {
+        Dimension d = component.getSize();
+        if (d.width == 0 || d.height == 0) {
+            d = component.getPreferredSize();
+            component.setSize( d );
+        }
+        return new Rectangle(0, 0, d.width, d.height);
+    }
+
+    static void layoutComponent(Component component) {
+        synchronized (component.getTreeLock()) {
+            component.doLayout();
+
+            if (component instanceof Container) {
+                for (Component child : ((Container)component).getComponents()) {
+                    layoutComponent(child);
+                }
+            }
+        }
+    }
+
+}

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

@@ -88,4 +88,8 @@ public class LogMessageBar extends JPanel {
 		}
 		THIS = null;
 	}
+
+	public JFrame getLogFrame() {
+		return dlg;
+	}
 }

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

@@ -5,6 +5,7 @@ import com.fr.base.theme.TemplateThemeConfig;
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.module.ModuleContext;
 
+import javax.swing.SwingUtilities;
 import java.util.concurrent.ExecutorService;
 
 /**
@@ -48,8 +49,14 @@ public class AsyncThemeFetcher<T extends TemplateTheme> {
                     return;
                 }
                 if (callback != null) {
+                    // 后续任务不要在工作线程中执行，从而确保只在EDT线程操作UI
+                    SwingUtilities.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
                             callback.afterCachedFetch(theme);
                         }
+                    });
+                }
             }
         });
     }

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

@@ -39,8 +39,22 @@ public class FormThemeProfilePane extends TemplateThemeProfilePane<FormTheme> {
     }
 
     @Override
-    protected JPanel createCustomEditorsPane() {
+    public TemplateThemeEditorPane<FormTheme> createThemeEditorPane() {
-        JPanel container = super.createCustomEditorsPane();
+        return new FormThemeEditorPane(config);
+    }
+
+    @Override
+    public String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_Form_Theme_Profile_Dialog_Title");
+    }
+
+    private static class FormThemeEditorPane extends TemplateThemeEditorPane<FormTheme> {
+
+        private final FormBodyStyleEditPane formBodyStyleSettingPane;
+        private final ComponentStyleEditPane componentStyleSettingPane;
+
+        public FormThemeEditorPane(TemplateThemeConfig<FormTheme> config) {
+            super(config);
             formBodyStyleSettingPane = new FormBodyStyleEditPane();
             addCustomEditorPane(i18nText("Fine-Design_Predefined_Template_Background"), formBodyStyleSettingPane);
 
@@ -50,7 +64,6 @@ public class FormThemeProfilePane extends TemplateThemeProfilePane<FormTheme> {
 
             componentStyleSettingPane = new ComponentStyleEditPane();
             addCustomEditorPane(i18nText("Fine-Design_Predefined_Component_Style"), componentStyleSettingPane);
-        return container;
         }
 
         @Override
@@ -62,44 +75,20 @@ public class FormThemeProfilePane extends TemplateThemeProfilePane<FormTheme> {
         }
 
         @Override
-    public void onColorSchemeChanged(List<Color> colors) {
+        protected void populateBean4CustomEditors(FormTheme theme) {
-        super.onColorSchemeChanged(colors);
+            super.populateBean4CustomEditors(theme);
-        FineColorManager.FineColorReplaceByColorScheme replaceByColorScheme = new FineColorManager.FineColorReplaceByColorScheme(colors);
-
-        ThemedFormBodyStyle formBodyStyle =  formBodyStyleSettingPane.updateBean();
-        FineColorManager.traverse(formBodyStyle, replaceByColorScheme);
-        formBodyStyleSettingPane.populateBean(formBodyStyle);
-
-        ThemedComponentStyle componentStyle = componentStyleSettingPane.updateBean();
-        FineColorManager.traverse(componentStyle, replaceByColorScheme);
-        componentStyleSettingPane.populateBean(componentStyle);
-    }
-
-    @Override
-    public void populateBean(FormTheme theme) {
-        super.populateBean(theme);
-
-        isPopulating = true;
-
             formBodyStyleSettingPane.populateBean(theme.getBodyStyle());
             componentStyleSettingPane.populateBean(theme.getComponentStyle());
-
-        themePreviewPane.refresh(theme);
-
-        isPopulating = false;
         }
 
         @Override
-    public void updateBean(FormTheme theme) {
+        protected void updateBean4CustomEditors(FormTheme theme) {
+            super.updateBean4CustomEditors(theme);
             ThemedFormBodyStyle formBodyStyle = formBodyStyleSettingPane.updateBean();
             theme.setBodyStyle(formBodyStyle);
 
             ThemedComponentStyle componentStyle = componentStyleSettingPane.updateBean();
             theme.setComponentStyle(componentStyle);
         }
-
-    @Override
-    public String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Basic_Form_Theme_Profile_Dialog_Title");
     }
 }

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

@@ -1,16 +1,11 @@
 package com.fr.design.mainframe.theme;
 
-import com.fr.base.theme.FineColorManager;
 import com.fr.base.theme.ReportTheme;
 import com.fr.base.theme.TemplateThemeConfig;
-import com.fr.base.theme.settings.ThemedReportBodyStyle;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.theme.edit.ReportBodyStyleEditPane;
 import com.fr.design.mainframe.theme.preview.ReportThemePreviewPane;
-
 import javax.swing.JPanel;
-import java.awt.Color;
-import java.util.List;
 
 /**
  * @author Starryi
@@ -30,45 +25,37 @@ public class ReportThemeProfilePane extends TemplateThemeProfilePane<ReportTheme
     }
 
     @Override
-    protected JPanel createCustomEditorsPane() {
+    public TemplateThemeEditorPane<ReportTheme> createThemeEditorPane() {
-        JPanel container = super.createCustomEditorsPane();
+        return new ReportThemeEditorPane(config);
-        this.reportBodyStyleSettingPane = new ReportBodyStyleEditPane();
-        addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), reportBodyStyleSettingPane);
-        addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane());
-        addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane());
-        return container;
     }
 
     @Override
-    public void onColorSchemeChanged(List<Color> colors) {
+    public String title4PopupWindow() {
-        super.onColorSchemeChanged(colors);
+        return Toolkit.i18nText("Fine-Design_Basic_Report_Theme_Profile_Dialog_Title");
+    }
+
+    private static class ReportThemeEditorPane extends TemplateThemeEditorPane<ReportTheme> {
 
-        FineColorManager.FineColorReplaceByColorScheme replaceByColorScheme = new FineColorManager.FineColorReplaceByColorScheme(colors);
+        private final ReportBodyStyleEditPane reportBodyStyleSettingPane;
 
-        ThemedReportBodyStyle bodyStyle =  reportBodyStyleSettingPane.updateBean();
+        public ReportThemeEditorPane(TemplateThemeConfig<ReportTheme> config) {
-        FineColorManager.traverse(bodyStyle, replaceByColorScheme);
+            super(config);
-        reportBodyStyleSettingPane.populateBean(bodyStyle);
+            this.reportBodyStyleSettingPane = new ReportBodyStyleEditPane();
+            addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Template_Background"), reportBodyStyleSettingPane);
+            addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Cell_Style"), createCellStyleSettingPane());
+            addCustomEditorPane(Toolkit.i18nText("Fine-Design_Predefined_Chart_Style"), createChartStyleSettingPane());
         }
 
         @Override
-    public void populateBean(ReportTheme theme) {
+        public void populateBean4CustomEditors(ReportTheme theme) {
-        super.populateBean(theme);
+            super.populateBean4CustomEditors(theme);
-
-        isPopulating = true;
             reportBodyStyleSettingPane.populateBean(theme.getBodyStyle());
-
-        themePreviewPane.refresh(theme);
-
-        isPopulating = false;
         }
 
         @Override
-    public void updateBean(ReportTheme theme) {
+        public void updateBean4CustomEditors(ReportTheme theme) {
+            super.updateBean4CustomEditors(theme);
             theme.setBodyStyle(this.reportBodyStyleSettingPane.updateBean());
         }
-
-    @Override
-    public String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Basic_Report_Theme_Profile_Dialog_Title");
     }
 }

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

@@ -16,7 +16,6 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
@@ -27,10 +26,10 @@ import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
+import java.awt.Toolkit;
 import java.awt.Window;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.concurrent.ExecutorService;
 
 /**
  * @author Starryi
@@ -38,8 +37,9 @@ import java.util.concurrent.ExecutorService;
  * Created by Starryi on 2021/8/13
  */
 public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
-    public static final int HEIGHT = 150;
+    public static final int INFO_HEIGHT = 30;
-    public static final int THUMBNAIL_HEIGHT = 125;
+    public static final int CONTENT_WIDTH = ThemeThumbnail.WIDTH;
+    public static final int CONTENT_HEIGHT = ThemeThumbnail.HEIGHT + INFO_HEIGHT;
     private static final Color HOVERING_BORDER_COLOR = new Color(65, 155, 249);
 
     private final String name;
@@ -51,7 +51,7 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
     private final Icon profileIcon = IOUtils.readIcon("/com/fr/design/icon/icon_edit.png");
     private final boolean displayTheme4NewTemplateMarker;
 
-    private UILabel thumbnailLabel;
+    private final ThumbnailPane thumbnailPane;
     // UIButton会影响Block的手势监听，这里使用UILabel代替，点击事件也有Block代为处理
     private UILabel profileButton;
     private boolean selected = false;
@@ -64,9 +64,11 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
                               TemplateThemeConfig<T> config,
                               TemplateThemeProfilePane<T> profilePane) {
         this.name = name;
+        this.setName(name);
         this.displayTheme4NewTemplateMarker = displayTheme4NewTemplateMarker;
         this.config = config;
         this.profilePane = profilePane;
+        this.thumbnailPane = new ThumbnailPane();
 
         initializePane();
         addMouseListener(new MouseAdapter() {
@@ -97,13 +99,14 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
 
     private void initializePane() {
         setLayout(FRGUIPaneFactory.createBorderLayout());
-        setPreferredSize(new Dimension(getPreferredSize().width, HEIGHT));
+        setPreferredSize(new Dimension(CONTENT_WIDTH, CONTENT_HEIGHT));
         setBackground(Color.WHITE);
 
-        thumbnailLabel = new UILabel();
+        thumbnailPane.setBackground(Color.WHITE);
-        thumbnailLabel.setPreferredSize(new Dimension(getPreferredSize().width, THUMBNAIL_HEIGHT));
+        thumbnailPane.setPreferredSize(new Dimension(ThemeThumbnail.WIDTH, ThemeThumbnail.HEIGHT));
 
         JPanel infoPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        infoPane.setPreferredSize(new Dimension(CONTENT_WIDTH, INFO_HEIGHT));
         infoPane.setBackground(Color.WHITE);
         infoPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L7,0,IntervalConstants.INTERVAL_L7));
 
@@ -115,22 +118,21 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
             addProfileButton(infoPane);
         }
 
-        add(thumbnailLabel, BorderLayout.CENTER);
+        add(thumbnailPane, BorderLayout.CENTER);
         add(infoPane, BorderLayout.SOUTH);
     }
 
     public void setTheme(T theme) {
         this.theme = theme;
-        thumbnailLabel.setIcon(null);
+        Image image = null;
         if (theme != null) {
             ThemeThumbnail thumbnail = theme.getThumbnail();
             if (thumbnail != null) {
-                Image image = thumbnail.getImage();
+                image = thumbnail.getImage();
-                if (image != null) {
-                    thumbnailLabel.setIcon(new ImageIcon(image));
-                }
             }
         }
+        thumbnailPane.setThumbnail(image);
+        invalidate();
         repaint();
     }
 
@@ -158,7 +160,7 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
         int y = e.getY();
 
         int profileButtonX = profileButton.getX();
-        int profileButtonY = thumbnailLabel.getHeight() + profileButton.getY();
+        int profileButtonY = thumbnailPane.getHeight() + profileButton.getY();
 
         boolean inX = profileButtonX <= x && x <= profileButtonX + profileButton.getWidth();
         boolean inY = profileButtonY <= y && y <= profileButtonY + profileButton.getHeight();
@@ -196,7 +198,7 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
         }
 
         if (displayTheme4NewTemplateMarker && StringUtils.equals(config.getThemeName4NewTemplate(), name)) {
-            theme4NewTemplateMarkIcon.paintIcon(this, g, 0, 0);
+            theme4NewTemplateMarkIcon.paintIcon(this, g, 0, thumbnailPane.getHeight() - 16);
         }
 
         if (selected || this.hovering) {
@@ -205,4 +207,58 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
             GraphHelper.draw(g, rectangle, Constants.LINE_MEDIUM);
         }
     }
+
+    private static class ThumbnailPane extends JPanel {
+        private static final Image LOADING_IMAGE = Toolkit.getDefaultToolkit().createImage(ThumbnailPane.class.getResource("/com/fr/design/images/mainframe/loading.gif"));
+        private Image thumbnail = null;
+
+        @Override
+        public void paint(Graphics g) {
+            super.paint(g);
+            Graphics2D g2d = (Graphics2D) g;
+            Color oldColor = g2d.getColor();
+            g2d.setColor(Color.WHITE);
+            g2d.fillRect(0, 0, getWidth(), getHeight());
+            g2d.setColor(oldColor);
+
+            paintCenterImage(g2d, thumbnail != null ? thumbnail : LOADING_IMAGE);
+        }
+
+        private void paintCenterImage(Graphics2D g2d, Image image) {
+            if (image == null) {
+                return;
+            }
+
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+            int width = getWidth();
+            int height = getHeight();
+            int imgWidth = image.getWidth(null);
+            int imgHeight = image.getHeight(null);
+
+            if (width <= 0 || height <= 0 || imgWidth <= 0 || imgHeight <= 0) {
+                return;
+            }
+
+            float imgAspect = 1.0F * imgWidth / imgHeight;
+
+            if (1.0F * width / height > 1.0F * imgWidth / imgHeight) {
+                imgHeight = height;
+                imgWidth = (int) (1.0F * imgHeight * imgAspect);
+            } else {
+                imgWidth = width;
+                imgHeight = (int) (1.0F * imgWidth / imgAspect);
+            }
+            int x = (width - imgWidth) / 2;
+            int y = (height - imgHeight) / 2;
+
+            g2d.drawImage(image, x, y, imgWidth, imgHeight, null);
+        }
+
+        public void setThumbnail(Image thumbnail) {
+            this.thumbnail = thumbnail;
+            invalidate();
+            repaint();
+        }
+    }
 }

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

@@ -0,0 +1,297 @@
+package com.fr.design.mainframe.theme;
+
+import com.fr.base.theme.FineColorFlushUtils;
+import com.fr.base.theme.FineColorManager;
+import com.fr.base.theme.TemplateTheme;
+import com.fr.base.theme.TemplateThemeConfig;
+import com.fr.base.theme.settings.ThemedCellStyleList;
+import com.fr.base.theme.settings.ThemedColorScheme;
+import com.fr.design.designer.IntervalConstants;
+import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.gui.frpane.UITabbedPane;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.mainframe.theme.edit.CellStyleListEditPane;
+import com.fr.design.mainframe.theme.edit.ChartStyleEditPane;
+import com.fr.design.mainframe.theme.edit.ui.ColorListExtendedPane;
+import com.fr.design.mainframe.theme.edit.ui.ColorListPane;
+import com.fr.design.mainframe.theme.edit.ui.LabelUtils;
+import com.fr.design.mainframe.theme.ui.AutoCheckTextField;
+import com.fr.design.mainframe.theme.ui.AutoCheckThemeNameTextField;
+import com.fr.design.mainframe.theme.ui.BorderUtils;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.util.List;
+
+/**
+ * @author Starryi
+ * @version 1.0
+ * Created by Starryi on 2021/8/13
+ */
+public abstract class TemplateThemeEditorPane<T extends TemplateTheme> extends JPanel {
+    public static final int LEFT_TITLE_PANE_HEIGHT = 539;
+
+    public static final int RIGHT_PANE_WIDTH = 362;
+    public static final int RIGHT_PANE_HEIGHT = LEFT_TITLE_PANE_HEIGHT;
+
+    protected AutoCheckThemeNameTextField<T> nameTextField;
+    private UILabel nameErrorLabel;
+    protected ColorListPane colorListPane;
+    protected CellStyleListEditPane cellStyleSettingPane;
+    protected ChartStyleEditPane chartStyleSettingPane;
+
+    protected boolean isPopulating = false;
+    protected UITabbedPane uiTabbedPane;
+
+    private final TemplateThemeConfig<T> config;
+
+    private boolean refreshingThemedColor = false;
+    private T theme;
+
+    private AttributeChangeListener changeListener;
+    private AutoCheckTextField.CheckListener themeNameCheckListener;
+
+    public TemplateThemeEditorPane(TemplateThemeConfig<T> config) {
+        super();
+        this.config = config;
+        theme = config.createNewTheme();
+        initializePane();
+    }
+
+    private void initializePane() {
+        setLayout(new BorderLayout(0, 0));
+        setPreferredSize(new Dimension(RIGHT_PANE_WIDTH,  RIGHT_PANE_HEIGHT));
+        JPanel nameEditPane =  createNameEditPane();
+        add(nameEditPane, BorderLayout.NORTH);
+
+        JPanel settingPane = new JPanel(new BorderLayout(0, IntervalConstants.INTERVAL_L1));
+        settingPane.add(createColorSchemeEditPane(), BorderLayout.NORTH);
+        settingPane.add(createCustomEditorsPane(), BorderLayout.CENTER);
+
+        add(settingPane, BorderLayout.CENTER);
+    }
+
+    private JPanel createNameEditPane() {
+        nameErrorLabel = LabelUtils.createLabel(StringUtils.EMPTY, Color.RED);
+        nameErrorLabel.setVisible(false);
+
+        nameTextField = new AutoCheckThemeNameTextField<>();
+        nameTextField.setThemeConfig(config);
+        nameTextField.setEditable(false);
+        nameTextField.setEnabled(false);
+        nameTextField.setPreferredSize(new Dimension(165, 20));
+        nameTextField.setNameCheckListener(new AutoCheckTextField.CheckListener() {
+            @Override
+            public void onChecked(String error, boolean valid) {
+                nameErrorLabel.setVisible(StringUtils.isNotEmpty(error));
+                nameErrorLabel.setText(error);
+
+                themeNameCheckListener.onChecked(error, valid);
+            }
+        });
+
+        double p = TableLayout.PREFERRED;
+
+        JPanel container = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
+                new Component[] { LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Name")), nameTextField },
+                new Component[] { null, nameErrorLabel },
+        }, new double[] { 20, 20}, new double[] { p, 165}, IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_W0);
+
+        container.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+        return container;
+    }
+
+    private JPanel createColorSchemeEditPane() {
+        colorListPane = new ColorListPane();
+
+        double p = TableLayout.PREFERRED;
+        double[] rowSize = new double[]{p, p, p};
+        double[] columnSize = {p, p};
+
+        JPanel colorListContainerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        colorListContainerPane.add(colorListPane, BorderLayout.WEST);
+
+        UILabel tipLabel = LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Edit_Tip"), new Color(153, 153, 153));
+
+        JPanel content = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
+                        {LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Edit_Label")), colorListContainerPane},
+                        {null, tipLabel},
+                },
+                rowSize, columnSize, 18, 7);
+        content.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+        JPanel borderContainer = new JPanel(new BorderLayout());
+        borderContainer.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Title")));
+        borderContainer.add(content);
+
+        JPanel container = new JPanel(new BorderLayout());
+        container.add(borderContainer, BorderLayout.CENTER);
+
+        colorListPane.addColorChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent e) {
+                if (refreshingThemedColor) {
+                    return;
+                }
+                List<Color> colors = colorListPane.update();
+                refreshingThemedColor = true;
+                onColorSchemeChanged(colors);
+                refreshingThemedColor = false;
+
+                fireAttributeChange();
+            }
+        });
+
+        return container;
+    }
+    private void onColorSchemeChanged(List<Color> colors) {
+        FineColorManager.FineColorReplaceByColorScheme replaceByColorScheme = new FineColorManager.FineColorReplaceByColorScheme(colors);
+        T theme = updateBean();
+        FineColorFlushUtils.replaceCacheObject(theme, replaceByColorScheme);
+        FineColorManager.traverse(theme, replaceByColorScheme);
+        populateBean4CustomEditors(theme);
+        //图表渐变色
+        chartStyleSettingPane.populateGradientBar(colors);
+        this.repaint();
+    }
+
+    protected JPanel createCustomEditorsPane() {
+        JPanel container = new JPanel(new BorderLayout());
+        container.setBorder(BorderUtils.createTitleBorder(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Custom_Settings_Title")));
+
+        uiTabbedPane = new UITabbedPane();
+        uiTabbedPane.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 1));
+        container.add(uiTabbedPane, BorderLayout.CENTER);
+
+        return container;
+    }
+
+    public void addCustomEditorPane(String title, final Component component) {
+        AbstractAttrNoScrollPane settingPane = new NoBorderAbstractAttrNoScrollPane() {
+            @Override
+            protected JPanel createContentPane() {
+                JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+                contentPane.add(component, BorderLayout.CENTER);
+                return contentPane;
+            }
+        };
+        settingPane.addAttributeChangeListener(new AttributeChangeListener() {
+            @Override
+            public void attributeChange() {
+                fireAttributeChange();
+            }
+        });
+        uiTabbedPane.addTab(title, settingPane);
+    }
+    protected JPanel createCellStyleSettingPane() {
+        JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        cellStyleSettingPane = new CellStyleListEditPane();
+        cellStyleSettingPane.registerAttrChangeListener(new AttributeChangeListener() {
+            @Override
+            public void attributeChange() {
+                fireAttributeChange();
+            }
+        });
+        container.add(cellStyleSettingPane);
+        return container;
+    }
+    protected JPanel createChartStyleSettingPane() {
+        JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        chartStyleSettingPane = new ChartStyleEditPane();
+        container.add(chartStyleSettingPane);
+        return container;
+    }
+
+    public void populateBean(T theme) {
+        this.theme = theme;
+        isPopulating = true;
+
+        String name = theme.getName();
+        setThemeNameEditable(StringUtils.isEmpty(name));
+
+        nameTextField.setText(name);
+
+        colorListPane.populate(theme.getColorScheme().getColors());
+
+        populateBean4CustomEditors(theme);
+        isPopulating = false;
+    }
+
+    protected void populateBean4CustomEditors(T theme) {
+        cellStyleSettingPane.populateBean(theme.getCellStyleList());
+        chartStyleSettingPane.populateBean(theme.getChartStyle());
+    }
+
+    public T updateBean() {
+        if (theme == null) {
+            theme = config.createNewTheme();
+        }
+
+        theme.setName(this.nameTextField.getText());
+
+        ThemedColorScheme colorScheme = theme.getColorScheme();
+        colorScheme.setColors(this.colorListPane.update());
+        theme.setColorScheme(colorScheme);
+
+        updateBean4CustomEditors(theme);
+
+        return theme;
+    }
+
+    protected void updateBean4CustomEditors(T theme) {
+        ThemedCellStyleList cellStyleConfig = this.cellStyleSettingPane.updateBean();
+        theme.setCellStyleList(cellStyleConfig);
+
+        theme.setChartStyle(this.chartStyleSettingPane.updateBean());
+    }
+
+    public void setThemeNameEditable(boolean editable) {
+        nameTextField.setEditable(editable);
+        nameTextField.setEnabled(editable);
+    }
+
+    public boolean checkNameValid() {
+        return nameTextField.checkValid();
+    }
+
+    public List<Color> getCurrentColorScheme() {
+        return colorListPane.update();
+    }
+
+    private void fireAttributeChange() {
+        if (!isPopulating && !refreshingThemedColor && changeListener != null) {
+            changeListener.attributeChange();
+        }
+    }
+
+    public void addAttributeChangeListener(AttributeChangeListener changeListener) {
+        this.changeListener = changeListener;
+    }
+    public void addThemeNameCheckListener(AutoCheckTextField.CheckListener checkListener) {
+        this.themeNameCheckListener = checkListener;
+    }
+
+    private static abstract class NoBorderAbstractAttrNoScrollPane extends AbstractAttrNoScrollPane {
+        @Override
+        protected void initContentPane() {
+            super.initContentPane();
+            if (leftContentPane != null) {
+                // 修正 AbstractAttrNoScrollPane 的默认行为
+                leftContentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+            }
+        }
+    }
+}