Pull request #4385: 无JIRA任务 feature/10.0 to feature/big-screen

Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/big-screen

* commit '4f34fc2697c3b57882f552746f15645e585b3aaf': (144 commits)
  omport
  处理冲突错了 更改
  REPORT-52843 && REPORT-52844 组件复用-合入主版本-read和clicked都是false时，点击提示的组件复用蓝字，弹出新手引导，关闭引导后，弹出了已合入主版本的提示;   组件复用-合入主版本-鼠标悬浮工具栏套用组件时，tooltip显示“套用组件”，交互文档以及和交互确认了下，应该是“复用组件”
  REPORT-52824 10.0.16 模板另存不会生成新的模板id
  REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
  REPORT-52629 组件展示排序逻辑的保存
  REPORT-52512 共享组件删除后删除对应的数据集
  颜色修改
  CHART-19306  默认渐变色修改
  REPORT-52699 组件复用-合入主版本-feature主jar，一些第三方插件控件，右侧点击事件/移动端，显示的还是属性设置页面内容
  CHART-19306 公式增加等于号
  REPORT-52539 组件生成面板出现横向滚动条
  CHART-19344 取色器改为点击之后确定颜色
  REPORT-52264 模版权限编辑警告弹窗不在页面中间
  REPORT-51992 设计器性能提升-缩略图占内存优化
  REPORT-51992 设计器性能提升-缩略图占内存优化
  CHART-19306 仪表盘配色面板修改
  REPORT-52538 组件复用-合入主版本-事件的常规设置处，切换组件后再查看，事件设置面板就不显示内容了
  REPORT-51992 设计器性能提升-缩略图占内存优化
  REPORT-51244【10.0.17】复用组件接触点优化
  ...

designer-base/src/main/java/com/fr/base/svg/SVGIcon.java

@@ -7,6 +7,8 @@ import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * SVG转化而来的Icon
@@ -28,6 +30,8 @@ public class SVGIcon implements Icon {
         this.image = image;
     }
 
+    private static Map<String, Icon> iconCache = new ConcurrentHashMap<>();
+
     @Override
     public void paintIcon(Component c, Graphics g, int x, int y) {
         if (HI_DPI_SURPORT) {
@@ -58,11 +62,26 @@ public class SVGIcon implements Icon {
      * @return
      */
     public static Icon readSVGIcon(String url) {
-        if (!url.startsWith(ICON_PREFIX)) {
+        return readSVGIconWithCache(url, true);
-            url = ICON_PREFIX + url;
+    }
+
+    public static Icon readSVGIconWithCache(String url, boolean cacheRead) {
+        Icon icon = null;
+        if (cacheRead) {
+            icon = iconCache.get(url);
         }
-        BufferedImage image = (BufferedImage) SVGLoader.load(url);
+        if (icon == null) {
-        return image == null ? IOUtils.readIcon(url) : new SVGIcon(image);
+            if (!url.startsWith(ICON_PREFIX)) {
+                url = ICON_PREFIX + url;
+            }
+            BufferedImage image = (BufferedImage) SVGLoader.load(url);
+            icon = image == null ? IOUtils.readIcon(url) : new SVGIcon(image);
+            //只缓存svg图标
+            if (image != null){
+                iconCache.put(url, icon);
+            }
+        }
+        return icon;
     }
 
     /**

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

@@ -21,6 +21,8 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.js.WidgetName;
 
 import com.fr.util.ParameterApplyHelper;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -73,6 +75,12 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
         setCurrentModelAdapter(this);
     }
 
+    public DesignModelAdapter(S jTemplate, Parameter[] parameters) {
+        this.jTemplate = jTemplate;
+        initParameter(parameters);
+        setCurrentModelAdapter(this);
+    }
+
     public static void setCurrentModelAdapter(DesignModelAdapter<?, ?> model) {
         currentModelAdapter = model;
     }
@@ -242,6 +250,16 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
                 && (widget instanceof DataControl || widget instanceof MultiFileEditor);
     }
 
+    private void initParameter(Parameter[] parameters) {
+        // 全部参数
+        this.parameters = parameters;
+        // 数据及参数
+        this.tableDataParameters = getLatestTableDataParameters();
+        // 模板参数
+        this.templateParameters = getLatestTemplateParameters();
+    }
+
+
     /**
      * 更新缓存的参数
      */
@@ -282,6 +300,15 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
                                              Map<String, ParameterProvider> map,
                                              Filter<ParameterProvider> filter) {
 
+        // 兼容下通过老数据集参数获取
+        tableDataParameters = getLatestTableDataParameters();
+        
+        // 处理初始化添加
+        if (tableDataParametersMap.isEmpty()) {
+            addTableDataParameters(map, filter);
+            return;
+        }
+
         ParameterProvider[] providers = null;
 
         if (!ComparatorUtils.equals(oldName, tdName)) {
@@ -303,13 +330,13 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
                 } else {
                     parameterProviders = entry.getValue();
                 }
+                updateParaMap(map, parameterProviders, filter);
+            }
 
-                if (filter != null) {
+            // 处理非初始化(已存在数据集参数)时 添加逻辑
-                    ParameterApplyHelper.addPara2Map(map, parameterProviders, filter);
+            if (!tableDataParametersMap.containsKey(tdName)) {
-                } else {
+                providers = DataOperator.getInstance().getTableDataParameters(tableData);
-                    ParameterApplyHelper.addPara2Map(map, parameterProviders);
+                updateParaMap(map, providers, filter);
-                }
-
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
@@ -321,6 +348,33 @@ public abstract class DesignModelAdapter<T extends BaseBook, S extends JTemplate
         }
     }
 
+    /**
+     *  更新全部参数中的数据集参数
+     */
+    private void updateParaMap(Map<String, ParameterProvider> map, ParameterProvider[] parameterProviders, Filter<ParameterProvider> filter) {
+        if (filter != null) {
+            ParameterApplyHelper.addPara2Map(map, parameterProviders, filter);
+        } else {
+            ParameterApplyHelper.addPara2Map(map, parameterProviders);
+        }
+    }
+
+    public void removeTableDataParameters(String tdName) {
+        ParameterProvider[] tableDataParameters =  tableDataParametersMap.remove(tdName);
+        List<Parameter> allParameterList = new ArrayList<>(Arrays.asList(parameters));
+        List<Parameter> tableDataParameterList = new ArrayList<>();
+        for (ParameterProvider parameterProvider : tableDataParameters) {
+            tableDataParameterList.add((Parameter) parameterProvider);
+        }
+        allParameterList.removeAll(tableDataParameterList);
+        parameters = allParameterList.toArray(new Parameter[0]);
+    }
+
+
+    public void updateAllParameters() {
+        parameters = getLatestParameters();
+    }
+
     protected void addGlobalParameters(Map<String, ParameterProvider> map) {
         // 添加全局参数
         Parameter[] glbParas = ParameterConfig.getInstance().getGlobalParameters();

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

@@ -18,6 +18,7 @@ import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.fun.DesignerPortProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.locale.impl.ProductImproveMark;
+import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.notification.SnapChatConfig;
 import com.fr.design.port.DesignerPortContext;
@@ -196,6 +197,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     // 开启内嵌web页面的调试窗口
     private boolean openDebug = false;
 
+    private ComponentReuseNotificationInfo notificationInfo = ComponentReuseNotificationInfo.getInstance();
+
     /**
      * DesignerEnvManager.
      */
@@ -1561,13 +1564,15 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 readRecentColor(reader);
             } else if ("OpenDebug".equals(name)) {
                 readOpenDebug(reader);
+            } else if (name.equals(ComponentReuseNotificationInfo.XML_TAG)) {
+                readComponentReuseNotificationInfo(reader);
             } else if (name.equals(DesignerPushUpdateConfigManager.XML_TAG)) {
                 readDesignerPushUpdateAttr(reader);
             } else if (name.equals(vcsConfigManager.XML_TAG)) {
                 readVcsAttr(reader);
             } else if (DesignerPort.XML_TAG.equals(name)) {
                 readDesignerPort(reader);
-            }else if (name.equals(SnapChatConfig.XML_TAG)) {
+            } else if (name.equals(SnapChatConfig.XML_TAG)) {
                 readSnapChatConfig(reader);
             } else {
                 readLayout(reader, name);
@@ -1575,6 +1580,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
     }
 
+    private void readComponentReuseNotificationInfo(XMLableReader reader){
+        reader.readXMLObject(this.notificationInfo);
+
+    }
+
     private void readSnapChatConfig(XMLableReader reader) {
         reader.readXMLObject(this.snapChatConfig = SnapChatConfig.getInstance());
     }
@@ -1795,9 +1805,16 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         writeVcsAttr(writer);
         writeDesignerPort(writer);
         writeSnapChatConfig(writer);
+        writeComponentReuseNotificationInfo(writer);
         writer.end();
     }
 
+    private void writeComponentReuseNotificationInfo(XMLPrintWriter writer) {
+        if (this.notificationInfo != null) {
+            this.notificationInfo.writeXML(writer);
+        }
+    }
+
     private void writeSnapChatConfig(XMLPrintWriter writer) {
 
         if (this.snapChatConfig != null) {

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

@@ -117,7 +117,7 @@ public class EnvChangeEntrance {
                     @Override
                     public void show() {
                         FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                     }
                 });
                 return false;
@@ -155,7 +155,7 @@ public class EnvChangeEntrance {
                 public void show() {
                     FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                       Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                      Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                       ERROR_MESSAGE,
                                                       UIManager.getIcon("OptionPane.errorIcon"));
                 }
@@ -171,7 +171,7 @@ public class EnvChangeEntrance {
                 FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
                 strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                                          Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                                         Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                         Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                                          ERROR_MESSAGE,
                                                                          UIManager.getIcon("OptionPane.errorIcon")));
             }
@@ -191,7 +191,7 @@ public class EnvChangeEntrance {
         if (ComparatorUtils.equals(result, TestConnectionResult.AUTH_FAILED)) {
             strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                                      Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                                     Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                     Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                                      ERROR_MESSAGE,
                                                                      UIManager.getIcon("OptionPane.errorIcon")));
         } else {
@@ -553,4 +553,14 @@ public class EnvChangeEntrance {
     interface PopTip {
         void show();
     }
+
+    private static class SuccessPopTip implements PopTip {
+        @Override
+        public void show() {
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                              Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Success"),
+                                              Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                                              FineJOptionPane.INFORMATION_MESSAGE);
+        }
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.fr.design.actions;
+
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIForbiddenButton;
+import javax.swing.AbstractButton;
+import javax.swing.JComponent;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/12
+ */
+public abstract class ForbiddenUpdateAction extends UpdateAction {
+
+    @Override
+    public JComponent createToolBarComponent() {
+        Object object = this.getValue(UIForbiddenButton.class.getName());
+        if (!(object instanceof AbstractButton)) {
+            UIButton button = null;
+            button = new UIForbiddenButton();
+            object = initButton(button, UIForbiddenButton.class.getName());
+        }
+
+        return (JComponent) object;
+    }
+}

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

@@ -60,6 +60,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
                 TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                 TableDataSourceAction.this.getEditingComponent().fireTargetModified();
                 fireDSChanged(tableDataPane.getDsNameChangedMap());
+                DesignModelAdapter.getCurrentModelAdapter().updateAllParameters();
             }
         });
         reportTableDataDialog.setVisible(true);

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

@@ -0,0 +1,52 @@
+package com.fr.design.actions.community;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.mainframe.share.collect.ComponentCollector;
+import com.fr.design.menu.MenuKeySet;
+import com.fr.design.utils.BrowseUtils;
+import com.fr.general.CloudCenter;
+
+import javax.swing.KeyStroke;
+import java.awt.event.ActionEvent;
+
+/**
+ * created by Harrison on 2020/03/24
+ **/
+public class TemplateStoreAction extends UpdateAction {
+    
+    public TemplateStoreAction() {
+
+        this.setMenuKeySet(TEMPLATE);
+        this.setName(getMenuKeySet().getMenuName());
+        this.setMnemonic(getMenuKeySet().getMnemonic());
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/share/template_store.png"));
+    }
+
+    public static final MenuKeySet TEMPLATE = new MenuKeySet() {
+        
+        @Override
+        public String getMenuName() {
+            
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Template_Store");
+        }
+        
+        @Override
+        public KeyStroke getKeyStroke() {
+            return null;
+        }
+        
+        @Override
+        public char getMnemonic() {
+            
+            return 'T';
+        }
+    };
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        ComponentCollector.getInstance().collectTepMenuEnterClick();
+        String url = CloudCenter.getInstance().acquireUrlByKind("design.market.template");
+        BrowseUtils.browser(url);
+    }
+}

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

@@ -7,6 +7,7 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.selection.QuickEditor;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
 
 import javax.swing.Action;
 import javax.swing.KeyStroke;
@@ -14,7 +15,6 @@ import java.awt.event.KeyEvent;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -242,8 +242,11 @@ public class ActionFactory {
         KeyStroke keyStroke = (KeyStroke) action.getValue(Action.ACCELERATOR_KEY);
         if (keyStroke != null) {
             buttonToolTipTextBuf.append(" (");
-            buttonToolTipTextBuf.append(KeyEvent.getKeyModifiersText(keyStroke.getModifiers()));
+            String modifiersText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers());
-            buttonToolTipTextBuf.append('+');
+            if (!StringUtils.isEmpty(modifiersText)) {
+                buttonToolTipTextBuf.append(modifiersText);
+                buttonToolTipTextBuf.append('+');
+            }
             buttonToolTipTextBuf.append(KeyEvent.getKeyText(keyStroke.getKeyCode()));
             buttonToolTipTextBuf.append(')');
         }

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

@@ -49,7 +49,8 @@ public class RedoAction extends UpdateAction implements TemplateComponentActionI
 	public void update() {
 		JTemplate<?, ?> undoComponent = getEditingComponent();
 		if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
-			this.setEnabled(undoComponent != null && undoComponent.canRedo());
+			boolean enable = undoComponent != null && undoComponent.canRedo() && undoComponent.checkEnable();
+			this.setEnabled(enable);
 		} else {
 			this.setEnabled(false);
 		}

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

@@ -28,7 +28,7 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
 
     @Override
     public JTemplate<?, ?> getEditingComponent() {
-    	return t;
+        return t;
     }
 
     /**
@@ -49,7 +49,8 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
     public void update() {
     	JTemplate<?, ?> undoComponent = getEditingComponent();
 		if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
-			this.setEnabled(undoComponent != null && undoComponent.canUndo());
+            boolean enable = undoComponent != null && undoComponent.canUndo() && undoComponent.checkEnable();
+            this.setEnabled(enable);
 		} else {
 			this.setEnabled(false);
 		}

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

@@ -1 +1,44 @@
-package com.fr.design.actions.file;

import com.fr.design.actions.UpdateAction;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.file.MutilTempalteTabPane;
import com.fr.design.menu.KeySetUtils;

import java.awt.event.ActionEvent;

/**
 * Author : daisy
 * Date: 13-8-16
 * Time: 下午3:23
 */
public class CloseCurrentTemplateAction extends UpdateAction {

	public CloseCurrentTemplateAction() {
        this.setMenuKeySet(KeySetUtils.CLOSE_CURRENT_TEMPLATE);
        this.setName(getMenuKeySet().getMenuKeySetName());
        this.setMnemonic(getMenuKeySet().getMnemonic());
        this.setAccelerator(getMenuKeySet().getKeyStroke());
	}

    /**
     * 动作
     * @param e 事件
     */
	public void actionPerformed(ActionEvent e) {
		MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
		MutilTempalteTabPane.getInstance().closeFormat(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
		MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
	}
}
+package com.fr.design.actions.file;
+
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.menu.KeySetUtils;
+
+import java.awt.event.ActionEvent;
+
+/**
+ * Author : daisy
+ * Date: 13-8-16
+ * Time: 下午3:23
+ */
+public class CloseCurrentTemplateAction extends UpdateAction {
+
+	public CloseCurrentTemplateAction() {
+        this.setMenuKeySet(KeySetUtils.CLOSE_CURRENT_TEMPLATE);
+        this.setName(getMenuKeySet().getMenuKeySetName());
+        this.setMnemonic(getMenuKeySet().getMnemonic());
+        this.setAccelerator(getMenuKeySet().getKeyStroke());
+	}
+
+    /**
+     * 动作
+     * @param e 事件
+     */
+	public void actionPerformed(ActionEvent e) {
+		MutilTempalteTabPane.getInstance().setIsCloseCurrent(true);
+		MutilTempalteTabPane.getInstance().closeFormat(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+		MutilTempalteTabPane.getInstance().closeSpecifiedTemplate(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
+	}
+
+	@Override
+	public void update() {
+		super.update();
+		JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+		if (template != null) {
+			this.setEnabled(!template.isSaving());
+		}
+	}
+}

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

@@ -3,6 +3,8 @@ package com.fr.design.actions.file;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.actions.UpdateAction;
 
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.JTemplate;
 import java.awt.event.ActionEvent;
 
 
@@ -17,4 +19,13 @@ public class EditEnvAction extends UpdateAction {
     public void actionPerformed(ActionEvent e) {
         EnvChangeEntrance.getInstance().chooseEnv();
     }
+
+    @Override
+    public void update() {
+        super.update();
+        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (template != null) {
+            this.setEnabled(!template.isSaving());
+        }
+    }
 }

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

@@ -3,6 +3,7 @@
  */
 package com.fr.design.actions.file;
 
+import com.fr.design.mainframe.TemplateSavingChecker;
 import java.awt.event.ActionEvent;
 
 import com.fr.design.actions.UpdateAction;
@@ -27,6 +28,9 @@ public class ExitDesignerAction extends UpdateAction {
      * @param e 事件
      */
     public void actionPerformed(ActionEvent e) {
+        if (!TemplateSavingChecker.check()) {
+            return;
+        }
         DesignerContext.getDesignerFrame().exit();
     }
 }

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

@@ -31,7 +31,7 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
         JTemplate<?, ?> jt = this.getEditingComponent();
         // kunsnat: 保存前停止编辑状态,保存属性.
         jt.stopEditing();
-        jt.saveAsTemplate();
+        jt.saveAsDirectly();
         this.setEnabled(true);
 
         jt.requestFocus();
@@ -40,9 +40,6 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
     @Override
     public void update() {
         super.update();
-
+        this.setEnabled(this.getEditingComponent().checkEnable());
-//    	this.setEnabled(!this.getEditingComponent().isSaved());
-//    	另存为按钮应该一直可用使用
-        this.setEnabled(true);
     }
 }

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

@@ -31,14 +31,15 @@ public class SaveTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
 	public void actionPerformed(ActionEvent e) {
 		JTemplate<?, ?> jt = this.getEditingComponent();
 		jt.stopEditing();
-		jt.saveTemplate();
+		jt.saveDirectly();
 		jt.requestFocus();
 	}
 
 	@Override
 	public void update() {
 		 super.update();
-		 this.setEnabled(!this.getEditingComponent().isSaved());
+		boolean enable = !this.getEditingComponent().isSaved() && this.getEditingComponent().checkEnable();
+		this.setEnabled(enable);
 	}
 
 }

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

@@ -1,10 +1,11 @@
 package com.fr.design.actions.file;
 
-import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
@@ -68,5 +69,14 @@ public class SwitchExistEnv extends MenuDef {
                 EnvChangeEntrance.getInstance().switch2Env(envName);
             }
         }
+
+        @Override
+        public void update() {
+            super.update();
+            JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            if (template != null) {
+                this.setEnabled(!template.isSaving());
+            }
+        }
     }
 }

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

@@ -6,6 +6,7 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.DesignUtils;
+import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
 import com.fr.general.GeneralUtils;
@@ -67,9 +68,21 @@ public final class WebPreviewUtils {
          *
          * 如果保存失败,不执行下面的WebPreview
          */
-        if (!jt.isSaved() && !jt.saveTemplate2Env()) {
+        if (!jt.isSaved()) {
+            CallbackSaveWorker worker = jt.save2Env();
+            worker.addSuccessCallback(new Runnable() {
+                @Override
+                public void run() {
+                    browserTemplate(jt, baseRoute, map, actionType);
+                }
+            });
+            worker.start(jt.getTarget().getTemplateID());
             return;
         }
+        browserTemplate(jt, baseRoute, map, actionType);
+    }
+
+    private static void browserTemplate(JTemplate<?, ?> jt, String baseRoute, Map<String, Object> map, String actionType) {
         FILE currentTemplate = jt.getEditingFILE();
         // carl:是否是保存在运行环境下的模板，不是就不能被预览
         if (currentTemplate instanceof FileNodeFILE) {
@@ -83,13 +96,18 @@ public final class WebPreviewUtils {
                         WARNING_MESSAGE
                 );
                 if (OK_OPTION == selVal) {
-                    if (!jt.saveAsTemplate()) {
+                    CallbackSaveWorker worker = jt.saveAs();
-                        return;
+                    worker.start(jt.getTarget().getTemplateID());
-                    }
+                    worker.addSuccessCallback(new Runnable() {
+                        @Override
+                        public void run() {
+                            browseUrl(jt.getEditingFILE(), baseRoute, map, actionType, jt);
+                        }
+                    });
                 }
-                currentTemplate = jt.getEditingFILE();
+                return;
             }
-            browseUrl(currentTemplate, baseRoute, map, actionType, jt);
+            browseUrl(jt.getEditingFILE(), baseRoute, map, actionType, jt);
         } else {
             // 说明模板没有保存在报表运行环境下面,提示用户
             int selVal = showConfirmDialog(
@@ -100,11 +118,14 @@ public final class WebPreviewUtils {
                     WARNING_MESSAGE);
 
             if (OK_OPTION == selVal) {
-                if (!jt.saveAsTemplate2Env()) {
+                CallbackSaveWorker worker = jt.saveAs2Env();
-                    return;
+                worker.addSuccessCallback(new Runnable() {
-                }
+                    @Override
-                currentTemplate = jt.getEditingFILE();
+                    public void run() {
-                browseUrl(currentTemplate, baseRoute, map, actionType, jt);
+                        browseUrl(jt.getEditingFILE(), baseRoute, map, actionType, jt);
+                    }
+                });
+                worker.start(jt.getTarget().getTemplateID());
             }
         }
     }
@@ -148,7 +169,7 @@ public final class WebPreviewUtils {
                     WARNING_MESSAGE
             );
             if (OK_OPTION == selVal) {
-                jt.saveAsTemplate();
+                jt.saveAsDirectly();
             }
         }
     }

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

@@ -226,4 +226,10 @@ public abstract class AbstractExportAction<E extends JTemplate<?, ?>> extends JT
         }
     }
 
+    @Override
+    public void update() {
+        super.update();
+        this.setEnabled(this.getEditingComponent().checkEnable());
+    }
+
 }

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

@@ -24,16 +24,20 @@ import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.gui.ibutton.UILockButton;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.mainframe.DockingView;
 import com.fr.design.menu.LineSeparator;
 import com.fr.design.menu.MenuDef;
+import com.fr.design.menu.ToolBarDef;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 
+import java.util.HashSet;
+import java.util.Set;
 import javax.swing.AbstractButton;
 import javax.swing.Action;
 import javax.swing.DefaultCellEditor;
@@ -60,6 +64,16 @@ import java.util.Objects;
  * Time: 16:23
  */
 public abstract class BasicTableDataTreePane extends DockingView implements ResponseDataSourceChange {
+
+    private static final Set<String> FORBIDDEN_SET = new HashSet<>();
+
+    static {
+        FORBIDDEN_SET.add(Toolkit.i18nText("Fine-Design_Basic_Edit"));
+        FORBIDDEN_SET.add(Toolkit.i18nText("Fine-Design_Basic_Remove"));
+        FORBIDDEN_SET.add(Toolkit.i18nText("Fine-Design_Basic_Preview"));
+        FORBIDDEN_SET.add(Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
+    }
+
     protected static final int PROCEDURE_NAME_INDEX = 4;
     protected static final int TEMPLATE_TABLE_DATA = 0;
     protected static final int SERVER_TABLE_DATA = 1;
@@ -68,6 +82,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
     protected UIHeadGroup buttonGroup;
     protected String[] allDSNames;
     protected ConnectionTableAction connectionTableAction;
+    protected ToolBarDef toolbarDef;
 
 
     private String type = "";
@@ -481,4 +496,14 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
 
     }
 
+    public void refreshToolBar() {
+        if (toolbarDef != null) {
+            toolbarDef.refreshToolBar(FORBIDDEN_SET);
+        }
+    }
+
+    public void checkEnable() {
+
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.TableData;
+import com.fr.concurrent.NamedThreadFactory;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.DBUtils;
 import com.fr.data.core.db.TableProcedure;
@@ -17,8 +18,8 @@ import com.fr.design.data.datapane.preview.PreviewLabel.Previewable;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.tabledata.Prepare4DataSourceChange;
 import com.fr.design.dialog.FineJOptionPane;
-import com.fr.design.gui.icombobox.FRTreeComboBox;
 import com.fr.design.gui.icombobox.FilterableComboBoxModel;
+import com.fr.design.gui.icombobox.SearchPreTaskTreeComboBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxEditor;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
@@ -59,6 +60,10 @@ import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.FutureTask;
 
 /**
  * @author zhou
@@ -80,21 +85,25 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     /**
      * 表名
      */
-    protected FRTreeComboBox tableNameComboBox;
+    protected SearchPreTaskTreeComboBox tableNameComboBox;
 
-    private SwingWorker populateWorker;
+    private static final ExecutorService SERVICE = Executors.newSingleThreadExecutor(new NamedThreadFactory("ChoosePane"));
 
+    private SwingWorker populateWorker;
 
     private PopupMenuListener popupMenuListener = new PopupMenuListener() {
 
         @Override
         public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-            new Thread() {
+            FutureTask<Void> task = new FutureTask<Void>(new Callable<Void>() {
                 @Override
-                public void run() {
+                public Void call() throws Exception {
                     calculateTableDataNames();
+                    return null;
                 }
-            }.start();
+            });
+            tableNameComboBox.setPreSearchTask(task);
+            SERVICE.submit(task);
         }
 
         @Override
@@ -158,7 +167,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         schemaBox = new StringUIComboBox();
         schemaBox.setEditor(new ComboBoxEditor());
 
-        tableNameComboBox = new FRTreeComboBox(new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer, false);
+        tableNameComboBox = new SearchPreTaskTreeComboBox(new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer, false);
         tableNameComboBox.setEditable(true);
         tableNameComboBox.setRenderer(listCellRenderer);
         registerDSChangeListener();

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

@@ -1,6 +1,5 @@
 package com.fr.design.data.datapane;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.TableDataSourceDependent;
@@ -101,7 +100,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         removeAction = new RemoveAction();
         previewTableDataAction = new PreviewTableDataAction(dataTree);
         connectionTableAction = new ConnectionTableAction();
-        ToolBarDef toolbarDef = new ToolBarDef();
+        toolbarDef = new ToolBarDef();
         toolbarDef.addShortCut(addMenuDef, SeparatorDef.DEFAULT, editAction, removeAction, SeparatorDef.DEFAULT, previewTableDataAction, connectionTableAction);
         UIToolbar toolBar = ToolBarDef.createJToolBar();
         toolBar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIConstants.TOOLBAR_BORDER_COLOR));
@@ -288,6 +287,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 fireDSChanged();
                 checkButtonEnabled();
                 DesignTableDataManager.removeSelectedColumnNames(selectedNO.getName());
+                DesignModelAdapter.getCurrentModelAdapter().removeTableDataParameters(selectedNO.getName());
             }
         }
     }
@@ -341,8 +341,10 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         dataTree.refresh();
     }
 
-
+    @Override
-
+    public void checkEnable() {
+        this.checkButtonEnabled();
+    }
 
     public void addDataPane(final AbstractTableDataPane<?> uPanel, String paneName) {
         final NamePane nPanel = uPanel.asNamePane();

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

@@ -0,0 +1,118 @@
+package com.fr.design.data.datapane.connect;
+
+import com.fr.data.impl.JDBCDatabaseConnection;
+import com.fr.data.pool.DBCPConnectionPoolAttr;
+import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.editor.editor.IntegerEditor;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+
+public class DBCPAttrPane extends BasicPane {
+    public static final int TIME_MULTIPLE = 1000;
+    // carl:DBCP的一些属性
+    private IntegerEditor DBCP_INITIAL_SIZE = new IntegerEditor();
+    private IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor();
+    private IntegerEditor DBCP_MAX_IDLE = new IntegerEditor();
+    private IntegerEditor DBCP_MIN_IDLE = new IntegerEditor();
+    private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor();
+    private UITextField DBCP_VALIDATION_QUERY = new UITextField();
+
+    private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
+    private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
+    private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
+
+    private IntegerEditor DBCP_TIMEBETWEENEVICTIONRUNSMILLS = new IntegerEditor();
+    private IntegerEditor DBCP_NUMTESTSPEREVICTIONRUN = new IntegerEditor();
+    private IntegerEditor DBCP_MINEVICTABLEIDLETIMEMILLIS = new IntegerEditor();
+
+    public DBCPAttrPane() {
+        JPanel defaultPane = this;
+
+        // JPanel northFlowPane
+        JPanel northFlowPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        defaultPane.add(northFlowPane, BorderLayout.NORTH);
+
+        DBCP_VALIDATION_QUERY.setColumns(15);
+        // ContextPane
+
+        double f = TableLayout.FILL;
+        // double p = TableLayout.PREFERRED;
+        double[] rowSize = {f, f, f, f, f, f, f, f, f, f, f, f};
+        double[] columnSize = {f, f};
+        Component[][] comps = {
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
+                        DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
+                {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":", SwingConstants.RIGHT),
+                        DBCP_MINEVICTABLEIDLETIMEMILLIS}};
+
+        JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
+        contextPane.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, UIConstants.LINE_COLOR));
+        northFlowPane.add(contextPane);
+    }
+
+    public void populate(JDBCDatabaseConnection jdbcDatabase) {
+        DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
+        if (dbcpAttr == null) {
+            dbcpAttr = new DBCPConnectionPoolAttr();
+            jdbcDatabase.setDbcpAttr(dbcpAttr);
+        }
+        this.DBCP_INITIAL_SIZE.setValue(dbcpAttr.getInitialSize());
+        this.DBCP_MAX_ACTIVE.setValue(dbcpAttr.getMaxActive());
+        this.DBCP_MAX_IDLE.setValue(dbcpAttr.getMaxIdle());
+        this.DBCP_MAX_WAIT.setValue(dbcpAttr.getMaxWait());
+        this.DBCP_MIN_IDLE.setValue(dbcpAttr.getMinIdle());
+        this.DBCP_VALIDATION_QUERY.setText(dbcpAttr.getValidationQuery());
+        this.DBCP_TESTONBORROW.setSelectedIndex(dbcpAttr.isTestOnBorrow() ? 1 : 0);
+        this.DBCP_TESTONRETURN.setSelectedIndex(dbcpAttr.isTestOnReturn() ? 1 : 0);
+        this.DBCP_TESTWHILEIDLE.setSelectedIndex(dbcpAttr.isTestWhileIdle() ? 1 : 0);
+        this.DBCP_MINEVICTABLEIDLETIMEMILLIS.setValue(dbcpAttr.getMinEvictableIdleTimeMillis() / TIME_MULTIPLE);
+        this.DBCP_NUMTESTSPEREVICTIONRUN.setValue(dbcpAttr.getNumTestsPerEvictionRun());
+        this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.setValue(dbcpAttr.getTimeBetweenEvictionRunsMillis());
+    }
+
+    public void update(JDBCDatabaseConnection jdbcDatabase) {
+        DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
+        if (dbcpAttr == null) {
+            dbcpAttr = new DBCPConnectionPoolAttr();
+            jdbcDatabase.setDbcpAttr(dbcpAttr);
+        }
+        dbcpAttr.setInitialSize(this.DBCP_INITIAL_SIZE.getValue().intValue());
+        dbcpAttr.setMaxActive(this.DBCP_MAX_ACTIVE.getValue().intValue());
+        dbcpAttr.setMaxIdle(this.DBCP_MAX_IDLE.getValue().intValue());
+        dbcpAttr.setMaxWait(this.DBCP_MAX_WAIT.getValue().intValue());
+        dbcpAttr.setMinIdle(this.DBCP_MIN_IDLE.getValue().intValue());
+        dbcpAttr.setValidationQuery(this.DBCP_VALIDATION_QUERY.getText());
+        dbcpAttr.setTestOnBorrow(this.DBCP_TESTONBORROW.getSelectedIndex() == 0 ? false : true);
+        dbcpAttr.setTestOnReturn(this.DBCP_TESTONRETURN.getSelectedIndex() == 0 ? false : true);
+        dbcpAttr.setTestWhileIdle(this.DBCP_TESTWHILEIDLE.getSelectedIndex() == 0 ? false : true);
+        dbcpAttr.setMinEvictableIdleTimeMillis(((Number) this.DBCP_MINEVICTABLEIDLETIMEMILLIS.getValue()).intValue() * TIME_MULTIPLE);
+        dbcpAttr.setNumTestsPerEvictionRun(((Number) this.DBCP_NUMTESTSPEREVICTIONRUN.getValue()).intValue());
+        dbcpAttr.setTimeBetweenEvictionRunsMillis(((Number) this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.getValue()).intValue());
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
+    }
+}

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

@@ -7,15 +7,20 @@ import com.fr.data.impl.Connection;
 import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.data.operator.DataOperator;
+import com.fr.data.solution.ExceptionSolutionSelector;
+import com.fr.data.solution.entity.DriverPage;
+import com.fr.data.solution.processor.ClassNotFoundExceptionSolutionProcessor;
+import com.fr.data.solution.processor.SolutionProcessor;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
@@ -25,19 +30,28 @@ import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Desktop;
 import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.HashMap;
+import java.net.URI;
-import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -50,45 +64,184 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private UIButton cancelButton;
     private JDialog dialog;
     private UILabel uiLabel;
+
+    private UILabel directUiLabel;
+    private UILabel detailLabel;
+    private JPanel midPane;
+    private JPanel hiddenPanel;
     // 编码转换.
     private UIComboBox charSetComboBox;
     private String originalCharSet = null;
 
+    private JPanel mainPanel;
+
     // Database pane
     public DatabaseConnectionPane() {
         this.initComponents();
     }
 
-    protected void initComponents() {
+    ActionListener testConnectionActionListener = new ActionListener() {
-        message = new UILabel();
+        private boolean firstCreate = true;
-        uiLabel = new UILabel();
-        okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
-        cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));
-        String[] defaultEncode = new String[] {Toolkit.i18nText("Fine-Design_Encode_Auto")};
-        charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
-        this.add(northPane, BorderLayout.NORTH);
 
-        // 按钮.
+        @Override
-        JPanel testPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
+        public void actionPerformed(ActionEvent evt) {
-        northPane.add(testPane, BorderLayout.NORTH);
-        UIButton testButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));
-        testPane.add(testButton);
-        testButton.addActionListener(testConnectionActionListener);
-        testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4));
 
-        // Center
+            // Try the java connection.
-        northPane.add(mainPanel(), BorderLayout.CENTER);
+            final SwingWorker<Void, Void> connectionThread = new SwingWorker<Void, Void>() {
-        // ChartSet
+                @Override
-        JPanel chartSetPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
+                protected Void doInBackground() throws Exception {
-        northPane.add(chartSetPane);
+                    Connection database = DatabaseConnectionPane.this.updateBean();
-        chartSetPane.setBorder(BorderFactory.createTitledBorder(
+                    // 返回连接结果
-                new ModLineBorder(ModLineBorder.TOP),
+                    DriverPage.updateCache();
-                Toolkit.i18nText("Fine-Design_Basic_Advanced")
+                    DataOperator.getInstance().testConnectionWithException(database);
-        ));
+                    return null;
-        chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":"));
+                }
-    }
+
+                @Override
+                protected void done() {
+                    try {
+                        get();
+                        dialog.setSize(new Dimension(380, 125));
+                        okButton.setEnabled(true);
+                        uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
+                        message.setText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
+                    } catch (InterruptedException e) {
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    } catch (ExecutionException e) {
+                        dialog.setSize(new Dimension(380, 142));
+                        midPane.setVisible(true);
+                        hiddenPanel.setVisible(false);
+                        okButton.setEnabled(true);
+                        uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
+                        message.setText(Toolkit.i18nText("Fine-Design_Basic_Connection_Failed"));
+
+                        SolutionProcessor select = ExceptionSolutionSelector.get().select(e);
+                        if (select instanceof ClassNotFoundExceptionSolutionProcessor) {
+                            JPanel gridJpanel = new JPanel();
+                            gridJpanel.setLayout(new GridLayout(5, 1, 0, 5));
+                            UILabel driverTips = new UILabel();
+                            driverTips.setText(Toolkit.i18nText("Fine_Designer_Not_Found_Driver"));
+                            gridJpanel.add(driverTips);
+                            UILabel deatail = new UILabel();
+                            String content = Toolkit.i18nText("Fine_Designer_Not_Found") + " " + select.getResultException().getDetailMessage() + " " + Toolkit.i18nText("Fine_Designer_Driver");
+                            deatail.setText(content);
+                            deatail.setToolTipText(content);
+                            gridJpanel.add(deatail);
+                            String solution = select.getResultException().getSolution();
+                            UILabel redirect = new UILabel();
+                            if (solution != null) {
+                                redirect.setText(Toolkit.i18nText("Fine_Designer_Download_Driver"));
+                                redirect.setForeground(Color.BLUE);
+                                redirect.addMouseListener(new MouseAdapter() {
+                                    @Override
+                                    public void mouseClicked(MouseEvent e) {
+                                        try {
+                                            Desktop.getDesktop().browse(new URI(solution));
+                                        } catch (Exception clickException) {
+                                            FineLoggerFactory.getLogger().warn("can not open browser with {}", solution);
+                                        }
+                                    }
+
+                                    @Override
+                                    public void mouseEntered(MouseEvent e) {
+                                        redirect.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                                    }
+
+                                    @Override
+                                    public void mouseExited(MouseEvent e) {
+                                        redirect.setCursor(Cursor.getDefaultCursor());
+                                    }
+                                });
+                            } else {
+                                redirect.setText(Toolkit.i18nText("Fine_Designer_Not_Found_Driver_No_Solution"));
+                            }
+                            gridJpanel.add(redirect);
+                            hiddenPanel.add(gridJpanel);
+                            gridJpanel.setBackground(Color.WHITE);
+                        } else {
+                            JPanel borderPanel = new JPanel();
+                            borderPanel.setLayout(new BorderLayout());
+                            JTextArea jta = new JTextArea();
+                            JScrollPane jsp = new JScrollPane(jta);
+                            jsp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+                            jsp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+                            jta.append(select.getResultException().getDetailMessage() + "\n");
+                            jta.append(select.getResultException().getSolution());
+                            jta.setCaretPosition(0);
+                            jta.setEditable(false);
+                            jta.getCaret().addChangeListener(new ChangeListener() {
+                                @Override
+                                public void stateChanged(ChangeEvent e) {
+                                    jta.getCaret().setVisible(true);
+                                }
+                            });
+                            borderPanel.add(jsp, BorderLayout.CENTER);
+                            hiddenPanel.add(borderPanel);
+                        }
+                        okButton.setEnabled(true);
+                    }
+                }
+            };
+            midPane.setVisible(false);
+            hiddenPanel.setVisible(false);
+            initDialogPane();
+            connectionThread.execute();
+            // 老bug，initDialogPane 中的 dialog每次都是new的，所以可以重新添加 listener，但是其他的对象不行，会多次添加listener
+            if (firstCreate) {
+                okButton.addActionListener(new ActionListener() {
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        hiddenPanel.removeAll();
+                        dialog.dispose();
+                    }
+                });
+                cancelButton.addActionListener(new ActionListener() {
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        hiddenPanel.removeAll();
+                        dialog.dispose();
+                        connectionThread.cancel(true);
+                    }
+                });
+                detailLabel.addMouseListener(new MouseAdapter() {
+                    @Override
+                    public void mouseClicked(MouseEvent e) {
+                        if (hiddenPanel.isVisible()) {
+                            hiddenPanel.setVisible(false);
+                            dialog.setSize(new Dimension(380, 142));
+                            detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
+                            directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right"));
+                        } else {
+                            dialog.setSize(new Dimension(380, 270));
+                            hiddenPanel.setVisible(true);
+                            detailLabel.setText(Toolkit.i18nText("Fine_Designer_Hide_Detail"));
+                            directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.down"));
+                        }
+                    }
+
+                    @Override
+                    public void mouseEntered(MouseEvent e) {
+                        detailLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+                    }
+
+                    @Override
+                    public void mouseExited(MouseEvent e) {
+                        detailLabel.setCursor(Cursor.getDefaultCursor());
+                    }
+                });
+                firstCreate = false;
+            }
+            dialog.addWindowListener(new WindowAdapter() {
+                @Override
+                public void windowClosed(WindowEvent e) {
+                    connectionThread.cancel(true);
+                }
+            });
+            dialog.setVisible(true);
+            hiddenPanel.removeAll();
+            dialog.dispose();
+        }
+    };
 
     protected abstract JPanel mainPanel();
 
@@ -96,14 +249,16 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     @Override
     public void populateBean(com.fr.data.impl.Connection ob) {
+        populateSubDatabaseConnectionBean((E) ob);
+        if (mainPanel instanceof JDBCDefPane) {
+            return;
+        }
         this.originalCharSet = ob.getOriginalCharsetName();
         if (StringUtils.isBlank(originalCharSet)) {
             this.charSetComboBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Encode_Auto"));
         } else {
             this.charSetComboBox.setSelectedItem(ob.getOriginalCharsetName());
         }
-
-        populateSubDatabaseConnectionBean((E) ob);
     }
 
     protected abstract void populateSubDatabaseConnectionBean(E ob);
@@ -111,7 +266,9 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     @Override
     public com.fr.data.impl.Connection updateBean() {
         E ob = updateSubDatabaseConnectionBean();
-
+        if (mainPanel instanceof JDBCDefPane) {
+            return ob;
+        }
         ob.setOriginalCharsetName(this.originalCharSet);
         if (this.charSetComboBox.getSelectedIndex() == 0) {
             ob.setNewCharsetName(null);
@@ -127,83 +284,97 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     protected abstract E updateSubDatabaseConnectionBean();
 
-    ActionListener testConnectionActionListener = new ActionListener() {
+    protected void initComponents() {
-        public void actionPerformed(ActionEvent evt) {
+        message = new UILabel();
+        uiLabel = new UILabel();
+        detailLabel = new UILabel();
+        directUiLabel = new UILabel();
+        hiddenPanel = new JPanel();
+        midPane = new JPanel();
+        midPane.add(directUiLabel);
+        midPane.add(detailLabel);
+        okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
+        cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        this.add(northPane, BorderLayout.NORTH);
 
-            // Try the java connection.
+        // 按钮.
-            final SwingWorker<Boolean, Void> connectionThread = new SwingWorker<Boolean, Void>() {
+        JPanel testPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
-                @Override
+        northPane.add(testPane, BorderLayout.NORTH);
-                protected Boolean doInBackground() throws Exception {
+        UIButton testButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));
-                    Connection database = DatabaseConnectionPane.this.updateBean();
+        testPane.add(testButton);
-                    // 返回连接结果
+        testButton.addActionListener(testConnectionActionListener);
-                    return DataOperator.getInstance().testConnection(database);
+        testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4));
-                }
 
-                @Override
+        // Center
-                protected void done() {
+        mainPanel = mainPanel();
-                    try {
+        northPane.add(mainPanel, BorderLayout.CENTER);
-                        boolean connect = get();
+        JPanel advancedPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
-                        okButton.setEnabled(true);
+        advancedPanel.setBorder(BorderFactory.createTitledBorder(
-                        if (connect) {
+                new ModLineBorder(ModLineBorder.TOP),
-                            uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
+                Toolkit.i18nText("Fine-Design_Basic_Advanced")
-                            message.setText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
+        ));
-                        }else{
+        if (mainPanel instanceof JDBCDefPane) {
-                            uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
+            ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
-                            message.setText(Toolkit.i18nText("Fine-Design_Basic_Connection_Failed"));
+            actionLabel.addActionListener(new ActionListener() {
-                        }
+                public void actionPerformed(ActionEvent evt) {
-                    } catch (InterruptedException | ExecutionException e) {
+                    JDialog wDialog = createJDialog();
-                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    if (wDialog != null) {
+                        wDialog.setVisible(true);
                     }
                 }
-            };
-
-            connectionThread.execute();
-            initDialogPane();
-            okButton.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    dialog.dispose();
-                }
-            });
-            cancelButton.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent e) {
-                    dialog.dispose();
-                    connectionThread.cancel(true);
-                }
             });
+            JPanel actionLabelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            actionLabelPanel.setBorder(BorderFactory.createEmptyBorder(2, 4, 4, 20));
+            actionLabelPanel.add(actionLabel, BorderLayout.WEST);
+            advancedPanel.add(actionLabelPanel);
 
-            dialog.addWindowListener(new WindowAdapter() {
+        } else {
-                public void windowClosed(WindowEvent e) {
+            //非jdbc配置布局保持不变
-                    connectionThread.cancel(true);
+            // ChartSet
-                }
+            String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")};
-            });
+            charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
-
+            JPanel chartSetPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
-            dialog.setVisible(true);
+            chartSetPane.add(GUICoreUtils.createNamedPane(charSetComboBox, Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":"));
-            dialog.dispose();
+            advancedPanel.add(chartSetPane);
         }
-    };
+        northPane.add(advancedPanel);
+    }
+
+    private JDialog createJDialog() {
+        return JDBC.getAdvancedAttrPane() != null ? JDBC.getAdvancedAttrPane().showWindow(SwingUtilities.getWindowAncestor(mainPanel)) : null;
+    }
 
     private void initDialogPane() {
 
         message.setText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection") + "...");
         message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
         okButton.setEnabled(false);
-
         dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true);
-        dialog.setSize(new Dimension(268, 118));
+        dialog.setSize(new Dimension(380, 125));
         okButton.setEnabled(false);
         JPanel jp = new JPanel();
         JPanel upPane = new JPanel();
         JPanel downPane = new JPanel();
         uiLabel = new UILabel(UIManager.getIcon("OptionPane.informationIcon"));
-
         upPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 10));
         upPane.add(uiLabel);
         upPane.add(message);
-        downPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0));
+        midPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 0));
+        directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right"));
+        detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
+        detailLabel.setForeground(Color.BLUE);
+        hiddenPanel.setLayout(new BorderLayout(2, 0));
+        hiddenPanel.add(new JPanel(), BorderLayout.WEST);
+        hiddenPanel.add(new JPanel(), BorderLayout.EAST);
+        downPane.setLayout(new FlowLayout(FlowLayout.RIGHT, 15, 9));
         downPane.add(okButton);
         downPane.add(cancelButton);
         jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS));
         jp.add(upPane);
+        jp.add(midPane);
+        jp.add(hiddenPanel);
         jp.add(downPane);
         dialog.add(jp);
         dialog.setResizable(false);
@@ -213,6 +384,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     public static class JDBC extends DatabaseConnectionPane<JDBCDatabaseConnection> {
         private static JDBCDefPane jdbcDefPane = new JDBCDefPane();
+        private static DBCPAttrPane dbcpAttrPane = new DBCPAttrPane();
 
         @Override
         protected JPanel mainPanel() {
@@ -224,14 +396,21 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             return false;
         }
 
+        protected static BasicPane getAdvancedAttrPane() {
+            return dbcpAttrPane;
+        }
+
         @Override
         protected void populateSubDatabaseConnectionBean(JDBCDatabaseConnection ob) {
             jdbcDefPane.populate(ob);
+            dbcpAttrPane.populate(jdbcDefPane.getJDBCDatabase());
         }
 
         @Override
         protected JDBCDatabaseConnection updateSubDatabaseConnectionBean() {
-            return jdbcDefPane.update();
+            JDBCDatabaseConnection jdbcDatabaseConnection = jdbcDefPane.update();
+            dbcpAttrPane.update(jdbcDatabaseConnection);
+            return jdbcDatabaseConnection;
         }
 
         @Override
@@ -268,5 +447,4 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             return "JNDI";
         }
     }
-
 }

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

@@ -1,9 +1,7 @@
 package com.fr.design.data.datapane.connect;
 
 import com.fr.base.GraphHelper;
-import com.fr.design.constants.UIConstants;
 import com.fr.data.impl.JDBCDatabaseConnection;
-import com.fr.data.pool.DBCPConnectionPoolAttr;
 import com.fr.design.border.UITitledBorder;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
@@ -16,22 +14,24 @@ 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.dialog.BasicPane;
-import com.fr.design.editor.editor.IntegerEditor;
 import com.fr.design.utils.BrowseUtils;
 import com.fr.file.filter.ChooseFileFilter;
 import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
-
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.EncodeConstants;
 import com.fr.stable.StringUtils;
-
+import java.awt.event.InputMethodEvent;
+import java.awt.event.InputMethodListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.swing.BorderFactory;
-import javax.swing.JDialog;
 import javax.swing.JFileChooser;
 import javax.swing.JPanel;
 import javax.swing.JPasswordField;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -44,13 +44,19 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 
 public class JDBCDefPane extends JPanel {
     public static final String DRIVER_TYPE = "driver_type";
     public static final String USER_NAME = "user_name";
-    public static final int TIME_MULTIPLE = 1000;
     private static final String OTHER_DB = "Others";
-
+    private static final Pattern ORACLE_URL = Pattern.compile("^jdbc:oracle:thin:@[/]*([-0-9a-zA-Z_\\.]+)(:([0-9]+|port))?([:/](.*))?.*", Pattern.CASE_INSENSITIVE);
+    private static final Pattern GENERAL_URL = Pattern.compile("^jdbc:(mysql|sqlserver|db2|derby|postgresql|inceptor|inceptor2|hive2)://([-0-9a-zA-Z_\\.]+)(:([0-9]+|port))?((/|;DatabaseName=)(.*))?.*", Pattern.CASE_INSENSITIVE);
+    private static final Pattern PORT = Pattern.compile("^0$|^[1-9][\\d]*[\\d]*$");
+    private static final Pattern CHAR_NEED_ESCAPE = Pattern.compile("[?|$^*\\\\\\[\\](){}.+]");
+    // 编码转换.
+    private String originalCharSet = null;
     private static Map<String, DriverURLName[]> jdbcMap = new HashMap<String, DriverURLName[]>();
 
     static {
@@ -59,45 +65,41 @@ public class JDBCDefPane extends JPanel {
                 new DriverURLName("COM.cloudscape.JDBCDriver", "jdbc:cloudscape:/cloudscape/"),
                 new DriverURLName("com.internetcds.jdbc.tds.Driver", "jdbc:freetds:sqlserver://localhost/"),
                 new DriverURLName("com.fr.swift.jdbc.Driver", "jdbc:swift:emb://default")});
-        jdbcMap.put("Inceptor", new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver", "jdbc:inceptor2://localhost:10000/default"),
+        jdbcMap.put("Inceptor", new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver", "jdbc:inceptor2://localhost:port/databaseName"),
-                new DriverURLName("org.apache.hadoop.hive.jdbc.HiveDriver", "jdbc:inceptor://localhost:10000/default")});
+                new DriverURLName("org.apache.hadoop.hive.jdbc.HiveDriver", "jdbc:inceptor://localhost:port/databaseName")});
-        jdbcMap.put("Oracle", new DriverURLName[]{new DriverURLName("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@localhost:1521:databaseName")});
+        jdbcMap.put("Oracle", new DriverURLName[]{new DriverURLName("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@localhost:port:databaseName")});
-        jdbcMap.put("DB2", new DriverURLName[]{new DriverURLName("com.ibm.db2.jcc.DB2Driver", "jdbc:db2://localhost:50000/")});
+        jdbcMap.put("DB2", new DriverURLName[]{new DriverURLName("com.ibm.db2.jcc.DB2Driver", "jdbc:db2://localhost:port/databaseName")});
-        jdbcMap.put("SQL Server", new DriverURLName[]{new DriverURLName("com.microsoft.sqlserver.jdbc.SQLServerDriver", "jdbc:sqlserver://localhost:1433;" + "databaseName=")});
+        jdbcMap.put("SQL Server", new DriverURLName[]{new DriverURLName("com.microsoft.sqlserver.jdbc.SQLServerDriver", "jdbc:sqlserver://localhost:port;databaseName=databaseName")});
-        jdbcMap.put("MySQL", new DriverURLName[]{new DriverURLName("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/"),
+        jdbcMap.put("MySQL", new DriverURLName[]{new DriverURLName("com.mysql.jdbc.Driver", "jdbc:mysql://localhost:port/databaseName"),
-                new DriverURLName("org.gjt.mm.mysql.Driver", "jdbc:mysql://localhost/")});
+                new DriverURLName("org.gjt.mm.mysql.Driver", "jdbc:mysql://localhost:port/databaseName")});
-        jdbcMap.put("Sybase", new DriverURLName[]{new DriverURLName("com.sybase.jdbc2.jdbc.SybDriver", "jdbc:sybase:Tds:localhost:5000/")});
+        jdbcMap.put("Sybase", new DriverURLName[]{new DriverURLName("com.sybase.jdbc2.jdbc.SybDriver", "jdbc:sybase:Tds:localhost:port/databaseName")});
+        jdbcMap.put("Derby", new DriverURLName[]{new DriverURLName("org.apache.derby.jdbc.ClientDriver", "jdbc:derby://localhost:port/databaseName")});
+        jdbcMap.put("Postgre", new DriverURLName[]{new DriverURLName("org.postgresql.Driver", "jdbc:postgresql://localhost:port/databaseName")});
+
         jdbcMap.put("Access", new DriverURLName[]{new DriverURLName("sun.jdbc.odbc.JdbcOdbcDriver", "jdbc:odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};DBQ=")});
-        jdbcMap.put("Derby", new DriverURLName[]{new DriverURLName("org.apache.derby.jdbc.ClientDriver", "jdbc:derby://localhost:1527/")});
-        jdbcMap.put("Postgre", new DriverURLName[]{new DriverURLName("org.postgresql.Driver", "jdbc:postgresql://localhost:5432/")});
         jdbcMap.put("SQLite", new DriverURLName[]{new DriverURLName("org.sqlite.JDBC", "jdbc:sqlite://${ENV_HOME}/../help/FRDemo.db")});
     }
 
     private UIButton dbtypeButton;
     private UIComboBox dbtypeComboBox;
     private UIComboBox driverComboBox;
+    private UITextField dbNameTextField;
+    private UITextField hostTextField;
+    private UITextField portTextField;
     private UITextField urlTextField;
     private UITextField userNameTextField;
     private JPasswordField passwordTextField;
+    private UIComboBox charSetComboBox;
     private ActionLabel odbcTipsLink;
+    private JPanel centerPanel;
+    private Component[][] allComponents;
+    private Component[][] partComponents;
     // 请不要改动dbtype,只应该最后添加
     private final String[] dbtype = {"Oracle", "DB2", "SQL Server", "MySQL", "Sybase", "Access", "Derby", "Postgre", "SQLite", "Inceptor", OTHER_DB};
 
-    // carl:DBCP的一些属性
-    private IntegerEditor DBCP_INITIAL_SIZE = new IntegerEditor();
-    private IntegerEditor DBCP_MAX_ACTIVE = new IntegerEditor();
-    private IntegerEditor DBCP_MAX_IDLE = new IntegerEditor();
-    private IntegerEditor DBCP_MIN_IDLE = new IntegerEditor();
-    private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor();
-    private UITextField DBCP_VALIDATION_QUERY = new UITextField();
-
-    private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
-    private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
-    private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{Toolkit.i18nText("Fine-Design_Basic_No"), Toolkit.i18nText("Fine-Design_Basic_Yes")});
 
-    private IntegerEditor DBCP_TIMEBETWEENEVICTIONRUNSMILLS = new IntegerEditor();
+    private JDBCDatabaseConnection jdbcDatabase;
-    private IntegerEditor DBCP_NUMTESTSPEREVICTIONRUN = new IntegerEditor();
+    private boolean needRefresh = true;
-    private IntegerEditor DBCP_MINEVICTABLEIDLETIMEMILLIS = new IntegerEditor();
 
     public JDBCDefPane() {
         this.setBorder(UITitledBorder.createBorderWithTitle("JDBC" + ":"));
@@ -116,7 +118,14 @@ public class JDBCDefPane extends JPanel {
         driverComboBox = new UIComboBox();
         driverComboBox.setEditable(true);
         driverComboBox.addActionListener(driverListener);
+        dbNameTextField = new UITextField(15);
+        hostTextField = new UITextField(15);
+        portTextField = new UITextField(15);
+        portTextField.addInputMethodListener(portInputMethodListener);
+        portTextField.addKeyListener(portKeyListener);
         urlTextField = new UITextField(15);
+        urlTextField.getDocument().addDocumentListener(updateParaListener);
+        enableSubDocListener();
         userNameTextField = new UITextField(15);
         userNameTextField.setName(USER_NAME);
         passwordTextField = new UIPasswordFieldWithFixedLength(15);
@@ -128,11 +137,10 @@ public class JDBCDefPane extends JPanel {
         double f = TableLayout.FILL;
         JPanel dbtypePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
         dbtypePane.add(new UILabel((Toolkit.i18nText("Fine-Design_Basic_Database") + ":")));
-        JPanel dbtypeComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         Component[][] dbtypeComComponents = {{dbtypeComboBox}};
         double[] dbtypeRowSize = {p};
         double[] dbtypeColumnSize = {p};
-        dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize);
+        JPanel dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize);
 
         JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
         driverPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
@@ -159,49 +167,69 @@ public class JDBCDefPane extends JPanel {
         driverComboBoxAndTips.add(driverComboBox, BorderLayout.WEST);
         driverComboBoxAndTips.add(odbcTipsPane, BorderLayout.CENTER);
 
+        JPanel hostPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        hostPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Host") + ":"));
+        Component[][] hostComComponents = {{hostTextField}};
+        double[] hostRowSize = {p};
+        double[] hostColumnSize = {p};
+        JPanel hostComPane = TableLayoutHelper.createTableLayoutPane(hostComComponents, hostRowSize, hostColumnSize);
+
+        JPanel portPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        portPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Port") + ":"));
+        Component[][] portComComponents = {{portTextField}};
+        double[] portRowSize = {p};
+        double[] portColumnSize = {p};
+        JPanel portComPane = TableLayoutHelper.createTableLayoutPane(portComComponents, portRowSize, portColumnSize);
+
+        JPanel dbNamePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        dbNamePane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_DatabaseName") + ":"));
+        Component[][] dbNameComComponents = {{dbNameTextField}};
+        double[] dbNameRowSize = {p};
+        double[] dbNameColumnSize = {p};
+        JPanel dbNameComPane = TableLayoutHelper.createTableLayoutPane(dbNameComComponents, dbNameRowSize, dbNameColumnSize);
+
         JPanel urlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
         urlPane.add(new UILabel("URL:"));
-        JPanel urlComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         Component[][] urlComComponents = {{urlTextField, dbtypeButton}};
         double[] urlRowSize = {p};
         double[] urlColumnSize = {f, 21};
-        urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4);
+        JPanel urlComPane = TableLayoutHelper.createCommonTableLayoutPane(urlComComponents, urlRowSize, urlColumnSize, 4);
 
         JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
         userPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_UserName") + ":"));
-        JPanel userComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         Component[][] userComComponents = {{userNameTextField, new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}};
         double[] userRowSize = {p};
         double[] userColumnSize = {f, p, f};
-        userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4);
+        JPanel userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4);
-
+
-        JPanel passwordPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        String[] defaultEncode = new String[]{Toolkit.i18nText("Fine-Design_Encode_Auto")};
-        passwordPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Password") + ":"));
+        charSetComboBox = new UIComboBox(ArrayUtils.addAll(defaultEncode, EncodeConstants.ENCODING_ARRAY));
-
+        JPanel chartSetPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        Component[][] components = {{dbtypePane, dbtypeComPane}, {driverPane, driverComboBoxAndTips}, {urlPane, urlComPane}, {userPane, userComPane},};
+        chartSetPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Datasource_Charset") + ":"));
-
+        Component[][] charSetComComponents = {{charSetComboBox}};
-        double[] rowSize = {p, p, p, p};
+        double[] charSetRowSize = {p};
+        double[] charSetColumnSize = {f};
+        JPanel charSetComPane = TableLayoutHelper.createTableLayoutPane(charSetComComponents, charSetRowSize, charSetColumnSize);
+
+        //这边调整的话注意下面的changePane
+        allComponents = new Component[][]{{dbtypePane, dbtypeComPane}, {driverPane, driverComboBoxAndTips}, {hostPane, hostComPane},
+                {portPane, portComPane}, {dbNamePane, dbNameComPane}, {userPane, userComPane},
+                {chartSetPane, charSetComPane}, {urlPane, urlComPane}};
+        partComponents = new Component[][]{{dbtypePane, dbtypeComPane}, {driverPane, driverComboBoxAndTips}, {urlPane, urlComPane},
+                {userPane, userComPane}, {chartSetPane, charSetComPane}};
+        double[] rowSize = {p, p, p, p, p, p, p, p};
         double[] columnSize = {p, f, 22};
         // REPORT-41450 Windows环境的jdk11下dpi为125%时会因为缩放导致显示问题，因此加个水平gap值
-        JPanel centerPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 6, 6);
+        centerPanel = TableLayoutHelper.createGapTableLayoutPane(allComponents, rowSize, columnSize, 6, 6);
         innerthis.add(centerPanel);
-        JPanel southPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        innerthis.add(southPanel);
-        southPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 4, 20));
-        ActionLabel actionLabel = new ActionLabel(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
-        southPanel.add(actionLabel, BorderLayout.EAST);
-        actionLabel.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent evt) {
-                JDialog wDialog = createJDialog();
-                wDialog.setVisible(true);
-            }
-        });
     }
 
     public void populate(JDBCDatabaseConnection jdbcDatabase) {
+        needRefresh = false;
         if (jdbcDatabase == null) {
             jdbcDatabase = new JDBCDatabaseConnection();
         }
+        this.jdbcDatabase = jdbcDatabase;
         if (ComparatorUtils.equals(jdbcDatabase.getDriver(), "sun.jdbc.odbc.JdbcOdbcDriver")
                 && jdbcDatabase.getURL().startsWith("jdbc:odbc:Driver={Microsoft")) {
             this.dbtypeComboBox.setSelectedItem("Access");
@@ -230,52 +258,51 @@ public class JDBCDefPane extends JPanel {
         this.urlTextField.setText(jdbcDatabase.getURL());
         this.userNameTextField.setText(jdbcDatabase.getUser());
         this.passwordTextField.setText(jdbcDatabase.getPassword());
+        this.originalCharSet = jdbcDatabase.getOriginalCharsetName();
+        if (StringUtils.isBlank(originalCharSet)) {
+            this.charSetComboBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Encode_Auto"));
+        } else {
+            this.charSetComboBox.setSelectedItem(jdbcDatabase.getOriginalCharsetName());
+        }
+        needRefresh = false;
+    }
+
+    protected JDBCDatabaseConnection getJDBCDatabase() {
+        return this.jdbcDatabase;
+    }
 
-        DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
+    private void changePane(Object dbType) {
-        if (dbcpAttr == null) {
+        double p = TableLayout.PREFERRED;
-            dbcpAttr = new DBCPConnectionPoolAttr();
+        double f = TableLayout.FILL;
-            jdbcDatabase.setDbcpAttr(dbcpAttr);
+        double[] columnSize = {p, f, 22};
+        if (ComparatorUtils.equals(dbType, OTHER_DB) || ComparatorUtils.equals(dbType, "Access") || ComparatorUtils.equals(dbType, "SQLite")) {
+            if (this.centerPanel.getComponentCount() != partComponents.length * 2) {
+                centerPanel.removeAll();
+                TableLayoutHelper.addComponent2ResultPane(partComponents, new double[]{p, p, p, p, p}, columnSize, centerPanel);
+            }
+        } else if (this.centerPanel.getComponentCount() != allComponents.length * 2) {
+            centerPanel.removeAll();
+            TableLayoutHelper.addComponent2ResultPane(allComponents, new double[]{p, p, p, p, p, p, p, p}, columnSize, centerPanel);
         }
-        this.DBCP_INITIAL_SIZE.setValue(dbcpAttr.getInitialSize());
-        this.DBCP_MAX_ACTIVE.setValue(dbcpAttr.getMaxActive());
-        this.DBCP_MAX_IDLE.setValue(dbcpAttr.getMaxIdle());
-        this.DBCP_MAX_WAIT.setValue(dbcpAttr.getMaxWait());
-        this.DBCP_MIN_IDLE.setValue(dbcpAttr.getMinIdle());
-        this.DBCP_VALIDATION_QUERY.setText(dbcpAttr.getValidationQuery());
-        this.DBCP_TESTONBORROW.setSelectedIndex(dbcpAttr.isTestOnBorrow() ? 1 : 0);
-        this.DBCP_TESTONRETURN.setSelectedIndex(dbcpAttr.isTestOnReturn() ? 1 : 0);
-        this.DBCP_TESTWHILEIDLE.setSelectedIndex(dbcpAttr.isTestWhileIdle() ? 1 : 0);
-        this.DBCP_MINEVICTABLEIDLETIMEMILLIS.setValue(dbcpAttr.getMinEvictableIdleTimeMillis() / TIME_MULTIPLE);
-        this.DBCP_NUMTESTSPEREVICTIONRUN.setValue(dbcpAttr.getNumTestsPerEvictionRun());
-        this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.setValue(dbcpAttr.getTimeBetweenEvictionRunsMillis());
     }
 
     public JDBCDatabaseConnection update() {
-        JDBCDatabaseConnection jdbcDatabase = new JDBCDatabaseConnection();
+        if (jdbcDatabase == null) {
+            jdbcDatabase = new JDBCDatabaseConnection();
+        }
         Object driveItem = this.driverComboBox.getSelectedItem();
         jdbcDatabase.setDriver(driveItem == null ? null : driveItem.toString());
         jdbcDatabase.setURL(this.urlTextField.getText().trim());
         jdbcDatabase.setUser(this.userNameTextField.getText().trim());
         jdbcDatabase.setPassword(new String(this.passwordTextField.getPassword()).trim());
-
+        jdbcDatabase.setOriginalCharsetName(this.originalCharSet);
-        DBCPConnectionPoolAttr dbcpAttr = jdbcDatabase.getDbcpAttr();
+        if (this.charSetComboBox.getSelectedIndex() == 0) {
-        if (dbcpAttr == null) {
+            jdbcDatabase.setNewCharsetName(null);
-            dbcpAttr = new DBCPConnectionPoolAttr();
+            jdbcDatabase.setOriginalCharsetName(null);
-            jdbcDatabase.setDbcpAttr(dbcpAttr);
+        } else {
+            jdbcDatabase.setNewCharsetName(EncodeConstants.ENCODING_GBK);
+            jdbcDatabase.setOriginalCharsetName(((String) this.charSetComboBox.getSelectedItem()));
         }
-        dbcpAttr.setInitialSize(this.DBCP_INITIAL_SIZE.getValue().intValue());
-        dbcpAttr.setMaxActive(this.DBCP_MAX_ACTIVE.getValue().intValue());
-        dbcpAttr.setMaxIdle(this.DBCP_MAX_IDLE.getValue().intValue());
-        dbcpAttr.setMaxWait(this.DBCP_MAX_WAIT.getValue().intValue());
-        dbcpAttr.setMinIdle(this.DBCP_MIN_IDLE.getValue().intValue());
-        dbcpAttr.setValidationQuery(this.DBCP_VALIDATION_QUERY.getText());
-        dbcpAttr.setTestOnBorrow(this.DBCP_TESTONBORROW.getSelectedIndex() == 0 ? false : true);
-        dbcpAttr.setTestOnReturn(this.DBCP_TESTONRETURN.getSelectedIndex() == 0 ? false : true);
-        dbcpAttr.setTestWhileIdle(this.DBCP_TESTWHILEIDLE.getSelectedIndex() == 0 ? false : true);
-        dbcpAttr.setMinEvictableIdleTimeMillis(((Number) this.DBCP_MINEVICTABLEIDLETIMEMILLIS.getValue()).intValue() * TIME_MULTIPLE);
-        dbcpAttr.setNumTestsPerEvictionRun(((Number) this.DBCP_NUMTESTSPEREVICTIONRUN.getValue()).intValue());
-        dbcpAttr.setTimeBetweenEvictionRunsMillis(((Number) this.DBCP_TIMEBETWEENEVICTIONRUNSMILLS.getValue()).intValue());
-
         return jdbcDatabase;
     }
 
@@ -297,6 +324,11 @@ public class JDBCDefPane extends JPanel {
                     urlTextField.setText(dus[i].getURL());
                 }
             }
+            // 更改数据库类型后 数据库名称置空和之前逻辑保持一致
+            if (needRefresh) {
+                jdbcDatabase.setDatabase(StringUtils.EMPTY);
+            }
+            changePane(dbtypeComboBox.getSelectedItem());
         }
     };
 
@@ -355,49 +387,175 @@ public class JDBCDefPane extends JPanel {
         }
     };
 
-    private JDialog createJDialog() {
+    InputMethodListener portInputMethodListener = new InputMethodListener() {
-        return new DBCPAttrPane().showWindow(SwingUtilities.getWindowAncestor(JDBCDefPane.this));
+        @Override
+        public void inputMethodTextChanged(InputMethodEvent event) {
+            if (null == event.getText()) {
+                return;
+            }
+            char ch = event.getText().current();
+            if (!(ch >= '0' && ch <= '9')) {
+                event.consume();
+            }
+        }
+
+        @Override
+        public void caretPositionChanged(InputMethodEvent event) {
+
+        }
+    };
+
+    DocumentListener updateParaListener = new DocumentListener() {
+        @Override
+        public void insertUpdate(DocumentEvent e) {
+            updatePara();
+        }
+
+        @Override
+        public void removeUpdate(DocumentEvent e) {
+            updatePara();
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e) {
+            updatePara();
+        }
+    };
+
+    private void updatePara() {
+        String dbType = dbtypeComboBox.getSelectedItem().toString();
+        if (ComparatorUtils.equals(dbType, OTHER_DB) || ComparatorUtils.equals(dbType, "Access") || ComparatorUtils.equals(dbType, "SQLite")) {
+            return;
+        }
+        disableSubDocListener();
+        String url = urlTextField.getText().trim();
+        Matcher matcher = ORACLE_URL.matcher(url);
+        if (matcher.find()) {
+            if (matcher.group(1) != null) {
+                hostTextField.setText(matcher.group(1));
+            } else {
+                hostTextField.setText(StringUtils.EMPTY);
+            }
+            if (matcher.group(3) != null) {
+                portTextField.setText(matcher.group(3));
+            } else {
+                portTextField.setText(StringUtils.EMPTY);
+            }
+            if (matcher.group(5) != null) {
+                dbNameTextField.setText(matcher.group(5));
+            } else {
+                dbNameTextField.setText(StringUtils.EMPTY);
+            }
+            enableSubDocListener();
+            return;
+        }
+        matcher = GENERAL_URL.matcher(url);
+        if (matcher.find()) {
+            if (matcher.group(2) != null) {
+                hostTextField.setText(matcher.group(2));
+            } else {
+                hostTextField.setText(StringUtils.EMPTY);
+            }
+            if (matcher.group(4) != null) {
+                portTextField.setText(matcher.group(4));
+            } else {
+                portTextField.setText(StringUtils.EMPTY);
+            }
+            if (matcher.group(7) != null) {
+                dbNameTextField.setText(matcher.group(7));
+            } else {
+                dbNameTextField.setText(StringUtils.EMPTY);
+            }
+            enableSubDocListener();
+            return;
+        }
+        hostTextField.setText(StringUtils.EMPTY);
+        portTextField.setText(StringUtils.EMPTY);
+        dbNameTextField.setText(StringUtils.EMPTY);
+        enableSubDocListener();
+    }
+
+    private void enableSubDocListener() {
+        this.dbNameTextField.getDocument().addDocumentListener(updateURLListener);
+        this.hostTextField.getDocument().addDocumentListener(updateURLListener);
+    }
+
+    private void disableSubDocListener() {
+        this.dbNameTextField.getDocument().removeDocumentListener(updateURLListener);
+        this.hostTextField.getDocument().removeDocumentListener(updateURLListener);
+    }
+
+    KeyListener portKeyListener = new KeyAdapter() {
+        @Override
+        public void keyReleased(KeyEvent e) {
+            String port = portTextField.getText();
+            if (isPortValid(port)) {
+                updateURL();
+            } else {
+                portTextField.setText(port.replaceAll(getCharNeedReplace(e.getKeyChar()) , ""));
+                if (!isPortValid(portTextField.getText())) {
+                    portTextField.setText(StringUtils.EMPTY);
+                    updateURL();
+                }
+            }
+        }
+    };
+
+    private boolean isPortValid(String port) {
+        return PORT.matcher(port).find();
     }
 
-    class DBCPAttrPane extends BasicPane {
+    private String getCharNeedReplace(char c) {
-        public DBCPAttrPane() {
+        String charNeedReplace = c + "";
-            JPanel defaultPane = this;
+        Matcher matcher = CHAR_NEED_ESCAPE.matcher(charNeedReplace);
-
+        if (matcher.find()) {
-            // JPanel northFlowPane
+            charNeedReplace = "\\" + charNeedReplace;
-            JPanel northFlowPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        }
-            defaultPane.add(northFlowPane, BorderLayout.NORTH);
+        return charNeedReplace;
-
+    }
-            DBCP_VALIDATION_QUERY.setColumns(15);
+
-            // ContextPane
+    DocumentListener updateURLListener = new DocumentListener() {
-
+
-            double f = TableLayout.FILL;
+        @Override
-            // double p = TableLayout.PREFERRED;
+        public void insertUpdate(DocumentEvent e) {
-            double[] rowSize = {f, f, f, f, f, f, f, f, f, f, f, f};
+            updateURL();
-            double[] columnSize = {f, f};
-            Component[][] comps = {
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":", SwingConstants.RIGHT), DBCP_MAX_WAIT},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
-                            DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
-                    {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":", SwingConstants.RIGHT),
-                            DBCP_MINEVICTABLEIDLETIMEMILLIS}};
-
-            JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);
-            contextPane.setBorder(BorderFactory.createMatteBorder(1, 1, 1, 1, UIConstants.LINE_COLOR));
-            northFlowPane.add(contextPane);
         }
 
         @Override
-        protected String title4PopupWindow() {
+        public void removeUpdate(DocumentEvent e) {
-            return Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
+            updateURL();
+        }
+
+        @Override
+        public void changedUpdate(DocumentEvent e) {
+            updateURL();
+        }
+    };
+
+    private void updateURL() {
+        String dbType = dbtypeComboBox.getSelectedItem().toString();
+        if (!ComparatorUtils.equals(dbType, OTHER_DB) && !ComparatorUtils.equals(dbType, "Access") && !ComparatorUtils.equals(dbType, "SQLite")) {
+            urlTextField.getDocument().removeDocumentListener(updateParaListener);
+            DriverURLName[] driverURLNames = jdbcMap.get(dbType);
+            String defaultURL = null;
+            for (DriverURLName driverURLName : driverURLNames) {
+                if (ComparatorUtils.equals(driverURLName.getDriver(), driverComboBox.getSelectedItem().toString())) {
+                    defaultURL = driverURLName.getURL();
+                }
+            }
+            if (defaultURL != null) {
+                String host = hostTextField.getText().trim();
+                String port = portTextField.getText().trim();
+                String dbName = dbNameTextField.getText().trim();
+                defaultURL = defaultURL.replace("localhost", host).replace(":port", ComparatorUtils.equals(port, "") ? "" : ":" + port);
+                if (defaultURL.startsWith("jdbc:sqlserver")) {
+                    defaultURL = defaultURL.replace("=databaseName", "=" + dbName);
+                } else {
+                    defaultURL = defaultURL.replace("databaseName", dbName);
+                }
+            }
+            urlTextField.setText(defaultURL);
+            urlTextField.getDocument().addDocumentListener(updateParaListener);
         }
     }
 

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

@@ -9,6 +9,7 @@ import java.awt.Font;
 import java.net.URI;
 import javax.swing.JEditorPane;
 import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
 
 /**
  * 用来构建JOptionPane带超链的消息提示
@@ -19,31 +20,45 @@ import javax.swing.event.HyperlinkEvent;
  */
 public class MessageWithLink extends JEditorPane {
 
+    private static final UILabel LABEL = new UILabel();
+
+
     public MessageWithLink(String message, String linkName, String link) {
-        super("text/html", "<html><body style=\"" + getStyle() + "\">" + message + "<a href=\"" + link + "\">" + linkName + "</a>" + "</body></html>");
+        this(message, linkName, link, LABEL.getBackground(), LABEL.getFont());
-        addHyperlinkListener(e -> {
-            if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
-                try {
-                    Desktop.getDesktop().browse(URI.create(link));
-                } catch (Exception exception) {
-                    FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
-                }
-            }
-        });
-        setEditable(false);
-        setBorder(null);
     }
 
     public MessageWithLink(String linkName, String link ) {
         this(StringUtils.EMPTY, linkName, link);
     }
 
-    private static StringBuilder getStyle() {
+    public MessageWithLink(String message, String linkName, String link, Color color) {
-        // 构建和相同风格样式
+        this(message, linkName, link, color, LABEL.getFont());
-        UILabel label = new UILabel();
+    }
-        Font font = label.getFont();
+
-        Color color = label.getBackground();
+    public MessageWithLink(String message, String linkName, String link, Color color, Font font) {
+        super("text/html", "<html><body style=\"" + generateStyle(color, font) + "\">" + message + "<a href=\"" + link + "\">" + linkName + "</a>" + "</body></html>");
+        initListener(link);
+        setEditable(false);
+        setBorder(null);
+    }
+
+    protected void initListener(String link) {
+        addHyperlinkListener(new HyperlinkListener() {
+            @Override
+            public void hyperlinkUpdate(HyperlinkEvent e) {
+                if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
+                    try {
+                        Desktop.getDesktop().browse(URI.create(link));
+                    } catch (Exception exception) {
+                        FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
+                    }
+                }
+            }
+        });
+    }
 
+    private static StringBuilder generateStyle(Color color, Font font) {
+        // 构建相同风格样式
         StringBuilder style = new StringBuilder("font-family:" + font.getFamily() + ";");
         style.append("font-weight:").append(font.isBold() ? "bold" : "normal").append(";");
         style.append("font-size:").append(font.getSize()).append("pt;");

designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceLoader.java

@@ -0,0 +1,21 @@
+package com.fr.design.env;
+
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.Workspace;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/11
+ */
+public class DesignerWorkspaceLoader {
+
+    public static void init() {
+        Workspace workspace = WorkContext.getCurrent();
+        if (workspace.isLocal()) {
+            return;
+        }
+        workspace.isWarDeploy();
+        workspace.isCluster();
+    }
+}

designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java

@@ -14,6 +14,7 @@ import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.server.authority.decision.DecisionOperator;
 import com.fr.workspace.engine.rpc.WorkspaceProxyPool;
 import com.fr.workspace.pool.WorkObjectPool;
+import javax.swing.SwingWorker;
 
 /**
  * Created by juhaoyu on 2018/6/14.
@@ -29,6 +30,10 @@ public class RemoteWorkspace implements Workspace {
 
     private volatile Boolean isRoot = null;
 
+    private volatile Boolean cluster;
+
+    private volatile Boolean warDeploy;
+
     RemoteWorkspace(WorkspaceClient client, WorkspaceConnectionInfo connection) {
 
         this.client = client;
@@ -50,12 +55,15 @@ public class RemoteWorkspace implements Workspace {
 
     @Override
     public boolean isWarDeploy() {
-        return WorkContext.getCurrent().get(CommonOperator.class, new ExceptionHandler<Boolean>() {
+        if (warDeploy == null) {
-            @Override
+            warDeploy = WorkContext.getCurrent().get(CommonOperator.class, new ExceptionHandler<Boolean>() {
-            public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
+                @Override
-                return false;
+                public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
-            }
+                    return false;
-         }).isWarDeploy();
+                }
+            }).isWarDeploy();
+        }
+        return warDeploy;
     }
 
     @Override
@@ -79,12 +87,15 @@ public class RemoteWorkspace implements Workspace {
 
     @Override
     public boolean isCluster() {
-        return WorkContext.getCurrent().get(ClusterOperator.class, new ExceptionHandler<Boolean>() {
+        if (cluster == null) {
-            @Override
+            cluster = WorkContext.getCurrent().get(ClusterOperator.class, new ExceptionHandler<Boolean>() {
-            public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
+                @Override
-                return false;
+                public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
-            }
+                    return false;
-        }).isCluster();
+                }
+            }).isCluster();
+        }
+        return cluster;
     }
 
     @Override
@@ -114,8 +125,13 @@ public class RemoteWorkspace implements Workspace {
 
     @Override
     public void close() {
-
+        new SwingWorker<Void, Void>() {
-        client.close();
+            @Override
+            protected Void doInBackground() throws Exception {
+                client.close();
+                return null;
+            }
+        }.execute();
     }
 
     @Override
@@ -127,7 +143,9 @@ public class RemoteWorkspace implements Workspace {
     @Override
     public boolean equals(Object obj) {
 
-        return obj instanceof RemoteWorkspace && AssistUtils.equals(((RemoteWorkspace) obj).connection, this.connection);
+        return obj instanceof RemoteWorkspace
+                && AssistUtils.equals(((RemoteWorkspace) obj).connection, this.connection)
+                && AssistUtils.equals(((RemoteWorkspace) obj).client.getConnection(), this.client.getConnection());
     }
 
     public WorkspaceClient getClient(){

designer-base/src/main/java/com/fr/design/env/WorkspaceChangeLoadingDialog.java

@@ -0,0 +1,47 @@
+package com.fr.design.env;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.utils.gui.GUICoreUtils;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import javax.swing.ImageIcon;
+import javax.swing.JDialog;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/10
+ */
+public class WorkspaceChangeLoadingDialog extends JDialog {
+
+    private static final ImageIcon LOADING_ICON = new ImageIcon(WorkspaceChangeLoadingDialog.class.getResource("/com/fr/web/images/loading-local.gif"));
+
+    private static WorkspaceChangeLoadingDialog dialog;
+
+    public WorkspaceChangeLoadingDialog() {
+        super(DesignerContext.getDesignerFrame());
+        setLayout(new BorderLayout());
+        this.getContentPane().setBackground(Color.WHITE);
+        this.setResizable(false);
+        this.setUndecorated(true);
+        this.setAlwaysOnTop(true);
+        this.setModal(false);
+        this.setSize(new Dimension(400, 100));
+        this.add(new UILabel(LOADING_ICON, UILabel.CENTER), BorderLayout.NORTH);
+        this.add(new UILabel(Toolkit.i18nText("Fine-Design_Change_Workspace_Tip"), UILabel.CENTER), BorderLayout.CENTER);
+        GUICoreUtils.centerWindow(this);
+    }
+
+
+    public static void showDialog() {
+        dialog = new WorkspaceChangeLoadingDialog();
+        dialog.setVisible(true);
+    }
+
+    public static void hideDialog() {
+        dialog.dispose();
+    }
+}

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

@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
+import javax.swing.SwingWorker;
 
 /**
  * 历史模板缓存
@@ -45,6 +46,7 @@ public class HistoryTemplateListCache implements CallbackEvent {
     private static final int DEAD_LINE = DesignerEnvManager.getEnvManager().getCachingTemplateLimit();
     private List<JTemplate<?, ?>> historyList;
     private JTemplate<?, ?> editingTemplate;
+    private SwingWorker<Boolean, Void> stashWorker;
 
     public static HistoryTemplateListCache getInstance() {
         return Holder.INSTANCE;
@@ -64,7 +66,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
      * @param selected 选择的
      */
     public void closeSelectedReport(JTemplate<?, ?> selected) {
-        DesignModuleFactory.clearChartPropertyPane();
         DesignTableDataManager.closeTemplate(selected);
         //直接关闭模板的时候(当且仅当设计器tab上只剩一个模板)退出权限编辑
         if (DesignModeContext.isAuthorityEditing() && historyList.size() <= 1) {
@@ -92,7 +93,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
      * @param selected 选择的
      */
     public void closeVirtualSelectedReport(JTemplate<?, ?> selected) {
-        DesignModuleFactory.clearChartPropertyPane();
         DesignTableDataManager.closeTemplate(selected);
         if (contains(selected) == -1) {
             return;
@@ -340,6 +340,17 @@ public class HistoryTemplateListCache implements CallbackEvent {
      * @see HistoryTemplateListCache#load()
      */
     public void stash() {
+        stashWorker = new SwingWorker<Boolean, Void>() {
+            @Override
+            protected Boolean doInBackground() throws Exception {
+                _stash();
+                return true;
+            }
+        };
+        stashWorker.execute();
+
+    }
+    private void _stash() {
         FineLoggerFactory.getLogger().info("Env Change Template Stashing...");
         if (stashFILEMap == null) {
             stashFILEMap = new HashMap<Integer, FILE>();
@@ -365,6 +376,15 @@ public class HistoryTemplateListCache implements CallbackEvent {
         FineLoggerFactory.getLogger().info("Env Change Template Stashed.");
     }
 
+    private boolean checkStash() {
+        try {
+            return stashWorker.get();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().debug(e.getMessage(), e);
+            return false;
+        }
+    }
+
     /**
      * 切换环境前将正在编辑的模板暂存起来后，在新环境重新读取一遍
      * <p>
@@ -373,6 +393,9 @@ public class HistoryTemplateListCache implements CallbackEvent {
      * @see HistoryTemplateListCache#stash()
      */
     public void load() {
+        if (!checkStash()) {
+            return;
+        }
         FineLoggerFactory.getLogger().info("Env Change Template Loading...");
         if (stashFILEMap != null && stashFILEMap.size() != 0) {
             int size = historyList.size();
@@ -490,4 +513,11 @@ public class HistoryTemplateListCache implements CallbackEvent {
         return false;
     }
 
+    public void replaceCurrentEditingTemplate(JTemplate<?, ?> jt) {
+        int index = contains(this.editingTemplate);
+        this.editingTemplate = jt;
+        historyList.set(index, jt);
+        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
+        MutilTempalteTabPane.getInstance().setSelectedIndex(contains(jt));
+    }
 }

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

@@ -11,11 +11,15 @@ import com.fr.design.gui.imenu.UIScrollPopUpMenu;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.TemplateSavingChecker;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
+import com.fr.design.worker.WorkerManager;
+import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.file.FILE;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.third.javax.annotation.Nonnull;
@@ -23,6 +27,7 @@ import com.fr.third.javax.annotation.Nonnull;
 import javax.swing.BorderFactory;
 import javax.swing.ButtonModel;
 import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -66,6 +71,8 @@ public class MutilTempalteTabPane extends JComponent {
     private static Icon CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
     private static Icon MOUSE_OVER_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png");
     private static Icon MOUSE_PRESS_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png");
+    private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/white_saving_close.gif"));
+    private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/grey_saving_close.gif"));
     private static final String ELLIPSIS = "...";
     private static final int GAP = 5;
     private static final int SMALLGAP = 3;
@@ -195,6 +202,9 @@ public class MutilTempalteTabPane extends JComponent {
                 if (openedTemplate.size() == 1) {
                     return;
                 }
+                if (!TemplateSavingChecker.check()) {
+                    return;
+                }
                 SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(false);
                 //点击关闭其他模板，并且点击确定保存
                 if (saveSomeTempaltePane.showSavePane()) {
@@ -380,8 +390,14 @@ public class MutilTempalteTabPane extends JComponent {
                 selectedIcon = CLOSE;
             }
             if (i == selectedIndex) {
+                if (template.isSaving()) {
+                    selectedIcon = WHITE_SAVING_CLOSE_ICON;
+                }
                 startX[i - minPaintIndex] = paintSelectedTab(g2d, icon, templateStartX, name, selectedIcon);
             } else {
+                if (template.isSaving()) {
+                    selectedIcon = GREY_SAVING_CLOSE_ICON;
+                }
                 boolean isLeft = i < selectedIndex;
                 startX[i - minPaintIndex] = paintUnSelectedTab(g2d, icon, templateStartX, name, selectedIcon, isLeft, mouseOveredIndex, i);
             }
@@ -682,9 +698,15 @@ public class MutilTempalteTabPane extends JComponent {
             int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
                     Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.YES_OPTION) {
-                specifiedTemplate.saveTemplate();
+                CallbackSaveWorker worker = specifiedTemplate.save();
-                FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
+                worker.addSuccessCallback(new Runnable() {
-                closeTpl(specifiedTemplate);
+                    @Override
+                    public void run() {
+                        FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
+                        closeTpl(specifiedTemplate);
+                    }
+                });
+                worker.start(specifiedTemplate.getTarget().getTemplateID());
             } else if (returnVal == JOptionPane.NO_OPTION) {
                 closeTpl(specifiedTemplate);
             }
@@ -919,8 +941,19 @@ public class MutilTempalteTabPane extends JComponent {
                 closeIconIndex = getTemplateIndex(evtX);
                 clodeMode = MOUSE_PRESS_CLOSE;
                 //关闭close图标所在的模板{
-                closeFormat(openedTemplate.get(closeIconIndex));
+                JTemplate<?, ?> template = openedTemplate.get(closeIconIndex);
-                closeSpecifiedTemplate(openedTemplate.get(closeIconIndex));
+                if (template.isOpening()) {
+                    WorkerManager.getInstance().cancelWorker(template.getPath());
+                } else if (template.isSaving()) {
+                    boolean completed = WorkerManager.getInstance().isCompleted(template.getTarget().getTemplateID());
+                    if (!completed) {
+                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                          Toolkit.i18nText("Fine-Design_Close_Template_Tip", template.getEditingFILE().getName()));
+                        return;
+                    }
+                }
+                closeFormat(template);
+                closeSpecifiedTemplate(template);
                 DesignerContext.getDesignerFrame().getContentFrame().repaint();
                 isShowList = false;
             } else {
@@ -934,7 +967,7 @@ public class MutilTempalteTabPane extends JComponent {
                     //如果在权限编辑情况下，不允许切换到表单类型的工作簿
                     if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) {
                         DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
-                        FineJOptionPane.showMessageDialog(MutilTempalteTabPane.this, Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
+                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
                                 + "!", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
                         MutilTempalteTabPane.this.repaint();
                         return;

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

@@ -195,7 +195,7 @@ public class SaveSomeTemplatePane extends BasicPane {
             specifiedTemplate.stopEditing();
             int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
-            if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) {
+            if (returnVal == JOptionPane.YES_OPTION) {
                 specifiedTemplate.saveTemplate();
                 FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
             }

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

@@ -25,6 +25,7 @@ public class ClassFilter implements Filter<String> {
     static {
         FILTER_SET.add("java.awt.image.BufferedImage");
         FILTER_SET.add("sun.awt.AppContext");
+        FILTER_SET.add("com.fr.poly.creator.ECBlockCreator");
     }
 
     @Override

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

@@ -30,10 +30,12 @@ import com.fr.design.gui.itoolbar.UIToolBarSeparatorUI;
 import com.fr.design.gui.itooltip.UIToolTipBorder;
 import com.fr.design.gui.itree.UITreeUI;
 import com.fr.design.i18n.Toolkit;
-import com.fr.log.FineLoggerFactory;
 import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.BorderUIResource;
@@ -171,6 +173,8 @@ public class UILookAndFeel extends MetalLookAndFeel {
         table.put("FileChooser.upFolderIcon", loadIcon("ParentDirectoryIcon.png", this));
         table.put("OptionPane.errorIcon", loadIcon("Information_Icon_Error_32x32.png", this));
         table.put("OptionPane.informationIcon", loadIcon("Information_Icon_OK_32x32.png", this));
+        table.put("OptionPane.narrow.right", loadIcon("Icon_Narrow_Right_16x16.png", this));
+        table.put("OptionPane.narrow.down", loadIcon("Icon_Narrow_Down_16x16.png", this));
         table.put("OptionPane.warningIcon", loadIcon("WarningIcon.png", this));
         table.put("OptionPane.questionIcon", loadIcon("QuestionIcon.png", this));
         table.put("ScrollPane.border", new UIScrollPaneBorder());
@@ -201,7 +205,7 @@ public class UILookAndFeel extends MetalLookAndFeel {
                     "com/fr/design/images/lookandfeel/" + fileName, UILookAndFeel.class);
 
             if (url == null) {
-                FineLoggerFactory.getLogger().error("Icon directory could not be resolved.");
+                FineLoggerFactory.getLogger().error(fileName + " :Icon directory could not be resolved.");
                 return null;
             }
         }

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

@@ -10,9 +10,6 @@ import com.fr.design.mainframe.DockingView;
  * @version 创建时间：2013-7-10 上午09:12:11
  */
 public abstract class BaseChartPropertyPane extends DockingView {
-	
-	public abstract void setSureProperty();
-
 	/**
 	 * 设置是否支持单元格数据.
 	 */
@@ -22,7 +19,5 @@ public abstract class BaseChartPropertyPane extends DockingView {
 
 	public abstract ChartEditPaneProvider getChartEditPane();
 
-	public abstract void addChartEditPane(String plotID);
+	public abstract void updateChartEditPane(String plotID);
-
-	//public abstract void clear();
 }

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

@@ -21,11 +21,9 @@ import java.util.Comparator;
  */
 public class CommonShortCutHandlers {
     ListControlPaneProvider listControlPane;
-    JNameEdList nameableList;
 
     private CommonShortCutHandlers(ListControlPaneProvider listControlPane) {
         this.listControlPane = listControlPane;
-        this.nameableList = listControlPane.getNameableList();
     }
 
     public static CommonShortCutHandlers newInstance(ListControlPaneProvider listControlPane) {
@@ -43,19 +41,19 @@ public class CommonShortCutHandlers {
 
     public void onRemoveItem() {
         try {
-            nameableList.getCellEditor()
+            listControlPane.getNameableList().getCellEditor()
                     .stopCellEditing();
         } catch (Exception ignored) {
         }
         if (GUICoreUtils.removeJListSelectedNodes(SwingUtilities
-                .getWindowAncestor((Component) listControlPane), nameableList)) {
+                .getWindowAncestor((Component) listControlPane), listControlPane.getNameableList())) {
             listControlPane.checkButtonEnabled();
         }
     }
 
     public void onCopyItem() {
         // p:选中的值.
-        ListModelElement selectedValue = (ListModelElement) nameableList.getSelectedValue();
+        ListModelElement selectedValue = (ListModelElement) listControlPane.getNameableList().getSelectedValue();
         if (selectedValue == null) {
             return;
         }
@@ -76,47 +74,51 @@ public class CommonShortCutHandlers {
     }
 
     public void onMoveUpItem() {
-        int selectedIndex = nameableList.getSelectedIndex();
+        int selectedIndex = listControlPane.getNameableList().getSelectedIndex();
         if (selectedIndex == -1) {
             return;
         }
 
         // 上移
         if (selectedIndex > 0) {
-            DefaultListModel listModel = (DefaultListModel) nameableList.getModel();
+            DefaultListModel listModel = (DefaultListModel) listControlPane.getNameableList().getModel();
             Object selecteObj1 = listModel.get(selectedIndex - 1);
             listModel.set(selectedIndex - 1, listModel.get(selectedIndex));
             listModel.set(selectedIndex, selecteObj1);
 
-            nameableList.setSelectedIndex(selectedIndex - 1);
+            listControlPane.getNameableList().setSelectedIndex(selectedIndex - 1);
-            nameableList.ensureIndexIsVisible(selectedIndex - 1);
+            listControlPane.getNameableList().ensureIndexIsVisible(selectedIndex - 1);
         }
     }
 
     public void onMoveDownItem() {
-        int selectedIndex = nameableList.getSelectedIndex();
+        int selectedIndex = listControlPane.getNameableList().getSelectedIndex();
         if (selectedIndex == -1) {
             return;
         }
 
-        if (selectedIndex < nameableList.getModel().getSize() - 1) {
+        if (selectedIndex < listControlPane.getNameableList().getModel().getSize() - 1) {
-            DefaultListModel listModel = (DefaultListModel) nameableList
+            DefaultListModel listModel = (DefaultListModel) listControlPane.getNameableList()
                     .getModel();
 
             Object selecteObj1 = listModel.get(selectedIndex + 1);
             listModel.set(selectedIndex + 1, listModel.get(selectedIndex));
             listModel.set(selectedIndex, selecteObj1);
 
-            nameableList.setSelectedIndex(selectedIndex + 1);
+            listControlPane.getNameableList().setSelectedIndex(selectedIndex + 1);
-            nameableList.ensureIndexIsVisible(selectedIndex + 1);
+            listControlPane.getNameableList().ensureIndexIsVisible(selectedIndex + 1);
         }
     }
 
     public void onSortItem(boolean isAtoZ) {
+       onSortItem(isAtoZ, listControlPane.getNameableList());
+    }
+
+    public void onSortItem(boolean isAtoZ, JNameEdList nameEdList) {
         // p:选中的值.
-        Object selectedValue = nameableList.getSelectedValue();
+        Object selectedValue = nameEdList.getSelectedValue();
 
-        DefaultListModel listModel = (DefaultListModel) nameableList
+        DefaultListModel listModel = (DefaultListModel) nameEdList
                 .getModel();
         Nameable[] nameableArray = new Nameable[listModel.getSize()];
         if (nameableArray.length <= 0) {
@@ -156,12 +158,12 @@ public class CommonShortCutHandlers {
 
         // p:需要选中以前的那个值.
         if (selectedValue != null) {
-            nameableList.setSelectedValue(selectedValue, true);
+            nameEdList.setSelectedValue(selectedValue, true);
         }
 
         listControlPane.checkButtonEnabled();
         // p:需要repaint.
-        nameableList.repaint();
+        nameEdList.repaint();
     }
 
     private String createUnrepeatedCopyName(String suffix) {

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

@@ -4,18 +4,41 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ilist.JNameEdList;
 import com.fr.design.gui.ilist.ListModelElement;
+import com.fr.design.gui.ilist.UINameEdList;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.os.impl.PopupDialogSaveAction;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.form.event.Listener;
+import com.fr.general.NameObject;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
+import com.fr.stable.os.support.OSSupportCenter;
 
 import javax.swing.DefaultListModel;
-import javax.swing.JOptionPane;
+import javax.swing.JList;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
 import java.awt.Component;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 存放一些公用的方法
  * Created by plough on 2018/8/13.
  */
 class ListControlPaneHelper {
+    private static final int EDIT_RANGE = 25;  // 编辑按钮的x坐标范围
+
     private ListControlPaneProvider listControlPane;
 
     private ListControlPaneHelper(ListControlPaneProvider listControlPane) {
@@ -110,4 +133,123 @@ class ListControlPaneHelper {
     }
 
 
+    protected void popupEditDialog(Point mousePos, UINameEdList nameableList, UIControlPane controlPane) {
+        int editingIndex = nameableList.getSelectedIndex();
+        Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex);
+        if (editingIndex < 0 || (mousePos != null && !currentCellBounds.contains(mousePos))) {
+            return;
+        }
+        Window popupEditDialog = controlPane.getPopupEditDialog();
+        popupEditDialog.setLocation(getPopupDialogLocation(nameableList, popupEditDialog));
+        if (popupEditDialog instanceof UIControlPane.PopupEditDialog) {
+            ((UIControlPane.PopupEditDialog) popupEditDialog).setTitle(getSelectedName());
+        }
+        popupEditDialog.setVisible(true);
+        PopupDialogSaveAction osBasedAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
+        osBasedAction.register(controlPane, popupEditDialog);
+    }
+
+    private Point getPopupDialogLocation(UINameEdList nameableList, Window popupEditDialog) {
+        Point resultPos = new Point(0, 0);
+        Point listPos = nameableList.getLocationOnScreen();
+        resultPos.x = listPos.x - popupEditDialog.getWidth();
+        resultPos.y = listPos.y + (nameableList.getSelectedIndex() - 1) * EDIT_RANGE;
+
+        // 当对象在屏幕上的位置比较靠下时，往下移动弹窗至与属性面板平齐
+        Window frame = DesignerContext.getDesignerFrame();
+        // 不能太低
+        int maxY = frame.getLocationOnScreen().y + frame.getHeight() - popupEditDialog.getHeight();
+        if (resultPos.y > maxY) {
+            resultPos.y = maxY;
+        }
+        // 也不能太高
+        int minY = frame.getLocationOnScreen().y + EDIT_RANGE;
+        if (resultPos.y < minY) {
+            resultPos.y = minY;
+        }
+
+        // 当在左侧显示不下时，在右侧弹出弹窗
+        if (resultPos.x < 0) {
+            resultPos.x = listPos.x + nameableList.getParent().getWidth();
+        }
+        // 如果右侧显示不下，可以向左移动
+        int maxX = frame.getLocationOnScreen().x + frame.getWidth() - popupEditDialog.getWidth() - EDIT_RANGE;
+        if (resultPos.x > maxX) {
+            resultPos.x = maxX;
+        }
+
+        return resultPos;
+    }
+
+    /*
+     * UINameEdList的鼠标事件
+     */
+    protected MouseListener getListMouseListener(UINameEdList nameableList,  UIControlPane controlPane) {
+        return new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent evt) {
+                nameableList.stopEditing();
+                if (evt.getClickCount() >= 2
+                        && SwingUtilities.isLeftMouseButton(evt) && evt.getX() > EDIT_RANGE) {
+                    nameableList.editItemAt(nameableList.getSelectedIndex());
+                } else if (SwingUtilities.isLeftMouseButton(evt) && evt.getX() <= EDIT_RANGE) {
+                    popupEditDialog(evt.getPoint(), nameableList, controlPane);
+                }
+
+                // peter:处理右键的弹出菜单
+                if (!SwingUtilities.isRightMouseButton(evt)) {
+                    return;
+                }
+
+                // peter: 注意,在checkButtonEnabled()方法里面,设置了所有的Action的Enabled.
+                checkButtonEnabled();
+
+                // p:右键菜单.
+                JPopupMenu popupMenu = new JPopupMenu();
+
+                for (ShortCut4JControlPane sj : listControlPane.getShorts()) {
+                    sj.getShortCut().intoJPopupMenu(popupMenu);
+                }
+
+                // peter: 只有弹出菜单有子菜单的时候,才需要弹出来.
+                GUICoreUtils.showPopupMenu(popupMenu, nameableList, evt.getX() - 1,
+                        evt.getY() - 1);
+            }
+
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                JList list = (JList) e.getSource();
+                if (list.locationToIndex(e.getPoint()) == -1 && !e.isShiftDown()
+                        && !isMenuShortcutKeyDown(e)) {
+                    list.clearSelection();
+                }
+            }
+
+            private boolean isMenuShortcutKeyDown(InputEvent event) {
+                return (event.getModifiers() & Toolkit.getDefaultToolkit()
+                        .getMenuShortcutKeyMask()) != 0;
+            }
+
+            @Override
+            public void mouseMoved(MouseEvent e) {
+
+            }
+        };
+    }
+
+    public Map<String, List<NameObject>> processCatalog(List<NameObject> nameObjectList) {
+        Map<String, List<NameObject>> map = new HashMap<>();
+        for (NameObject nameObject : nameObjectList) {
+            Listener listener = (Listener) nameObject.getObject();
+            if (StringUtils.isNotEmpty(listener.getName())) {
+                nameObject.setName(listener.getName());
+            }
+            List<NameObject> list = map.computeIfAbsent(listener.getEventName(), k -> new ArrayList<>());
+            list.add(nameObject);
+        }
+        return map;
+    }
+
+
+
 }

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

@@ -49,7 +49,7 @@ import java.awt.event.WindowEvent;
 /**
  * Created by plough on 2017/7/21.
  */
-abstract class UIControlPane extends JControlPane {
+public abstract class UIControlPane extends JControlPane {
     private UIToolbar topToolBar;
     protected Window popupEditDialog;
     private static final int TOP_TOOLBAR_HEIGHT = 20;
@@ -78,7 +78,7 @@ abstract class UIControlPane extends JControlPane {
 
         initCardPane();
         if (isNewStyle()) {
-            getPopupEditDialog(cardPane);
+            createPopupEditDialog(cardPane);
             this.add(getLeftPane(), BorderLayout.CENTER);
             this.setBorder(BorderFactory.createEmptyBorder(10, 10, 15, 10));
         } else {
@@ -100,7 +100,11 @@ abstract class UIControlPane extends JControlPane {
         this.checkButtonEnabled();
     }
 
-    private void getPopupEditDialog(JPanel cardPane) {
+    protected Window getPopupEditDialog(){
+        return this.popupEditDialog;
+    }
+
+    private void createPopupEditDialog(JPanel cardPane) {
         popupEditDialog = new PopupEditDialog(cardPane);
     }
 

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

@@ -6,32 +6,18 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilist.JNameEdList;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.gui.ilist.UINameEdList;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.os.impl.PopupDialogSaveAction;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
-import com.fr.stable.os.support.OSSupportCenter;
 
 import javax.swing.DefaultListModel;
-import javax.swing.JList;
 import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
 import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.awt.BorderLayout;
 import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
@@ -41,11 +27,8 @@ import java.lang.reflect.InvocationTargetException;
 
 public abstract class UIListControlPane extends UIControlPane implements ListControlPaneProvider {
     private static final String LIST_NAME = "UIControl_List";
-    private static final int EDIT_RANGE = 25;  // 编辑按钮的x坐标范围
 
     protected UINameEdList nameableList;
-    private int editingIndex;
-    protected String selectedName;
     protected boolean isPopulating = false;
     private CommonShortCutHandlers commonHandlers;
     private ListControlPaneHelper helper;
@@ -93,7 +76,7 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
 
 
         nameableList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-        nameableList.addMouseListener(getListMouseListener());
+        nameableList.addMouseListener(getHelper().getListMouseListener(nameableList, this));
         nameableList.addListSelectionListener(new ListSelectionListener() {
             public void valueChanged(ListSelectionEvent evt) {
                 // richie:避免多次update和populate大大降低效率
@@ -139,7 +122,7 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
                 saveSettings();
             }
         };
-        nameEdList.setCellRenderer(new UINameableListCellRenderer(this));
+        nameEdList.setCellRenderer(new UINameableListCellRenderer(this.isNewStyle(), this.creators));
         return nameEdList;
     }
 
@@ -181,13 +164,6 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
     }
 
 
-    /**
-     * 获取选中的名字
-     */
-    public String getSelectedName() {
-       return getHelper().getSelectedName();
-    }
-
     /**
      * 添加 Nameable
      *
@@ -209,51 +185,10 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
 
     protected void popupEditDialog(Point mousePos) {
         if (isNewStyle()) {
-            Rectangle currentCellBounds = nameableList.getCellBounds(editingIndex, editingIndex);
+            getHelper().popupEditDialog(mousePos, nameableList, this);
-            if (editingIndex < 0 || (mousePos != null && !currentCellBounds.contains(mousePos))) {
-                return;
-            }
-            popupEditDialog.setLocation(getPopupDialogLocation());
-            if (popupEditDialog instanceof PopupEditDialog) {
-                ((PopupEditDialog)popupEditDialog).setTitle(getSelectedName());
-            }
-            popupEditDialog.setVisible(true);
-            PopupDialogSaveAction osBasedAction = OSSupportCenter.getAction(PopupDialogSaveAction.class);
-            osBasedAction.register(this, popupEditDialog);
         }
     }
 
-    private Point getPopupDialogLocation() {
-        Point resultPos = new Point(0, 0);
-        Point listPos = nameableList.getLocationOnScreen();
-        resultPos.x = listPos.x - popupEditDialog.getWidth();
-        resultPos.y = listPos.y + (nameableList.getSelectedIndex() - 1) * EDIT_RANGE;
-
-        // 当对象在屏幕上的位置比较靠下时，往下移动弹窗至与属性面板平齐
-        Window frame = DesignerContext.getDesignerFrame();
-        // 不能太低
-        int maxY = frame.getLocationOnScreen().y + frame.getHeight() - popupEditDialog.getHeight();
-        if (resultPos.y > maxY) {
-            resultPos.y = maxY;
-        }
-        // 也不能太高
-        int minY = frame.getLocationOnScreen().y + EDIT_RANGE;
-        if (resultPos.y < minY) {
-            resultPos.y = minY;
-        }
-
-        // 当在左侧显示不下时，在右侧弹出弹窗
-        if (resultPos.x < 0) {
-            resultPos.x = listPos.x + nameableList.getParent().getWidth();
-        }
-        // 如果右侧显示不下，可以向左移动
-        int maxX = frame.getLocationOnScreen().x + frame.getWidth() - popupEditDialog.getWidth() - EDIT_RANGE;
-        if (resultPos.x > maxX) {
-            resultPos.x = maxX;
-        }
-
-        return resultPos;
-    }
 
     /**
      * 生成不重复的名字
@@ -301,65 +236,6 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
         return getModel().getSize() > 0 && nameableList.getSelectedIndex() != -1;
     }
 
-    /*
-     * UINameEdList的鼠标事件
-     */
-    private MouseListener getListMouseListener() {
-        return new MouseAdapter() {
-            @Override
-            public void mouseReleased(MouseEvent evt) {
-                nameableList.stopEditing();
-                if (evt.getClickCount() >= 2
-                        && SwingUtilities.isLeftMouseButton(evt) && evt.getX() > EDIT_RANGE) {
-                    editingIndex = nameableList.getSelectedIndex();
-                    selectedName = nameableList.getNameAt(editingIndex);
-                    nameableList.editItemAt(nameableList.getSelectedIndex());
-                } else if (SwingUtilities.isLeftMouseButton(evt) && evt.getX() <= EDIT_RANGE) {
-                    editingIndex = nameableList.getSelectedIndex();
-                    selectedName = nameableList.getNameAt(editingIndex);
-                    popupEditDialog(evt.getPoint());
-                }
-
-                // peter:处理右键的弹出菜单
-                if (!SwingUtilities.isRightMouseButton(evt)) {
-                    return;
-                }
-
-                // peter: 注意,在checkButtonEnabled()方法里面,设置了所有的Action的Enabled.
-                checkButtonEnabled();
-
-                // p:右键菜单.
-                JPopupMenu popupMenu = new JPopupMenu();
-
-                for (ShortCut4JControlPane sj : getShorts()) {
-                    sj.getShortCut().intoJPopupMenu(popupMenu);
-                }
-
-                // peter: 只有弹出菜单有子菜单的时候,才需要弹出来.
-                GUICoreUtils.showPopupMenu(popupMenu, nameableList, evt.getX() - 1,
-                        evt.getY() - 1);
-            }
-
-            @Override
-            public void mouseClicked(MouseEvent e) {
-                JList list = (JList) e.getSource();
-                if (list.locationToIndex(e.getPoint()) == -1 && !e.isShiftDown()
-                        && !isMenuShortcutKeyDown(e)) {
-                    list.clearSelection();
-                }
-            }
-
-            private boolean isMenuShortcutKeyDown(InputEvent event) {
-                return (event.getModifiers() & Toolkit.getDefaultToolkit()
-                        .getMenuShortcutKeyMask()) != 0;
-            }
-
-            @Override
-            public void mouseMoved(MouseEvent e) {
-
-            }
-        };
-    }
 
     /**
      * 检查按钮可用状态 Check button enabled.

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

@@ -1,12 +1,8 @@
 package com.fr.design.gui.controlpane;
 
-import com.fr.base.BaseUtils;
 import com.fr.design.constants.UIConstants;
-import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ilist.ListModelElement;
-import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.Nameable;
 import sun.swing.DefaultLookup;
 
@@ -14,8 +10,6 @@ import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 /**
  * Nameable的ListCellRenerer
@@ -32,12 +26,14 @@ public class UINameableListCellRenderer extends
     private static final int BUTTON_WIDTH = 25;
     private UILabel editButton;  // "编辑按钮"，实际上是一个 UILabel，由列表项（UIListControlPane）统一处理点击事件
     private UILabel label;
-    private UIListControlPane listControlPane;
+    private boolean isNewStyle;
+    private NameableCreator[] creators;
     private Color initialLabelForeground;
 
-    public UINameableListCellRenderer(UIListControlPane listControlPane) {
+    public UINameableListCellRenderer( boolean isNewStyle, NameableCreator[] creators) {
         super();
-        this.listControlPane = listControlPane;
+        this.isNewStyle = isNewStyle;
+        this.creators = creators;
         initComponents();
         setOpaque(true);
         setBorder(getNoFocusBorder());
@@ -50,7 +46,7 @@ public class UINameableListCellRenderer extends
                 return new Dimension(BUTTON_WIDTH, BUTTON_WIDTH);
             }
         };
-        editButton.setIcon(listControlPane.isNewStyle() ? UIConstants.LIST_EDIT_ICON : UIConstants.CPT_ICON);
+        editButton.setIcon(isNewStyle ? UIConstants.LIST_EDIT_ICON : UIConstants.CPT_ICON);
         editButton.setBorder(BorderFactory.createMatteBorder(0, 0, 0, 1, UIConstants.LIST_ITEM_SPLIT_LINE));
         editButton.setHorizontalAlignment(SwingConstants.CENTER);
         label = new UILabel();
@@ -92,7 +88,7 @@ public class UINameableListCellRenderer extends
             setBackground(bg == null ? list.getSelectionBackground() : bg);
             setForeground(fg == null ? list.getSelectionForeground() : fg);
             label.setForeground(Color.WHITE);
-            if (listControlPane.isNewStyle()) {
+            if (isNewStyle) {
                 editButton.setIcon(UIConstants.LIST_EDIT_WHITE_ICON);
             }
         }
@@ -100,7 +96,7 @@ public class UINameableListCellRenderer extends
             setBackground(list.getBackground());
             setForeground(list.getForeground());
             label.setForeground(initialLabelForeground);
-            if (listControlPane.isNewStyle()) {
+            if (isNewStyle) {
                 editButton.setIcon(UIConstants.LIST_EDIT_ICON);
             }
         }
@@ -114,7 +110,7 @@ public class UINameableListCellRenderer extends
             Nameable wrappee = ((ListModelElement) value).wrapper;
             this.setText(((ListModelElement) value).wrapper.getName());
 
-            for (NameableCreator creator : listControlPane.creators()) {
+            for (NameableCreator creator : creators) {
                 if (creator.menuIcon() != null && creator.acceptObject2Populate(wrappee) != null) {
                     this.setToolTipText(creator.createTooltip());
                     break;

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

@@ -0,0 +1,64 @@
+package com.fr.design.gui.ibutton;
+
+import com.fr.base.CellBorderStyle;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.JTemplate;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.plaf.ButtonUI;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/9
+ */
+public class UIForbiddenButton extends UIButton {
+
+    public UIForbiddenButton() {
+        super();
+    }
+
+    public UIForbiddenButton(String string) {
+        super(string);
+    }
+
+    public UIForbiddenButton(Icon icon) {
+        super(icon);
+    }
+
+    public UIForbiddenButton(Action action) {
+        super(action);
+    }
+
+    public UIForbiddenButton(String text, Icon icon) {
+        super(text, icon);
+    }
+
+    public UIForbiddenButton(Icon normal, Icon rollOver, Icon pressed) {
+        super(normal, rollOver, pressed);
+    }
+
+    public UIForbiddenButton(String resource, boolean needSetDisabledIcon) {
+        super(resource, needSetDisabledIcon);
+    }
+
+    @Override
+    public CellBorderStyle getBorderStyle() {
+        return super.getBorderStyle();
+    }
+
+    @Override
+    public boolean isEnabled() {
+        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        boolean enabled = true;
+        if (template != null) {
+            enabled = super.isEnabled() && template.checkEnable();
+        }
+        return enabled;
+    }
+
+    @Override
+    public ButtonUI getUI() {
+        return new UIForbiddenButtonUI();
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.fr.design.gui.ibutton;
+
+import java.awt.Graphics;
+import javax.swing.JComponent;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/11
+ */
+public class UIForbiddenButtonUI extends UIButtonUI {
+
+    @Override
+    public void paint(Graphics g, JComponent c) {
+        super.paint(g, c);
+        c.setEnabled(c.isEnabled());
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.fr.design.gui.ibutton;
+
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.mainframe.JTemplate;
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.plaf.ButtonUI;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/10
+ */
+public class UISaveForbiddenButton extends UIButton {
+    public UISaveForbiddenButton() {
+    }
+
+    public UISaveForbiddenButton(String string) {
+        super(string);
+    }
+
+    public UISaveForbiddenButton(Icon icon) {
+        super(icon);
+    }
+
+    public UISaveForbiddenButton(Action action) {
+        super(action);
+    }
+
+    public UISaveForbiddenButton(String text, Icon icon) {
+        super(text, icon);
+    }
+
+    public UISaveForbiddenButton(Icon normal, Icon rollOver, Icon pressed) {
+        super(normal, rollOver, pressed);
+    }
+
+    public UISaveForbiddenButton(String resource, boolean needSetDisabledIcon) {
+        super(resource, needSetDisabledIcon);
+    }
+
+    @Override
+    public boolean isEnabled() {
+        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        boolean enabled = true;
+        if (template != null) {
+            enabled = !template.isSaving();
+        }
+        return enabled;
+    }
+
+    @Override
+    public ButtonUI getUI() {
+        return new UISaveForbiddenButtonUI();
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.fr.design.gui.ibutton;
+
+import java.awt.Graphics;
+import javax.swing.JComponent;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/14
+ */
+public class UISaveForbiddenButtonUI extends UIButtonUI {
+
+    @Override
+    public void paint(Graphics g, JComponent c) {
+        super.paint(g, c);
+        c.setEnabled(c.isEnabled());
+    }
+}

designer-base/src/main/java/com/fr/design/gui/icombobox/FRTreeComboBox.java

@@ -597,6 +597,10 @@ public class FRTreeComboBox extends UIComboBox {
             return this.item;
         }
 
+        public boolean isSetting() {
+            return setting;
+        }
+
         public void insertUpdate(DocumentEvent e) {
             changeHandler();
         }
@@ -614,11 +618,19 @@ public class FRTreeComboBox extends UIComboBox {
                 return;
             }
             setPopupVisible(true);
+            search();
+        }
+
+        /**
+         * 模糊搜索，选中首个匹配项
+         */
+        protected void search() {
             this.item = textField.getText();
+            tree.updateUI();
             TreeNode root = (TreeNode) tree.getModel().getRoot();
             TreePath parent = new TreePath(root);
             TreeNode node = (TreeNode) parent.getLastPathComponent();
-            dealSamePath(parent,node,textField);
+            dealSamePath(parent, node, textField);
             this.getEditorComponent().requestFocus();
         }
 

designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java

@@ -62,6 +62,12 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
             this.setModel(new DefaultComboBoxModel<>(new Object[]{anObject}));
             super.setSelectedItem(anObject);
         }
+
+    }
+
+    private void setSelectedItemWithDocumentChange(Object anObject) {
+        initialSelected = anObject;
+        super.setSelectedItem(anObject);
     }
 
     @Override
@@ -183,7 +189,7 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
             }
             filtering = true;
             String xx = textField.getText();
-            LazyComboBox.this.setSelectedItem(xx);
+            LazyComboBox.this.setSelectedItemWithDocumentChange(xx);
             this.item = textField.getText();
 
             setPopupVisible(true);

designer-base/src/main/java/com/fr/design/gui/icombobox/SearchPreTaskTreeComboBox.java

@@ -0,0 +1,77 @@
+package com.fr.design.gui.icombobox;
+
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.JTree;
+import javax.swing.SwingWorker;
+import javax.swing.tree.TreeCellRenderer;
+import java.util.concurrent.FutureTask;
+
+/**
+ * 模糊搜索前需执行完前置任务的TreeComboBox
+ * @author Lucian.Chen
+ * @version 10.0
+ * Created by Lucian.Chen on 2021/4/14
+ */
+public class SearchPreTaskTreeComboBox extends FRTreeComboBox {
+
+    /**
+     * 模糊搜索前任务
+     */
+    private FutureTask<Void> preSearchTask;
+
+    public SearchPreTaskTreeComboBox(JTree tree, TreeCellRenderer renderer, boolean editable) {
+        super(tree, renderer, editable);
+    }
+
+    public FutureTask<Void> getPreSearchTask() {
+        return preSearchTask;
+    }
+
+    public void setPreSearchTask(FutureTask<Void> preSearchTask) {
+        this.preSearchTask = preSearchTask;
+    }
+
+    protected UIComboBoxEditor createEditor() {
+        return new SearchPreTaskComboBoxEditor(this);
+    }
+
+    private class SearchPreTaskComboBoxEditor extends FrTreeSearchComboBoxEditor {
+
+        public SearchPreTaskComboBoxEditor(FRTreeComboBox comboBox) {
+            super(comboBox);
+        }
+
+        protected void changeHandler() {
+            if (isSetting()) {
+                return;
+            }
+            setPopupVisible(true);
+            new SwingWorker<Void, Void>() {
+                @Override
+                protected Void doInBackground() {
+                    FutureTask<Void> task = getPreSearchTask();
+                    try {
+                        // 确保模糊搜索前任务执行完成后，再进行模糊搜索
+                        if (task != null) {
+                            task.get();
+                        }
+                    } catch (Exception e) {
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    }
+                    if (task != null) {
+                        // 任务执行后置空，否则会被别的操作重复触发
+                        setPreSearchTask(null);
+                    }
+                    return null;
+                }
+
+                @Override
+                protected void done() {
+                    // 模糊搜索
+                    search();
+                }
+            }.execute();
+        }
+    }
+}

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

@@ -4,7 +4,6 @@ import com.fr.base.Utils;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StringUtils;
-
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;

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

@@ -1,8 +1,11 @@
 package com.fr.design.gui.itoolbar;
 
-import javax.swing.*;
+import com.fr.design.file.HistoryTemplateListCache;
-import java.awt.*;
+import com.fr.design.mainframe.JTemplate;
+import java.awt.Component;
+import java.awt.FlowLayout;
 import java.util.ArrayList;
+import javax.swing.JToolBar;
 
 public class UIToolbar extends JToolBar {
 
@@ -31,4 +34,14 @@ public class UIToolbar extends JToolBar {
             }
         }
     }
+
+    public void refreshUIToolBar() {
+        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (template != null) {
+            for (int i = 0; i < getComponentCount(); i++) {
+                Component component = getComponents()[i];
+                component.setEnabled(template.checkEnable());
+            }
+        }
+    }
 }

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

@@ -233,7 +233,7 @@ public class TableLayoutHelper {
         container.repaint();
     }
 
-    private static void addComponent2ResultPane(Component[][] components, double[] rowSize, double[] columnSize, JPanel resultPane) {
+    public static void addComponent2ResultPane(Component[][] components, double[] rowSize, double[] columnSize, JPanel resultPane) {
 
         for (int i = 0; i < components.length; i++) {
             if (i >= rowSize.length) {

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

@@ -133,6 +133,8 @@ public class CenterRegionContainerPane extends JPanel {
                     combineUp.add(jComponent);
                 }
             }
+            //添加检测按钮
+            addCheckButton();
         }
         //添加分享按钮
         addShareButton();
@@ -158,6 +160,18 @@ public class CenterRegionContainerPane extends JPanel {
         }
     }
 
+    private void addCheckButton() {
+        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (jt == null) {
+            return;
+        }
+        combineUp.addSeparator(new Dimension(2, 16));
+        UIButton[] checkButtons = jt.createCheckButton();
+        for (UIButton checkButton : checkButtons) {
+            combineUp.add(checkButton);
+        }
+    }
+
     private void addShareButton() {
 
         JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
@@ -227,4 +241,11 @@ public class CenterRegionContainerPane extends JPanel {
         return centerTemplateCardPane;
     }
 
+    protected void refreshUIToolBar() {
+        if (toolbarComponent instanceof UIToolbar) {
+            ((UIToolbar ) toolbarComponent).refreshUIToolBar();
+        }
+        combineUp.refreshUIToolBar();
+    }
+
 }

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

@@ -0,0 +1,39 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
+import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
+import com.fr.design.notification.SnapChat;
+import com.fr.design.notification.SnapChatFactory;
+import com.fr.design.notification.SnapChatKey;
+
+/**
+ * Created by kerry on 5/8/21
+ */
+public class ComponentReuseNotifyUtil {
+    private static final String COMPONENT_SNAP_CHAT_KEY = "com.fr.component.share-components";
+
+    private ComponentReuseNotifyUtil() {
+
+    }
+
+    public static void enterWidgetLibExtraAction(boolean needValidRead) {
+        if (ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib()) {
+            return;
+        }
+        SnapChat snapChat = SnapChatFactory.createSnapChat(false, new SnapChatKey() {
+            @Override
+            public String calc() {
+                return COMPONENT_SNAP_CHAT_KEY;
+            }
+        });
+        if (snapChat.hasRead() && needValidRead) {
+            DesignerToastMsgUtil.toastPrompt(Toolkit.i18nText("Fine-Design_Component_Reuse_Merge_Prompt"));
+        }
+        ComponentReuseNotificationInfo.getInstance().setClickedWidgetLib(true);
+        DesignerEnvManager.getEnvManager().saveXMLFile();
+    }
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.fr.design.mainframe;
+
+import com.fr.event.Event;
+import com.fr.event.Null;
+
+/**
+ * Created by kerry on 4/28/21
+ */
+public enum DesignOperationEvent implements Event<Null> {
+
+    CELL_STYLE_MODIFY,
+
+    CELL_IMAGE_VALUE_MODIFY
+
+}

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

@@ -4,6 +4,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.chart.exception.ChartNotFoundException;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -64,6 +65,7 @@ import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.WindowConstants;
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Point;
@@ -144,6 +146,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         @Override
         public void windowClosing(WindowEvent e) {
+            // 关闭前check
+            if (!TemplateSavingChecker.check()) {
+                return;
+            }
             //关闭前当前模板 停止编辑
             HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().stopEditing();
             SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true);
@@ -334,7 +340,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         designerOpenedListenerList.clear();
     }
 
-    protected DesktopCardPane getCenterTemplateCardPane() {
+    public DesktopCardPane getCenterTemplateCardPane() {
 
         return CenterRegionContainerPane.getInstance().getCenterTemplateCardPane();
     }
@@ -567,6 +573,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         layeredPane.repaint();
     }
 
+    public void refreshUIToolBar() {
+        CenterRegionContainerPane.getInstance().refreshUIToolBar();
+        this.ad.updateEnable();
+    }
+
     public JComponent getToolbarComponent() {
 
         return CenterRegionContainerPane.getInstance().getToolbarComponent();
@@ -696,42 +707,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         return getCenterTemplateCardPane().getSelectedJTemplate();
     }
 
-    /**
-     * 保存当前编辑的模板
-     */
-
-    public void saveCurrentEditingTemplate() {
-
-        JTemplate<?, ?> editingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        if (editingTemplate == null) {
-            return;
-        }
-        if (editingTemplate.isSaved()) {// isSaved == true表示已经保存过，或者新建的一张模板
-            if (editingTemplate.getEditingFILE().exists()) {// 表示磁盘上的某一张已经保存过的模板，要添加到历史中
-                // HistoryTemplateListPane.getInstance().addHistory();
-            }
-        } else {
-            editingTemplate.stopEditing();
-            if (!editingTemplate.getEditingFILE().exists()) {
-                int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(),
-                        Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + editingTemplate.getEditingFILE()
-                                + "\" ?", Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION,
-                        JOptionPane.QUESTION_MESSAGE);
-                if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
-                    editingTemplate.saveTemplate();
-                    FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
-                            editingTemplate.getEditingFILE().getName()));
-                }
-            } else {
-                if (editingTemplate.saveTemplate()) {
-                    editingTemplate.saveTemplate();
-                    FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
-                            editingTemplate.getEditingFILE().getName()));
-                }
-            }
-        }
-    }
-
     /**
      * 添加新建模板, 并激活.
      */
@@ -905,6 +880,16 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
                     JOptionPane.WARNING_MESSAGE,
                     UIManager.getIcon("OptionPane.errorIcon")
             );
+            if (this.getSelectedJTemplate() == null) {
+                addAndActivateJTemplate();
+            }
+        } catch (ChartNotFoundException e) {
+            FineJOptionPane.showMessageDialog(this,
+                    Toolkit.i18nText("Fine-Design_Chart_Not_Found_Exception"),
+                    Toolkit.i18nText("Fine-Design_Basic_Error"),
+                    JOptionPane.ERROR_MESSAGE,
+                    UIManager.getIcon("OptionPane.errorIcon"));
+
             if (this.getSelectedJTemplate() == null) {
                 addAndActivateJTemplate();
             }

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

@@ -181,9 +181,12 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         jt.requestFocus();
         jt.revert();
 
-        FineLoggerFactory.getLogger().info(
+        // 打开为空占位模板时不输出
-                "\"" + jt.getEditingFILE().getName() + "\""
+        if (!jt.isOpening()) {
-                        + Toolkit.i18nText("Fine-Design_Basic_LOG_Has_Been_Openned") + "!");
+            FineLoggerFactory.getLogger().info(
+                    "\"" + jt.getEditingFILE().getName() + "\""
+                            + Toolkit.i18nText("Fine-Design_Basic_LOG_Has_Been_Openned") + "!");
+        }
     }
 
     /**
@@ -289,16 +292,18 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         // 新建文件夹，重命名操作，在explorer中打开三个操作在选中单个文件夹或者文件时可用，其他情况不可用
         boolean singleSelected = selectedPathNum == 1;
+        // 打开和保存中 需要禁用相关操作
+        boolean enable = isEnable();
         newFolderAction.setEnabled(singleSelected);
-        renameAction.setEnabled(singleSelected);
+        renameAction.setEnabled(singleSelected && enable);
         showInExplorerAction.setEnabled(singleSelected);
         // 删除操作在至少选中一个时可用
         boolean selected = selectedPathNum > 0;
-        delFileAction.setEnabled(selected);
+        delFileAction.setEnabled(selected && enable);
         // 刷新操作始终可用
         refreshTreeAction.setEnabled(true);
         //触发vcsAction变化
-        vcsAction.fireVcsActionChange();
+        vcsAction.fireVcsActionChange(enable);
 
         // 其他状态
         otherStateChange();
@@ -363,7 +368,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         /**
          * 版本管理可用状态的监控
          */
-        private void fireVcsActionChange() {
+        private void fireVcsActionChange(boolean enable) {
             if (!DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable()
                     || VcsHelper.getInstance().isUnSelectedTemplate()
                     || WorkContext.getCurrent().isCluster()) {
@@ -381,14 +386,14 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                         if (node.getLock() != null && !ComparatorUtils.equals(node.getUserID(), node.getLock())) {
                             setEnabled(false);
                         } else {
-                            setEnabled(true);
+                            setEnabled(enable);
                         }
                     } else {
                         setEnabled(false);
                     }
                 } else {
                     //当前环境为本地环境时
-                    setEnabled(pathSupportVcsAction);
+                    setEnabled(pathSupportVcsAction && enable);
                 }
             }
         }
@@ -915,5 +920,18 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         }
     }
 
+    private boolean isEnable() {
+        List<JTemplate<?, ?>> templates = HistoryTemplateListCache.getInstance().getHistoryList();
+        for (JTemplate<?, ?> template : templates) {
+            if (template.isSaving() || template.isOpening()) {
+                FileNode node = TemplateTreePane.getInstance().getFileNode();
+                if (node != null && ComparatorUtils.equals(template.getEditingFILE().getPath(), node.getEnvPath())) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
 
 }

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

@@ -6,11 +6,15 @@ package com.fr.design.mainframe;
 import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.base.mode.DesignerMode;
+import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 
 import java.awt.BorderLayout;
+import java.awt.Component;
+import javax.swing.JComponent;
+import javax.swing.JLayeredPane;
 
 
 /**
@@ -19,11 +23,30 @@ import java.awt.BorderLayout;
  */
 public class DesktopCardPane extends BasicPane implements TargetModifiedListener {
 
+    private static final int CONTENT_LAYER = 0;
+    private static final int TRANSPARENT_LAYER = 1;
+    private static final int LOADING_LAYER = 2;
+    private static final int FAILED_LAYER = 3;
+
     private static final long serialVersionUID = 1L;
     private JTemplate<?, ?> component;
+    private TransparentPane transparentPane = new TransparentPane();
+    private OpenLoadingPane loadingPane = new OpenLoadingPane();
+    private OpenFailedPane failedPane = new OpenFailedPane();
+    private JLayeredPane layeredPane = new JLayeredPane() {
+        @Override
+        public void doLayout() {
+            for (Component comp : getComponents()) {
+                comp.setBounds(0, 0, getWidth(), getHeight());
+            }
+        }
+    };
 
     protected DesktopCardPane() {
         setLayout(new BorderLayout());
+        layeredPane.add(transparentPane, TRANSPARENT_LAYER);
+        layeredPane.add(failedPane, FAILED_LAYER);
+        add(layeredPane, BorderLayout.CENTER);
     }
 
     protected void showJTemplate(final JTemplate<?, ?> jt) {
@@ -36,10 +59,12 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         DesignerFrameFileDealerPane.getInstance().setCurrentEditingTemplate(jt);
         if (component != null) {
             component.onLostFocus();
-            remove(component);
+            layeredPane.remove(component);
         }
         component = jt;
-        add(component, BorderLayout.CENTER);
+        layeredPane.add(component, CONTENT_LAYER);
+        checkSavingAndOpening(jt);
+        add(layeredPane, BorderLayout.CENTER);
         validate();
         repaint();
         revalidate();
@@ -47,6 +72,69 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         component.onGetFocus();
     }
 
+
+    private void checkSavingAndOpening(JTemplate<?, ?> jt) {
+        if (jt.isSaving()) {
+            showCover();
+        } else if (jt.isOpening()) {
+            showOpenStatus();
+        } else if (jt.isOpenFailed()) {
+            showOpenFailedCover();
+        } else {
+            hideCover();
+        }
+    }
+
+    /**
+     * 让loadingPane懒加载
+     */
+    private void checkLoadingPane() {
+        if (layeredPane.getComponent(LOADING_LAYER) != loadingPane) {
+            layeredPane.add(loadingPane, LOADING_LAYER);
+            component.setVisible(false);
+        }
+    }
+
+    private void showOpenStatus() {
+        DesignerContext.getDesignerFrame().refreshUIToolBar();
+        DesignerFrameFileDealerPane.getInstance().stateChange();
+        EastRegionContainerPane.getInstance().updateAllPropertyPane();
+        JComponent downPane = WestRegionContainerPane.getInstance().getDownPane();
+        if (downPane instanceof BasicTableDataTreePane) {
+            BasicTableDataTreePane dataTreePane = (BasicTableDataTreePane) downPane;
+            dataTreePane.refreshToolBar();
+        }
+        checkLoadingPane();
+        layeredPane.moveToFront(loadingPane);
+    }
+
+    public void showOpenFailedCover() {
+        layeredPane.moveToFront(failedPane);
+    }
+
+    public void showCover() {
+        transparentPane.start();
+        layeredPane.moveToFront(transparentPane);
+        DesignerContext.getDesignerFrame().refreshUIToolBar();
+        EastRegionContainerPane.getInstance().updateAllPropertyPane();
+        JComponent downPane = WestRegionContainerPane.getInstance().getDownPane();
+        if (downPane instanceof BasicTableDataTreePane) {
+            BasicTableDataTreePane dataTreePane = (BasicTableDataTreePane) downPane;
+            dataTreePane.refreshToolBar();
+        }
+    }
+
+    public void hideCover() {
+        transparentPane.stop();
+        layeredPane.moveToFront(component);
+        EastRegionContainerPane.getInstance().updateAllPropertyPane();
+        JComponent downPane = WestRegionContainerPane.getInstance().getDownPane();
+        if (downPane instanceof BasicTableDataTreePane) {
+            BasicTableDataTreePane dataTreePane = (BasicTableDataTreePane) downPane;
+            dataTreePane.checkEnable();
+        }
+    }
+
     protected JTemplate<?, ?> getSelectedJTemplate() {
         return component;
     }

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

@@ -6,14 +6,18 @@ import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.fun.PropertyItemPaneProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.icontainer.UIEastResizableContainer;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.VerticalFlowLayout;
+import com.fr.design.mainframe.reuse.ReuseGuideDialog;
+import com.fr.design.mainframe.reuse.SnapChatKeys;
 import com.fr.design.menu.SnapChatUtil;
 import com.fr.design.notification.SnapChat;
+import com.fr.design.notification.SnapChatFactory;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -96,6 +100,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     private JPanel defaultPane;  // "无可用配置项"面板
     private JPanel defaultAuthorityPane;  // "该元素不支持权限编辑"
     private PropertyItem selectedItem;  // 当前被选中的属性配置项
+    private SnapChat widgetLibSnapChat;
 
     public enum PropertyMode {
         REPORT,  // 报表
@@ -296,9 +301,21 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_PARA_WIDGET, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
                 new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
         // 组件库
-        PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Library"),
+        widgetLibSnapChat = SnapChatFactory.createSnapChat(false, SnapChatKeys.COMPONENT);
-                "widgetlib", new PropertyMode[]{PropertyMode.FORM},
+        PropertyItem widgetLib = new PropertyItem(
-                new PropertyMode[]{PropertyMode.FORM});
+                KEY_WIDGET_LIB,
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Library"),
+                "widgetlib",
+                new PropertyMode[]{PropertyMode.FORM},
+                new PropertyMode[]{PropertyMode.FORM},
+                getWidgetLibSnapChat(),
+                getWidgetLibPromptWindow(),
+                new ActionListener() {
+                    @Override
+                    public void actionPerformed(ActionEvent e) {
+                        ComponentReuseNotifyUtil.enterWidgetLibExtraAction(true);
+                    }
+                });
         // 权限编辑
         PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Permissions_Edition"),
                 "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED},
@@ -513,6 +530,17 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         propertyItemMap.get(KEY_WIDGET_LIB).replaceContentPane(pane);
     }
 
+    public SnapChat getWidgetLibSnapChat() {
+        return widgetLibSnapChat;
+    }
+
+    public PromptWindow getWidgetLibPromptWindow() {
+        if (!getWidgetLibSnapChat().hasRead()) {
+            return new ReuseGuideDialog(DesignerContext.getDesignerFrame());
+        }
+        return null;
+    }
+
     public JComponent getWidgetLibPane() {
         return propertyItemMap.get(KEY_WIDGET_LIB).getContentPane();
     }
@@ -594,6 +622,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         if (propertyItem.isVisible() && propertyItem.isEnabled() && !propertyItem.isPoppedOut()) {
             propertyCard.show(rightPane, tabName);
             propertyItem.setTabButtonSelected();
+            propertyItem.processSnapChat();
             //从单元格菜单过来也要关闭弹出窗
             hideCurrentPopupPane();
         }
@@ -712,19 +741,33 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         private String iconSuffix = ICON_SUFFIX_NORMAL;  // normal, diabled, selected, 三者之一
         private final Color selectedBtnBackground = new Color(0xF5F5F7);
         private Color originBtnBackground;
+        private ActionListener actionListener;
 
 
         public PropertyItem(String name, String title, String btnIconName, PropertyMode[] visibleModes, PropertyMode[] enableModes) {
             this(name, title, btnIconName, ICON_BASE_DIR, visibleModes, enableModes, null, null);
         }
 
+        public PropertyItem(String name, String title, String btnIconName, PropertyMode[] visibleModes, PropertyMode[] enableModes, SnapChat snapChat, PromptWindow promptWindow, ActionListener actionListener) {
+            this(name, title, btnIconName, ICON_BASE_DIR, visibleModes, enableModes, snapChat, promptWindow, actionListener);
+        }
+
+        public PropertyItem(String name, String title, String btnIconName, PropertyMode[] visibleModes, PropertyMode[] enableModes, ActionListener actionListener) {
+            this(name, title, btnIconName, ICON_BASE_DIR, visibleModes, enableModes, null, null, actionListener);
+        }
+
         public PropertyItem(String name, String title, String btnIconName, String iconBaseDir, PropertyMode[] visibleModes, PropertyMode[] enableModes, SnapChat snapChat, PromptWindow promptWindow) {
+            this(name, title, btnIconName, iconBaseDir, visibleModes, enableModes, snapChat, promptWindow, null);
+        }
+
+        public PropertyItem(String name, String title, String btnIconName, String iconBaseDir, PropertyMode[] visibleModes, PropertyMode[] enableModes, SnapChat snapChat, PromptWindow promptWindow, ActionListener actionListener) {
             this.name = name;
             this.title = title;
             this.btnIconName = btnIconName;
             this.iconBaseDir = iconBaseDir;
             this.snapChat = snapChat;
             this.promptWindow = promptWindow;
+            this.actionListener = actionListener;
             initButton();
             initPropertyPanel();
             initModes(visibleModes, enableModes);
@@ -791,8 +834,13 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
 
         // 选项不可用
         public void setEnabled(boolean isEnabled) {
-            this.isEnabled = isEnabled;
+            JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-            button.setEnabled(isEnabled);
+            if (template != null) {
+                this.isEnabled = isEnabled && template.checkEnable();
+            } else {
+                this.isEnabled = isEnabled;
+            }
+            button.setEnabled(this.isEnabled);
         }
 
         public void setIconBaseDir(String iconBaseDir) {
@@ -919,9 +967,6 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                 @Override
                 public void paintComponent(Graphics g) {
                     super.paintComponent(g);
-                    if (snapChat != null && !snapChat.hasRead()) {
-                        SnapChatUtil.paintPropertyItemPoint(g, getBounds());
-                    }
                 }
             };
             button.setDisabledIcon(IconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED));
@@ -950,17 +995,25 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                         popupFixedPane();
                     }
                     setTabButtonSelected();
-                    if (snapChat != null && !snapChat.hasRead()) {
+                    processSnapChat();
-                        snapChat.markRead();
-                        if (promptWindow != null) {
-                            promptWindow.showWindow();
-                        }
-                    }
                 }
             });
+            if (actionListener != null) {
+                button.addActionListener(actionListener);
+            }
             button.setToolTipText(title);
         }
 
+        public void processSnapChat(){
+            if (snapChat != null && !snapChat.hasRead()) {
+                snapChat.markRead();
+                if (promptWindow != null) {
+                    promptWindow.showWindow();
+                }
+            }
+        }
+
+
         public UIButton getButton() {
             return button;
         }

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

@@ -1,7 +1,6 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.io.BaseBook;
 import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
@@ -22,6 +21,7 @@ import com.fr.design.designer.DesignerProxy;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.dialog.InformationWarnPane;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.file.TemplateResourceManager;
 import com.fr.design.fun.DesignerFrameUpButtonProvider;
@@ -36,6 +36,7 @@ import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.chart.info.ChartInfoCollector;
+import com.fr.design.mainframe.check.CheckButton;
 import com.fr.design.mainframe.template.info.TemplateInfoCollector;
 import com.fr.design.mainframe.template.info.TemplateProcessInfo;
 import com.fr.design.mainframe.template.info.TimeConsumeTimer;
@@ -46,6 +47,8 @@ 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.worker.save.CallbackSaveWorker;
+import com.fr.design.worker.save.EmptyCallBackSaveWorker;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.event.EventDispatcher;
@@ -81,13 +84,16 @@ import javax.swing.JOptionPane;
 import javax.swing.undo.UndoManager;
 import java.awt.BorderLayout;
 import java.util.Set;
+import java.util.concurrent.Callable;
 
 /**
  * 报表设计和表单设计的编辑区域(设计器编辑的IO文件)
  */
-public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy {
+public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy, JTemplateSave {
     // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
-    private FILE editingFILE = null;
+
+    private static final int PREFIX_NUM = 3000;
+    protected FILE editingFILE = null;
     // alex:初始状态为saved,这样不管是新建模板,还是打开模板,如果未做任何操作直接关闭,不提示保存
     private boolean saved = true;
     private boolean authoritySaved = true;
@@ -101,6 +107,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     private DesignModelAdapter<T, ?> designModel;
     private PreviewProvider previewType;
     protected TimeConsumeTimer consumeTimer = new TimeConsumeTimer();
+    private volatile boolean saving = false;
+    private volatile boolean opening = false;
+    private volatile boolean openFailed = false;
 
     private PluginEventListener pluginListener;
 
@@ -116,7 +125,15 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         this(t, file, false);
     }
 
+    public JTemplate(T t, FILE file, Parameter[] parameters) {
+        this(t, file, false, parameters);
+    }
+
     public JTemplate(T t, FILE file, boolean isNewFile) {
+        this(t, file, isNewFile, null);
+    }
+
+    public JTemplate(T t, FILE file, boolean isNewFile, Parameter[] parameters) {
         super(t);
         beforeInit();
         // 判断是否切换设计器状态到禁止拷贝剪切
@@ -130,7 +147,11 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         this.editingFILE = file;
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder());
-        designModel = createDesignModel();
+        if (parameters == null) {
+            designModel = createDesignModel();
+        } else {
+            designModel = createDesignModel(parameters);
+        }
         addCenterPane();
         this.undoState = createUndoState();
 
@@ -388,6 +409,12 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
 
     protected abstract DesignModelAdapter<T, ?> createDesignModel();
 
+    protected  DesignModelAdapter<T, ?> createDesignModel(Parameter[] parameters) {
+        // 空实现 兼容下
+        return null;
+    }
+
+
     /**
      * 创建菜单项Preview
      *
@@ -605,6 +632,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      *
      * @return 保存模板
      */
+    @Deprecated
     public boolean saveTemplate() {
         return this.saveTemplate(true);
     }
@@ -614,6 +642,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      *
      * @return 保存成功返回true
      */
+    @Deprecated
     public boolean saveTemplate2Env() {
         return this.saveTemplate(false);
     }
@@ -623,6 +652,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      *
      * @return 保存成功返回true
      */
+    @Deprecated
     public boolean saveAsTemplate() {
         return this.saveAsTemplate(true);
     }
@@ -632,6 +662,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      *
      * @return 保存成功返回true
      */
+    @Deprecated
     public boolean saveAsTemplate2Env() {
         return this.saveAsTemplate(false);
     }
@@ -642,6 +673,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * @param isShowLoc 是否本地
      * @return 保存成功返回true
      */
+    @Deprecated
     public boolean saveTemplate(boolean isShowLoc) {
         FILE editingFILE = this.getEditingFILE();
         // carl:editingFILE没有，当然不存了,虽然不会有这种情况
@@ -653,17 +685,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (!editingFILE.exists()) {
             return saveAsTemplate(isShowLoc);
         }
-        boolean access = false;
-
-        try {
-            access = FRContext.getOrganizationOperator().canAccess(this.getEditingFILE().getPath());
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-        if (!access) {
-            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
-            return false;
-        }
         collectInfo();
         return this.saveFile();
     }
@@ -693,6 +714,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      * @param fileName  保存文件名
      * @return
      */
+    @Deprecated
     public boolean saveAsTemplate(boolean isShowLoc, String fileName) {
         String oldName = this.getPath();
         // alex:如果是SaveAs的话需要让用户来选择路径了
@@ -708,20 +730,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         FILE sourceFile = editingFILE;
 
         if (isOkOperation(chooseResult)) {
-            boolean access = false;
-            try {
-                access = FRContext.getOrganizationOperator().canAccess(fileChooser.getSelectedFILE().getPath());
-            } catch (Exception e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            }
-            if (!access) {
-                FineJOptionPane.showMessageDialog(
-                        DesignerContext.getDesignerFrame(),
-                        Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!",
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"),
-                        JOptionPane.WARNING_MESSAGE);
-                return false;
-            }
             // 目标文件
             editingFILE = fileChooser.getSelectedFILE();
         }
@@ -1296,6 +1304,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return uiButtons;
     }
 
+    public UIButton[] createCheckButton() {
+        return new UIButton[]{new CheckButton()};
+    }
+
     /**
      * 由于老版本的模板没有模板ID，当勾选使用参数模板时候，就加一个模板ID attr
      *
@@ -1319,7 +1331,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return getEditingFILE().getName();
     }
 
-    public String getTemplatePredefinedStyle(){
+    public String getTemplatePredefinedStyle() {
         return StringUtils.EMPTY;
     }
 
@@ -1363,4 +1375,203 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return EastRegionContainerPane.getInstance();
     }
 
+    private CallbackSaveWorker save(boolean showLoc) {
+        FILE editingFILE = this.getEditingFILE();
+        // carl:editingFILE没有，当然不存了,虽然不会有这种情况
+        if (editingFILE == null) {
+            return new EmptyCallBackSaveWorker();
+        }
+        // 检查一下editingFILE是不是已存在的文件,如果不存在则用saveAs
+        if (!editingFILE.exists()) {
+            return saveAs(showLoc);
+        }
+
+        CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                collectInfo();
+                return JTemplate.this.saveRealFile();
+            }
+        }, this);
+
+        worker.addSuccessCallback(new Runnable() {
+            @Override
+            public void run() {
+                callBackForSave();
+            }
+        });
+
+        return worker;
+    }
+
+    private void callBackForSave() {
+        JTemplate.this.saved = true;
+        JTemplate.this.authoritySaved = true;
+        DesignerContext.getDesignerFrame().setTitle();
+        JTemplate.this.fireJTemplateSaved();
+    }
+
+    private boolean saveRealFile() throws Exception {
+        FILE editingFILE = this.getEditingFILE();
+        if (editingFILE == null || editingFILE instanceof MemFILE) {
+            return false;
+        }
+        this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+        this.editingFILE = editingFILE;
+        return true;
+    }
+
+    private CallbackSaveWorker saveAs(boolean showLoc) {
+        FILE editingFILE = this.getEditingFILE();
+        if (editingFILE == null) {
+            return new EmptyCallBackSaveWorker();
+        }
+        String oldName = this.getPath();
+        // alex:如果是SaveAs的话需要让用户来选择路径了
+        FILEChooserPane fileChooser = getFILEChooserPane(showLoc);
+        addChooseFILEFilter(fileChooser);
+        fileChooser.setFileNameTextField(editingFILE.getName(), this.suffix());
+        int chooseResult = fileChooser.showSaveDialog(DesignerContext.getDesignerFrame(), this.suffix());
+        if (isCancelOperation(chooseResult)) {
+            return new EmptyCallBackSaveWorker();
+        }
+        // 源文件
+        FILE sourceFile = editingFILE;
+
+        if (isOkOperation(chooseResult)) {
+            // 目标文件
+            editingFILE = fileChooser.getSelectedFILE();
+        }
+
+        //收集和生成templateID  因为是另存为操作 无论怎么样都需要重新生成templateID
+        initForCollect();
+
+        FILE finalEditingFILE = editingFILE;
+        CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return saveAs(finalEditingFILE, sourceFile, oldName);
+            }
+        }, this);
+
+        worker.addSuccessCallback(new Runnable() {
+            @Override
+            public void run() {
+                callBackForSave();
+                // 当前打开的是正在保存的模板才刷新
+                if (ComparatorUtils.equals(JTemplate.this.template.getTemplateID(),
+                                           HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().template.getTemplateID())) {
+                    refreshToolArea();
+                }
+                DesignerFrameFileDealerPane.getInstance().refresh();
+            }
+        });
+
+        return worker;
+
+    }
+
+    private boolean saveAs(FILE editingFILE, FILE sourceFile, String oldName) throws Exception {
+        boolean lockedTarget =
+                // 目标本地文件
+                !editingFILE.isEnvFile() ||
+                        // 目标远程文件
+                        WorkContext.getCurrent().get(TplOperator.class).saveAs(editingFILE.getPath());
+        if (lockedTarget) {
+            boolean saved = saveNewRealFile(editingFILE, oldName);
+            // 目标文件保存成功并且源文件不一致的情况下，把源文件锁释放掉
+            if (saved && !ComparatorUtils.equals(editingFILE.getPath(), sourceFile.getPath())) {
+                WorkContext.getCurrent().get(TplOperator.class).closeAndFreeFile(sourceFile.getPath());
+            }
+            return saved;
+        } else {
+            return false;
+        }
+    }
+
+    private boolean saveNewRealFile(FILE editingFILE, String oldName) throws Exception {
+        consumeTimer.setEnabled(true);
+        consumeTimer.start();
+        this.editingFILE = editingFILE;
+        boolean result = this.saveToNewRealFile(oldName);
+        if (result) {
+            collectInfo(this.template.getTemplateID());
+        }
+        return result;
+    }
+
+    private boolean saveToNewRealFile(String oldName) throws Exception {
+        boolean result = false;
+        Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
+        for (ReportSupportedFileUIProvider provider : providers) {
+            result = result || provider.saveToNewFile(this.editingFILE.getPath(), this);
+        }
+        if (!result) {
+            result = this.saveRealFile();
+            // 更换最近打开
+            DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getPath());
+        }
+        return result;
+    }
+
+    @Override
+    public CallbackSaveWorker save() {
+        return save(true);
+    }
+
+    @Override
+    public CallbackSaveWorker saveAs() {
+        return saveAs(true);
+    }
+
+    @Override
+    public void saveDirectly() {
+        CallbackSaveWorker worker = save();
+        worker.start(this.template.getTemplateID());
+    }
+
+    @Override
+    public void saveAsDirectly() {
+        CallbackSaveWorker worker = saveAs();
+        worker.start(this.template.getTemplateID());
+    }
+
+    @Override
+    public CallbackSaveWorker save2Env() {
+        return save(false);
+    }
+
+    @Override
+    public CallbackSaveWorker saveAs2Env() {
+        return saveAs(false);
+    }
+
+    public boolean isSaving() {
+        return saving;
+    }
+
+    public void setSaving(boolean saving) {
+        this.saving = saving;
+    }
+
+    public boolean isOpening() {
+        return opening;
+    }
+
+    public void setOpening(boolean opening) {
+        this.opening = opening;
+    }
+
+    public boolean isOpenFailed() {
+        return openFailed;
+    }
+
+    public void setOpenFailed(boolean openFailed) {
+        this.openFailed = openFailed;
+    }
+
+    public boolean checkEnable() {
+        return !isSaving() && !isOpening() && !isOpenFailed();
+    }
+
 }

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

@@ -2,12 +2,12 @@ package com.fr.design.mainframe;
 
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
-import com.fr.general.ComparatorUtils;
+import com.fr.stable.StringUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
-import java.util.regex.Pattern;
+import java.util.List;
 
 /**
  * @author shine
@@ -26,30 +26,58 @@ public class JTemplateNameHelper {
         TemplateFileTree tt = TemplateTreePane.getInstance().getTemplateFileTree();
         DefaultMutableTreeNode gen = (DefaultMutableTreeNode) tt.getModel().getRoot();
         String[] str = new String[gen.getChildCount()];
-        ArrayList<String> al = new ArrayList<String>();
+
+        List<Integer> reportNum = new ArrayList<>();
         for (int j = 0; j < gen.getChildCount(); j++) {
             str[j] = gen.getChildAt(j).toString();
-            if (str[j].contains(prefix) && str[j].contains(".")) {
+            //返回文件名中的index(算法中没有再匹配文件后缀了，因为DefaultMutableTreeNode中已经匹配过了)
-                for (int i = 0; i < PREFIX_NUM; i++) {
+            Integer index = getFileNameIndex(prefix, str[j]);
-                    if (ComparatorUtils.equals(str[j].split("[.]")[0], (prefix + i))) {
+            if (index != null) {
-                        al.add(str[j]);
+                reportNum.add(index);
-                    }
-
-                }
             }
         }
+        Collections.sort(reportNum);
+        int idx = reportNum.size() > 0 ? reportNum.get(reportNum.size() - 1) + 1 : 1;
 
-        int[] reportNum = new int[al.size()];
-        for (int i = 0; i < al.size(); i++) {
-            Pattern pattern = Pattern.compile("[" + prefix + ".]+");
-            String[] strs = pattern.split(al.get(i).toString());
-            reportNum[i] = Integer.parseInt(strs[1]);
-        }
-
-        Arrays.sort(reportNum);
-        int idx = reportNum.length > 0 ? reportNum[reportNum.length - 1] + 1 : 1;
         idx = idx + currentIndex;
         currentIndex++;
         return prefix + idx;
     }
+
+    /**
+     * @return java.lang.Integer WorkBook11.cpt则返回11，如果没有找到index返回null
+     * @Description 返回文件名中的index
+     * @param: prefix 前缀
+     * @param: fileName 文件名称全名
+     * @Author Henry.Wang
+     * @Date 2021/4/9 11:13
+     **/
+    private static Integer getFileNameIndex(String prefix, String fileName) {
+        char[] chars = new char[fileName.length()];
+        int i = 0;
+        for (; i < fileName.length(); i++) {
+            char c = fileName.charAt(i);
+            //匹配前缀
+            if (i < prefix.length()) {
+                if (c != prefix.charAt(i)) {
+                    return null;
+                }
+            } else {
+                if (c == '.') {
+                    break;
+                } else {
+                    //匹配0~9
+                    if (c < 48 || c > 57) {
+                        return null;
+                    }
+                    chars[i - prefix.length()] = c;
+                }
+            }
+        }
+        String s = new String(chars).substring(0, i - prefix.length());
+        if (StringUtils.isBlank(s)) {
+            return null;
+        }
+        return Integer.valueOf(s);
+    }
 }

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

@@ -0,0 +1,57 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.worker.save.CallbackSaveWorker;
+
+/**
+ * 模板保存接口
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/9
+ */
+public interface JTemplateSave {
+
+    /**
+     * 保存后需要根据是否成功做外部回调，可选保存位置
+     *
+     * @return
+     */
+    CallbackSaveWorker save();
+
+
+    /**
+     * 另存为后需要根据是否成功做外部回调，可选保存位置
+     *
+     * @return
+     */
+    CallbackSaveWorker saveAs();
+
+
+    /**
+     * 保存到当前工作目录(reportlets)后需要根据是否成功做外部回调
+     *
+     *
+     * @return
+     */
+    CallbackSaveWorker save2Env();
+
+
+    /**
+     * 另存为到当前工作目录(reportlets)后需要根据是否成功做外部回调
+     *
+     * @return
+     */
+    CallbackSaveWorker saveAs2Env();
+
+    /**D
+     * 直接保存
+      */
+   void saveDirectly();
+
+
+    /**
+     * 直接另存为
+     */
+   void saveAsDirectly();
+
+}

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

@@ -0,0 +1,93 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.dialog.link.MessageWithLink;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.general.IOUtils;
+import com.fr.stable.StringUtils;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import javax.swing.JPanel;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/20
+ */
+public class OpenFailedPane extends JPanel {
+
+    private  UILabel label;
+    private MessageWithLink link;
+
+    public OpenFailedPane() {
+        this.setLayout(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) {
+                int width = parent.getParent().getWidth();
+                int height = parent.getParent().getHeight();
+                int labelWidth = label.getPreferredSize().width;
+                int labelHeight = label.getPreferredSize().height;
+                int labelX = (width - labelWidth) / 2;
+                int labelY = (height - labelHeight) / 2;
+                int linkWidth = link.getPreferredSize().width;
+                int linkHeight = link.getPreferredSize().height;
+                int linkX = (width - linkWidth) / 2;
+                int linkY = (height - labelHeight) / 2 + labelHeight;
+                label.setBounds(labelX, labelY, labelWidth, labelHeight);
+                link.setBounds(linkX, linkY, linkWidth, linkHeight);
+            }
+        });
+        this.setBackground(Color.WHITE);
+        label = new UILabel(IOUtils.readIcon("/com/fr/design/images/mainframe/open_failed.png"), UILabel.CENTER);
+        link = new MessageWithLink(Toolkit.i18nText("Fine-Design_Open_Failed_Tip"), Toolkit.i18nText("Fine-Design_Open_Failed_Retry"), StringUtils.EMPTY, Color.WHITE) {
+            @Override
+            protected void initListener(String link) {
+                addHyperlinkListener(new HyperlinkListener() {
+                    @Override
+                    public void hyperlinkUpdate(HyperlinkEvent e) {
+                        if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
+                            // 重试
+                            JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+                            template.whenClose();
+                            template = JTemplateFactory.createJTemplate(template.getEditingFILE());
+                            HistoryTemplateListCache.getInstance().replaceCurrentEditingTemplate(template);
+                            DesignerContext.getDesignerFrame().addAndActivateJTemplate(template);
+                        }
+                    }
+                });
+            }
+        };
+        link.setBackground(Color.WHITE);
+        this.add(label);
+        this.add(link);
+    }
+
+
+
+}

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

@@ -0,0 +1,62 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.general.IOUtils;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/9
+ */
+public class OpenLoadingPane extends JPanel {
+
+    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/loading.gif"));
+
+    private UILabel loadingLabel;
+
+    public OpenLoadingPane() {
+
+        setLayout(new LayoutManager() {
+
+            @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) {
+                int width = parent.getParent().getWidth();
+                int height = parent.getParent().getHeight();
+                int loadingLabelWidth = loadingLabel.getPreferredSize().width;
+                int loadingLabelHeight = loadingLabel.getPreferredSize().height;
+                int loadingLabelX = (width - loadingLabelWidth) / 2;
+                int loadingLabelY = (height - loadingLabelHeight) / 2;
+                loadingLabel.setBounds(loadingLabelX, loadingLabelY, loadingLabelWidth, loadingLabelHeight);
+            }
+
+            @Override
+            public void addLayoutComponent(String name, Component comp) {
+            }
+        });
+        setBackground(Color.WHITE);
+        loadingLabel = new UILabel(LOADING_ICON);
+        add(loadingLabel);
+
+    }
+}

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

@@ -0,0 +1,41 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.i18n.Toolkit;
+import com.fr.stable.StableUtils;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/12
+ */
+public class TemplateSavingChecker {
+
+
+    public static boolean check() {
+        List<String> list = getSavingTemplate();
+        if (!list.isEmpty()) {
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                              Toolkit.i18nText("Fine-Design_Close_Template_Tip", StableUtils.join(list, "、")),
+                                              Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                                              FineJOptionPane.INFORMATION_MESSAGE);
+            return false;
+        }
+        return true;
+    }
+
+
+    private static List<String> getSavingTemplate() {
+        List<String> result = new ArrayList<>();
+        for (JTemplate<?, ?> template : HistoryTemplateListCache.getInstance().getHistoryList()) {
+            if (template.isSaving()) {
+                result.add(template.getEditingFILE().getName());
+            }
+        }
+        return result;
+    }
+
+}

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

@@ -0,0 +1,162 @@
+package com.fr.design.mainframe;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Composite;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.LayoutManager;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.Timer;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/12
+ */
+public class TransparentPane extends JComponent implements ActionListener {
+
+    private UILabel label;
+    private AlphaComposite composite = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f);
+    private volatile boolean mIsRunning;
+    private volatile boolean mIsFadingOut;
+    private Timer mTimer;
+    private int mAngle;
+    private int mFadeCount;
+    private int mFadeLimit = 15;
+    private int lines = 12;
+    private int maxAngle = 360;
+    private int angleAdd = 30;
+    private double prec = 0.56;
+
+    public TransparentPane() {
+
+        addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                // do nothing
+            }
+        });
+
+        setLayout(getCoverLayout());
+        setBackground(null);
+        setOpaque(false);
+        label = new UILabel(Toolkit.i18nText("Fine-Design_Saving_Template_Tip"));
+        add(label);
+    }
+
+    protected LayoutManager getCoverLayout() {
+        return new LayoutManager() {
+
+            @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) {
+                int width = parent.getParent().getWidth();
+                int height = parent.getParent().getHeight();
+                int labelWidth = label.getPreferredSize().width;
+                int labelHeight = label.getPreferredSize().height;
+                int labelX = (width - labelWidth) / 2;
+                int labelY = (int) ((height - labelHeight) * prec);
+                label.setBounds(labelX, labelY, labelWidth, labelHeight);
+            }
+
+            @Override
+            public void addLayoutComponent(String name, Component comp) {
+            }
+        };
+    }
+
+
+    @Override
+    public void paint(Graphics g) {
+        int w = this.getWidth();
+        int h = this.getHeight();
+        super.paint(g);
+        if (!mIsRunning) {
+            return;
+        }
+        Graphics2D g2 = (Graphics2D) g.create();
+        float fade = (float) mFadeCount / (float) mFadeLimit;
+        Composite urComposite = g2.getComposite();
+        g2.setComposite(composite);
+        g2.fillRect(0, 0, w, h);
+        g2.setComposite(urComposite);
+        int s = Math.min(w, h) / 50;
+        int cx = w / 2;
+        int cy = h / 2;
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2.setStroke(new BasicStroke(s / 4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+        g2.setPaint(Color.BLACK);
+        g2.rotate(Math.PI * mAngle / 180, cx, cy);
+        for (int i = 0; i < lines; i++) {
+            float scale = (11.0f - (float) i) / 11.0f;
+            g2.drawLine(cx + s, cy, cx + s * 2, cy);
+            g2.rotate(-Math.PI / 6, cx, cy);
+            g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, scale * fade));
+        }
+        g2.dispose();
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        if (mIsRunning) {
+            repaint();
+            mAngle += angleAdd;
+            if (mAngle >= maxAngle) {
+                mAngle = 0;
+            }
+            if (mIsFadingOut) {
+                if (--mFadeCount == 0) {
+                    mIsRunning = false;
+                    mTimer.stop();
+                }
+            } else if (mFadeCount < mFadeLimit) {
+                mFadeCount++;
+            }
+        }
+    }
+
+    public void start() {
+        if (mIsRunning) {
+            return;
+        }
+        mIsRunning = true;
+        mIsFadingOut = false;
+        mFadeCount = 0;
+        int fps = 24;
+        int tick = 1000 / fps;
+        mTimer = new Timer(tick, this);
+        mTimer.start();
+    }
+
+    public void stop() {
+        mIsRunning = false;
+        mIsFadingOut = true;
+    }
+
+}

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

@@ -0,0 +1,214 @@
+package com.fr.design.mainframe.check;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.worker.save.CallbackSaveWorker;
+import com.fr.file.FILE;
+import com.fr.file.FileNodeFILE;
+import com.fr.log.FineLoggerFactory;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.check.TemplateChecker;
+
+import javax.swing.BoxLayout;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
+import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog;
+import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
+import static javax.swing.JOptionPane.OK_OPTION;
+import static javax.swing.JOptionPane.WARNING_MESSAGE;
+
+public class CheckButton extends UIButton {
+
+    private UILabel message;
+    private UIButton okButton;
+    private JDialog dialog;
+    private UILabel uiLabel;
+
+    public CheckButton() {
+        this.setIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/check.png"));
+        this.setToolTipText(Toolkit.i18nText("Fine_Designer_Check_Font"));
+        this.set4ToolbarButton();
+        this.addActionListener(checkListener);
+    }
+
+    private ActionListener checkListener = new ActionListener() {
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+
+            // Try check
+            final SwingWorker<Set<String>, Void> checkThread = new SwingWorker<Set<String>, Void>() {
+                @Override
+                protected Set<String> doInBackground() throws Exception {
+                    // 返回校验结果
+                    return check(DesignerContext.getDesignerFrame().getSelectedJTemplate());
+                }
+
+                @Override
+                protected void done() {
+                    try {
+                        Set<String> set = get();
+                        if (set == null) {
+                            return;
+                        }
+                        if (set.isEmpty()) {
+                            okButton.setEnabled(true);
+                            uiLabel.setIcon(BaseUtils.readIcon("com/fr/design/images/correct.png"));
+                            message.setText("<html>" + Toolkit.i18nText("Fine_Designer_Check_Font_Success") + "</html>");
+                        } else {
+                            if (dialog != null) {
+                                dialog.dispose();
+                            }
+                            StringBuilder textBuilder = new StringBuilder();
+                            textBuilder.append(Toolkit.i18nText("Fine_Designer_Check_Font_Missing_Font")).append("\n");
+                            for (String font : set) {
+                                textBuilder.append(font).append("\n");
+                            }
+                            String areaText = textBuilder.toString();
+                            CheckFontInfoDialog dialog = new CheckFontInfoDialog(DesignerContext.getDesignerFrame(), areaText);
+                            dialog.setVisible(true);
+                        }
+                    } catch (InterruptedException | ExecutionException e) {
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    }
+                }
+            };
+
+            JTemplate<?, ?> jtemplate = DesignerContext.getDesignerFrame().getSelectedJTemplate();
+            if (jtemplate == null || jtemplate.getEditingFILE() == null) {
+                return;
+            }
+            FILE currentTemplate = jtemplate.getEditingFILE();
+            if (currentTemplate instanceof FileNodeFILE) {
+                // 判断下模板是否存在 不存在先提示
+                if (!currentTemplate.exists()) {
+                    int selVal = showConfirmDialog(
+                            DesignerContext.getDesignerFrame(),
+                            Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Message"),
+                            Toolkit.i18nText("Fine_Designer_Check_Font"),
+                            OK_CANCEL_OPTION,
+                            WARNING_MESSAGE
+                    );
+                    if (OK_OPTION == selVal) {
+                        CallbackSaveWorker worker = jtemplate.saveAs();
+                        worker.addSuccessCallback(new Runnable() {
+                            @Override
+                            public void run() {
+                                startCheck(checkThread);
+                            }
+                        });
+                        worker.start(jtemplate.getTarget().getTemplateID());
+                    }
+                } else {
+                    if (!jtemplate.isSaved()) {
+                        CallbackSaveWorker worker = jtemplate.save();
+                        worker.addSuccessCallback(new Runnable() {
+                            @Override
+                            public void run() {
+                                startCheck(checkThread);
+                            }
+                        });
+                        worker.start(jtemplate.getTarget().getTemplateID());
+                    } else {
+                        startCheck(checkThread);
+                    }
+                }
+            } else {
+                //模板不在报表环境下，提示保存
+                int selVal = FineJOptionPane.showConfirmDialog(
+                        DesignerContext.getDesignerFrame(),
+                        Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Message"),
+                        Toolkit.i18nText("Fine_Designer_Check_Font"),
+                        OK_CANCEL_OPTION,
+                        WARNING_MESSAGE);
+                if (OK_OPTION == selVal) {
+                    CallbackSaveWorker worker = jtemplate.saveAs2Env();
+                    worker.addSuccessCallback(new Runnable() {
+                        @Override
+                        public void run() {
+                            startCheck(checkThread);
+                        }
+                    });
+                    worker.start(jtemplate.getTarget().getTemplateID());
+                }
+            }
+        }
+
+        private void startCheck(SwingWorker<Set<String>, Void> checkThread) {
+            initDialogPane();
+            dialog.addWindowListener(new WindowAdapter() {
+                public void windowClosed(WindowEvent e) {
+                    checkThread.cancel(true);
+                }
+            });
+            checkThread.execute();
+            dialog.setVisible(true);
+            dialog.dispose();
+        }
+    };
+
+    private Set<String> check(JTemplate jtemplate) {
+        String path = jtemplate.getEditingFILE().getEnvFullName();
+        Set<String> fontSet = WorkContext.getCurrent().get(TemplateChecker.class, new ExceptionHandler<Void>() {
+
+            @Override
+            public Void callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
+                uiLabel.setIcon(BaseUtils.readIcon("com/fr/design/images/error.png"));
+                message.setText("<html>" + Toolkit.i18nText("Fine_Designer_Check_Font_Upgrade") + "</html>");
+                okButton.setEnabled(true);
+                return null;
+            }
+        }).checkFont(path);
+        return fontSet;
+    }
+
+    private void initDialogPane() {
+        message = new UILabel();
+        message.setText(Toolkit.i18nText("Fine-Designer_Check_Font_Checking") + "...");
+        uiLabel = new UILabel();
+        okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
+        okButton.setEnabled(false);
+        okButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                dialog.dispose();
+            }
+        });
+        dialog = new JDialog();
+        dialog.setTitle(Toolkit.i18nText("Fine_Designer_Check_Font"));
+        dialog.setModal(true);
+        dialog.setSize(new Dimension(268, 118));
+        JPanel jp = new JPanel();
+        JPanel upPane = new JPanel();
+        JPanel downPane = new JPanel();
+        uiLabel = new UILabel(BaseUtils.readIcon("com/fr/design/images/waiting.png"));
+        upPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 10));
+        upPane.add(uiLabel);
+        upPane.add(message);
+        downPane.setLayout(new FlowLayout(FlowLayout.CENTER, 6, 0));
+        downPane.add(okButton);
+        jp.setLayout(new BoxLayout(jp, BoxLayout.Y_AXIS));
+        jp.add(upPane);
+        jp.add(downPane);
+        dialog.add(jp);
+        dialog.setResizable(false);
+        dialog.setLocationRelativeTo(SwingUtilities.getWindowAncestor(this));
+    }
+}

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

@@ -0,0 +1,126 @@
+package com.fr.design.mainframe.check;
+
+import com.fr.design.dialog.link.MessageWithLink;
+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.utils.gui.GUICoreUtils;
+import com.fr.general.CloudCenter;
+import com.fr.general.GeneralContext;
+import com.fr.general.IOUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.UIManager;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Locale;
+
+/**
+ * 字体缺失检测的具体结果对话框
+ *
+ */
+public class CheckFontInfoDialog extends JDialog implements ActionListener {
+
+    private JPanel topPanel;
+    private JPanel upInTopPanel;
+    private JPanel downInTopPanel;
+    private JPanel hiddenPanel;
+    private JPanel bottomPanel;
+
+    private UILabel imageLabel;
+    private UILabel directUiLabel;
+    private UILabel detailLabel;
+
+    public CheckFontInfoDialog(Frame parent, String areaText) {
+        super(parent,true);
+        //提示信息
+        JPanel imagePanel = new JPanel();
+        imageLabel = new UILabel(IOUtils.readIcon("com/fr/design/images/warnings/warning32.png"));
+        imagePanel.add(imageLabel);
+
+        JPanel messagePanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
+        MessageWithLink linkMessage = new MessageWithLink(Toolkit.i18nText("Fine_Designer_Check_Font_Message"),
+                Toolkit.i18nText("Fine_Designer_Check_Font_Install_Font"),
+                CloudCenter.getInstance().acquireUrlByKind("help.install.font", "https://help.fanruan.com/finereport/doc-view-3999.html"));
+        linkMessage.setPreferredSize(new Dimension(380, 31));
+        messagePanel.add(linkMessage);
+
+        // 查看详情按钮
+        directUiLabel = new UILabel();
+        directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right"));
+        detailLabel = new UILabel();
+        detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
+
+        upInTopPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        upInTopPanel.add(imageLabel, BorderLayout.WEST);
+        upInTopPanel.add(messagePanel, BorderLayout.CENTER);
+
+        downInTopPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        downInTopPanel.add(directUiLabel, BorderLayout.WEST);
+        downInTopPanel.add(detailLabel, BorderLayout.CENTER);
+
+        topPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
+        topPanel.add(upInTopPanel, BorderLayout.NORTH);
+        topPanel.add(downInTopPanel, BorderLayout.SOUTH);
+
+        //中间的详情展示(可隐藏)
+        hiddenPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        hiddenPanel.setBorder(BorderFactory.createEmptyBorder(0,12,0,12));
+        JScrollPane scrollPane = new JScrollPane();
+        JTextArea checkArea = new JTextArea(areaText);
+        scrollPane.setViewportView(checkArea);
+        scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+        checkArea.setEnabled(false);
+        hiddenPanel.add(scrollPane);
+        hiddenPanel.setVisible(false);
+
+        downInTopPanel.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (hiddenPanel.isVisible()) {
+                    hiddenPanel.setVisible(false);
+                    CheckFontInfoDialog.this.setSize(new Dimension(380, 185));
+                    detailLabel.setText(Toolkit.i18nText("Fine_Designer_Look_Detail"));
+                    directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.right"));
+                } else {
+                    CheckFontInfoDialog.this.setSize(new Dimension(380, 280));
+                    hiddenPanel.setVisible(true);
+                    detailLabel.setText(Toolkit.i18nText("Fine_Designer_Hide_Detail"));
+                    directUiLabel.setIcon(UIManager.getIcon("OptionPane.narrow.down"));
+                }
+            }
+        });
+
+        //底部的按钮面板
+        UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
+        okButton.addActionListener(this);
+        bottomPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
+        bottomPanel.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
+        bottomPanel.add(okButton, BorderLayout.EAST);
+
+        this.setTitle(Toolkit.i18nText("Fine_Designer_Check_Font"));
+        this.setResizable(false);
+
+        this.add(topPanel, BorderLayout.NORTH);
+        this.add(hiddenPanel, BorderLayout.CENTER);
+        this.add(bottomPanel, BorderLayout.SOUTH);
+        this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US)? 400:380, 185));
+
+        GUICoreUtils.centerWindow(this);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        this.dispose();
+    }
+}

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

@@ -0,0 +1,87 @@
+package com.fr.design.mainframe.reuse;
+
+import com.fr.design.DesignerEnvManager;
+import com.fr.stable.xml.XMLPrintWriter;
+import com.fr.stable.xml.XMLable;
+import com.fr.stable.xml.XMLableReader;
+
+/**
+ * Created by kerry on 5/8/21
+ */
+public class ComponentReuseNotificationInfo implements XMLable {
+    public static final String XML_TAG = "ComponentReuseNotificationInfo";
+
+    private static final ComponentReuseNotificationInfo INSTANCE = new ComponentReuseNotificationInfo();
+
+    public static ComponentReuseNotificationInfo getInstance() {
+        return INSTANCE;
+    }
+
+    private long lastNotifyTime = 0;
+
+    private int notifiedNumber = 0;
+
+    private boolean clickedWidgetLib = false;
+
+    private long lastGuidePopUpTime = 0;
+
+    public long getLastNotifyTime() {
+        return lastNotifyTime;
+    }
+
+    public void setLastNotifyTime(long lastNotifyTime) {
+        this.lastNotifyTime = lastNotifyTime;
+    }
+
+    public int getNotifiedNumber() {
+        return notifiedNumber;
+    }
+
+    public void setNotifiedNumber(int notifiedNumber) {
+        this.notifiedNumber = notifiedNumber;
+    }
+
+    public boolean isClickedWidgetLib() {
+        return clickedWidgetLib;
+    }
+
+    public void setClickedWidgetLib(boolean clickedWidgetLib) {
+        this.clickedWidgetLib = clickedWidgetLib;
+    }
+
+    public long getLastGuidePopUpTime() {
+        return lastGuidePopUpTime;
+    }
+
+    public void setLastGuidePopUpTime(long lastGuidePopUpTime) {
+        this.lastGuidePopUpTime = lastGuidePopUpTime;
+    }
+
+    public void updateLastGuidePopUpTime() {
+        this.setLastGuidePopUpTime(System.currentTimeMillis());
+        DesignerEnvManager.getEnvManager().saveXMLFile();
+    }
+
+    @Override
+    public void readXML(XMLableReader reader) {
+        this.setLastNotifyTime(reader.getAttrAsLong("lastNotifyTime", 0L));
+        this.setNotifiedNumber(reader.getAttrAsInt("notifiedNumber", 0));
+        this.setClickedWidgetLib(reader.getAttrAsBoolean("clickedWidgetLib", false));
+        this.setLastGuidePopUpTime(reader.getAttrAsLong("lastGuidePopUpTime", 0L));
+    }
+
+    @Override
+    public void writeXML(XMLPrintWriter writer) {
+        writer.startTAG("ComponentReuseNotificationInfo");
+        writer.attr("lastNotifyTime", this.lastNotifyTime)
+                .attr("notifiedNumber", this.notifiedNumber)
+                .attr("clickedWidgetLib", this.clickedWidgetLib)
+                .attr("lastGuidePopUpTime", this.lastGuidePopUpTime);
+        writer.end();
+    }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+}

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

@@ -0,0 +1,169 @@
+package com.fr.design.mainframe.reuse;
+
+import com.fr.base.background.ColorBackground;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.PromptWindow;
+import com.fr.design.mainframe.share.collect.ComponentCollector;
+import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.IOUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.RenderingHints;
+import java.awt.geom.RoundRectangle2D;
+
+public class ReuseGuideDialog extends UIDialog implements PromptWindow {
+    InnerDialog innerDialog;
+    private static final Dimension DEFAULT = new Dimension(735, 510);
+
+    public ReuseGuideDialog(Frame parent) {
+        super(parent);
+    }
+
+    @Override
+    public void showWindow() {
+        innerDialog = new InnerDialog(this);
+        JPanel backGroundPane = new JPanel() {
+            @Override
+            protected void paintComponent(Graphics g) {
+                Image icon = IOUtils.readImage("com/fr/base/images/share/background.png");// 003.jpg是测试图片在项目的根目录下
+                g.drawImage(icon, 0, 0, getSize().width, getSize().height, this);// 图片会自动缩放
+            }
+        };
+        add(backGroundPane, BorderLayout.CENTER);
+        initStyle();
+        innerDialog.showWindow();
+    }
+
+    private void initStyle() {
+        setSize(DEFAULT);
+        setUndecorated(true);
+        setBackground(new Color(0, 0, 0, 0));
+        GUICoreUtils.centerWindow(this);
+    }
+
+    @Override
+    public void hideWindow() {
+        ComponentReuseNotificationInfo.getInstance().updateLastGuidePopUpTime();
+        this.setVisible(false);
+        if (innerDialog != null) {
+            innerDialog.setVisible(false);
+            innerDialog.dispose();
+            innerDialog = null;
+        }
+        this.dispose();
+    }
+
+    @Override
+    public void checkValid() {
+
+    }
+
+    class InnerDialog extends UIDialog {
+        private final Dimension DEFAULT = new Dimension(700, 475);
+        private static final int TITLE_FONT_SIZE = 20;
+
+        public InnerDialog(Dialog dialog) {
+            super(dialog);
+        }
+
+        public void showWindow() {
+            add(createCenterPanel(), BorderLayout.CENTER);
+            add(createSouthPanel(), BorderLayout.SOUTH);
+            add(createNorthPanel(), BorderLayout.NORTH);
+            showDialog();
+        }
+
+        private JPanel createNorthPanel() {
+            JPanel northPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+
+            //右上角关闭按钮
+            JButton button = new JButton(new ImageIcon(IOUtils.readImage("/com/fr/base/images/share/close.png").getScaledInstance(15, 15, Image.SCALE_SMOOTH)));
+            button.setBorder(null);
+            button.setOpaque(false);
+            button.addActionListener(e -> ReuseGuideDialog.this.hideWindow());
+
+            northPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 15));
+            northPanel.setOpaque(false);
+            northPanel.add(button);
+            return northPanel;
+        }
+
+        private JPanel createCenterPanel() {
+            JPanel centerPanel = new JPanel(new BorderLayout());
+
+            UILabel titleLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Drag_And_Make_Component"));
+            UILabel imageLabel = new UILabel(new ImageIcon(IOUtils.readImage("com/fr/base/images/share/guide.png").getScaledInstance(DEFAULT.width, DEFAULT.height, Image.SCALE_SMOOTH)));
+            titleLabel.setFont(new Font(titleLabel.getFont().getName(), Font.BOLD, TITLE_FONT_SIZE));
+            titleLabel.setBorder(BorderFactory.createEmptyBorder());
+
+            JPanel panel = new JPanel(new FlowLayout(FlowLayout.CENTER));
+            panel.setOpaque(false);
+            panel.add(titleLabel);
+
+            centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
+            centerPanel.setOpaque(false);
+            centerPanel.add(imageLabel, BorderLayout.CENTER);
+            centerPanel.add(panel, BorderLayout.NORTH);
+            return centerPanel;
+        }
+
+        private JPanel createSouthPanel() {
+            JPanel southPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+
+            JButton button = new JButton(Toolkit.i18nText("Fine-Design_Share_Try_Drag")) {
+                @Override
+                public void paint(Graphics g) {
+                    ColorBackground buttonBackground = ColorBackground.getInstance(Color.decode("#419BF9"));
+                    Graphics2D g2d = (Graphics2D) g;
+                    g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                    buttonBackground.paint(g2d, new RoundRectangle2D.Double(0, 0, getWidth(), getHeight(), 8, 8));
+                    g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+                    super.paint(g);
+                }
+            };
+            button.setBorder(null);
+            button.setForeground(Color.WHITE);
+            button.setOpaque(false);
+            button.addActionListener(e -> ReuseGuideDialog.this.hideWindow());
+
+            southPanel.setBorder(BorderFactory.createEmptyBorder(0, 290, 19, 290));
+            southPanel.setPreferredSize(new Dimension(DEFAULT.width, 51));
+            southPanel.setOpaque(false);
+            southPanel.add(button);
+            return southPanel;
+        }
+
+        /**
+         * 显示窗口
+         */
+        private void showDialog() {
+            setSize(DEFAULT);
+            setUndecorated(true);
+            GUICoreUtils.centerWindow(this);
+            setModalityType(ModalityType.APPLICATION_MODAL);
+            ReuseGuideDialog.this.setVisible(true);
+            setVisible(true);
+        }
+
+        @Override
+        public void checkValid() {
+
+        }
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.fr.design.mainframe.reuse;
+
+import com.fr.design.notification.SnapChatKey;
+
+/**
+ * created by Harrison on 2020/03/24
+ **/
+public enum SnapChatKeys implements SnapChatKey {
+
+    /**
+     * 组件
+     */
+    COMPONENT("components"),
+
+    /**
+     * 模板
+     */
+    TEMPLATE("template");
+
+    private String sign;
+
+    private static final String PREFIX = "com.fr.component.share";
+
+    SnapChatKeys(String sign) {
+        this.sign = sign;
+    }
+
+    @Override
+    public String calc() {
+        return PREFIX + "-" + sign;
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/share/collect/CollectorManager.java

@@ -0,0 +1,89 @@
+package com.fr.design.mainframe.share.collect;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.stable.StringUtils;
+import com.fr.third.joda.time.DateTime;
+import com.fr.third.joda.time.Days;
+import com.fr.third.joda.time.format.DateTimeFormat;
+import com.fr.third.joda.time.format.DateTimeFormatter;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * created by Harrison on 2020/03/25
+ **/
+public class CollectorManager {
+
+    /**
+     * 1 天
+     */
+    private static final int DELTA = 1;
+
+    /**
+     * 发送间隔 5 分钟
+     */
+    private static final long SEND_DELAY = 300 * 1000L;
+
+    /**
+     * 线程
+     */
+    private ScheduledExecutorService service;
+
+    private static class ConfigManagerHolder {
+        private static CollectorManager instance = new CollectorManager();
+    }
+
+    public static CollectorManager getInstance() {
+
+        return ConfigManagerHolder.instance;
+    }
+
+    public void execute() {
+
+        service = Executors
+                .newSingleThreadScheduledExecutor(new NamedThreadFactory("plugin-CollectorManager", true));
+        service.scheduleAtFixedRate(new Runnable() {
+            @Override
+            public void run() {
+                sendCloudCenter();
+            }
+        }, SEND_DELAY, SEND_DELAY, TimeUnit.MILLISECONDS);
+    }
+
+    public void shutdown() {
+
+        ComponentCollector.getInstance().saveInfo();
+        if (service != null) {
+            service.shutdown();
+        }
+    }
+
+    private void sendCloudCenter() {
+
+        String lastTime = ComponentCollector.getInstance().getLastTime();
+        if (validate(lastTime)) {
+            boolean sendSuccess = ComponentSender.send();
+            String currentTime = DateTime.now().toString("yyyy-MM-dd");
+            ComponentCollector.getInstance().setLastTime(currentTime);
+            if (sendSuccess) {
+                ComponentCollector.getInstance().clear();
+            }
+        }
+        ComponentCollector.getInstance().saveInfo();
+    }
+
+    private boolean validate(String lastTime) {
+
+        if (StringUtils.isEmpty(lastTime)) {
+            return true;
+        }
+        DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
+        DateTime last = formatter.parseDateTime(lastTime);
+        DateTime current = DateTime.now();
+        return Days.daysBetween(last, current).getDays() >= DELTA;
+    }
+
+
+}

designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentCollector.java

@@ -0,0 +1,609 @@
+package com.fr.design.mainframe.share.collect;
+
+import com.fr.base.io.XMLReadHelper;
+import com.fr.config.MarketConfig;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
+import com.fr.form.share.DefaultSharableWidget;
+import com.fr.form.share.SharableWidgetProvider;
+import com.fr.form.share.constants.ComponentPath;
+import com.fr.form.share.group.DefaultShareGroupManager;
+import com.fr.form.share.Group;
+import com.fr.form.share.group.filter.DirFilter;
+import com.fr.form.share.group.filter.ReuFilter;
+import com.fr.general.ComparatorUtils;
+import com.fr.json.JSON;
+import com.fr.json.JSONArray;
+import com.fr.json.JSONException;
+import com.fr.json.JSONFactory;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.plugin.context.PluginContexts;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.xml.XMLPrintWriter;
+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.joda.time.DateTime;
+import com.fr.third.joda.time.Days;
+import com.fr.third.org.apache.commons.io.FileUtils;
+import com.fr.workspace.WorkContext;
+
+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.Iterator;
+
+/**
+ * created by Harrison on 2020/03/25
+ **/
+public class ComponentCollector implements XMLable {
+    private static final long ONE_MINUTE = 60 * 1000L;
+
+    private static final int REUSE_INFO_FIRST_POPUP = 1;
+
+    private static final int REUSE_INFO_SECOND_POPUP = 2;
+
+    private static final String SIMPLE_DATE_PATTERN = "yyyy-MM-dd";
+
+    private static final String XML = "ComponentCollector";
+
+    private static final String ACTIVATE_VALUE = "activateValue";
+
+    private static final String COMP_PKT_CLICK = "cmpPktClick";
+
+    private static final String DOWNLOAD_PKT_NUM = "downloadPktNum";
+
+    private static final String DOWNLOAD_CMP = "downloadCmp";
+
+    private static final int ACTIVATE_INITIAL_VALUE = 1;
+
+    private static final String ACTIVATE_DATE = "date";
+
+    private static final String GENERATE_CMP_RECORD_NAME = "name";
+
+    private static final String GENERATE_CMP_RECORD_TYPE = "type";
+
+    private static final String GENERATE_CMP_RECORD_UUID = "uuid";
+
+    private static final String HELP_CONFIG_INFO = "helpConfigInfo";
+
+    private static final String HELP_CONFIG_USE_INFO = "helpConfigUseInfo";
+
+    private static final String TEMPLATE_ID = "templateId";
+
+    private static final String SHOW_COUNT = "showCount";
+
+    private static final String USE_COUNT = "useCount";
+
+    private static final String GROUPING_DETAIL = "groupingDetail";
+
+    private static final String GROUP_NAME = "groupName";
+
+    private static final String CONTAIN_AMOUNT = "containAmount";
+
+    private static final String SEARCH_CONTENT = "searchContent";
+
+    private static final String FILTER_CONTENT = "filterContent";
+
+    private static final String SORT_TYPE = "sortType";
+
+    private static final String MARKET_CLICK = "marketClick";
+
+    private static final String PROMPT_JUMP = "promptJump";
+
+    private static final String TOOLBAR_JUMP = "toolbarJump";
+
+    private static final String POPUP_JUMP = "popupJump";
+
+    private static final String uuid = DesignerEnvManager.getEnvManager().getUUID();
+
+    private int localCmpNumber = 0;
+
+    private int remoteCmpNumber = 0;
+
+    private int generateCmpNumber = 0;
+
+    private int uploadCmpNumber = 0;
+
+    private int cmpBoardClick = 0;
+
+    private int promptJump = 0;
+
+    private int toolbarJump = 0;
+
+    private int popupJump = 0;
+
+    private JSONArray activateRecord = JSONFactory.createJSON(JSON.ARRAY);
+
+    private JSONArray generateCmpRecord = JSONFactory.createJSON(JSON.ARRAY);
+
+    private JSONArray helpConfigInfo = JSONFactory.createJSON(JSON.ARRAY);
+
+    private JSONArray searchContent = JSONFactory.createJSON(JSON.ARRAY);
+
+    private JSONArray filterContent = JSONFactory.createJSON(JSON.ARRAY);
+
+    private JSONArray sortType = JSONFactory.createJSON(JSON.ARRAY);
+
+    private String startTime = StringUtils.EMPTY;
+
+    private String lastTime = StringUtils.EMPTY;
+
+    private JSONArray helpConfigUseInfo = JSONFactory.createJSON(JSON.ARRAY);
+
+    private static class ComponentCollectorHolder {
+
+        private static ComponentCollector collector = new ComponentCollector();
+    }
+
+    public static ComponentCollector getInstance() {
+        return ComponentCollectorHolder.collector;
+    }
+
+    private ComponentCollector() {
+
+        loadFromFile();
+        if (StringUtils.isEmpty(startTime)) {
+            startTime = DateTime.now().toString(SIMPLE_DATE_PATTERN);
+        }
+    }
+
+    public void collectGenerateCmpNumber() {
+
+        generateCmpNumber++;
+        saveInfo();
+    }
+
+    public void collectUploadCmpNumber() {
+
+        uploadCmpNumber++;
+        saveInfo();
+    }
+
+    public void collectTepMenuEnterClick() {
+
+        saveInfo();
+    }
+
+    public void collectCmpBoardClick() {
+        collectActivateRecord();
+        cmpBoardClick++;
+        saveInfo();
+    }
+
+    public void collectCmpNumber() {
+        int count = 0;
+        //默认分组组件数量
+        String[] reus = WorkContext.getWorkResource().list(ComponentPath.SHARE_PATH.path(), new ReuFilter());
+        count += reus.length;
+
+        //其他分组组件数量
+        String[] groups = WorkContext.getWorkResource().list(ComponentPath.SHARE_PATH.path(), new DirFilter());
+        for (String groupName : groups) {
+            String relativePath = StableUtils.pathJoin(ComponentPath.SHARE_PATH.path(), groupName);
+            String[] groupReus = WorkContext.getWorkResource().list(relativePath, new ReuFilter());
+            count += groupReus.length;
+        }
+
+        if (WorkContext.getCurrent().isLocal()) {
+            localCmpNumber = count;
+        } else {
+            remoteCmpNumber = count;
+        }
+        saveInfo();
+    }
+
+    public void collectCmpPktClick() {
+        collectAttrActiveCount(COMP_PKT_CLICK);
+        saveInfo();
+    }
+
+    public void collectDownloadPktNum() {
+        collectAttrActiveCount(DOWNLOAD_PKT_NUM);
+        saveInfo();
+    }
+
+    public void collectMarkerClick() {
+        collectAttrActiveCount(MARKET_CLICK);
+    }
+
+    public void clearActiveRecord() {
+        String currentDate = DateTime.now().toString(SIMPLE_DATE_PATTERN);
+        Iterator<Object> iterator = activateRecord.iterator();
+        while (iterator.hasNext()) {
+            JSONObject jo = (JSONObject) iterator.next();
+            if (!ComparatorUtils.equals(currentDate, jo.getString(ACTIVATE_DATE))) {
+                iterator.remove();
+            }
+        }
+    }
+
+    public void collectGenerateCmpRecord(SharableWidgetProvider bindInfo) {
+        JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
+        jo.put(GENERATE_CMP_RECORD_NAME, bindInfo.getName())
+                .put(GENERATE_CMP_RECORD_TYPE, ((DefaultSharableWidget) bindInfo).getChildClassify())
+                .put(GENERATE_CMP_RECORD_UUID, bindInfo.getId());
+        generateCmpRecord.add(jo);
+    }
+
+    public void clearGenerateCmpRecord() {
+        generateCmpRecord = JSONFactory.createJSON(JSON.ARRAY);
+    }
+
+    public void collectCmpDownLoad(String uuid) {
+        String currentDate = DateTime.now().toString(SIMPLE_DATE_PATTERN);
+        for (int i = 0; i < activateRecord.size(); i++) {
+            JSONObject jo = activateRecord.getJSONObject(i);
+            if (ComparatorUtils.equals(currentDate, jo.getString(ACTIVATE_DATE))) {
+                JSONArray downloadComp = jo.containsKey(DOWNLOAD_CMP) ? jo.getJSONArray(DOWNLOAD_CMP) : JSONFactory.createJSON(JSON.ARRAY);
+                downloadComp.add(uuid);
+                jo.put(DOWNLOAD_CMP, downloadComp);
+                saveInfo();
+                return;
+            }
+        }
+        JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
+        jo.put(ACTIVATE_DATE, currentDate).put(DOWNLOAD_CMP, JSONFactory.createJSON(JSON.ARRAY).add(uuid));
+        activateRecord.add(jo);
+        saveInfo();
+    }
+
+    public JSONArray getActivateRecord() {
+        return activateRecord;
+    }
+
+    public JSONArray getGenerateCmpRecord() {
+        return generateCmpRecord;
+    }
+
+    private void collectActivateRecord() {
+        collectAttrActiveCount(ACTIVATE_VALUE);
+    }
+
+    private void collectAttrActiveCount(String attrName) {
+        String currentDate = DateTime.now().toString(SIMPLE_DATE_PATTERN);
+        for (int i = 0; i < activateRecord.size(); i++) {
+            JSONObject jo = activateRecord.getJSONObject(i);
+            if (ComparatorUtils.equals(currentDate, jo.getString(ACTIVATE_DATE))) {
+                int attrNum = jo.getInt(attrName);
+                attrNum++;
+                jo.put(attrName, attrNum);
+                return;
+            }
+        }
+        JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
+        jo.put(ACTIVATE_DATE, currentDate).put(attrName, ACTIVATE_INITIAL_VALUE);
+        activateRecord.add(jo);
+    }
+
+
+    private JSONArray getGroupingDetail() {
+        JSONArray ja = JSONFactory.createJSON(JSON.ARRAY);
+        Group[] groups = DefaultShareGroupManager.getInstance().getAllGroup();
+        for(Group group : groups) {
+            JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
+            jo.put(GROUP_NAME, group.getGroupName());
+            jo.put(CONTAIN_AMOUNT, group.getAllBindInfoList().length);
+            ja.add(jo);
+        }
+        return ja;
+    }
+
+    public void collectHelpConfigInfo(String templateId, int showCount, int useCount) {
+        JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
+        jo.put(TEMPLATE_ID, templateId);
+        jo.put(SHOW_COUNT, showCount);
+        jo.put(USE_COUNT, useCount);
+        helpConfigInfo.add(jo);
+        saveInfo();
+    }
+
+    public void clearHelpConfigInfo() {
+        helpConfigInfo = JSONFactory.createJSON(JSON.ARRAY);
+    }
+
+    public void collectSearchContent(String search) {
+        searchContent.add(search);
+    }
+
+    public void clearSearchContent() {
+        searchContent = JSONFactory.createJSON(JSON.ARRAY);
+    }
+
+    public void collectFilterContent(String filter) {
+        filterContent.add(filter);
+        saveInfo();
+    }
+
+    public void clearFilterContent() {
+        filterContent = JSONFactory.createJSON(JSON.ARRAY);
+    }
+
+    public void collectSortType(String type) {
+        sortType.add(type);
+        saveInfo();
+    }
+
+    public void collectPromptJumpWhenJump(){
+        if (ComponentReuseNotificationInfo.getInstance().getNotifiedNumber() == REUSE_INFO_FIRST_POPUP) {
+            this.promptJump = 1;
+            saveInfo();
+        }else if(ComponentReuseNotificationInfo.getInstance().getNotifiedNumber() == REUSE_INFO_SECOND_POPUP){
+            this.promptJump = 2;
+            saveInfo();
+        }
+    }
+
+
+    public void collectPromptJumpWhenShow() {
+        if (ComponentReuseNotificationInfo.getInstance().getNotifiedNumber() == REUSE_INFO_SECOND_POPUP) {
+            this.promptJump = -1;
+            saveInfo();
+        }
+    }
+
+    public void collectToolbarJump() {
+        if (this.toolbarJump == 0) {
+            this.toolbarJump = 1;
+            saveInfo();
+        }
+
+    }
+
+    public void collectPopupJump() {
+        long currentTime = System.currentTimeMillis();
+        long lastGuidePopUpTime = ComponentReuseNotificationInfo.getInstance().getLastGuidePopUpTime();
+        if (currentTime - lastGuidePopUpTime <= ONE_MINUTE && this.popupJump == 0) {
+            this.popupJump = 1;
+            saveInfo();
+        }
+    }
+
+    public void clearSortType() {
+        sortType = JSONFactory.createJSON(JSON.ARRAY);
+    }
+
+     private int cmpBoardClickDaily() {
+
+        DateTime dateTime = DateTime.parse(startTime);
+        DateTime currTime = DateTime.now();
+        int days = (Days.daysBetween(dateTime, currTime).getDays() + 1);
+        return cmpBoardClick / days;
+    }
+
+    public String getLastTime() {
+        return lastTime;
+    }
+
+    public void setLastTime(String lastTime) {
+        this.lastTime = lastTime;
+    }
+
+    /**
+     * 保存埋点信息到文件中
+     */
+    public void saveInfo() {
+
+        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 void loadFromFile() {
+
+        if (!getInfoFile().exists()) {
+            return;
+        }
+        XMLableReader reader = null;
+        try (InputStream in = new FileInputStream(getInfoFile())) {
+            // XMLableReader 还是应该考虑实现 Closable 接口的，这样就能使用 try-with 语句了
+            reader = XMLReadHelper.createXMLableReader(in, XMLPrintWriter.XML_ENCODER);
+            if (reader == null) {
+                return;
+            }
+            reader.readXMLObject(this);
+        } catch (FileNotFoundException e) {
+            // do nothing
+        } 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);
+            }
+        }
+    }
+
+
+    private File getInfoFile() {
+
+        File file = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), "component.info"));
+        try {
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+        } catch (Exception ex) {
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
+        }
+        return file;
+    }
+
+    @Override
+    public void readXML(XMLableReader reader) {
+
+        String tagName = reader.getTagName();
+        if (tagName.equals(XML)) {
+            this.cmpBoardClick = reader.getAttrAsInt("cmpBoardClick", 0);
+            this.startTime = reader.getAttrAsString("startTime", StringUtils.EMPTY);
+            this.lastTime = reader.getAttrAsString("lastTime", StringUtils.EMPTY);
+            this.localCmpNumber = reader.getAttrAsInt("localCmpNumber", 0);
+            this.remoteCmpNumber = reader.getAttrAsInt("remoteCmpNumber", 0);
+            this.generateCmpNumber = reader.getAttrAsInt("generateCmpNumber", 0);
+            this.uploadCmpNumber = reader.getAttrAsInt("uploadCmpNumber", 0);
+
+            String activateRecordStr = reader.getAttrAsString("activateRecord", StringUtils.EMPTY);
+            activateRecord = parseJSONArray(activateRecordStr);
+            String generateCmpRecordStr = reader.getAttrAsString("generateCmpRecord", StringUtils.EMPTY);
+            generateCmpRecord = parseJSONArray(generateCmpRecordStr);
+
+            this.helpConfigInfo = parseJSONArray(reader.getAttrAsString(HELP_CONFIG_INFO, StringUtils.EMPTY));
+            this.helpConfigUseInfo = parseJSONArray(reader.getAttrAsString(HELP_CONFIG_USE_INFO, StringUtils.EMPTY));
+            this.searchContent = parseJSONArray(reader.getAttrAsString(SEARCH_CONTENT,StringUtils.EMPTY));
+            this.filterContent = parseJSONArray(reader.getAttrAsString(FILTER_CONTENT, StringUtils.EMPTY));
+            this.sortType = parseJSONArray(reader.getAttrAsString(SORT_TYPE, StringUtils.EMPTY));
+            this.promptJump = reader.getAttrAsInt(PROMPT_JUMP, 0);
+            this.toolbarJump = reader.getAttrAsInt(TOOLBAR_JUMP, 0);
+            this.popupJump = reader.getAttrAsInt(POPUP_JUMP, 0);
+
+        }
+    }
+
+    private JSONArray parseJSONArray(String value) {
+        JSONArray ja;
+        try {
+            ja = new JSONArray(value);
+        } catch (JSONException e) {
+            ja = JSONFactory.createJSON(JSON.ARRAY);
+
+        }
+        return ja;
+    }
+
+
+    @Override
+    public void writeXML(XMLPrintWriter writer) {
+
+        writer.startTAG(XML)
+                .attr("cmpBoardClick", cmpBoardClick)
+                .attr("startTime", startTime)
+                .attr("lastTime", lastTime)
+                .attr("localCmpNumber", localCmpNumber)
+                .attr("remoteCmpNumber", remoteCmpNumber)
+                .attr("uploadCmpNumber", uploadCmpNumber)
+                .attr("generateCmpNumber", generateCmpNumber)
+                .attr("activateRecord", activateRecord.toString())
+                .attr("generateCmpRecord", generateCmpRecord.toString())
+                .attr(HELP_CONFIG_INFO, helpConfigInfo.toString())
+                .attr(HELP_CONFIG_USE_INFO, helpConfigUseInfo.toString())
+                .attr(SEARCH_CONTENT, searchContent.toString())
+                .attr(FILTER_CONTENT, filterContent.toString())
+                .attr(SORT_TYPE, sortType.toString())
+                .attr(PROMPT_JUMP, promptJump)
+                .attr(TOOLBAR_JUMP, toolbarJump)
+                .attr(POPUP_JUMP, popupJump)
+                .end();
+    }
+
+    /**
+     * 累计信息
+     */
+    public String generateTotalInfo() {
+        collectCmpNumber();
+        JSONObject jo = JSONObject.create();
+        jo.put("userId", MarketConfig.getInstance().getBBSAttr().getBbsUid());
+        jo.put("uuid", uuid);
+        jo.put("cmpBoardClickDaily", cmpBoardClickDaily());
+        jo.put("pluginVersion", PluginContexts.currentContext().getVersion());
+        jo.put("localCmpNumber", localCmpNumber);
+        jo.put("remoteCmpNumber", remoteCmpNumber);
+        jo.put("uploadCmpNumber", uploadCmpNumber);
+        jo.put("generateCmpNumber", generateCmpNumber);
+        jo.put("activateRecord", getValidActivateRecord());
+        jo.put("generateCmpRecord", generateCmpRecord.toString());
+        jo.put(HELP_CONFIG_INFO, helpConfigInfo.toString());
+        jo.put(GROUPING_DETAIL, getGroupingDetail().toString());
+        jo.put(SEARCH_CONTENT, searchContent.toString());
+        jo.put(FILTER_CONTENT, filterContent.toString());
+        jo.put(SORT_TYPE, sortType.toString());
+        jo.put("guideInfo", assembleGuideInfo());
+        return jo.toString();
+    }
+
+    private String assembleGuideInfo() {
+        JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
+        jo.put(PROMPT_JUMP, promptJump)
+                .put(TOOLBAR_JUMP, toolbarJump)
+                .put(POPUP_JUMP, popupJump);
+        return jo.toString();
+    }
+
+    public String getValidActivateRecord() {
+        JSONArray result = JSONFactory.createJSON(JSON.ARRAY);
+        String currentDate = DateTime.now().toString(SIMPLE_DATE_PATTERN);
+        for (Object o : activateRecord) {
+            JSONObject jo = (JSONObject) o;
+            if (!ComparatorUtils.equals(currentDate, jo.getString(ACTIVATE_DATE))) {
+                result.add(jo);
+            }
+        }
+        return result.toString();
+    }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+
+        return null;
+    }
+
+    public void setHelpConfigUseInfo(String templateId, String widgetId) {
+        for (int i = 0; i < helpConfigUseInfo.size(); i++) {
+            JSONObject jo = helpConfigUseInfo.getJSONObject(i);
+            if (ComparatorUtils.equals(templateId, jo.getString(TEMPLATE_ID))) {
+                JSONArray useInfo = jo.getJSONArray(HELP_CONFIG_USE_INFO);
+                if (!useInfo.contains(widgetId)) {
+                    useInfo.add(widgetId);
+                }
+                jo.put(HELP_CONFIG_USE_INFO, useInfo);
+                return;
+            }
+        }
+        JSONObject jo = JSONFactory.createJSON(JSON.OBJECT);
+        JSONArray ja = JSONFactory.createJSON(JSON.ARRAY);
+        ja.add(widgetId);
+        jo.put(TEMPLATE_ID, templateId);
+        jo.put(HELP_CONFIG_USE_INFO, ja);
+        helpConfigUseInfo.add(jo);
+        saveInfo();
+    }
+
+    public JSONArray getHelpConfigUseInfoWithTemplate(String templateId) {
+        for (int i = 0; i < helpConfigUseInfo.size(); i++) {
+            JSONObject jo = helpConfigUseInfo.getJSONObject(i);
+            if (ComparatorUtils.equals(templateId, jo.getString(TEMPLATE_ID))) {
+                return jo.getJSONArray(HELP_CONFIG_USE_INFO);
+            }
+        }
+        return JSONFactory.createJSON(JSON.ARRAY);
+    }
+
+    public void clear(){
+        clearActiveRecord();
+        clearGenerateCmpRecord();
+        clearFilterContent();
+        clearHelpConfigInfo();
+        clearSearchContent();
+        clearSortType();
+        saveInfo();
+    }
+}

designer-base/src/main/java/com/fr/design/mainframe/share/collect/ComponentSender.java

@@ -0,0 +1,45 @@
+package com.fr.design.mainframe.share.collect;
+
+import com.fr.design.mainframe.SiteCenterToken;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.http.HttpToolbox;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * created by Harrison on 2020/03/25
+ **/
+public class ComponentSender {
+    
+    private static final String CLOUD_REUSE_URL = "https://cloud.fanruan.com/api/monitor/record_of_reusePlugin/single";
+    
+    public static boolean send() {
+    
+        long start = System.currentTimeMillis();
+    
+        String content = ComponentCollector.getInstance().generateTotalInfo();
+    
+        long end = System.currentTimeMillis();
+        FineLoggerFactory.getLogger().error("cal time cost {} ms", end - start);
+        return sendInfo(CLOUD_REUSE_URL, content);
+    }
+    
+    private static boolean sendInfo(String url, String content) {
+        
+        Map<String, Object> para = new HashMap<>();
+        para.put("token", SiteCenterToken.generateToken());
+        para.put("content", content);
+        
+        try {
+            String res = HttpToolbox.post(url, para);
+            return ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
+        } catch (Throwable e) {
+            // 客户不需要关心，错误等级为 debug 就行了
+            FineLoggerFactory.getLogger().debug(e.getMessage(), e);
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.fr.design.mainframe.toast;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.stable.Constants;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JEditorPane;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Font;
+
+/**
+ * Created by kerry on 5/6/21
+ */
+public class DesignerToastMsgUtil {
+    private static final int MIN_WIDTH = 134;
+    private static final int MAX_WIDTH = 454;
+    private static final Icon PROMPT_ICON = BaseUtils.readIcon("/com/fr/design/images/toast/toast_prompt.png");
+    private static final Icon WARNING_ICON = BaseUtils.readIcon("/com/fr/design/images/toast/toast_warning.png");
+
+    private DesignerToastMsgUtil() {
+
+    }
+
+
+    public static void toastPrompt(JPanel contendPane) {
+        toastPane(PROMPT_ICON, contendPane);
+    }
+
+    public static void toastWarning(JPanel contendPane) {
+        toastPane(WARNING_ICON, contendPane);
+
+    }
+
+    public static void toastPrompt(String promptInfo) {
+        toastPrompt(toastPane(promptInfo));
+    }
+
+    public static void toastWarning(String warningInfo) {
+        toastWarning(toastPane(warningInfo));
+    }
+
+    private static JPanel toastPane(String text) {
+        UILabel promptLabel = new UILabel("<html>" + text + "</html>");
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        int width = promptLabel.getPreferredSize().width;
+        if (width > MAX_WIDTH) {
+            Dimension dimension = calculatePreferSize(text, promptLabel.getFont(), width);
+            jPanel.setPreferredSize(dimension);
+        }
+        jPanel.add(promptLabel, BorderLayout.NORTH);
+        return jPanel;
+    }
+
+    private static void toastPane(Icon icon, JPanel contendPane) {
+        JPanel pane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        UILabel uiLabel = new UILabel(icon);
+        uiLabel.setVerticalAlignment(SwingConstants.TOP);
+        uiLabel.setBorder(BorderFactory.createEmptyBorder(3, 0, 0, 0));
+        pane.add(uiLabel, BorderLayout.WEST);
+        pane.add(contendPane, BorderLayout.CENTER);
+        pane.setBorder(BorderFactory.createEmptyBorder(8, 15, 8, 15));
+        contendPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+        ToastMsgDialog dialog = new ToastMsgDialog(DesignerContext.getDesignerFrame(), pane);
+        dialog.setVisible(true);
+    }
+
+
+    private static Dimension calculatePreferSize(String text, Font font, int width) {
+        int limitWidth = Math.max(MIN_WIDTH, width);
+        limitWidth = Math.min(MAX_WIDTH, limitWidth);
+        return new Dimension(limitWidth, getHtmlHeight(text, limitWidth, font));
+    }
+
+
+    private static int getHtmlHeight(String content, int width, Font font) {
+        StringBuffer limitDiv = new StringBuffer("<div style='width:").append(width)
+                .append("px;height:100%").append(getFontWrapStyle(font)).append(";'>");
+        return getHtmlContentDimension(content, limitDiv).height;
+    }
+
+
+    private static Dimension getHtmlContentDimension(String content, StringBuffer limitDiv) {
+        content = limitDiv.append(content).append("</div>").toString();
+        JEditorPane editorPane = new JEditorPane();
+        editorPane.setContentType("text/html");
+        editorPane.setText(content);
+        return editorPane.getPreferredSize();
+    }
+
+    private static String getFontWrapStyle(Font font) {
+        double dpi96 = Constants.FR_PAINT_RESOLUTION;
+        double dpi72 = Constants.DEFAULT_FONT_PAINT_RESOLUTION;
+        return new StringBuilder()
+                .append(";font-size:").append(font.getSize() * dpi96 / dpi72)
+                .append("pt;font-family:").append(font.getFontName())
+                .toString();
+    }
+
+}

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

@@ -0,0 +1,153 @@
+package com.fr.design.mainframe.toast;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.design.dialog.UIDialog;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.module.ModuleContext;
+
+import javax.swing.JPanel;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by kerry on 4/29/21
+ */
+public class ToastMsgDialog extends UIDialog {
+    private static final int MIN_HEIGHT = 36;
+    private static final String TOAST_MSG_TIMER = "TOAST_MSG_TIMER";
+    private ScheduledExecutorService TIMER;
+    private int hide_height = 0;
+    private JPanel contentPane;
+
+    public ToastMsgDialog(Frame parent, JPanel panel) {
+        super(parent);
+        setFocusable(false);
+        setAutoRequestFocus(false);
+        setUndecorated(true);
+        contentPane = panel;
+        initComponent(parent);
+    }
+
+    private void initComponent(Frame parent) {
+        this.getContentPane().setLayout(null);
+        this.getContentPane().add(contentPane);
+        Dimension dimension = calculatePreferSize();
+        hide_height = dimension.height;
+        setSize(new Dimension(dimension.width, 0));
+        contentPane.setSize(dimension);
+        setLocationRelativeTo(DesignerContext.getDesignerFrame().getContentFrame());
+        int positionY = DesignerContext.getDesignerFrame().getContentFrame().getLocationOnScreen().y + 10;
+        setLocation((parent.getWidth() - dimension.width) / 2, positionY);
+        addMouseEvent(contentPane);
+    }
+
+
+    private Dimension calculatePreferSize() {
+        Dimension contentDimension = contentPane.getPreferredSize();
+        int height = Math.max(MIN_HEIGHT, contentDimension.height);
+        return new Dimension(contentDimension.width, height);
+    }
+
+
+    public void display(JPanel outerJPanel) {
+        outerJPanel.setLocation(0, -hide_height);
+        ScheduledExecutorService TIP_TOOL_TIMER = createToastScheduleExecutorService();
+        TIP_TOOL_TIMER.scheduleAtFixedRate(new Runnable() {
+            @Override
+            public void run() {
+                Point point = outerJPanel.getLocation();
+                if (point.y >= 0) {
+                    TIP_TOOL_TIMER.shutdown();
+                    disappear(outerJPanel);
+                }
+                int showDistance = 5 + point.y < 0 ? 5 : -point.y;
+                outerJPanel.setLocation(point.x, point.y + showDistance);
+                Dimension dimension = ToastMsgDialog.this.getSize();
+                ToastMsgDialog.this.setSize(new Dimension(dimension.width, dimension.height + showDistance));
+            }
+        }, 0, 50, TimeUnit.MILLISECONDS);
+
+    }
+
+    private void disappear(JPanel outerJPanel) {
+        TIMER = createToastScheduleExecutorService();
+        TIMER.schedule(new Runnable() {
+            @Override
+            public void run() {
+                ScheduledExecutorService TIP_TOOL_TIMER = createToastScheduleExecutorService();
+                TIP_TOOL_TIMER.scheduleAtFixedRate(new Runnable() {
+                    @Override
+                    public void run() {
+                        Point point = outerJPanel.getLocation();
+                        if (point.y <= -hide_height) {
+                            TIP_TOOL_TIMER.shutdown();
+                            ToastMsgDialog.this.setVisible(false);
+                            ToastMsgDialog.this.dispose();
+                        }
+                        outerJPanel.setLocation(point.x, point.y - 5);
+                        Dimension dimension = ToastMsgDialog.this.getSize();
+                        ToastMsgDialog.this.setSize(new Dimension(dimension.width, dimension.height - 5));
+                    }
+                }, 0,50, TimeUnit.MILLISECONDS);
+
+            }
+        }, 5000, TimeUnit.MILLISECONDS);
+    }
+
+    private ScheduledExecutorService createToastScheduleExecutorService() {
+        return ModuleContext.getExecutor().newSingleThreadScheduledExecutor(new NamedThreadFactory(TOAST_MSG_TIMER));
+    }
+
+    private void addMouseEvent(JPanel jPanel) {
+        jPanel.addMouseListener(new MouseListener() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent e) {
+
+            }
+
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                TIMER.shutdownNow();
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+                disappear(jPanel);
+            }
+        });
+    }
+
+
+    @Override
+    public void checkValid() throws Exception {
+    }
+
+    public void setVisible(boolean visible) {
+        super.setVisible(visible);
+        if (visible) {
+            display(contentPane);
+        }
+    }
+
+    @Override
+    public void dispose() {
+        super.dispose();
+    }
+
+
+}

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

@@ -19,6 +19,7 @@ import com.fr.design.actions.community.QuestionAction;
 import com.fr.design.actions.community.SignAction;
 import com.fr.design.actions.community.TechSolutionAction;
 import com.fr.design.actions.community.TechSupportAction;
+import com.fr.design.actions.community.TemplateStoreAction;
 import com.fr.design.actions.community.VideoAction;
 import com.fr.design.actions.community.WorkOrderCenterAction;
 import com.fr.design.actions.file.CloseCurrentTemplateAction;
@@ -169,6 +170,12 @@ public abstract class ToolBarMenuDock {
         }
     }
 
+    public void updateEnable() {
+        for (int i = 0, count = ArrayUtils.getLength(menus); i < count; i++) {
+            menus[i].updateEnable();
+        }
+    }
+
     /**
      * 更新toolbar
      */
@@ -585,6 +592,7 @@ public abstract class ToolBarMenuDock {
         shortCuts.add(new TechSolutionAction());
 
         shortCuts.add(SeparatorDef.DEFAULT);
+        shortCuts.add(new TemplateStoreAction());
 
         LocaleCenter.buildAction(new LocaleAction() {
             @Override

designer-base/src/main/java/com/fr/design/menu/MenuDef.java

@@ -1,12 +1,17 @@
 package com.fr.design.menu;
 
 import com.fr.base.svg.IconUtils;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.*;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.StringUtils;
 
+import java.util.HashSet;
+import java.util.Set;
 import javax.swing.*;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
@@ -25,6 +30,17 @@ public class MenuDef extends ShortCut {
 
     private static final int MENU_DEFAULTWDITH = 156;
     private static final int BLANK_WIDTH = 30;
+
+    private static final Set<String> FORBIDDEN_SET = new HashSet<>();
+
+    {
+        FORBIDDEN_SET.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Template"));
+        FORBIDDEN_SET.add(Toolkit.i18nText("Fine-Design_Report_M_Insert"));
+        FORBIDDEN_SET.add(Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
+        FORBIDDEN_SET.add(KeySetUtils.CELL.getMenuKeySetName());
+        FORBIDDEN_SET.add(KeySetUtils.INSERT_FLOAT.getMenuKeySetName());
+    }
+
     protected String name;
     //右侧属性表弹出框重绘
     protected Boolean isEastAttr = false;
@@ -277,6 +293,10 @@ public class MenuDef extends ShortCut {
         }
     }
 
+    public void updateEnable() {
+        setEnabled(checkEnable());
+    }
+
     /**
      * 更新菜单
      *
@@ -390,6 +410,20 @@ public class MenuDef extends ShortCut {
         toolBar.add(this.createUIButton());
     }
 
+    private boolean checkEnable() {
+        if (FORBIDDEN_SET.contains(this.getName())) {
+            JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            boolean flag = true;
+            if (template != null) {
+                flag = template.checkEnable();
+            }
+            if (!flag) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     protected MenuListener createMenuListener() {
 
         return menuDefListener;
@@ -411,7 +445,6 @@ public class MenuDef extends ShortCut {
             if (!(source instanceof JMenu)) {
                 return;
             }
-
             MenuDef.this.updateMenu();
         }
     };

designer-base/src/main/java/com/fr/design/menu/ToolBarDef.java

@@ -1,7 +1,11 @@
 package com.fr.design.menu;
 
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.itoolbar.UIToolBarUI;
 import com.fr.design.gui.itoolbar.UIToolbar;
+import com.fr.design.mainframe.JTemplate;
+import java.util.Set;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -82,4 +86,25 @@ public class ToolBarDef {
         }
     }
 
+    public void refreshToolBar(Set<String> set) {
+        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (template != null) {
+            for (int i = 0; i < getShortCutCount(); i++) {
+                ShortCut shortCut = getShortCut(i);
+                if (shortCut instanceof  MenuDef) {
+                    MenuDef menuDef = (MenuDef) shortCut;
+                    if (set.contains(menuDef.getName())) {
+                        menuDef.setEnabled(template.checkEnable());
+                    }
+                }
+                if (shortCut instanceof UpdateAction) {
+                    UpdateAction updateAction = (UpdateAction) shortCut;
+                    if (set.contains(updateAction.getName())) {
+                        updateAction.setEnabled(template.checkEnable());
+                    }
+                }
+            }
+        }
+    }
+
 }

designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java

@@ -243,14 +243,6 @@ public class DesignModuleFactory {
         return bp;
     }
 
-
-    public static void clearChartPropertyPane() {
-        if (instance.chartPropertyPaneClass != null) {
-            StableUtils.clearInstance(instance.chartPropertyPaneClass);
-        }
-    }
-
-
     public static void registerButtonDetailPaneClass(Class clazz) {
         instance.buttonDetailPaneClass = clazz;
     }

designer-base/src/main/java/com/fr/design/os/impl/PopupDialogSaveAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.os.impl;
 
-import com.fr.design.gui.controlpane.UIListControlPane;
+import com.fr.design.gui.controlpane.UIControlPane;
 import com.fr.stable.os.OperatingSystem;
 import com.fr.stable.os.support.OSBasedAction;
 
@@ -15,7 +15,7 @@ import java.awt.*;
  */
 public class PopupDialogSaveAction implements OSBasedAction {
 
-    private UIListControlPane currentControlPane;
+    private UIControlPane currentControlPane;
     private Window popupDialog;
 
     @Override
@@ -26,7 +26,7 @@ public class PopupDialogSaveAction implements OSBasedAction {
         }
     }
 
-    public void register(UIListControlPane currentControlPane, Window popupDialog) {
+    public void register(UIControlPane currentControlPane, Window popupDialog) {
         this.currentControlPane = currentControlPane;
         this.popupDialog = popupDialog;
     }

designer-base/src/main/java/com/fr/design/selection/SelectableElement.java

@@ -15,6 +15,16 @@ public interface SelectableElement {
 	 * @return
 	 */
 	@SuppressWarnings("rawtypes")
-	public QuickEditor getQuickEditor(TargetComponent tc);
+	QuickEditor getQuickEditor(TargetComponent tc);
 
+	/**
+	 * @Description 有些实现类中getQuickEditor会在获取editor后，再填充面板。这个方法只会获取editor，不会填充面板
+	 * @param: tc
+	 * @return com.fr.design.selection.QuickEditor
+	 * @Author Henry.Wang
+	 * @Date 2021/4/2 15:02
+	 **/
+	default QuickEditor getQuickEditorWithoutPopulate(TargetComponent tc){
+		return null;
+	}
 }

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

@@ -126,6 +126,11 @@ public class ColorButton extends AbstractSelectBox<Color> {
             public void setVisible(boolean b) {
                 super.setVisible(b);
             }
+
+            @Override
+            protected boolean selectRealTime() {
+                return false;
+            }
         };
         colorPane.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {

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

@@ -4,12 +4,15 @@ import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.stable.Constants;
 
+import com.fr.stable.os.OperatingSystem;
 import java.awt.*;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.RoundRectangle2D;
 
 public class GUIPaintUtils {
 
+    private static boolean macos = OperatingSystem.isMacos();
+
     public static final void drawBorder(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection) {
         drawBorder(g2d, x, y, width, height, isRound, rectDirection, false);
     }
@@ -39,10 +42,14 @@ public class GUIPaintUtils {
                 g2d.drawLine(x, y, x, height - 1);
                 g2d.drawLine(x, height - 1, x + 3, height - 1);
             } else {
-                double offsetX = Math.min(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleX() - 1, 0.5d);
+                if (macos) {
-                double offsetY = Math.min(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleY() - 1, 0.5d);
+                    g2d.drawRoundRect(x, y, width - 1, height - 1, UIConstants.ARC, UIConstants.ARC);
-                Shape shape = new RoundRectangle2D.Double(x + offsetX,  y + offsetY, width - 1d, height - 1d, UIConstants.ARC, UIConstants.ARC);
+                } else {
-                g2d.draw(shape);
+                    double offsetX = Math.min(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleX() - 1, 0.5d);
+                    double offsetY = Math.min(GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform().getScaleY() - 1, 0.5d);
+                    Shape shape = new RoundRectangle2D.Double(x + offsetX,  y + offsetY, width - 1d, height - 1d, UIConstants.ARC, UIConstants.ARC);
+                    g2d.draw(shape);
+                }
             }
             g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
         } else {

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

@@ -18,6 +18,10 @@ public class EventCreator extends NameableSelfCreator {
 		this.eventName = eventName;
 	}
 
+	public String getEventName() {
+		return eventName;
+	}
+
 	@Override
 	public Nameable createNameable(UnrepeatedNameHelper helper) {
 		return new NameObject(helper.createUnrepeatedName(this.menuName()),new Listener(this.eventName)) ;
@@ -47,9 +51,13 @@ public class EventCreator extends NameableSelfCreator {
 			return eventName;
 		}
 	}
+
 	@Override
-	public void saveUpdatedBean(ListModelElement wrapper, Object bean) {
+	public void saveUpdatedBean(ListModelElement element, Object bean) {
-		((NameObject)wrapper.wrapper).setObject(bean);
+		if (bean instanceof Listener){
+			((Listener)bean).setName(element.wrapper.getName());
+		}
+		((NameObject)element.wrapper).setObject(bean);
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/worker/WorkerManager.java

@@ -0,0 +1,49 @@
+package com.fr.design.worker;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.swing.SwingWorker;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/2
+ */
+public class WorkerManager {
+
+    private static final WorkerManager INSTANCE = new WorkerManager();
+
+    private Map<String, SwingWorker> workerMap = new HashMap<>();
+
+    public static WorkerManager getInstance() {
+        return INSTANCE;
+    }
+
+    @Nullable
+    public SwingWorker getWorker(String taskName) {
+        return workerMap.get(taskName);
+    }
+
+    public boolean isCompleted(String taskName) {
+        SwingWorker worker = getWorker(taskName);
+        return worker == null || worker.isDone();
+    }
+
+    public void registerWorker(String taskName, SwingWorker worker) {
+        workerMap.put(taskName, worker);
+    }
+
+    public void removeWorker(String taskName) {
+        workerMap.remove(taskName);
+    }
+
+    public void cancelWorker(String taskName) {
+        SwingWorker worker = getWorker(taskName);
+        if (worker != null && !worker.isDone()) {
+            worker.cancel(true);
+            removeWorker(taskName);
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/worker/open/OpenResult.java

@@ -0,0 +1,28 @@
+package com.fr.design.worker.open;
+
+import com.fr.base.io.BaseBook;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/13
+ */
+public class OpenResult<T extends BaseBook, R> {
+
+    private final T  baseBook;
+
+    private final R ref;
+
+    public OpenResult(T baseBook, R r) {
+        this.baseBook = baseBook;
+        this.ref = r;
+    }
+
+    public T getBaseBook() {
+        return baseBook;
+    }
+
+    public R getRef() {
+        return ref;
+    }
+}

designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java

@@ -0,0 +1,154 @@
+package com.fr.design.worker.open;
+
+import com.fr.base.chart.exception.ChartNotFoundException;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrameFileDealerPane;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.worker.WorkerManager;
+import com.fr.exception.DecryptTemplateException;
+import com.fr.file.FILE;
+import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.JOptionPane;
+import javax.swing.SwingWorker;
+import javax.swing.UIManager;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * 模板打开的worker
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/9
+ */
+public class OpenWorker<T> extends SwingWorker<T, Void> {
+
+    private static final int TIME_OUT = 400;
+
+    private final Callable<T> callable;
+
+    private final JTemplate<?, ?> template;
+
+    private Callable<JTemplate<?, ?>> templateCallable;
+
+    private boolean slowly = false;
+
+    private String taskName;
+
+    private T result;
+
+    public OpenWorker(Callable<T> callable, JTemplate<?, ?> template) {
+        this.callable = callable;
+        this.template = template;
+    }
+
+    @Override
+    protected T doInBackground() throws Exception {
+        return this.callable.call();
+    }
+
+    @Override
+    protected void done() {
+        try {
+         result = get();
+        } catch (CancellationException ignored) {
+          return;
+        } catch (Throwable t) {
+            processFailed();
+            Throwable cause = t.getCause();
+            if (cause instanceof DecryptTemplateException) {
+                FineJOptionPane.showMessageDialog(
+                        DesignerContext.getDesignerFrame(),
+                        Toolkit.i18nText("Fine-Design_Encrypt_Decrypt_Exception"),
+                        Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                        JOptionPane.WARNING_MESSAGE,
+                        UIManager.getIcon("OptionPane.errorIcon")
+                );
+            }
+            if (cause instanceof ChartNotFoundException) {
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                  Toolkit.i18nText("Fine-Design_Chart_Not_Found_Exception"),
+                                                  Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                  JOptionPane.ERROR_MESSAGE,
+                                                  UIManager.getIcon("OptionPane.errorIcon"));
+            }
+            FineLoggerFactory.getLogger().error(t.getMessage(), t);
+            return;
+        }
+        // 后续动作
+        processResult();
+    }
+
+    private void processResult() {
+        this.template.setOpening(false);
+        if (slowly && templateCallable != null) {
+            try {
+                JTemplate<?, ?> book = templateCallable.call();
+                FILE tplFile = book.getEditingFILE();
+                JTemplate<?, ?> currentTemplate =  HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+                // 当前tab页是正在打开的模板
+                if (ComparatorUtils.equals(currentTemplate.getEditingFILE(), tplFile)) {
+                    currentTemplate.whenClose();
+                    DesignerContext.getDesignerFrame().addAndActivateJTemplate(book);
+                    HistoryTemplateListCache.getInstance().replaceCurrentEditingTemplate(book);
+                } else {
+                    // 当前tab页是其他模板
+                    for (int i = 0, len = HistoryTemplateListCache.getInstance().getHistoryCount(); i < len; i++) {
+                        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getTemplate(i);
+                        if (ComparatorUtils.equals(template.getEditingFILE(), book.getEditingFILE())) {
+                            template.whenClose();
+                            HistoryTemplateListCache.getInstance().getHistoryList().set(i, book);
+                            break;
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+        DesignerFrameFileDealerPane.getInstance().stateChange();
+        WorkerManager.getInstance().removeWorker(taskName);
+    }
+
+    private void processFailed() {
+        this.template.setOpenFailed(true);
+        this.template.setOpening(false);
+        DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showOpenFailedCover();
+        DesignerFrameFileDealerPane.getInstance().stateChange();
+        WorkerManager.getInstance().removeWorker(taskName);
+
+    }
+
+    public void addCallBack(Callable<JTemplate<?, ?>> templateCallable) {
+        this.templateCallable = templateCallable;
+    }
+
+    public void start(String taskName) {
+        this.taskName = taskName;
+        this.template.setOpening(true);
+        this.execute();
+        WorkerManager.getInstance().registerWorker(taskName, this);
+    }
+
+    public T getResult() {
+        if (result != null) {
+            return result;
+        }
+        try {
+           return this.get(TIME_OUT, TimeUnit.MILLISECONDS);
+        } catch (TimeoutException e) {
+            slowly = true;
+        } catch (Exception exception) {
+            FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
+            WorkerManager.getInstance().removeWorker(taskName);
+        }
+        return null;
+    }
+}

designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java

@@ -0,0 +1,75 @@
+package com.fr.design.worker.save;
+
+import com.fr.common.util.Collections;
+import com.fr.design.mainframe.JTemplate;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+/**
+ * 保存之后需要做些外部回调
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/8
+ */
+public class CallbackSaveWorker extends SaveWorker {
+
+    private List<Runnable> successRunnableList;
+
+    private List<Runnable> failRunnableList;
+
+    public CallbackSaveWorker(Callable<Boolean> callable, JTemplate<?, ?> template) {
+        super(callable, template);
+    }
+
+    @Override
+    protected void done() {
+        super.done();
+
+        if (success) {
+            fireRunnable(successRunnableList);
+        } else {
+            fireRunnable(failRunnableList);
+        }
+        successRunnableList = null;
+        failRunnableList = null;
+    }
+
+    private void fireRunnable(List<Runnable> list) {
+        if (Collections.isEmpty(list)) {
+            return;
+        }
+        for (Runnable runnable : list) {
+            runnable.run();
+        }
+    }
+
+    private void addCallback(List<Runnable> runnableList, Runnable runnable) {
+        if (runnableList == null) {
+            runnableList = new LinkedList<>();
+        }
+        if (runnable != null) {
+            runnableList.add(runnable);
+        }
+    }
+
+    public void addSuccessCallback(Runnable successRunnable) {
+        if (successRunnableList == null) {
+            successRunnableList = new LinkedList<>();
+        }
+        if (successRunnable != null) {
+            successRunnableList.add(successRunnable);
+        }
+    }
+
+    public void addFailCallback(Runnable failRunnable) {
+        if (failRunnableList == null) {
+            failRunnableList = new LinkedList<>();
+        }
+        if (failRunnable != null) {
+            failRunnableList.add(failRunnable);
+        }
+    }
+
+}

designer-base/src/main/java/com/fr/design/worker/save/EmptyCallBackSaveWorker.java

@@ -0,0 +1,37 @@
+package com.fr.design.worker.save;
+
+import com.fr.design.mainframe.JTemplate;
+import java.util.concurrent.Callable;
+
+/**
+ * 空实现
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/9
+ */
+public class EmptyCallBackSaveWorker extends CallbackSaveWorker {
+
+    public EmptyCallBackSaveWorker(Callable<Boolean> callable, JTemplate<?, ?> template) {
+        super(callable, template);
+    }
+
+    public EmptyCallBackSaveWorker() {
+        this(null, null);
+    }
+
+    @Override
+    protected Boolean doInBackground() throws Exception {
+        return false;
+    }
+
+    @Override
+    protected void done() {
+        // do nothing
+    }
+
+    @Override
+    public void start(String taskName) {
+        // do nothing
+    }
+}

designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

@@ -0,0 +1,99 @@
+package com.fr.design.worker.save;
+
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrameFileDealerPane;
+import com.fr.design.mainframe.EastRegionContainerPane;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.worker.WorkerManager;
+import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
+import java.awt.Frame;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import javax.swing.JOptionPane;
+import javax.swing.SwingWorker;
+
+/**
+ * 模板保存的worker
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/4/1
+ */
+public class SaveWorker extends SwingWorker<Boolean, Void> {
+
+    private static final int TIME_OUT = 400;
+
+    private final Callable<Boolean> callable;
+
+    private String taskName;
+
+    private final JTemplate<?, ?> template;
+
+    protected boolean success;
+
+    private boolean slowly;
+
+    public SaveWorker(Callable<Boolean> callable, JTemplate<?, ?> template) {
+        this.callable = callable;
+        this.template = template;
+    }
+
+    @Override
+    protected Boolean doInBackground() throws Exception {
+        return callable.call();
+    }
+
+    @Override
+    protected void done() {
+        try {
+           success = get();
+        } catch (Exception e) {
+            processResult();
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            boolean minimized = (DesignerContext.getDesignerFrame().getExtendedState() & Frame.ICONIFIED ) != 0;
+            FineJOptionPane.showMessageDialog(
+                    minimized ? null : DesignerContext.getDesignerFrame(),
+                    Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                    JOptionPane.ERROR_MESSAGE);
+            return;
+        }
+        processResult();
+    }
+
+    private void processResult() {
+        this.template.setSaving(false);
+        // 恢复界面
+        if (slowly && ComparatorUtils.equals(this.template.getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) {
+            DesignerContext.getDesignerFrame().refreshUIToolBar();
+            DesignerContext.getDesignerFrame().getCenterTemplateCardPane().hideCover();
+        }
+        DesignerFrameFileDealerPane.getInstance().stateChange();
+        WorkerManager.getInstance().removeWorker(taskName);
+    }
+
+    public void start(String taskName) {
+        this.taskName = taskName;
+        this.template.setSaving(true);
+        this.execute();
+        // worker纳入管理
+        WorkerManager.getInstance().registerWorker(taskName, this);
+        try {
+            this.get(TIME_OUT, TimeUnit.MILLISECONDS);
+        } catch (TimeoutException timeoutException) {
+            slowly = true;
+            // 开始禁用
+            EastRegionContainerPane.getInstance().updateAllPropertyPane();
+            DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showCover();
+            DesignerFrameFileDealerPane.getInstance().stateChange();
+        } catch (Exception exception) {
+            FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
+            WorkerManager.getInstance().removeWorker(taskName);
+        }
+    }
+}

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

@@ -892,7 +892,7 @@ public class FILEChooserPane extends BasicPane {
         if (access(selectedFile) && access(currentDirectory)) {
             if (selectedFile.exists()) {
                 int selVal = FineJOptionPane.showConfirmDialog(dialog, Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Cover_The_Current_File") + " ?",
-                        Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+                                                               Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
                 if (selVal == JOptionPane.YES_OPTION) {
                     option = JOPTIONPANE_OK_OPTION;
                     saveDictionary();
@@ -913,9 +913,8 @@ public class FILEChooserPane extends BasicPane {
 
 
     private boolean access(FILE selectedFile) {
-        boolean access = false;
+        boolean access = true;
         try {
-            access = FRContext.getOrganizationOperator().canAccess(selectedFile.getPath());
             if (selectedFile.isEnvFile() && selectedFile instanceof FileNodeFILE) {
                 FileNodeFILE fileNodeFILE = ((FileNodeFILE) selectedFile);
                 access = access && fileNodeFILE.hasFullAuth() && NodeAuthProcessor.getInstance().checkFileNodeAuth(new FileNode(fileNodeFILE.getPath(), fileNodeFILE.isDirectory()));
@@ -1158,7 +1157,7 @@ public class FILEChooserPane extends BasicPane {
                 };
             }
             if (FILEChooserPane.this.showWebReport) {
-                webReportFILE = new FileNodeFILE(FRContext.getCommonOperator().getWebRootPath());
+                webReportFILE = new FileNodeFILE(FileNodeFILE.webRootPath);
             }
             if (FILEChooserPane.this.showLoc) {
                 processSystemFile();
@@ -1219,7 +1218,7 @@ public class FILEChooserPane extends BasicPane {
             }
 
             if (FILEChooserPane.this.showWebReport) {
-                webReportFILE = new FileNodeFILE(FRContext.getCommonOperator().getWebRootPath());
+                webReportFILE = new FileNodeFILE(FileNodeFILE.webRootPath);
             }
             if (FILEChooserPane.this.showLoc) {
                 processSystemFile();

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

@@ -32,7 +32,7 @@ public class FILEFactory {
             return new FileNodeFILE(new FileNode(path.substring(envPath.length() + 1), false));
         } else if (path.startsWith(WEBREPORT_PREFIX)) {
             return new FileNodeFILE(new FileNode(path.substring(WEBREPORT_PREFIX.length()), false),
-                    FRContext.getCommonOperator().getWebRootPath());
+                    FileNodeFILE.webRootPath);
         } else if (path.startsWith(FILE_PREFIX)) {
             return new FileFILE(new java.io.File(path.substring(FILE_PREFIX.length())));
         } else {
@@ -50,7 +50,7 @@ public class FILEFactory {
                     fixFILENodeAuth(new FileNode(path.substring(ENV_PREFIX.length()), true));
         } else if (path.startsWith(WEBREPORT_PREFIX)) {
             return new FileNodeFILE(new FileNode(path.substring(WEBREPORT_PREFIX.length()), true),
-                    FRContext.getCommonOperator().getWebRootPath());
+                    FileNodeFILE.webRootPath);
         } else if (path.startsWith(FILE_PREFIX)) {
             return new FileFILE(new java.io.File(path.substring(FILE_PREFIX.length())));
         } else {

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

@@ -32,7 +32,7 @@ import java.util.Arrays;
 public class FileNodeFILE implements FILE {
 
 
-    private static String webRootPath = FRContext.getCommonOperator().getWebRootPath();
+    public static String webRootPath = FRContext.getCommonOperator().getWebRootPath();
     private static String[] supportTypes = FRContext.getFileNodes().getSupportedTypes();
 
     static {

designer-base/src/main/java/com/fr/start/BaseDesigner.java

@@ -155,7 +155,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
                 isException = true;//此时有文件nullpointer异常，执行打开空文件
             }
         }
-        if (file.exists() && !isException) {
+        if (file != null && file.exists() && !isException) {
             df.openTemplate(file);
         } else {
             df.addAndActivateJTemplate();

designer-base/src/main/resources/com/fr/design/images/control/addPopup_disabled.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="16px" viewBox="0 0 24 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <g id="工具栏/导入数据集" transform="translate(-8.000000, -6.000000)">
+            <g id="编组" transform="translate(8.000000, 6.000000)">
+                <g fill="#333334" id="Combined-Shape">
+                    <path d="M8,2 C8.38659932,2 8.7,2.32097101 8.7,2.69703907 L8.7,7.3 L13.3029609,7.3 C13.6558446,7.3 13.9474813,7.56107882 13.9936369,7.90444795 L14,8 C14,8.38659932 13.679029,8.7 13.3029609,8.7 L8.7,8.699 L8.7,13.3029609 C8.7,13.6558446 8.43892118,13.9474813 8.09555205,13.9936369 L8,14 C7.61340068,14 7.3,13.679029 7.3,13.3029609 L7.3,8.699 L2.69703907,8.7 C2.34415536,8.7 2.05251868,8.43892118 2.00636315,8.09555205 L2,8 C2,7.61340068 2.32097101,7.3 2.69703907,7.3 L7.3,7.3 L7.3,2.69703907 C7.3,2.34415536 7.56107882,2.05251868 7.90444795,2.00636315 L8,2 Z"></path>
+                </g>
+                <g transform="translate(16.000000, 4.000000)" fill="#8F8F92" id="Rectangle-6">
+                    <path d="M2,0.997030139 C2,0.446385598 2.31387329,0.313873291 2.70591205,0.705912054 L6,4 L2.70591205,7.29408795 C2.31604759,7.68395241 2,7.54696369 2,7.00296986 L2,0.997030139 Z" transform="translate(4.000000, 4.000000) rotate(90.000000) translate(-4.000000, -4.000000) "></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/control/addPopup_normal.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="16px" viewBox="0 0 24 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组备份</title>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组备份">
+            <g id="Combined-Shape" fill="#333334">
+                <path d="M8,2 C8.38659932,2 8.7,2.32097101 8.7,2.69703907 L8.7,7.3 L13.3029609,7.3 C13.6558446,7.3 13.9474813,7.56107882 13.9936369,7.90444795 L14,8 C14,8.38659932 13.679029,8.7 13.3029609,8.7 L8.7,8.699 L8.7,13.3029609 C8.7,13.6558446 8.43892118,13.9474813 8.09555205,13.9936369 L8,14 C7.61340068,14 7.3,13.679029 7.3,13.3029609 L7.3,8.699 L2.69703907,8.7 C2.34415536,8.7 2.05251868,8.43892118 2.00636315,8.09555205 L2,8 C2,7.61340068 2.32097101,7.3 2.69703907,7.3 L7.3,7.3 L7.3,2.69703907 C7.3,2.34415536 7.56107882,2.05251868 7.90444795,2.00636315 L8,2 Z"></path>
+            </g>
+            <g id="Rectangle-6" transform="translate(16.000000, 4.000000)" fill="#8F8F92">
+                <path d="M2,0.997030139 C2,0.446385598 2.31387329,0.313873291 2.70591205,0.705912054 L6,4 L2.70591205,7.29408795 C2.31604759,7.68395241 2,7.54696369 2,7.00296986 L2,0.997030139 Z" transform="translate(4.000000, 4.000000) rotate(90.000000) translate(-4.000000, -4.000000) "></path>
+            </g>
+        </g>
+    </g>
+</svg>