Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0

build.gradle

@@ -68,7 +68,7 @@ allprojects {
         implementation 'org.swingexplorer:swexpl:2.0.1'
         implementation 'org.swingexplorer:swag:1.0'
         implementation 'net.java.dev.jna:jna:5.4.0'
-        implementation 'org.apache.tomcat:tomcat-catalina:8.5.69'
+        implementation 'org.apache.tomcat:tomcat-catalina:8.5.72'
         implementation 'io.socket:socket.io-client:0.7.0'
         implementation 'com.fr.third:fine-third:' + frVersion
         implementation 'com.fr.core:fine-core:' + frDevVersion

designer-base/src/main/java/com/fr/common/exception/ThrowableHandler.java

@@ -0,0 +1,12 @@
+package com.fr.common.exception;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/27
+ */
+public interface ThrowableHandler {
+
+    boolean process(Throwable e);
+
+}

designer-base/src/main/java/com/fr/common/listener/ManageDsListenerRegisterListener.java

@@ -0,0 +1,51 @@
+package com.fr.common.listener;
+
+import com.fr.design.data.DesignTableDataManager;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
+import javax.swing.event.ChangeListener;
+
+/**
+ * 管理数据集相关监听的注册
+ *
+ * 原本的监听生命周期注册与销毁：
+ *
+ * 创建时组件时进行注册，在模板关闭时进行销毁
+ * 但是在模板未关闭的这段时间，如果不断的打开和关闭某些弹窗，次数达到一定程度，会导致出现大量内存占用，除非此时关闭模板
+ *
+ * 改成以下模式：
+ *
+ * 当组件可见或者被添加到某个大组件 注册相关监听
+ * 当组件不可见或者被移除时 立即移除相关监听
+ * 及时清理无效监听，减少实时内存占用
+ *
+ *
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2022/2/14
+ */
+public class ManageDsListenerRegisterListener implements AncestorListener {
+
+    private ChangeListener changeListener;
+
+    public ManageDsListenerRegisterListener(ChangeListener changeListener) {
+        this.changeListener = changeListener;
+    }
+
+    @Override
+    public void ancestorAdded(AncestorEvent event) {
+        DesignTableDataManager.addDsChangeListener(changeListener);
+        // 添加后 fire一下 更新数据
+        changeListener.stateChanged(null);
+    }
+
+    @Override
+    public void ancestorRemoved(AncestorEvent event) {
+        DesignTableDataManager.removeDsChangeLister(changeListener);
+    }
+
+    @Override
+    public void ancestorMoved(AncestorEvent event) {
+        // do nothing
+    }
+}

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

@@ -22,6 +22,7 @@ import com.fr.design.login.DesignerLoginType;
 import com.fr.design.login.config.DesignerLoginConfigManager;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.notification.SnapChatConfig;
+import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.port.DesignerPortContext;
 import com.fr.design.style.color.ColorSelectConfigManager;
 import com.fr.design.update.push.DesignerPushUpdateConfigManager;
@@ -202,6 +203,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
 
     private boolean showTemplateMissingPlugin = true;
 
+    private boolean useOptimizedUPM4Adapter;
+
     /**
      * DesignerEnvManager.
      */
@@ -639,6 +642,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.showTemplateMissingPlugin = showTemplateMissingPlugin;
     }
 
+    public boolean isUseOptimizedUPM4Adapter() {
+        return useOptimizedUPM4Adapter;
+    }
+
+    public void setUseOptimizedUPM4Adapter(boolean useOptimizedUPM4Adapter) {
+        this.useOptimizedUPM4Adapter = useOptimizedUPM4Adapter;
+    }
+
     /**
      * 知否自动备份
      *
@@ -867,6 +878,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         designerLoginConfigManager.setPluginRemindOnFirstLaunch(pluginRemindOnFirstLaunch);
     }
 
+    public boolean isUseOldVersionLogin() {
+        return designerLoginConfigManager.isUseOldVersionLogin();
+    }
+
+    public void setUseOldVersionLogin(boolean useOldVersionLogin) {
+        designerLoginConfigManager.setUseOldVersionLogin(useOldVersionLogin);
+    }
+
     /**
      * 内置服务器是否使用时启动
      *
@@ -1821,6 +1840,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
         this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false));
         this.setShowTemplateMissingPlugin(reader.getAttrAsBoolean("showTemplateMissingPlugin", true));
+        this.setUseOptimizedUPM4Adapter(reader.getAttrAsBoolean("useOptimizedUPM4Adapter", SupportOSImpl.MACOS_12_VERSION_ADAPTER.support()));
     }
 
     private void readReportPaneAttributions(XMLableReader reader) {
@@ -2093,6 +2113,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         if (!this.isShowTemplateMissingPlugin()) {
             writer.attr("showTemplateMissingPlugin", this.isShowTemplateMissingPlugin());
         }
+        writer.attr("useOptimizedUPM4Adapter", this.isUseOptimizedUPM4Adapter());
         writer.end();
     }
 

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

@@ -427,9 +427,11 @@ public class EnvChangeEntrance {
                     DesignerExiter.getInstance().execute();
                 } else {
                     updateNotRememberPwdEnv();
+                    if (DesignerContext.getDesignerFrame().isVisible()) {
                         VersionCheckUtils.showVersionCheckDialog(envListPane.getSelectedName());
                     }
                 }
+            }
 
             @Override
             public void doCancel() {

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

@@ -185,13 +185,25 @@ public abstract class UpdateAction extends ShortCut implements Action {
 	 * @param resource 图标资源路径
 	 */
 	public void setSmallIcon(String resource) {
+		setSmallIcon(resource, true);
+	}
+
+	/**
+	 * 使用传入资源url的方式设置Icon，会自动设置_normal.svg，然后通过needDisable参数判断是否需要自动设置_disable.svg
+	 * 因为有些地方是不需要设置灰化图标的，所以不存在灰化图标资源，这边如果一并设置，就会报错文件找不到
+	 * @param resource
+	 * @param needDisable
+	 */
+	public void setSmallIcon(String resource, boolean needDisable) {
 		if (StringUtils.equals(resource, StringUtils.EMPTY)) {
 			this.putValue(Action.SMALL_ICON, null);
 			return;
 		}
 		this.putValue(Action.SMALL_ICON, IconUtils.readIcon(resource));
+		if (needDisable) {
 			this.putValue(UpdateAction.DISABLED_ICON, IconUtils.readSVGIcon(resource, IconUtils.ICON_TYPE_DISABLED));
 		}
+	}
 
 	public void setSmallIcon(Icon[] smallIcon, boolean white) {
 		this.putValue(Action.SMALL_ICON, smallIcon);

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

@@ -17,7 +17,7 @@ public class BugAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "http://bbs.fanruan.com/forum-156-1.html");
+        return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "https://service.fanruan.com/PF/FR/feedback?type=2");
     }
 
     public static final MenuKeySet BUG = new MenuKeySet() {

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

@@ -18,7 +18,7 @@ public class NeedAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "http://bbs.fanruan.com/forum-56-1.html");
+        return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "https://service.fanruan.com/PF/FR/feedback?type=1");
     }
 
     public static final MenuKeySet NEED = new MenuKeySet() {

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

@@ -0,0 +1,17 @@
+package com.fr.design.actions.community;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.login.AbstractDesignerSSO;
+import com.fr.general.CloudCenter;
+
+public class StudyPlanAction extends AbstractDesignerSSO {
+    public StudyPlanAction() {
+        this.setName(Toolkit.i18nText("Fine-Design_Study_Plan"));
+        this.setSmallIcon("/com/fr/design/images/bbs/studyPlan");
+    }
+
+    @Override
+    public String getJumpUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind("bbs.studyPlan", "https://edu.fanruan.com/studypath/finereport");
+    }
+}

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

@@ -15,9 +15,10 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIDictionaryComboBox;
+import com.fr.design.gui.ifilechooser.FileChooserArgs;
+import com.fr.design.gui.ifilechooser.FileChooserFactory;
 import com.fr.design.gui.ifilechooser.FileChooserProvider;
 import com.fr.design.gui.ifilechooser.FileSelectionMode;
-import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iprogressbar.UIProgressBarUI;
@@ -28,7 +29,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.layout.VerticalFlowLayout;
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.mainframe.vcs.common.VcsHelper;
 import com.fr.design.os.impl.SupportOSImpl;
@@ -50,8 +50,6 @@ import com.fr.transaction.Worker;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.vcs.VcsOperator;
 import com.fr.workspace.server.vcs.git.config.GcConfig;
-import com.sun.javafx.tk.FileChooserType;
-import javafx.stage.FileChooser;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -500,9 +498,8 @@ public class PreferencePane extends BasicPane {
             @Override
             public void actionPerformed(ActionEvent evt) {
                 FileChooserProvider fileChooserProvider =
-                        new JavaFxNativeFileChooser.Builder().
+                        FileChooserFactory.createFileChooser(FileChooserArgs.newBuilder().
-                                fileSelectionMode(FileSelectionMode.DIR).
+                                setFileSelectionMode(FileSelectionMode.DIR).build());
-                                build();
                 int saveValue = fileChooserProvider.showDialog(chooseDirBtn);
                 if (saveValue == JFileChooser.APPROVE_OPTION) {
                     File selectedFile = fileChooserProvider.getSelectedFile();
@@ -715,7 +712,8 @@ public class PreferencePane extends BasicPane {
         this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort()));
 
         if (useOptimizedUPMCheckbox != null) {
-            useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM());
+            useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM()
+                                                        || DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter());
         }
 
         useUniverseDBMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseUniverseDBM());
@@ -790,6 +788,7 @@ public class PreferencePane extends BasicPane {
         designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected());
         designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected());
         designerEnvManager.setImageCompress(this.imageCompressPanelCheckBox.isSelected());
+        designerEnvManager.setUseOptimizedUPM4Adapter(this.useOptimizedUPMCheckbox != null && this.useOptimizedUPMCheckbox.isSelected());
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
         vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue());
         vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected());

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

@@ -14,6 +14,7 @@ import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.GeneralUtils;
+import com.fr.i18n.UrlI18nManager;
 import com.fr.locale.InterProviderFactory;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
@@ -82,7 +83,7 @@ public class AboutPane extends JPanel {
         addPhoneAndQQPane(contentPane);
 
         // 官网
-        JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Official_Website"), CloudCenter.getInstance().acquireConf("website." + GeneralContext.getLocale(), ProductConstants.WEBSITE_URL));
+        JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Official_Website"), UrlI18nManager.getInstance().getI18nUrl("website"));
 
         // 支持邮箱
         String defaultEmail = CloudCenter.getInstance().acquireConf("support.email", ProductConstants.SUPPORT_EMAIL);
@@ -126,8 +127,8 @@ public class AboutPane extends JPanel {
         if (GeneralContext.getLocale().equals(Locale.TAIWAN)) {
             return;
         }
-        boxCenterAlignmentPane = new BoxCenterAligmentPane("QQ: " + CloudCenter.getInstance().acquireUrlByKind("help.qq"));
+        JPanel servicePlatformPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Service_Platform"), CloudCenter.getInstance().acquireUrlByKind("service.platform"));
-        contentPane.add(boxCenterAlignmentPane);
+        contentPane.add(servicePlatformPane);
     }
 
     // 是否显示鸣谢面板

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

@@ -41,16 +41,12 @@ public class SystemInfoPane extends JPanel {
         for (int i = 0; i < keys.length; i++) {
             Object[] tableRowData = new Object[2];
             String keyValue = keys[i].toString();
-            // james:屏蔽掉exe4j的内容
+
-            if (keyValue.indexOf("exe4j") != -1) {
+            if (needToShield(keyValue)) {
-            	continue;
-            }
-            // james：这个也是exe4j的东东
-            if ("install4j.exeDir".equals(keyValue)) {
                 continue;
             }
 
-        	if(keyValue.indexOf("FineReport") != -1){
+            if(keyValue.contains("FineReport")){
                 keys[i] = keyValue.replaceAll("FineReport", ProductConstants.APP_NAME);
             }
 
@@ -66,4 +62,14 @@ public class SystemInfoPane extends JPanel {
 
         add(new JScrollPane(table), BorderLayout.CENTER);
     }
+
+    /**
+     * 是否属于需要屏蔽的内容(当前屏蔽掉exe4j与jxbrowser的内容)
+     *
+     * @param keyValue 对应的key值
+     * @return 需要屏蔽则返回true
+     */
+    private boolean needToShield(String keyValue) {
+        return keyValue.contains("exe4j") || keyValue.contains("jxbrowser") || "install4j.exeDir".equals(keyValue);
+    }
 }

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

@@ -3,9 +3,9 @@ package com.fr.design.actions.help;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.CloudCenter;
 import com.fr.general.GeneralContext;
 import com.fr.general.http.HttpToolbox;
+import com.fr.i18n.UrlI18nManager;
 import com.fr.stable.CommonUtils;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
@@ -28,7 +28,7 @@ public class TutorialAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind(createDocKey(), "http://help.finereport.com");
+        return UrlI18nManager.getInstance().getI18nUrl("help");
     }
 
     public String getOffLineWarnMessage() {

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

@@ -0,0 +1,200 @@
+package com.fr.design.actions.help.alphafine;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.general.CloudCenter;
+import com.fr.json.JSONArray;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 云端变量统一管理
+ *
+ * @author Link
+ * @version 11.0
+ * Created by Link on 2022/9/28
+ */
+public class AlphaFineCloudConstants {
+
+    private static final String PLUGIN_SEARCH_API = "plugin.searchAPI";
+    private static final String PLUGIN_ALL_SEARCH_API = "plugin.all.searchAPI";
+    private static final String AF_PLUGIN_INFO = "af.pluginInfo";
+    private static final String AF_REUSE_INFO = "af.reuseInfo";
+    private static final String AF_DOC_VIEW = "af.doc_view";
+    private static final String AF_DOC_SEARCH = "af.doc_search";
+    private static final String AF_DOC_INFO = "af.doc_info";
+    private static final String AF_PLUGIN_IMAGE = "af.plugin_image";
+    private static final String AF_RECORD = "af.record";
+    private static final String AF_CLOUD_SEARCH = "af.cloud_search";
+    private static final String AF_SIMILAR_SEARCH = "af.similar_search";
+    private static final String AF_ADVICE_SEARCH = "af.advice_search";
+    private static final String AF_HOT_SEARCH = "af.hot_search";
+    private static final String AF_GO_FORUM = "af.go_fourm";
+    private static final String AF_GO_WEB = "af.go_web";
+    private static final String AF_PREVIEW = "af.preview";
+    private static final String AF_CID_NEW = "af.cid.new";
+    private static final String AF_CID_USER_GROUP_INFO = "af.cid.user.group.info";
+    private static final String AF_HELP_QUICK_START = "af.help.quick.start";
+    private static final String AF_HELP_REPORT_LEARNING_PATH = "af.help.report.learning.path";
+    private static final String AF_HELP_PARAM_LEARNING_PATH = "af.help.param.learning.path";
+    private static final String AF_HELP_FILL_LEARNING_PATH = "af.help.fill.learning.path";
+    private static final String AF_HELP_API_SUMMARY = "af.help.api.summary";
+    private static final String AF_HELP_MONTHLY_DOCUMENT = "af.help.monthly.document";
+    private static final String AF_RECOMMEND = "af.recommend";
+
+    private static final String LINK_NAME = "name";
+    private static final String LINK_URL = "link";
+
+    /**
+     * 获取插件搜索api
+     */
+    public static String getPluginSearchUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(PLUGIN_SEARCH_API);
+    };
+
+    /**
+     * 帆软市场里全部插件api
+     */
+    public static String getSearchAllPluginUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(PLUGIN_ALL_SEARCH_API);
+    }
+
+    /**
+     * 获取插件信息api
+     */
+    public static String getPluginUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_PLUGIN_INFO);
+    }
+
+    /**
+     * 获取组件信息api
+     */
+    public static String getReuseUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_REUSE_INFO);
+    }
+
+    /**
+     * 获取帮助文档url
+     */
+    public static String getDocumentDocUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_DOC_VIEW);
+    }
+
+    /**
+     * 帮助文档搜索api
+     */
+    public static String getDocumentSearchUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_DOC_SEARCH);
+    }
+
+    /**
+     * 帮助文档信息api
+     */
+    public static String getDocumentInformationUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_DOC_INFO);
+    }
+
+    /**
+     * 插件图片api
+     */
+    public static String getPluginImageUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_PLUGIN_IMAGE);
+    }
+
+    /**
+     * 获取云端接口，用于上传alphafine搜索记录
+     */
+    public static String getCloudServerUrl() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_RECORD);
+    }
+
+    /**
+     * 获取搜索api，输入搜索词，返回fr的相关功能
+     */
+    public static String getSearchApi() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_CLOUD_SEARCH);
+    }
+
+    /**
+     * 获取模糊搜索api前缀，输入搜索词，返回alphaFine相关内容，插件，文档，功能等
+     */
+    public static String getSimilarSearchUrlPrefix() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_SIMILAR_SEARCH);
+    }
+
+    /**
+     * 补全建议搜索结果 api，与AF_SIMILAR_SEARCH接口类似，但是返回的信息更全
+     */
+    public static String getComplementAdviceSearchUrlPrefix() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_ADVICE_SEARCH);
+    }
+
+    /**
+     * 获取热门问题
+     */
+    public static String getAlphaHotSearch() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_HOT_SEARCH);
+    }
+
+    /**
+     * 跳转论坛url
+     */
+    public static String getAlphaGoToForum() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_GO_FORUM);
+    }
+
+    /**
+     * 推荐搜索api，输入搜索词，返回猜你想搜的内容（html格式）
+     */
+    public static String getAlphaGoToWeb() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_GO_WEB);
+    }
+
+    /**
+     * 帆软智能客服页面url
+     */
+    public static String getAlphaPreview() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_PREVIEW);
+    }
+
+    /**
+     * cid系统的产品动态api
+     */
+    public static String getAlphaCid() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_CID_NEW);
+    }
+
+    /**
+     * cid系统的 用户组信息api
+     */
+    public static String getAlphaCidUserGroupInfo() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_CID_USER_GROUP_INFO);
+    }
+
+    private static String getDefaultRecommend() {
+        String[][] links = new String[][]{
+                {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Quick_Start"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_QUICK_START)},
+                {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Report_Learning"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_REPORT_LEARNING_PATH)},
+                {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Parameter_Learning"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_PARAM_LEARNING_PATH)},
+                {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Fill_Learning"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_FILL_LEARNING_PATH)},
+                {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Api_Summary"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_API_SUMMARY)},
+                {Toolkit.i18nText("Fine-Design_Report_AlphaFine_Doc_Monthly_Document"), CloudCenter.getInstance().acquireUrlByKind(AF_HELP_MONTHLY_DOCUMENT)}
+        };
+        JSONArray jsonArray = new JSONArray();
+        for (String[] link : links) {
+            Map<String, String> map = new HashMap<>();
+            map.put(LINK_NAME, link[0]);
+            map.put(LINK_URL, link[1]);
+            jsonArray.put(map);
+        }
+
+        return jsonArray.toString();
+    }
+
+    /**
+     * 获取默认推荐帮助文档url
+     */
+    public static String getAlphaHelpRecommend() {
+        return CloudCenter.getInstance().acquireUrlByKind(AF_RECOMMEND, getDefaultRecommend());
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.fr.design.actions.help.alphafine;
 
+import com.fr.base.FRContext;
+import com.fr.design.DesignerEnvManager;
 import com.fr.general.ComparatorUtils;
 import com.fr.license.function.VT4FR;
 import com.fr.stable.OperatingSystem;
@@ -10,10 +12,14 @@ import com.fr.stable.xml.XMLable;
 import com.fr.stable.xml.XMLableReader;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
+import javax.swing.KeyStroke;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
 
 /**
  * AlphaFine配置类
@@ -23,6 +29,7 @@ import java.util.Map;
  */
 public class AlphaFineConfigManager implements XMLable {
 
+    public static final String COMMA = ",";
     private static final long serialVersionUID = -8170289826729582122L;
     private static AlphaFineConfigManager alphaFineConfigManager = new AlphaFineConfigManager();
     /**
@@ -46,13 +53,17 @@ public class AlphaFineConfigManager implements XMLable {
      */
     private boolean containRecommend = true;
     /**
-     * 设置
+     * 功能
      */
     private boolean containAction = true;
     /**
      * 帮助文档
      */
     private boolean containDocument = true;
+    /**
+     * 我的模板
+     * */
+    private boolean containMyTemplate = true;
     /**
      * 模板
      */
@@ -62,7 +73,7 @@ public class AlphaFineConfigManager implements XMLable {
      */
     private boolean containFileContent;
     /**
-     * 应用中心
+     * 插件中心
      */
     private boolean containPlugin = true;
     /**
@@ -81,10 +92,37 @@ public class AlphaFineConfigManager implements XMLable {
      * 是否提醒
      */
     private boolean needRemind = true;
-
+    /**
+     * 产品动态
+     */
+    private boolean productDynamics = true;
+    /**
+     * 模板商城是否展示
+     */
+    private boolean showTemplateShop = true;
+    /**
+     * tab页排序
+     * 默认排序：动态，模板商城，帮助文档，插件中心，功能，我的模板
+     */
+    private String[] tabOrder;
     private Map<String, String> actionSearchTextCache = new HashMap<>(8);
-
     private String cacheBuildNO;
+
+    private static final String CONTAIN_TEMPLATE_SHOP = "isContainTemplateShop";
+    private static final String TAB_ORDER = "tabOrder";
+
+    /**
+     * key: 登录的bbs用户
+     * value: alphaFine历史搜索记录
+     */
+    private Map<String, Stack<String>> historySearchMap = new LinkedHashMap<>();
+
+    /**
+     * key: 登录的bbs用户
+     * value: 已读的cid的集合
+     */
+    private Map<String, Set<Long>> readSetMap = new LinkedHashMap<>();
+
     /**
      * 直接操作菜单次数
      */
@@ -115,17 +153,24 @@ public class AlphaFineConfigManager implements XMLable {
             this.setContainPlugin(reader.getAttrAsBoolean("isContainDocument", true));
             this.setContainDocument(reader.getAttrAsBoolean("isContainDocument", true));
             this.setContainRecommend(reader.getAttrAsBoolean("isContainRecommend", true));
+            this.setShowTemplateShop(reader.getAttrAsBoolean(CONTAIN_TEMPLATE_SHOP, true));
             this.setContainAction(reader.getAttrAsBoolean("isContainAction", true));
             this.setContainTemplate(reader.getAttrAsBoolean("isContainTemplate", true));
             this.setContainFileContent(reader.getAttrAsBoolean("isContainFileContent", false));
             this.setNeedSegmentationCheckbox(reader.getAttrAsBoolean("needSegmentationCheckbox", true));
             this.setNeedIntelligentCustomerService(reader.getAttrAsBoolean("needIntelligentCustomerService", true));
+            this.setProductDynamics(reader.getAttrAsBoolean("productDynamics", true));
             this.setShortcuts(reader.getAttrAsString("shortcuts", getDefaultShortCuts()));
             this.setNeedRemind(reader.getAttrAsBoolean("isNeedRemind", true));
             this.setOperateCount(reader.getAttrAsInt("operateCount", 0));
+            this.setTabOrder(reader.getAttrAsString(TAB_ORDER, getDefaultTabOrder()).split(COMMA));
         } else if (reader.isChildNode()) {
             if (ComparatorUtils.equals(reader.getTagName(), "ActionSearchTextCache")) {
                 readActionSearchTextCacheXML(reader);
+            } else if ("SearchHistory".equals(reader.getTagName())) {
+                readHistorySearch(reader);
+            } else if ("ReadSet".equals(reader.getTagName())) {
+                readReadSet(reader);
             }
         }
     }
@@ -152,6 +197,53 @@ public class AlphaFineConfigManager implements XMLable {
         });
     }
 
+    private void readHistorySearch(XMLableReader reader) {
+        reader.readXMLObject(new XMLReadable() {
+            @Override
+            public void readXML(XMLableReader xmLableReader) {
+                if (ComparatorUtils.equals(reader.getTagName(), "history")) {
+                    String tmpVal = reader.getElementValue();
+                    if (tmpVal != null) {
+                        tmpVal = tmpVal.replace("[", StringUtils.EMPTY).replace("]", StringUtils.EMPTY);
+                        Stack<String> stack = new SizedStack<>(3);
+                        String[] historyList = tmpVal.split(",");
+                        for (String history : historyList) {
+                            String value = history.trim();
+                            if (StringUtils.isNotEmpty(value)) {
+                                stack.add(value);
+                            }
+                        }
+                        historySearchMap.put(reader.getAttrAsString("user", StringUtils.EMPTY), stack);
+                    }
+                }
+            }
+        });
+    }
+
+
+    private void readReadSet(XMLableReader reader) {
+        reader.readXMLObject(new XMLReadable() {
+            @Override
+            public void readXML(XMLableReader xmLableReader) {
+                if (ComparatorUtils.equals(reader.getTagName(), "readId")) {
+                    String tmpVal = reader.getElementValue();
+                    if (tmpVal != null) {
+                        tmpVal = tmpVal.replace("[", StringUtils.EMPTY).replace("]", StringUtils.EMPTY);
+                        String[] idArr = tmpVal.split(",");
+                        Set<Long> setId = new HashSet<>();
+                        for (String id : idArr) {
+                            String value = id.trim();
+                            if (StringUtils.isNotEmpty(value)) {
+                                setId.add(Long.parseLong(value));
+                            }
+                        }
+                        readSetMap.put(reader.getAttrAsString("user", StringUtils.EMPTY), setId);
+                    }
+                }
+            }
+        });
+    }
+
     @Override
     public void writeXML(XMLPrintWriter writer) {
         writer.startTAG("AlphaFineConfigManager");
@@ -167,8 +259,13 @@ public class AlphaFineConfigManager implements XMLable {
                 .attr("isNeedRemind", this.isNeedRemind())
                 .attr("operateCount", this.getOperateCount())
                 .attr("needSegmentationCheckbox", this.isNeedSegmentationCheckbox())
-                .attr("needIntelligentCustomerService", this.isNeedIntelligentCustomerService());
+                .attr("needIntelligentCustomerService", this.isNeedIntelligentCustomerService())
+                .attr("productDynamics", this.isProductDynamics())
+                .attr(CONTAIN_TEMPLATE_SHOP, this.showTemplateShop)
+                .attr(TAB_ORDER, this.getTabOrderString());
         writeActionSearchTextCacheXML(writer);
+        writeSearchHistory(writer);
+        writeReadSet(writer);
         writer.end();
     }
 
@@ -183,6 +280,22 @@ public class AlphaFineConfigManager implements XMLable {
         writer.end();
     }
 
+    private void writeSearchHistory(XMLPrintWriter writer) {
+        writer.startTAG("SearchHistory");
+        for (Map.Entry<String, Stack<String>> entry : historySearchMap.entrySet()) {
+            writer.startTAG("history").attr("user", entry.getKey()).textNode(entry.getValue().toString()).end();
+        }
+        writer.end();
+    }
+
+    private void writeReadSet(XMLPrintWriter writer) {
+        writer.startTAG("ReadSet");
+        for (Map.Entry<String, Set<Long>> entry : readSetMap.entrySet()) {
+            writer.startTAG("readId").attr("user", entry.getKey()).textNode(entry.getValue().toString()).end();
+        }
+        writer.end();
+    }
+
     public boolean isSearchOnLine() {
         return searchOnLine;
     }
@@ -212,6 +325,13 @@ public class AlphaFineConfigManager implements XMLable {
         return OperatingSystem.isMacOS() ? "meta + D" : "ctrl + D";
     }
 
+    /**
+     * 返回默认排序
+     */
+    private String getDefaultTabOrder() {
+        return AlphaFineConstants.PRODUCT_NEWS + COMMA + AlphaFineConstants.TEMPLATE_SHOP + COMMA + AlphaFineConstants.HELP + COMMA + AlphaFineConstants.PLUGIN + COMMA + AlphaFineConstants.FUNCTION + COMMA + AlphaFineConstants.MY_TEMPLATES;
+    }
+
     public boolean isContainAction() {
         return containAction;
     }
@@ -228,6 +348,14 @@ public class AlphaFineConfigManager implements XMLable {
         this.containDocument = containDocument;
     }
 
+    public boolean isContainMyTemplate() {
+        return containMyTemplate;
+    }
+
+    public void setContainMyTemplate(boolean containMyTemplate) {
+        this.containMyTemplate = containMyTemplate;
+    }
+
     public boolean isContainTemplate() {
         return containTemplate;
     }
@@ -335,4 +463,61 @@ public class AlphaFineConfigManager implements XMLable {
     public void setCacheBuildNO(@NotNull String cacheBuildNO) {
         this.cacheBuildNO = cacheBuildNO;
     }
+
+    public Stack<String> getHistorySearch() {
+        return historySearchMap.computeIfAbsent(DesignerEnvManager.getEnvManager().getDesignerLoginUsername(), k -> new SizedStack<>(3));
+    }
+
+    public Set<Long> getReadSet() {
+        return readSetMap.computeIfAbsent(DesignerEnvManager.getEnvManager().getDesignerLoginUsername(), k -> new HashSet<>());
+    }
+
+    public boolean isProductDynamics() {
+        return productDynamics && FRContext.isChineseEnv();
+    }
+
+    public void setProductDynamics(boolean productDynamics) {
+        this.productDynamics = productDynamics;
+    }
+
+    public boolean hasTemplateShop() {
+        return showTemplateShop && FRContext.isChineseEnv();
+    }
+
+    public void setShowTemplateShop(boolean showTemplateShop) {
+        this.showTemplateShop = showTemplateShop;
+    }
+
+    /**
+     * 是否展示alphafine窗口，设置-搜索范围 0勾选，则不显示
+     */
+    public boolean needShowAlphaFineDialog() {
+        return hasTemplateShop() || isContainDocument() || isContainPlugin() ||
+                isContainAction() || isProductDynamics() || isContainMyTemplate();
+    }
+
+    /**
+     * 返回tab显示顺序
+     */
+    public String[] getTabOrder() {
+        if (tabOrder == null) {
+            tabOrder = getDefaultTabOrder().split(COMMA);
+        }
+        return tabOrder;
+    }
+
+    public void setTabOrder(String[] tabOrder) {
+        this.tabOrder = tabOrder;
+    }
+
+    /**
+     * getTabOrder的tostring
+     */
+    public String getTabOrderString() {
+        StringBuilder sb = new StringBuilder();
+        for (String s : getTabOrder()) {
+            sb.append(s + COMMA);
+        }
+        return sb.toString();
+    }
 }

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

@@ -1,23 +1,41 @@
 package com.fr.design.actions.help.alphafine;
 
 import com.fr.base.FRContext;
+import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.actions.help.alphafine.component.CustomSortPane;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.log.FineLoggerFactory;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.KeyStroke;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by XiaXiang on 2017/4/6.
@@ -25,39 +43,32 @@ import java.awt.event.MouseEvent;
 public class AlphaFineConfigPane extends BasicPane {
     private static final String TYPE = "pressed";
     private static final String DISPLAY_TYPE = "+";
-    private static final String BACK_SLASH = "BACK_SLASH";
+    private static final Color LABEL_TEXT = new Color(0x919193);
-    private static final String DISPLAY_BACK_SLASH = "\\";
+
-    private static final String SLASH = "SLASH";
+    private static final int SEARCH_CONFIG_PANE_HEIGHT = 70;
-    private static final String DISPLAY_SLASH = "/";
+    private static final int SEARCH_CONFIG_PANE_WIDTH = 87;
-    private static final String CONTROL = "CONTROL";
+    private static final double COLUMN_WIDTH = 150;
-    private static final String DISPLAY_CONTROL = "ctrl";
+    private static final double ROW_HEIGHT = 25;
-    private static final String OPEN_BRACKET = "OPEN_BRACKET";
-    private static final String DISPLAY_OPEN_BRACKET = "{";
-    private static final String CLOSE_BRACKET = "CLOSE_BRACKET";
-    private static final String DISPLAY_CLOSE_BRACKET = "}";
-    private static final String COMMA = "COMMA";
-    private static final String DISPLAY_COMMA = ",";
-    private static final String PERIOD = "PERIOD";
-    private static final String DISPLAY_PERIOD = ".";
-    private static final String SEMICOLON = "SEMICOLON";
-    private static final String DISPLAY_SEMICOLON = ";";
-    private static final String QUOTE = "QUOTE";
-    private static final String DISPLAY_QUOTE = "'";
-    private static final String EQUALS = "EQUALS";
-    private static final String DISPLAY_EQUALS = "+";
-    private static final String MINUS = "MINUS";
-    private static final String DISPLAY_MINUS = "-";
-    private static final String COMMAND = "META";
-    private static final String SMALL_COMMAND = "meta";
-    private static final String DISPLAY_COMMAND = "\u2318";
-
-
-    private static final double COLUMN_GAP = 180;
-    private static final double ROW_GAP = 25;
     private KeyStroke shortCutKeyStore = null;
-    private UICheckBox enabledCheckbox, searchOnlineCheckbox, needSegmentationCheckbox, needIntelligentCustomerService, containRecommendCheckbox, containActionCheckbox, containDocumentCheckbox, containTemplateCheckbox, containPluginCheckbox, containFileContentCheckbox;
+    private UICheckBox enabledCheckbox, searchOnlineCheckbox, needSegmentationCheckbox;
+    private UICheckBox productDynamicsCheckbox, containTemplateShopCheckbox, containDocumentCheckbox,
+            containPluginCheckbox, containActionCheckbox, containMyTemplateCheckbox;
+    // 自定义排序按钮
+    private ActionLabel customSortLabel;
     private UITextField shortcutsField;
 
+
+
+    // 当前tab排序。点击确定后会保存到配置文件中
+    private String[] currentOrder;
+
+
+    // 搜索范围-我的模板，相关组件
+    private JPanel containMyTemplatePane;
+    private JButton myTemplateSearchConfigButton;
+    private UIPopupMenu myTemplateSearchMenu;
+    private UICheckBox containTemplateNameSearchCheckbox, containFileContentSearchCheckbox;
+
     public AlphaFineConfigPane() {
         this.initComponents();
     }
@@ -70,43 +81,154 @@ public class AlphaFineConfigPane extends BasicPane {
         createSearchConfigPane(contentPane);
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.add(contentPane, BorderLayout.NORTH);
-
     }
 
-    private Component[][] initSearchRangeComponents() {
+    private Component[][] initOnlineComponents() {
         Component[][] components = new Component[][]{
-                new Component[]{containRecommendCheckbox, containActionCheckbox, containDocumentCheckbox},
+                new Component[]{searchOnlineCheckbox, needSegmentationCheckbox, null}
-                new Component[]{containTemplateCheckbox, containPluginCheckbox, containFileContentCheckbox},
-                new Component[]{needIntelligentCustomerService, null, null}
         };
         return components;
     }
 
-    private Component[][] initOnlineComponents() {
+    /**
+     * 搜索范围面板
+     */
+    private void createSearchConfigPane(JPanel contentPane) {
+        double[] rowSize = {ROW_HEIGHT, ROW_HEIGHT, ROW_HEIGHT};
+        double[] columnSize = {COLUMN_WIDTH, COLUMN_WIDTH, COLUMN_WIDTH};
+
+        JPanel searchConfigWrapperPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range"));
+        // 搜索选项
+        productDynamicsCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Product_News"));
+        containActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Function"));
+        containPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Plugin_Addon"));
+        containDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"));
+        containMyTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_My_Templates"));
+        containFileContentSearchCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content"));
+        containTemplateShopCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Shop"));
+        containMyTemplateCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_Report_My_Templates"));
+        JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize);
+
+        // 自定义排序
+        JPanel customSortWrapperPane = new JPanel();
+        customSortWrapperPane.setPreferredSize(new Dimension(SEARCH_CONFIG_PANE_HEIGHT, SEARCH_CONFIG_PANE_WIDTH));
+        customSortWrapperPane.setAlignmentY(JPanel.TOP_ALIGNMENT);
+        customSortLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Config_Custom_Sort"), false);
+        customSortLabel.setForeground(UIConstants.NORMAL_BLUE);
+        customSortLabel.addActionListener((event)->{
+            if (customSortLabel.isEnabled()) {
+                openCustomSortMenu();
+            }
+        });
+        customSortWrapperPane.add(customSortLabel);
+        if (!hasSelectedSearchRangeCheckBox()) {
+            customSortLabel.setEnabled(false);
+        }
+
+        searchConfigWrapperPane.add(searchConfigPane);
+        searchConfigWrapperPane.add(customSortWrapperPane);
+        contentPane.add(searchConfigWrapperPane);
+    }
+
+    /**
+     * 打开自定义排序面板
+     * */
+    private void openCustomSortMenu() {
+        CustomSortPane customSortPane = new CustomSortPane(getSelectedSearchRangeCheckBox(), this);
+        JPopupMenu popupMenu = new JPopupMenu();
+        popupMenu.add(customSortPane);
+        GUICoreUtils.showPopupMenu(popupMenu, customSortLabel, 0, customSortLabel.getHeight());
+    }
+
+
+    private Component[][] initSearchRangeComponents() {
+        // 我的模板checkbox设置，点击后
+        initMyTemplateSearchPane();
+
         Component[][] components = new Component[][]{
-                new Component[]{searchOnlineCheckbox, needSegmentationCheckbox, null}
+                new Component[]{productDynamicsCheckbox, containTemplateShopCheckbox, containDocumentCheckbox},
+                new Component[]{containPluginCheckbox, containActionCheckbox, containMyTemplatePane},
         };
+
+        // 添加选项点事件，无选中选项时自定排序按钮置灰
+        UICheckBox[] checkBoxes = new UICheckBox[]{productDynamicsCheckbox, containTemplateShopCheckbox, containDocumentCheckbox, containPluginCheckbox, containActionCheckbox, containMyTemplateCheckbox};
+        for (UICheckBox box : checkBoxes) {
+            box.addActionListener((e)->{
+                customSortLabel.setEnabled(hasSelectedSearchRangeCheckBox());
+            });
+        }
         return components;
     }
 
-    private void createSearchConfigPane(JPanel contentPane) {
+    /**
-        double[] rowSize = {ROW_GAP, ROW_GAP, ROW_GAP};
+     * 【搜索范围】中的复选框有无选中的
+     * */
+    private boolean hasSelectedSearchRangeCheckBox() {
+        return productDynamicsCheckbox.isSelected() || containTemplateShopCheckbox.isSelected() || containDocumentCheckbox.isSelected()
+                || containPluginCheckbox.isSelected() || containActionCheckbox.isSelected() || containMyTemplateCheckbox.isSelected();
+    }
 
-        double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP};
+    /**
+     * 获取当前选中的搜索范围选项
+     * */
+    private List<UICheckBox> getSelectedSearchRangeCheckBox() {
+        List<UICheckBox> res = new ArrayList<>();
+        UICheckBox[] checkBoxes = new UICheckBox[]{productDynamicsCheckbox, containTemplateShopCheckbox, containDocumentCheckbox, containPluginCheckbox, containActionCheckbox, containMyTemplateCheckbox};
+        for (UICheckBox c : checkBoxes) {
+            if (c.isSelected()) {
+                res.add(c);
+            }
+        }
+        return res;
+    }
 
-        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range"));
+    /**
-        containRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Recommend"));
+     * 搜索范围-我的模板
-        containActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"));
+     */
-        containPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Addon"));
+    private void initMyTemplateSearchPane() {
-        containDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"));
+        containMyTemplatePane = new JPanel(new FlowLayout(FlowLayout.LEFT, 4, 5));
-        containTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Templates"));
+        containMyTemplateCheckbox.setBorder(BorderFactory.createEmptyBorder());
-        containFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content"));
+        containMyTemplateCheckbox.addActionListener(new ActionListener() {
-        needIntelligentCustomerService = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Intelligent_Customer_Service"));
+            @Override
-        JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize);
+            public void actionPerformed(ActionEvent e) {
-        northPane.add(searchConfigPane);
+                if (containMyTemplateCheckbox.isSelected()) {
-        contentPane.add(northPane);
+                    myTemplateSearchConfigButton.setVisible(true);
+                } else {
+                    myTemplateSearchConfigButton.setVisible(false);
+                }
+            }
+        });
+        myTemplateSearchConfigButton = new JButton();
+        myTemplateSearchConfigButton.setBorder(BorderFactory.createEmptyBorder());
+        myTemplateSearchConfigButton.setMargin(new Insets(0, 0, 0, 0));
+        myTemplateSearchConfigButton.setIcon(IconUtils.readIcon("/com/fr/design/mainframe/alphafine/images/config.svg"));
+        myTemplateSearchMenu = new UIPopupMenu();
+        containTemplateNameSearchCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_AlphaFine_Config_Name_Search"));
+        containFileContentSearchCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_AlphaFine_Config_Content_Search"));
+        containTemplateNameSearchCheckbox.setSelected(true);
+        containTemplateNameSearchCheckbox.setEnabled(false);
+        containTemplateNameSearchCheckbox.setBackground(null);
+        containFileContentSearchCheckbox.setBackground(null);
+        myTemplateSearchMenu.add(containTemplateNameSearchCheckbox);
+        myTemplateSearchMenu.add(containFileContentSearchCheckbox);
+        myTemplateSearchConfigButton.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                super.mouseClicked(e);
+                GUICoreUtils.showPopupMenu(myTemplateSearchMenu, containMyTemplatePane, containMyTemplateCheckbox.getWidth(), containMyTemplatePane.getY());
+            }
+
+            @Override
+            public void mouseMoved(MouseEvent e) {
+                super.mouseMoved(e);
+                myTemplateSearchMenu.setVisible(false);
+            }
+        });
+        containMyTemplatePane.add("containMyTemplateCheckbox", containMyTemplateCheckbox);
+        containMyTemplatePane.add("myTemplateSearchConfigButton", myTemplateSearchConfigButton);
     }
 
+
     private void createShortcutsPane(JPanel contentPane) {
         JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Shortcut_Config"));
         shortcutsField = new UITextField();
@@ -117,7 +239,7 @@ public class AlphaFineConfigPane extends BasicPane {
         northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open") + ":"));
         northPane.add(shortcutsField);
         UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts"));
-        label.setForeground(Color.RED);
+        label.setForeground(LABEL_TEXT);
         northPane.add(label);
         contentPane.add(northPane);
     }
@@ -139,7 +261,7 @@ public class AlphaFineConfigPane extends BasicPane {
                 int keyCode = e.getKeyCode();
                 shortCutKeyStore = KeyStroke.getKeyStroke(keyCode, modifier);
                 String str = shortCutKeyStore.toString();
-                shortcutsField.setText(getDisplayShortCut(str));
+                shortcutsField.setText(AlphaFineShortCutUtil.getDisplayShortCut(str));
                 shortcutsField.selectAll();
             }
         });
@@ -153,24 +275,24 @@ public class AlphaFineConfigPane extends BasicPane {
             @Override
             public void actionPerformed(ActionEvent e) {
                 if (!searchOnlineCheckbox.isSelected()) {
-                    containRecommendCheckbox.setEnabled(false);
+                    productDynamicsCheckbox.setEnabled(false);
                     containPluginCheckbox.setEnabled(false);
                     containDocumentCheckbox.setEnabled(false);
-                    needIntelligentCustomerService.setEnabled(false);
+                    containTemplateShopCheckbox.setEnabled(false);
-                    containRecommendCheckbox.setSelected(false);
+                    productDynamicsCheckbox.setSelected(false);
                     containPluginCheckbox.setSelected(false);
                     containDocumentCheckbox.setSelected(false);
-                    needIntelligentCustomerService.setSelected(false);
+                    containTemplateShopCheckbox.setSelected(false);
                 } else {
-                    containRecommendCheckbox.setEnabled(true);
+                    productDynamicsCheckbox.setEnabled(true);
                     containPluginCheckbox.setEnabled(true);
                     containDocumentCheckbox.setEnabled(true);
-                    needIntelligentCustomerService.setEnabled(true);
+                    containTemplateShopCheckbox.setEnabled(true);
                 }
             }
         });
-        double[] rowSize = {ROW_GAP};
+        double[] rowSize = {ROW_HEIGHT};
-        double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP};
+        double[] columnSize = {COLUMN_WIDTH, COLUMN_WIDTH, COLUMN_WIDTH};
         JPanel onlinePane = TableLayoutHelper.createTableLayoutPane(initOnlineComponents(), rowSize, columnSize);
         northPane.add(onlinePane);
         contentPane.add(northPane);
@@ -198,8 +320,10 @@ public class AlphaFineConfigPane extends BasicPane {
         this.searchOnlineCheckbox.setSelected(enabled4Locale);
 
         this.containActionCheckbox.setSelected(alphaFineConfigManager.isContainAction());
-        this.containTemplateCheckbox.setSelected(alphaFineConfigManager.isContainTemplate());
+
-        this.containFileContentCheckbox.setSelected(alphaFineConfigManager.isContainFileContent());
+        this.containMyTemplateCheckbox.setSelected(alphaFineConfigManager.isContainMyTemplate());
+        this.myTemplateSearchConfigButton.setVisible(alphaFineConfigManager.isContainMyTemplate());
+        this.containFileContentSearchCheckbox.setSelected(alphaFineConfigManager.isContainFileContent());
 
         this.containDocumentCheckbox.setSelected(alphaFineConfigManager.isContainDocument() && enabled4Locale);
         this.containDocumentCheckbox.setEnabled(enabled4Locale);
@@ -207,17 +331,25 @@ public class AlphaFineConfigPane extends BasicPane {
         this.containPluginCheckbox.setSelected(alphaFineConfigManager.isContainPlugin() && enabled4Locale);
         this.containPluginCheckbox.setEnabled(enabled4Locale);
 
-        this.containRecommendCheckbox.setSelected(alphaFineConfigManager.isContainRecommend() && enabled4Locale);
+        this.productDynamicsCheckbox.setSelected(alphaFineConfigManager.isProductDynamics() && enabled4Locale);
-        this.containRecommendCheckbox.setEnabled(enabled4Locale);
+        this.productDynamicsCheckbox.setEnabled(enabled4Locale);
 
-        this.shortcutsField.setText(getDisplayShortCut(alphaFineConfigManager.getShortcuts()));
+        this.containTemplateShopCheckbox.setSelected(alphaFineConfigManager.hasTemplateShop() && enabled4Locale);
+        this.containTemplateShopCheckbox.setEnabled(enabled4Locale);
 
-        this.needSegmentationCheckbox.setSelected(alphaFineConfigManager.isNeedSegmentationCheckbox());
+        this.shortcutsField.setText(AlphaFineShortCutUtil.getDisplayShortCut(alphaFineConfigManager.getShortcuts()));
 
-        this.needIntelligentCustomerService.setSelected(alphaFineConfigManager.isNeedIntelligentCustomerService() && enabled4Locale);
+        this.needSegmentationCheckbox.setSelected(alphaFineConfigManager.isNeedSegmentationCheckbox());
-        this.needIntelligentCustomerService.setEnabled(enabled4Locale);
 
         shortCutKeyStore = convert2KeyStroke(alphaFineConfigManager.getShortcuts());
+
+        this.currentOrder = alphaFineConfigManager.getTabOrder().clone();
+
+        if (!hasSelectedSearchRangeCheckBox()) {
+            customSortLabel.setEnabled(false);
+        } else {
+            customSortLabel.setEnabled(true);
+        }
     }
 
     public void update() {
@@ -226,14 +358,16 @@ public class AlphaFineConfigPane extends BasicPane {
         alphaFineConfigManager.setContainPlugin(this.containPluginCheckbox.isSelected());
         alphaFineConfigManager.setContainAction(this.containActionCheckbox.isSelected());
         alphaFineConfigManager.setContainDocument(this.containDocumentCheckbox.isSelected());
-        alphaFineConfigManager.setContainRecommend(this.containRecommendCheckbox.isSelected());
+        alphaFineConfigManager.setProductDynamics(this.productDynamicsCheckbox.isSelected());
+        alphaFineConfigManager.setShowTemplateShop(this.containTemplateShopCheckbox.isSelected());
         alphaFineConfigManager.setEnabled(this.enabledCheckbox.isSelected());
         alphaFineConfigManager.setSearchOnLine(this.searchOnlineCheckbox.isSelected());
-        alphaFineConfigManager.setContainTemplate(this.containTemplateCheckbox.isSelected());
+        alphaFineConfigManager.setContainMyTemplate(this.containMyTemplateCheckbox.isSelected());
-        alphaFineConfigManager.setContainFileContent(this.containFileContentCheckbox.isSelected());
+        alphaFineConfigManager.setContainFileContent(this.containFileContentSearchCheckbox.isSelected());
         alphaFineConfigManager.setNeedSegmentationCheckbox(this.needSegmentationCheckbox.isSelected());
-        alphaFineConfigManager.setNeedIntelligentCustomerService(this.needIntelligentCustomerService.isSelected());
         alphaFineConfigManager.setShortcuts(shortCutKeyStore != null ? shortCutKeyStore.toString().replace(TYPE, DISPLAY_TYPE) : this.shortcutsField.getText());
+        alphaFineConfigManager.setTabOrder(currentOrder);
+
         designerEnvManager.setAlphaFineConfigManager(alphaFineConfigManager);
         try {
             DesignerEnvManager.loadLogSetting();
@@ -245,13 +379,6 @@ public class AlphaFineConfigPane extends BasicPane {
 
     }
 
-    private String getDisplayShortCut(String shortCut) {
-        return shortCut.replace(TYPE, DISPLAY_TYPE).replace(BACK_SLASH, DISPLAY_BACK_SLASH).replace(SLASH, DISPLAY_SLASH)
-                .replace(CONTROL, DISPLAY_CONTROL).replace(OPEN_BRACKET, DISPLAY_OPEN_BRACKET).replace(CLOSE_BRACKET, DISPLAY_CLOSE_BRACKET)
-                .replace(COMMA, DISPLAY_COMMA).replace(PERIOD, DISPLAY_PERIOD).replace(SEMICOLON, DISPLAY_SEMICOLON).replace(QUOTE, DISPLAY_QUOTE)
-                .replace(EQUALS, DISPLAY_EQUALS).replace(MINUS, DISPLAY_MINUS).replace(COMMAND, DISPLAY_COMMAND).replace(SMALL_COMMAND, DISPLAY_COMMAND);
-    }
-
 
     private KeyStroke convert2KeyStroke(String ks) {
         return KeyStroke.getKeyStroke(ks.replace(DISPLAY_TYPE, TYPE));
@@ -266,10 +393,18 @@ public class AlphaFineConfigPane extends BasicPane {
     }
 
     public UICheckBox getIsContainFileContentCheckbox() {
-        return containFileContentCheckbox;
+        return containFileContentSearchCheckbox;
     }
 
     public void setIsContainFileContentCheckbox(UICheckBox isContainFileContentCheckbox) {
-        this.containFileContentCheckbox = isContainFileContentCheckbox;
+        this.containFileContentSearchCheckbox = isContainFileContentCheckbox;
+    }
+
+    public String[] getCurrentOrder() {
+        return currentOrder;
+    }
+
+    public void setCurrentOrder(String[] currentOrder) {
+        this.currentOrder = currentOrder;
     }
 }

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

@@ -1,13 +1,19 @@
-package com.fr.design.mainframe.alphafine;
+package com.fr.design.actions.help.alphafine;
 
 import com.fr.base.extension.FileExtension;
+import com.fr.base.svg.IconUtils;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.DesignUtils;
-import com.fr.general.CloudCenter;
+import com.fr.general.IOUtils;
 
+import javax.swing.Icon;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 
 /**
@@ -15,6 +21,19 @@ import java.util.ArrayList;
  */
 public class AlphaFineConstants {
 
+
+    public static final String FUNCTION = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Function");
+
+    public static final String MY_TEMPLATES = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_My_Templates");
+
+    public static final String PRODUCT_NEWS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Product_News");
+
+    public static final String HELP = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help");
+
+    public static final String PLUGIN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Plugin_Addon");
+
+    public static final String TEMPLATE_SHOP = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Shop");
+
     public static final int SHOW_SIZE = 5;
 
     public static final int MAX_FILE_SIZE = 1000;
@@ -33,7 +52,7 @@ public class AlphaFineConstants {
 
     public static final int CONTENT_HEIGHT = 405;
 
-    public static final int CELL_HEIGHT = 32;
+    public static final int CELL_HEIGHT = 29;
 
     public static final int CELL_TITLE_HEIGHT = 24;
 
@@ -41,6 +60,15 @@ public class AlphaFineConstants {
 
     public static final int HOT_ITEMS = 6;
 
+    /**
+     * 限制搜索字符长度
+     */
+    public static final int LEN_LIMIT = 50;
+
+    /**
+     * 帮助文档搜索间隔（ms） api限制了1s之内只能搜索一次
+     */
+    public static final long DOCUMENT_SEARCH_GAP = 1000;
 
     public static final Dimension FULL_SIZE = new Dimension(680, 460);
 
@@ -54,10 +82,17 @@ public class AlphaFineConstants {
 
     public static final Dimension HOT_ISSUES_JAPNEL_SIZE = new Dimension(213, 182);
 
+    /**
+     * 展示面板的尺寸
+     */
+    public static final Dimension PREVIEW_SIZE = new Dimension(680, 305);
+
     public static final Dimension CLOSE_BUTTON_SIZE = new Dimension(40, 40);
 
     public static final Color WHITE = new Color(0xf9f9f9);
 
+    public static final Color LABEL_SELECTED = new Color(0x419bf9);
+
     public static final Color GRAY = new Color(0xd2d2d2);
 
     public static final Color LIGHT_GRAY = new Color(0xcccccc);
@@ -88,60 +123,65 @@ public class AlphaFineConstants {
 
     public static final String ALPHA_HOT_IMAGE_NAME = "alphafine_hot";
 
-    public static final String PLUGIN_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("plugin.searchAPI");
+    public static final String SPECIAL_CHARACTER_REGEX = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】'；：”“’。，、？]";
-
-    public static final String PLUGIN_URL = CloudCenter.getInstance().acquireUrlByKind("af.pluginInfo");
-
-    public static final String REUSE_URL = CloudCenter.getInstance().acquireUrlByKind("af.reuseInfo");
 
+    public static final String BOTTOM_REGEX_FIRST = "<div class=\"bang\">([\\s\\S]*?)class=\"jiaoyes\">YES</a><br/>";
 
-    public static final String DOCUMENT_DOC_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_view");
+    public static final String BOTTOM_REGEX_SECOND = "<div class=\"yes_([\\s\\S]*?)帮助</a></div></div>";
 
-    public static final String DOCUMENT_SEARCH_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_search");
+    public static final String LINK_REGEX = "javascript:;\"([\\s\\S]*?)','";
 
-    public static final String DOCUMENT_INFORMATION_URL = CloudCenter.getInstance().acquireUrlByKind("af.doc_info");
+    public static final String LINK_REGEX_ANOTHER = "javascript:([\\s\\S]*?)url=\"";
 
-    public static final String PLUGIN_IMAGE_URL = CloudCenter.getInstance().acquireUrlByKind("af.plugin_image");
+    public static final String ALPHA_ROBOT_SEARCH_TOKEN = "K8dl0Np6l0gs";
 
-    public static final String CLOUD_SERVER_URL = CloudCenter.getInstance().acquireUrlByKind("af.record");
+    public static final String SEARCH_BY_ID = "?id=";
 
-    public static final String SEARCH_API = CloudCenter.getInstance().acquireUrlByKind("af.cloud_search");
+    public static final String JAVASCRIPT_PREFIX = "javascript:SendJava";
 
-    public static final String SPECIAL_CHARACTER_REGEX = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】'；：”“’。，、？]";
+    public static final String CHINESE_CHARACTERS = "[\\u4e00-\\u9fa5]";
 
-    public static final String BOTTOM_REGEX_FIRST = "<div class=\"bang\">([\\s\\S]*?)class=\"jiaoyes\">YES</a><br/>";
+    public static final String FIRST_PAGE = "-1";
 
-    public static final String BOTTOM_REGEX_SECOND = "<div class=\"yes_([\\s\\S]*?)帮助</a></div></div>";
+    public static final FileExtension[] FILE_EXTENSIONS = new FileExtension[]{FileExtension.CPT, FileExtension.FRM};
 
-    public static final String LINK_REGEX = "javascript:;\"([\\s\\S]*?)','";
+    public static final int RECOMMEND_MAX_ITEM_NUM = 3;
 
-    public static final String LINK_REGEX_ANOTHER = "javascript:([\\s\\S]*?)url=\"";
+    public static final String BACK_ICON_NAME = "back@1x.png";
 
-    public static final String ALPHA_ROBOT_SEARCH_TOKEN = "K8dl0Np6l0gs";
+    public static final Icon NO_RESULT_ICON = IOUtils.readIcon(AlphaFineConstants.IMAGE_URL + "noresult.png");
 
-    public static final String SIMILAR_SEARCH_URL_PREFIX = CloudCenter.getInstance().acquireUrlByKind("af.similar_search");
+    public static final Color SUSPENDED_COLOR = new Color(84, 165, 249);
 
-    public static final String COMPLEMENT_ADVICE_SEARCH_URL_PREFIX = CloudCenter.getInstance().acquireUrlByKind("af.advice_search");
+    public static final Color FOREGROUND_COLOR = new Color(51, 51, 52);
 
-    public static final String ALPHA_HOT_SEARCH = CloudCenter.getInstance().acquireUrlByKind("af.hot_search");
+    /**
+     * 后面数字代表透明度 80%
+     */
+    public static final Color FOREGROUND_COLOR_8 = new Color(51, 51, 52, 204);
 
-    public static final String ALPHA_GO_TO_FORUM = CloudCenter.getInstance().acquireUrlByKind("af.go_fourm");
+    public static final Color FOREGROUND_COLOR_6 = new Color(51, 51, 52, 153);
 
-    public static final String ALPHA_GO_TO_WEB = CloudCenter.getInstance().acquireUrlByKind("af.go_web");
+    public static final Color FOREGROUND_COLOR_5 = new Color(51, 51, 52, 128);
 
-    public static final String ALPHA_PREVIEW = CloudCenter.getInstance().acquireUrlByKind("af.preview");
+    public static final Color BACKGROUND_COLOR = new Color(245, 245, 247);
 
-    public static final String JAVASCRIPT_PREFIX = "javascript:SendJava";
+    public static final Icon BULB_ICON = IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bulb.svg");
 
-    public static final String CHINESE_CHARACTERS = "[\\u4e00-\\u9fa5]";
+    public static final Icon YELLOW_BULB_ICON = IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/yellow_bulb.svg");
 
-    public static final String FIRST_PAGE = "-1";
+    public static final Icon LIGHT_YELLOW_BULB_ICON = IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/light_yellow_bulb.svg");
 
-    public static final FileExtension[] FILE_EXTENSIONS = new FileExtension[]{FileExtension.CPT, FileExtension.FRM};
+    public static final String HOT_SEARCH = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Hot_Search");
 
-    public static final int RECOMMEND_MAX_ITEM_NUM = 3;
+    public static final Set<String> HOT_SEARCH_SET = new LinkedHashSet<>(
+            Arrays.asList(
+                    Toolkit.i18nText("Fine-Design_Report_AlphaFine_Hot_Search_TOP_ONE"),
+                    Toolkit.i18nText("Fine-Design_Report_AlphaFine_Hot_Search_TOP_TWO"),
+                    Toolkit.i18nText("Fine-Design_Report_AlphaFine_Hot_Search_TOP_THREE")
+            )
+    );
 
-    public static final String BACK_ICON_NAME = "back@1x.png";
 
     public static final ArrayList<String> CONJUNCTION = new ArrayList<String>() {{
         add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Conjunction_HE"));
@@ -149,4 +189,11 @@ public class AlphaFineConstants {
         add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Conjunction_DE"));
     }};
 
+    public static final String LOADING = "loading";
+
+    public static final String NETWORK_ERROR = "network error";
+
+    public static final String TITLE = "AlphaFine";
+
+    public static final int DEFAULT_CLICK_COUNT = 1;
 }

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

@@ -0,0 +1,44 @@
+package com.fr.design.actions.help.alphafine;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2022/4/26
+ */
+public class AlphaFineShortCutUtil {
+
+    private static final String TYPE = "pressed";
+    private static final String DISPLAY_TYPE = "+";
+    private static final String BACK_SLASH = "BACK_SLASH";
+    private static final String DISPLAY_BACK_SLASH = "\\";
+    private static final String SLASH = "SLASH";
+    private static final String DISPLAY_SLASH = "/";
+    private static final String CONTROL = "CONTROL";
+    private static final String DISPLAY_CONTROL = "ctrl";
+    private static final String OPEN_BRACKET = "OPEN_BRACKET";
+    private static final String DISPLAY_OPEN_BRACKET = "{";
+    private static final String CLOSE_BRACKET = "CLOSE_BRACKET";
+    private static final String DISPLAY_CLOSE_BRACKET = "}";
+    private static final String COMMA = "COMMA";
+    private static final String DISPLAY_COMMA = ",";
+    private static final String PERIOD = "PERIOD";
+    private static final String DISPLAY_PERIOD = ".";
+    private static final String SEMICOLON = "SEMICOLON";
+    private static final String DISPLAY_SEMICOLON = ";";
+    private static final String QUOTE = "QUOTE";
+    private static final String DISPLAY_QUOTE = "'";
+    private static final String EQUALS = "EQUALS";
+    private static final String DISPLAY_EQUALS = "+";
+    private static final String MINUS = "MINUS";
+    private static final String DISPLAY_MINUS = "-";
+    private static final String COMMAND = "META";
+    private static final String SMALL_COMMAND = "meta";
+    private static final String DISPLAY_COMMAND = "\u2318";
+
+    public  static String getDisplayShortCut(String shortCut) {
+        return shortCut.replace(TYPE, DISPLAY_TYPE).replace(BACK_SLASH, DISPLAY_BACK_SLASH).replace(SLASH, DISPLAY_SLASH)
+                .replace(CONTROL, DISPLAY_CONTROL).replace(OPEN_BRACKET, DISPLAY_OPEN_BRACKET).replace(CLOSE_BRACKET, DISPLAY_CLOSE_BRACKET)
+                .replace(COMMA, DISPLAY_COMMA).replace(PERIOD, DISPLAY_PERIOD).replace(SEMICOLON, DISPLAY_SEMICOLON).replace(QUOTE, DISPLAY_QUOTE)
+                .replace(EQUALS, DISPLAY_EQUALS).replace(MINUS, DISPLAY_MINUS).replace(COMMAND, DISPLAY_COMMAND).replace(SMALL_COMMAND, DISPLAY_COMMAND);
+    }
+}

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

@@ -0,0 +1,30 @@
+package com.fr.design.actions.help.alphafine;
+
+import java.util.Stack;
+
+/**
+ * @author hades
+ * @version 11.0
+ * Created by hades on 2022/4/23
+ */
+public class SizedStack<T> extends Stack<T> {
+
+    private final int maxSize;
+
+    public SizedStack(int size) {
+        super();
+        this.maxSize = size;
+    }
+
+    @Override
+    public T push(T object) {
+        while (this.size() >= maxSize) {
+            this.remove(0);
+        }
+        // 不重复
+        if (this.contains(object)) {
+            return object;
+        }
+        return super.push(object);
+    }
+}

designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java

@@ -0,0 +1,229 @@
+package com.fr.design.actions.help.alphafine.component;
+
+import com.fr.base.svg.IconUtils;
+import com.fr.design.actions.help.alphafine.AlphaFineConfigPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.PanelUI;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * alphafine设置 - 搜索范围 - 自定义排序 - 弹出面板
+ *
+ * @author Link
+ * @version 11.0
+ * Created by Link on 2022/9/18
+ */
+public class CustomSortPane extends JPanel {
+
+
+    private static final int WIDTH = 147;
+    private static final int ITEM_HEIGHT = 23;
+    private static final int GAP = 1;
+    private static final Color BACKGROUND_COLOR = new Color(0xdadadd);
+
+    private UIButton top;
+    private UIButton bottom;
+    private UIButton up;
+    private UIButton down;
+    private JPanel toolbarPane;
+    private MenuLabelPane sortItemPane;
+    private List<UICheckBox> sortItems;
+    private MenuLabel selectedLabel;
+    private AlphaFineConfigPane parentPane;
+
+    public CustomSortPane(List<UICheckBox> items, AlphaFineConfigPane parentPane) {
+        this.sortItems = items;
+        this.parentPane = parentPane;
+        setLayout(new BorderLayout(GAP, GAP));
+        int height = (sortItems.size() + 1) * (ITEM_HEIGHT + GAP) + GAP;
+        setPreferredSize(new Dimension(WIDTH, height));
+        initComponent();
+        add(toolbarPane, BorderLayout.NORTH);
+        add(sortItemPane, BorderLayout.CENTER);
+        revalidate();
+        this.setVisible(true);
+    }
+
+    @Override
+    public void setUI(PanelUI ui) {
+        super.setUI(ui);
+        setBackground(BACKGROUND_COLOR);
+
+    }
+
+    private void initComponent() {
+        createToolbarPane();
+        createSortItemPane();
+    }
+
+    private void createToolbarPane() {
+        top = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top.svg"), false);
+        bottom = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom.svg"), false);
+        up = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up.svg"), false);
+        down = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down.svg"), false);
+        top.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top_disable.svg"));
+        bottom.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom_disable.svg"));
+        up.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up_disable.svg"));
+        down.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down_disable.svg"));
+        top.addActionListener(e -> {
+            SwingUtilities.invokeLater(() -> {
+                sortItemPane.setComponentZOrder(selectedLabel, 0);
+                setToolbarEnable(sortItemPane.getComponentZOrder(selectedLabel), sortItemPane.getComponentCount());
+                CustomSortPane.this.revalidate();
+                CustomSortPane.this.repaint();
+                refreshCurrentOrder();
+            });
+
+        });
+        bottom.addActionListener(e -> {
+            SwingUtilities.invokeLater(() -> {
+                sortItemPane.setComponentZOrder(selectedLabel, sortItemPane.getComponentCount() - 1);
+                setToolbarEnable(sortItemPane.getComponentZOrder(selectedLabel), sortItemPane.getComponentCount());
+                CustomSortPane.this.revalidate();
+                CustomSortPane.this.repaint();
+                refreshCurrentOrder();
+            });
+
+        });
+        up.addActionListener(e -> {
+            SwingUtilities.invokeLater(() -> {
+                sortItemPane.setComponentZOrder(selectedLabel, sortItemPane.getComponentZOrder(selectedLabel) - 1);
+                setToolbarEnable(sortItemPane.getComponentZOrder(selectedLabel), sortItemPane.getComponentCount());
+                CustomSortPane.this.revalidate();
+                CustomSortPane.this.repaint();
+                refreshCurrentOrder();
+            });
+
+        });
+        down.addActionListener(e -> {
+            SwingUtilities.invokeLater(() -> {
+                sortItemPane.setComponentZOrder(selectedLabel, sortItemPane.getComponentZOrder(selectedLabel) + 1);
+                setToolbarEnable(sortItemPane.getComponentZOrder(selectedLabel), sortItemPane.getComponentCount());
+                CustomSortPane.this.revalidate();
+                CustomSortPane.this.repaint();
+                refreshCurrentOrder();
+            });
+
+        });
+        toolbarPane = new JPanel(new FlowLayout(FlowLayout.TRAILING, GAP, GAP));
+        toolbarPane.setBorder(BorderFactory.createEmptyBorder());
+        toolbarPane.add(top);
+        toolbarPane.add(bottom);
+        toolbarPane.add(up);
+        toolbarPane.add(down);
+    }
+
+    private void createSortItemPane() {
+        String[] currentTabOrder = parentPane.getCurrentOrder();
+        Map<String, Integer> sortMap = new HashMap<>();
+        for (int i = 0; i < currentTabOrder.length; i++) {
+            sortMap.put(currentTabOrder[i], i);
+        }
+        List<MenuLabel> sortLabels = new ArrayList<>();
+        for (UICheckBox item : sortItems) {
+            MenuLabel label = new MenuLabel(item.getText(), (Function<MenuLabel, Object>) o -> {
+                selectedLabel = o;
+                disableButton();
+                return null;
+            });
+            sortLabels.add(label);
+        }
+        sortLabels.sort(Comparator.comparingInt(tab -> sortMap.get(tab.getText())));
+        sortItemPane = new MenuLabelPane(sortLabels);
+    }
+
+    /**
+     * 如果选中第一个和最后一个，则置灰向上和向下的按钮
+     */
+    private void disableButton() {
+        int order = sortItemPane.getComponentZOrder(selectedLabel);
+        if (order == 0) {
+            setToolbarEnable(false, false, true, true);
+        } else if (order == sortItemPane.getComponentCount() - 1) {
+            setToolbarEnable(true, true, false, false);
+        } else {
+            setToolbarEnable(true, true, true, true);
+        }
+    }
+
+    /**
+     * 设置 置顶，上移，下移，置底 按钮的状态
+     * true：启用
+     * false：关闭
+     */
+    private void setToolbarEnable(boolean top, boolean up, boolean down, boolean bottom) {
+        this.top.setEnabled(top);
+        this.up.setEnabled(up);
+        this.down.setEnabled(down);
+        this.bottom.setEnabled(bottom);
+    }
+
+    /**
+     * 根据选项当前位置以及菜单大小设置 置顶，上移，下移，置底 按钮的状态
+     */
+    private void setToolbarEnable(int order, int maxOrder) {
+        this.top.setEnabled(true);
+        this.up.setEnabled(true);
+        this.down.setEnabled(true);
+        this.bottom.setEnabled(true);
+        // 选项处于顶端，则置灰上移和置顶按钮
+        if (order == 0) {
+            this.top.setEnabled(false);
+            this.up.setEnabled(false);
+        }
+        // 选项处于底端，则置灰下移和置底按钮
+        if (order == maxOrder - 1) {
+            this.down.setEnabled(false);
+            this.bottom.setEnabled(false);
+        }
+    }
+
+    private void refreshCurrentOrder() {
+        String[] currentTabOrder = parentPane.getCurrentOrder();
+        HashSet<String> selectedTab = new HashSet<>();
+        for (UICheckBox item : sortItems) {
+            selectedTab.add(item.getText());
+        }
+
+        // 未选中的tab，保持原排序不变
+        Map<String, Integer> exTab = new HashMap<>();
+        for (int i = 0; i < currentTabOrder.length; i++) {
+            if (!selectedTab.contains(currentTabOrder[i])) {
+                exTab.put(currentTabOrder[i], i);
+            }
+        }
+
+        // 计算当前排序
+        String[] newOrder = new String[currentTabOrder.length];
+        Component[] components = sortItemPane.getComponents();
+        for (String s : exTab.keySet()) {
+            newOrder[exTab.get(s)] = s;
+        }
+
+        int t = 0;
+        for (int i = 0; i < newOrder.length; i++) {
+            if (StringUtils.isEmpty(newOrder[i])) {
+                newOrder[i] = ((MenuLabel) components[t++]).getText();
+            }
+        }
+        parentPane.setCurrentOrder(newOrder);
+    }
+
+}

designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabel.java

@@ -0,0 +1,96 @@
+package com.fr.design.actions.help.alphafine.component;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.utils.DesignUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.plaf.LabelUI;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.function.Function;
+
+/**
+ * 菜单选项label
+ *
+ * @author Link
+ * @version 11.0
+ * Created by Link on 2022/9/18
+ */
+public class MenuLabel extends UILabel {
+
+    private static final Color BACKGROUND_COLOR = Color.white;
+    private static final Color SELECTED_COLOR = new Color(0x419BF9);
+    private static final Color HOVERED_COLOR = new Color(0xd9ebfe);
+    private static final int HEIGHT = 23;
+    private static final int WIDTH = 147;
+
+    private MenuLabelPane parentMenu;
+    private final Function function;
+    private boolean selected;
+
+    public MenuLabel(String text, Function function) {
+        super(text);
+        this.function = function;
+        setOpaque(true);
+        addMouseListener(createMouseListener());
+    }
+
+    public void setParentMenu(MenuLabelPane menu) {
+        this.parentMenu = menu;
+    }
+
+
+    @Override
+    public void setUI(LabelUI ui) {
+        super.setUI(ui);
+        this.setBackground(BACKGROUND_COLOR);
+        this.setBorder(BorderFactory.createEmptyBorder(2, 10, 1, 10));
+        this.setPreferredSize(new Dimension(WIDTH, HEIGHT));
+        this.setFont(DesignUtils.getDefaultGUIFont().applySize(12));
+    }
+
+    public boolean isSelected() {
+        return selected;
+    }
+
+    public void setSelected(boolean selected) {
+        if (selected) {
+            parentMenu.setNoneSelected();
+            setBackground(SELECTED_COLOR);
+            function.apply(this);
+            this.selected = true;
+        } else {
+            setBackground(BACKGROUND_COLOR);
+            this.selected = false;
+        }
+    }
+
+    MouseListener createMouseListener() {
+        return new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                super.mouseClicked(e);
+                setSelected(true);
+            }
+
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                super.mouseEntered(e);
+                if (!selected) {
+                    setBackground(HOVERED_COLOR);
+                }
+            }
+
+            @Override
+            public void mouseExited(MouseEvent e) {
+                super.mouseExited(e);
+                if (!selected) {
+                    setBackground(BACKGROUND_COLOR);
+                }
+            }
+        };
+    }
+}

designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabelPane.java

@@ -0,0 +1,34 @@
+package com.fr.design.actions.help.alphafine.component;
+
+import javax.swing.JPanel;
+import java.awt.FlowLayout;
+import java.util.List;
+
+/**
+ * 简单菜单面板
+ *
+ * @author Link
+ * @version 11.0
+ * Created by Link on 2022/9/18
+ */
+public class MenuLabelPane extends JPanel {
+
+    private static final int GAP = 1;
+
+    private List<MenuLabel> labels;
+
+    public MenuLabelPane(List<MenuLabel> labels) {
+        this.labels = labels;
+        setLayout(new FlowLayout(FlowLayout.CENTER, GAP, GAP));
+        for (MenuLabel label : labels) {
+            label.setParentMenu(this);
+            add(label);
+        }
+    }
+
+    public void setNoneSelected() {
+        for (MenuLabel label : labels) {
+            label.setSelected(false);
+        }
+    }
+}

designer-base/src/main/java/com/fr/design/base/clipboard/ClipboardFilter.java

@@ -27,11 +27,7 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T cut(T selection) {
-
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-        for (ClipboardHandlerProvider provider : providers) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).cut(selection);
             }
@@ -40,10 +36,7 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T copy(T selection) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-        for (ClipboardHandlerProvider provider : providers) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).copy(selection);
             }
@@ -52,15 +45,27 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T paste(T selection) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-
-        for (ClipboardHandlerProvider provider : providers) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).paste(selection);
             }
         }
         return selection;
     }
+
+    private static Set<ClipboardHandlerProvider> getClipboardHandlerProviders() {
+        Set<ClipboardHandlerProvider> providers = new HashSet<>();
+
+        for (ClipboardHandlerProvider clipboardHandlerProvider : clipboardHandlerProviders) {
+            providers.add(clipboardHandlerProvider);
+        }
+
+        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
+        Set<ClipboardHandlerProvider> pluginProviders = manager.getArray(ClipboardHandlerProvider.XML_TAG);
+        for (ClipboardHandlerProvider clipboardHandlerProvider : pluginProviders) {
+            providers.add(clipboardHandlerProvider);
+        }
+
+        return providers;
+    }
 }

designer-base/src/main/java/com/fr/design/beans/ErrorMsgTextFieldAdapter.java

@@ -0,0 +1,11 @@
+package com.fr.design.beans;
+
+import javax.swing.JComponent;
+
+public interface ErrorMsgTextFieldAdapter {
+    void setText(String str);
+
+    String getText();
+
+    JComponent getErrorMsgTextField();
+}

designer-base/src/main/java/com/fr/design/beans/UITextFieldAdapter.java

@@ -0,0 +1,46 @@
+package com.fr.design.beans;
+
+import com.fr.design.gui.itextfield.UITextField;
+
+import javax.swing.JComponent;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+public class UITextFieldAdapter implements ErrorMsgTextFieldAdapter {
+    private final UITextField uiTextField = new UITextField();
+
+    public UITextFieldAdapter(){
+        addDocumentListener();
+    }
+    @Override
+    public void setText(String str) {
+        uiTextField.setText(str);
+    }
+
+    @Override
+    public String getText() {
+        return uiTextField.getText();
+    }
+
+    public void addDocumentListener() {
+        uiTextField.getDocument().addDocumentListener(new DocumentListener() {
+
+            public void changedUpdate(DocumentEvent e) {
+                uiTextField.setToolTipText(uiTextField.getText());
+            }
+
+            public void insertUpdate(DocumentEvent e) {
+                uiTextField.setToolTipText(uiTextField.getText());
+            }
+
+            public void removeUpdate(DocumentEvent e) {
+                uiTextField.setToolTipText(uiTextField.getText());
+            }
+        });
+    }
+
+    @Override
+    public JComponent getErrorMsgTextField() {
+        return uiTextField;
+    }
+}

designer-base/src/main/java/com/fr/design/constants/TableDataConstants.java

@@ -0,0 +1,5 @@
+package com.fr.design.constants;
+
+public class TableDataConstants {
+    public static final String SEPARATOR = "_";
+}

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

@@ -1,6 +1,7 @@
 package com.fr.design.data;
 
 import com.fr.data.TableDataSource;
+import com.fr.design.constants.TableDataConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.i18n.Toolkit;
 import com.fr.stable.StringUtils;
@@ -11,8 +12,6 @@ import com.fr.stable.StringUtils;
  * Created by hades on 2020/4/27
  */
 public abstract class BasicTableDataUtils {
-    private static final String SEPARATOR = "-";
-
     private static final int LEN = 2;
 
 
@@ -38,10 +37,10 @@ public abstract class BasicTableDataUtils {
 
     public static String getTableDataName(boolean isCover, TableDataSource tds, String tdName, String srcName, boolean isDsNameRepeaded) {
         if (isCover) {
-            return srcName + SEPARATOR + tdName;
+            return srcName + TableDataConstants.SEPARATOR + tdName;
         }
         if (tds.getTableData(tdName) != null || isDsNameRepeaded) {//如果有同名的就拼上来源名称
-            tdName = srcName + SEPARATOR + tdName;
+            tdName = srcName + TableDataConstants.SEPARATOR  + tdName;
         }
         int i = 0;
         while (tds.getTableData(tdName) != null) {

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

@@ -172,24 +172,39 @@ public abstract class DesignTableDataManager {
         globalDsListeners.add(l);
     }
 
+    private static String getCurrentChangeListenerKey() {
+        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        String key = StringUtils.EMPTY;
+        if (template != null) {
+            key = template.getPath();
+        }
+        return key;
+    }
+
     /**
      * 添加模板数据集改变 监听事件.
      *
      * @param l ChangeListener监听器
      */
     public static void addDsChangeListener(ChangeListener l) {
-        JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        String key = getCurrentChangeListenerKey();
-        String key = StringUtils.EMPTY;
-        if (template != null) {
-            key = template.getPath();
-        }
         List<ChangeListener> dsListeners = dsListenersMap.get(key);
         if (dsListeners == null) {
             dsListeners = new ArrayList<ChangeListener>();
             dsListenersMap.put(key, dsListeners);
         }
+        if (!dsListeners.contains(l)) {
             dsListeners.add(l);
         }
+    }
+
+    public static void removeDsChangeLister(ChangeListener l) {
+        String key = getCurrentChangeListenerKey();
+        List<ChangeListener> dsListeners = dsListenersMap.get(key);
+        if (dsListeners != null) {
+            dsListeners.remove(l);
+        }
+    }
 
     /**
      * 获取数据源source中dsName的所有字段

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

@@ -0,0 +1,93 @@
+package com.fr.design.data;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * @author rinoux
+ * @version 10.0
+ * Created by rinoux on 2022/3/28
+ */
+public final class MapCompareUtils {
+
+
+    /**
+     * 对比两个map 查找出相比orig，other中有哪些是新增的、删除的或者被修改的，并分别进行处理
+     *
+     * 对比时默认用equals方法来判断是否为 EntryEventKind#UPDATED
+     *
+     * @param orig         原始map
+     * @param other        参考的新map
+     * @param eventHandler 有区别时的事件处理器
+     * @param <K>          K
+     * @param <V>          V
+     */
+    public static <K, V> void contrastMapEntries(@NotNull Map<K, V> orig, @NotNull Map<K, V> other, @NotNull EventHandler<K, V> eventHandler) {
+
+        contrastMapEntries(orig, other, eventHandler, UpdateRule.DEFAULT);
+    }
+
+    /**
+     * 对比两个map 查找出相比orig，other中有哪些是新增的、删除的或者被修改的，并分别进行处理
+     *
+     * 对比时用自定义的规则来判断是否为 EntryEventKind#UPDATED
+     *
+     * @param orig          原始map
+     * @param other         参考的新map
+     * @param eventHandler  有区别时的事件处理器
+     * @param updateRule    自定义的Update事件判定规则
+     * @param <K>
+     * @param <V>
+     */
+    public static <K, V> void contrastMapEntries(@NotNull Map<K, V> orig, @NotNull Map<K, V> other, @NotNull EventHandler<K, V> eventHandler, @NotNull UpdateRule<K, V> updateRule) {
+
+        Map<K, V> copiedOrig = new LinkedHashMap<>(orig);
+
+        other.forEach((k, v) -> {
+            V existedV = copiedOrig.remove(k);
+            if (existedV != null) {
+                if (updateRule.needUpdate(existedV, v)) {
+                    eventHandler.on(EntryEventKind.UPDATED, k, v);
+                }
+            } else {
+                eventHandler.on(EntryEventKind.ADDED, k, v);
+            }
+        });
+
+        copiedOrig.forEach((k, v) -> eventHandler.on(EntryEventKind.REMOVED, k, v));
+    }
+
+
+    /**
+     * 事件处理器，对应比较后的三种结果的事件处理
+     * @param <K>
+     * @param <V>
+     */
+    public interface EventHandler<K, V> {
+        void on(EntryEventKind entryEventKind, K k, V v);
+    }
+
+    /**
+     * 判定 数据被修改 的判定规则
+     * @param <K>
+     * @param <V>
+     */
+    public interface UpdateRule<K, V> {
+
+        EntryEventKind eventKind = EntryEventKind.UPDATED;
+
+        UpdateRule DEFAULT = new UpdateRule() {};
+
+        default boolean needUpdate(V origin, V v) {
+            return !v.equals(origin);
+        }
+    }
+
+    public enum EntryEventKind {
+        ADDED,
+        REMOVED,
+        UPDATED;
+    }
+}

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

@@ -1,17 +1,17 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.TableData;
-import com.fr.concurrent.NamedThreadFactory;
+import com.fr.common.listener.ManageDsListenerRegisterListener;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.DBUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.core.db.dialect.Dialect;
 import com.fr.data.core.db.dialect.DialectFactory;
+import com.fr.data.impl.Connection;
 import com.fr.data.impl.DBTableData;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.RefreshLabel.Refreshable;
 import com.fr.design.data.datapane.preview.PreviewLabel;
 import com.fr.design.data.datapane.preview.PreviewLabel.Previewable;
@@ -19,7 +19,7 @@ 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.FilterableComboBoxModel;
-import com.fr.design.gui.icombobox.SearchPreTaskTreeComboBox;
+import com.fr.design.gui.icombobox.TableSearchTreeComboBox;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxEditor;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
@@ -40,11 +40,6 @@ import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.util.Collections;
-import java.util.concurrent.CancellationException;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -58,21 +53,20 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Enumeration;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.FutureTask;
 
 /**
  * @author zhou
@@ -97,41 +91,12 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     /**
      * 表名
      */
-    protected SearchPreTaskTreeComboBox tableNameComboBox;
+    protected TableSearchTreeComboBox tableNameComboBox;
-
-    private static final ExecutorService SERVICE = Executors.newSingleThreadExecutor(new NamedThreadFactory("ChoosePane"));
 
     private SwingWorker populateWorker;
 
     private SwingWorker<List<String>, Void> initWorker;
 
-    private PopupMenuListener popupMenuListener = new PopupMenuListener() {
-
-        @Override
-        public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
-            FutureTask<Void> task = new FutureTask<Void>(new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    calculateTableDataNames();
-                    return null;
-                }
-            });
-            tableNameComboBox.setPreSearchTask(task);
-            SERVICE.submit(task);
-        }
-
-        @Override
-        public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-            // Do nothing
-        }
-
-        @Override
-        public void popupMenuCanceled(PopupMenuEvent e) {
-            // Do nothing
-        }
-    };
-
-
     private PopupMenuListener listener = new PopupMenuListener() {
         @Override
         public void popupMenuCanceled(PopupMenuEvent e) {
@@ -181,7 +146,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         schemaBox = new StringUIComboBox();
         schemaBox.setEditor(new ComboBoxEditor());
 
-        tableNameComboBox = new SearchPreTaskTreeComboBox(new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer, false);
+        tableNameComboBox = new TableSearchTreeComboBox(this, new JTree(new DefaultMutableTreeNode()), tableNameTreeRenderer);
         tableNameComboBox.setEditable(true);
         tableNameComboBox.setRenderer(listCellRenderer);
         registerDSChangeListener();
@@ -198,7 +163,6 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         });
         schemaBox.addPopupMenuListener(listener);
         addFocusListener();
-        this.tableNameComboBox.addPopupMenuListener(popupMenuListener);
     }
 
     protected void addDSBoxListener() {
@@ -355,7 +319,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         GUICoreUtils.setSelectedItemQuietly(tableNameComboBox, -1);
     }
 
-    protected com.fr.data.impl.Connection getConnection() {
+    public Connection getConnection() {
         String selectedDSName = this.getDSName();
         if (StringUtils.isEmpty(selectedDSName)) {
             return null; // peter:选中了当前的零长度的节点,直接返回.
@@ -455,56 +419,6 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         return "choosepane";
     }
 
-    protected void calculateTableDataNames() {
-        JTree tree = tableNameComboBox.getTree();
-        if (tree == null) {
-            return;
-        }
-        DefaultMutableTreeNode rootTreeNode = (DefaultMutableTreeNode) tree.getModel().getRoot();
-        rootTreeNode.removeAllChildren();
-
-        String selectedDSName = this.getDSName();
-        com.fr.data.impl.Connection selectedDatabase = this.getConnection();
-        if (selectedDatabase == null) {
-            return;
-        }
-        try {
-            String schema = StringUtils.isEmpty(this.schemaBox.getSelectedItem()) ? null : this.schemaBox.getSelectedItem();
-            TableProcedure[] sqlTableArray = DataCoreUtils.getTables(selectedDatabase, TableProcedure.TABLE, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
-            if (sqlTableArray.length > 0) {
-                ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"));
-                rootTreeNode.add(tableTreeNode);
-                for (int i = 0; i < sqlTableArray.length; i++) {
-                    ExpandMutableTreeNode tableChildTreeNode = new ExpandMutableTreeNode(sqlTableArray[i]);
-                    tableTreeNode.add(tableChildTreeNode);
-                }
-            }
-            TableProcedure[] sqlViewArray = DataCoreUtils.getTables(selectedDatabase, TableProcedure.VIEW, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
-            if (sqlViewArray.length > 0) {
-                ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"));
-                rootTreeNode.add(viewTreeNode);
-                for (int i = 0; i < sqlViewArray.length; i++) {
-                    ExpandMutableTreeNode viewChildTreeNode = new ExpandMutableTreeNode(sqlViewArray[i]);
-                    viewTreeNode.add(viewChildTreeNode);
-                }
-            }
-            ((DefaultTreeModel) tree.getModel()).reload();
-            // daniel 展开所有tree
-            TreeNode root = (TreeNode) tree.getModel().getRoot();
-            TreePath parent = new TreePath(root);
-            TreeNode node = (TreeNode) parent.getLastPathComponent();
-            for (Enumeration e = node.children(); e.hasMoreElements(); ) {
-                TreeNode n = (TreeNode) e.nextElement();
-                TreePath path = parent.pathByAddingChild(n);
-                tree.expandPath(path);
-            }
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
-        }
-    }
-
     /**
      * 创建选中的数据集数据
      *
@@ -558,23 +472,24 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         return tableData;
     }
 
-    protected String getDSName() {
+    public String getDSName() {
         return this.dsNameComboBox.getSelectedItem();
     }
 
+    public String getSchema() {
+        return this.schemaBox.getSelectedItem();
+    }
+
     protected void failedToFindTable() {
         // Do nothing
     }
 
     protected String getTableName() {
         String tableName = "";
-        Object obj = this.tableNameComboBox.getSelectedItemObject();
+        Object obj = this.tableNameComboBox.getSelectedItem();
-        if (obj == null) {
-            obj = this.tableNameComboBox.getSelectedItem();
         if (obj == null) {
             obj = this.tableNameComboBox.getEditor().getItem();
         }
-        }
         if (obj instanceof TreePath) {
             Object tp = ((ExpandMutableTreeNode) ((TreePath) obj).getLastPathComponent()).getUserObject();
             if (tp instanceof TableProcedure) {
@@ -648,12 +563,49 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
      */
     @Override
     public void registerDSChangeListener() {
-        DesignTableDataManager.addDsChangeListener(new ChangeListener() {
+        // 还是需要保留 恶心
+        // 1. 切换工作目录需要依赖这个监听  切换工作目录没有一个数据连接的刷新触发 就很坑
+        // 2. DesignerContext.getDesignerBean("databasename").refreshBeanElement()有坑 a.调用不全 b.某些场景下 因为注册覆盖 会失效
+        // 监听内容变成刷新模式  不会覆盖 populate填充内容
+        this.addAncestorListener(new ManageDsListenerRegisterListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
-                initDsNameComboBox();
+                refreshDsNameComboBox();
             }
-        });
+        }));
+    }
+
+
+    @SuppressWarnings("unchecked")
+    private void refreshDsNameComboBox() {
+        if (initWorker != null && !initWorker.isDone()) {
+            initWorker.cancel(true);
+        }
+        dsNameComboBox.setRefreshingModel(true);
+        initWorker = new SwingWorker<List<String>, Void>() {
+
+            @Override
+            protected List<String> doInBackground() throws Exception {
+                return getHasAuthConnections();
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    FilterableComboBoxModel dsNameComboBoxModel = new FilterableComboBoxModel(get());
+                    String selected = dsNameComboBox.getSelectedItem();
+                    dsNameComboBox.setModel(dsNameComboBoxModel);
+                    dsNameComboBox.setRefreshingModel(true);
+                    dsNameComboBox.setSelectedItem(selected);
+                    dsNameComboBox.setRefreshingModel(false);
+                } catch (Exception e) {
+                    if (!(e instanceof CancellationException)) {
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                    }
+                }
+            }
+        };
+        initWorker.execute();
     }
 
     /**

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

@@ -83,7 +83,7 @@ public class ChoosePaneSupportFormula extends ChoosePane {
      *
      * @return
      */
-    protected String getDSName() {
+    public String getDSName() {
         String selectedDSName = null;
         String item = Utils.objectToString(this.dsNameComboBox.getEditor().getItem());
         // 没有选中的列表项 那么看看是不是手输值

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

@@ -1,5 +1,6 @@
 package com.fr.design.data.datapane;
 
+import com.fr.common.listener.ManageDsListenerRegisterListener;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.util.Iterator;
@@ -148,7 +149,7 @@ public class TableDataComboBox extends UIComboBox implements Prepare4DataSourceC
 				TableDataComboBox.this.refresh(DesignTableDataManager.getEditingTableDataSource());
 			}
 		};
-		DesignTableDataManager.addDsChangeListener(changeListener);
+		this.addAncestorListener(new ManageDsListenerRegisterListener(changeListener));
 	}
 
 	public void registerGlobalDSChangeListener() {

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

@@ -2,6 +2,7 @@ package com.fr.design.data.datapane;
 
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
+import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.TableDataSourceDependent;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.ExtraDesignClassManager;
@@ -10,8 +11,10 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.data.BasicTableDataUtils;
 import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.data.datapane.auth.TableDataAuthHelper;
 import com.fr.design.data.tabledata.StoreProcedureWorkerListener;
 import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.loading.TableDataLoadingPane;
 import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
@@ -31,6 +34,7 @@ import com.fr.design.menu.ToolBarDef;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.manage.PluginFilter;
@@ -42,6 +46,7 @@ import javax.swing.BorderFactory;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
 import javax.swing.ToolTipManager;
 import java.awt.BorderLayout;
 import java.awt.GridLayout;
@@ -49,6 +54,7 @@ import java.awt.dnd.DnDConstants;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -239,7 +245,11 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 doPropertyChange(dg, nPanel, oldName);
             }
         });
+        // 有些数据集（DBTableData）面板的初始化过程中是包含了SwingWorker处理（查询数据连接、查表等）的
+        // 如果这里直接setVisible，可能阻塞SwingWorker的done方法，导致面板渲染出现问题
+        SwingUtilities.invokeLater(() -> {
             dg.setVisible(true);
+        });
     }
 
     private class EditAction extends UpdateAction {
@@ -249,13 +259,60 @@ public class TableDataTreePane extends BasicTableDataTreePane {
             this.setSmallIcon("/com/fr/design/images/control/edit");
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             final NameObject selectedNO = dataTree.getSelectedNameObject();
             if (selectedNO == null) {
                 return;
             }
-            DesignTableDataManager.removeSelectedColumnNames(selectedNO.getName());
+
-            dgEdit(((AbstractTableDataWrapper) selectedNO.getObject()).creatTableDataPane(), selectedNO.getName(), false);
+            String dsName = selectedNO.getName();
+            DesignTableDataManager.removeSelectedColumnNames(dsName);
+
+            AbstractTableDataWrapper wrapper = (AbstractTableDataWrapper) selectedNO.getObject();
+
+            AbstractTableDataPane<?> tableDataPane = wrapper.creatTableDataPane();
+
+            if (TableDataAuthHelper.needCheckAuthWhenEdit(wrapper.getTableData())) {
+                // 先打开一个Loading面板
+                TableDataLoadingPane loadingPane = new TableDataLoadingPane();
+                BasicDialog loadingDialog = loadingPane.showLargeWindow(SwingUtilities.getWindowAncestor(TableDataTreePane.this), null);
+                // 查询权限
+                new SwingWorker<Boolean, Void>() {
+                    @Override
+                    protected Boolean doInBackground() throws Exception {
+                        // 获取无权限连接名称集合
+                        Collection<String> noAuthConnections = TableDataAuthHelper.getNoAuthConnections();
+                        // 获取当前数据集对应的数据连接名称
+                        String connectionName = TableDataAuthHelper.getConnectionNameByDBTableData((DBTableData) wrapper.getTableData());
+                        return !noAuthConnections.contains(connectionName);
+                    }
+
+                    @Override
+                    protected void done() {
+                        try {
+                            Boolean hasAuth = get();
+                            if (hasAuth) {
+                                // 有权限时，关闭Loading面板，打开编辑面板
+                                loadingDialog.setVisible(false);
+                                dgEdit(tableDataPane, dsName, false);
+                            } else {
+                                // 无权限时，给出无权限提示
+                                loadingPane.switchTo(TableDataLoadingPane.NO_AUTH_PANE_NAME);
+                            }
+                        } catch (Exception e) {
+                            FineLoggerFactory.getLogger().error("loading connection error in remote design", e.getMessage());
+                            // 查询权限失败时，给出报错提示
+                            loadingPane.switchTo(TableDataLoadingPane.ERROR_NAME);
+                        }
+                    }
+                }.execute();
+                loadingDialog.setVisible(true);
+            } else {
+                // 无需检查权限时，直接打开数据库查询编辑面板
+                //下面创建creatTableDataPane后会直接populate，所以populate时不能用后设置的一些参数，比如name
+                dgEdit(tableDataPane, dsName, false);
+            }
         }
     }
 

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

@@ -0,0 +1,57 @@
+package com.fr.design.data.datapane.auth;
+
+import com.fr.base.TableData;
+import com.fr.data.impl.Connection;
+import com.fr.data.impl.DBTableData;
+import com.fr.data.impl.NameDatabaseConnection;
+import com.fr.stable.StringUtils;
+import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.connection.DBConnectAuth;
+
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * 数据连接权限相关的工具类
+ * @author Yvan
+ */
+public class TableDataAuthHelper {
+
+    /**
+     * 编辑数据集时是否需要检查权限
+     * @param tableData
+     * @return
+     */
+    public static boolean needCheckAuthWhenEdit(TableData tableData) {
+        // 远程设计下，编辑DBTableData时需要判断权限
+        return !WorkContext.getCurrent().isLocal() && tableData instanceof DBTableData;
+    }
+
+    /**
+     * 获取无权限数据连接集合
+     * 远程下需要调用RPC，为耗时操作，谨慎使用
+     * @return
+     */
+    public static Collection<String> getNoAuthConnections() {
+        // 获取无权限连接集合
+        Collection<String> noAuthConnections = WorkContext.getCurrent().get(DBConnectAuth.class).getNoAuthConnections();
+        return noAuthConnections == null ? Collections.emptyList() : noAuthConnections;
+    }
+
+    /**
+     * 通过数据集获取其数据连接的名称
+     *
+     * 注意：
+     * 1. Connection接口本身是不提供名称的，只有我们内部为了使用方便，将其包装成了NameDataBaseConnection
+     *      如果不是NameDataBaseConnection类型，则无名称，因此这里只能用判断类型的方式获取名称
+     * 2. 仅支持DBTableData获取连接名
+     * @return
+     */
+    public static String getConnectionNameByDBTableData(DBTableData tableData) {
+        Connection database = tableData.getDatabase();
+        if (database instanceof NameDatabaseConnection) {
+            return ((NameDatabaseConnection) database).getName();
+        }
+        return StringUtils.EMPTY;
+    }
+}

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

@@ -8,21 +8,23 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.server.ConnectionListAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.editlock.ConnectionLockChangeChecker;
 import com.fr.design.editlock.EditLockUtils;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UILockButton;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.file.ConnectionConfig;
-import com.fr.general.ComparatorUtils;
+import com.fr.report.LockItem;
 import com.fr.stable.StringUtils;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.connection.DBConnectAuth;
-import com.fr.report.LockItem;
 
+import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -33,6 +35,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * 选择数据连接的下拉框
@@ -103,6 +106,7 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                 continue;
             }
             Connection connection = mgr.getConnection(conName);
+            // nameList依赖items方法初始化，父类ItemEditableComboBoxPanel里异步执行item方法
             filterConnection(connection, conName, nameList);
         }
 
@@ -145,10 +149,16 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                     connectionListDialog.setDoOKSucceed(false);
                     return;
                 }
+                AtomicBoolean saved = new AtomicBoolean(true);
                 Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
                     @Override
                     public void run() {
+                        try {
                             connectionListPane.update(connectionConfig);
+                        } catch (Exception e) {
+                            saved.set(false);
+                            FineJOptionPane.showMessageDialog(connectionListPane, e.getMessage(), Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
+                        }
                     }
                 }.addCallBack(new CallBackAdaptor() {
                     @Override
@@ -159,9 +169,13 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
 
                     @Override
                     public void afterCommit() {
+                        if (saved.get()) {
                             DesignerContext.getDesignerBean("databasename").refreshBeanElement();
-                        // 关闭定义数据连接页面，为其解锁
+                            // 定义数据连接弹窗关闭后，解锁
                             EditLockUtils.unlock(LockItem.CONNECTION);
+                        } else {
+                            connectionListDialog.setDoOKSucceed(false);
+                        }
                     }
                 }));
 
@@ -186,14 +200,20 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
         if (connection instanceof NameDatabaseConnection) {
             this.setSelectedItem(((NameDatabaseConnection) connection).getName());
         } else {
+            setRecentConnection();
+        }
+    }
+
+    /**
+     * 下拉框选项设置成最近选择的connection，如果最近选择不存在，则选择列表中的第一个
+     */
+    protected void setRecentConnection() {
         String s = DesignerEnvManager.getEnvManager().getRecentSelectedConnection();
         if (StringUtils.isNotBlank(s)) {
-                for (int i = 0; i < this.getConnectionSize(); i++) {
+            // 之前的写法有多线程问题，nameList异步尚未初始化完成的时候，这里可能无法匹配设置数据连接名称，导致DBTableDataPane打开后连接面板空白
-                    String t = this.getConnection(i);
+            // 这里的需求无非是设置上一次使用的数据连接，做个简单检查这个连接是否存在即可，存在就设置
-                    if (ComparatorUtils.equals(s, t)) {
+            if (nameList.contains(s)) {
                 this.setSelectedItem(s);
-                        break;
-                    }
             }
         }
         // alex:如果这个ComboBox还是没有选中,那么选中第一个
@@ -201,5 +221,13 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
             this.setSelectedItem(this.getConnection(0));
         }
     }
+
+    /**
+     * 是否无选中状态（空白item也视为无选中）
+     * @return
+     */
+    protected boolean isSelectedItemEmpty() {
+        String selectedItem = this.getSelectedItem();
+        return selectedItem == null || StringUtils.equals(selectedItem, EMPTY.toString());
     }
 }

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

@@ -1,30 +1,38 @@
 package com.fr.design.data.datapane.connect;
 
+import com.fr.data.driver.DriverClassNotFoundException;
 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.design.ExtraDesignClassManager;
+import com.fr.design.data.MapCompareUtils;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
+import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.i18n.Toolkit;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
+import javax.swing.SwingUtilities;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 /**
  * Connection List Pane.
@@ -32,7 +40,8 @@ import java.util.Set;
 public class ConnectionListPane extends JListControlPane implements ConnectionShowPane {
     public static final String TITLE_NAME = Toolkit.i18nText("Fine-Design_Basic_Server_Define_Data_Connection");
     private boolean isNamePermitted = true;
-    private HashMap<String, String> renameMap = new HashMap<String, String>();
+    private final HashMap<String, String> renameMap = new HashMap<>();
+    private final Map<String, Connection> populatedConnectionsSnapshot = new LinkedHashMap<>();
 
     public ConnectionListPane() {
         renameMap.clear();
@@ -136,27 +145,102 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
      */
     public void populate(ConnectionConfig connectionConfig) {
         List<NameObject> nameObjectList = new ArrayList<NameObject>();
+        populatedConnectionsSnapshot.clear();
         for (Map.Entry<String, Connection> entry : connectionConfig.getConnections().entrySet()) {
             nameObjectList.add(new NameObject(entry.getKey(), entry.getValue()));
+            try {
+                populatedConnectionsSnapshot.put(entry.getKey(), (Connection) entry.getValue().clone());
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
         }
         this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()]));
-
     }
 
     /**
      * Update.
      */
-    public void update(ConnectionConfig connectionConfig) {
+    public void update(ConnectionConfig connectionConfig) throws Exception {
         // Nameable[]居然不能强转成NameObject[],一定要这么写...
         Nameable[] res = this.update();
-        NameObject[] res_array = new NameObject[res.length];
+        Map<String, Connection> updatedMap = new LinkedHashMap<>();
-        java.util.Arrays.asList(res).toArray(res_array);
+        Arrays.stream(res).map(n -> (NameObject) n).forEach(no -> updatedMap.put(no.getName(), (Connection) no.getObject()));
+
+        List<String> removedConnNames = new ArrayList<>();
+        Map<String, Connection> addedOrUpdatedConnections = new LinkedHashMap<>();
+        MapCompareUtils.contrastMapEntries(populatedConnectionsSnapshot, updatedMap, (entryEventKind, s, connection) -> {
+            switch (entryEventKind) {
+                case REMOVED:
+                    removedConnNames.add(s);
+                    break;
+                case ADDED:
+                case UPDATED:
+                    addedOrUpdatedConnections.put(s, connection);
+                default:
+                    break;
+            }
+        }, new MapCompareUtils.UpdateRule<String, Connection>() {
+            @Override
+            public boolean needUpdate(Connection origin, Connection connection) {
+                return needUpdate0(origin, connection);
+            }
+
+            /**
+             * 是否需要更新处理
+             * 1. Connection本身equals为false，代表字段修改
+             * 2. 非内置的Connection，即插件提供的Connection
+             * todo 原本一个equals方法就可以搞定，但是插件里面没有实现equals，结果导致不能正确判断，只能主代码里做兼容，很恶心，先记个todo，以后看有没有办法改掉
+             * @param origin
+             * @param connection
+             * @return
+             */
+            private boolean needUpdate0(Connection origin, Connection connection) {
+                return  !connection.equals(origin) || !isEmbedConnection(connection);
+            }
 
-        connectionConfig.removeAllConnection();
+            /**
+             * 是否是主工程里内置的Connection
+             * @return
+             */
+            private boolean isEmbedConnection(Connection connection) {
+                return connection instanceof JDBCDatabaseConnection || connection instanceof JNDIDatabaseConnection;
+            }
+        });
 
-        for (int i = 0; i < res_array.length; i++) {
+        this.validateConnections(addedOrUpdatedConnections);
-            NameObject nameObject = res_array[i];
+        alterConnections(removedConnNames, addedOrUpdatedConnections);
-            connectionConfig.addConnection(nameObject.getName(), (Connection) nameObject.getObject());
+    }
+
+    private void alterConnections(List<String> removedConnNames, Map<String, Connection> addedOrUpdatedConnections) {
+        removedConnNames.forEach(n -> ConnectionConfig.getInstance().removeConnection(n));
+        addedOrUpdatedConnections.forEach((name, conn) -> ConnectionConfig.getInstance().addConnection(name, conn));
+    }
+
+    private void validateConnections(Map<String, Connection> addedOrUpdatedConnections) throws Exception {
+
+        for (Map.Entry<String, Connection> entry : addedOrUpdatedConnections.entrySet()) {
+            Connection connection = entry.getValue();
+            try {
+                DataOperator.getInstance().validateConnectionSettings(connection);
+            } catch (DriverClassNotFoundException e) {
+                FineLoggerFactory.getLogger().info(e.getMessage());
+            } catch (SQLException e) {
+                throw new SQLException(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Invalid_Config", entry.getKey()) + ", " + e.getMessage(), e.getCause());
+            }
+        }
+    }
+
+    @Override
+    public void onCopyItem() {
+        super.onCopyItem();
+        ListModelElement selectedValue = getSelectedValue();
+        // identity 需要重置
+        if (selectedValue != null && selectedValue.wrapper != null) {
+            Object temp = ((NameObject) selectedValue.wrapper).getObject();
+            if (temp instanceof JDBCDatabaseConnection) {
+                JDBCDatabaseConnection object = (JDBCDatabaseConnection) temp;
+                object.setIdentity(UUID.randomUUID().toString());
+            }
         }
     }
 }

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

@@ -4,9 +4,8 @@ import com.fr.design.gui.frpane.LoadingBasicPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.file.ConnectionConfig;
 
-
+import javax.swing.JPanel;
-import javax.swing.*;
+import java.awt.BorderLayout;
-import java.awt.*;
 import java.util.HashMap;
 
 public class ConnectionManagerPane extends LoadingBasicPane implements ConnectionShowPane {
@@ -39,7 +38,7 @@ public class ConnectionManagerPane extends LoadingBasicPane implements Connectio
         this.connectionListPane.populate(datasourceManager);
     }
 
-    public void update(ConnectionConfig datasourceManager) {
+    public void update(ConnectionConfig datasourceManager) throws Exception {
         this.connectionListPane.update(datasourceManager);
     }
 

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

@@ -7,7 +7,7 @@ import com.fr.file.ConnectionConfig;
  * 数据链接显示面板
  */
 public interface ConnectionShowPane {
-    void update(ConnectionConfig connectionConfig);
+    void update(ConnectionConfig connectionConfig) throws Exception;
 
     void populate(ConnectionConfig connectionConfig);
 

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

@@ -1,26 +1,32 @@
 package com.fr.design.data.datapane.connect;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.impl.AbstractDatabaseConnection;
 import com.fr.data.impl.Connection;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.loading.SwitchableTableDataPane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ilist.TableViewList;
 import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.GeneralContext;
 import com.fr.stable.ArrayUtils;
 
+import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.ToolTipManager;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -45,7 +51,39 @@ public class ConnectionTableProcedurePane extends BasicPane {
 	private java.util.List<DoubleClickSelectedNodeOnTreeListener> listeners = new java.util.ArrayList<DoubleClickSelectedNodeOnTreeListener>();
 
 	public ConnectionTableProcedurePane() {
+		init(null);
+	}
+
+	/**
+	 * 传入父容器
+	 * @param parent
+	 */
+	public ConnectionTableProcedurePane(SwitchableTableDataPane parent) {
+		init(parent);
+	}
+
+	private void init(SwitchableTableDataPane parent) {
 		this.setLayout(new BorderLayout(4, 4));
+		// 初始化数据连接下拉框
+		initConnectionComboBox(parent);
+		// 初始化中间的面板
+		JPanel centerPane = initCenterPane();
+		this.add(connectionComboBox, BorderLayout.NORTH);
+		this.add(centerPane, BorderLayout.CENTER);
+		this.setPreferredSize(new Dimension(WIDTH, getPreferredSize().height));
+		addKeyMonitor();
+	}
+
+	private JPanel initCenterPane() {
+		JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		// 搜索面板
+		centerPane.add(createSearchPane(), BorderLayout.NORTH);
+		// 数据库表视图面板
+		centerPane.add(createTableViewBorderPane(), BorderLayout.CENTER);
+		return centerPane;
+	}
+
+	private void initConnectionComboBox(SwitchableTableDataPane parent) {
 		connectionComboBox = new ConnectionComboBoxPanel(com.fr.data.impl.Connection.class) {
 
 			@Override
@@ -60,10 +98,34 @@ public class ConnectionTableProcedurePane extends BasicPane {
 					search(true);
 				}
 			}
+
+			@Override
+			protected void afterRefreshItems() {
+				// 刷新完成后，如果未选中（在nameList初始化完成之前可能会出现），则尝试再次设置
+				if (isSelectedItemEmpty()) {
+					setRecentConnection();
+				}
+				// 获取数据连接之后，让父容器切换面板
+				if (parent != null) {
+					parent.switchTo(SwitchableTableDataPane.CONTENT_PANE_NAME);
+				}
+			}
+
+			@Override
+			protected void refreshItemsError() {
+				// 获取数据连接出现错误时，也让父容器从Loading面板切换至内容面板
+				if (parent != null) {
+					parent.switchTo(SwitchableTableDataPane.CONTENT_PANE_NAME);
+				}
+			}
 		};
+		connectionComboBox.addComboBoxActionListener(filter);
+	}
+
+	private JPanel createTableViewBorderPane() {
 		tableViewList = new TableViewList();
 		ToolTipManager.sharedInstance().registerComponent(tableViewList);
-		connectionComboBox.addComboBoxActionListener(filter);
+
 		tableViewList.addMouseListener(new MouseAdapter() {
 			public void mouseClicked(MouseEvent evt) {
 				if (evt.getClickCount() >= 2) {
@@ -80,23 +142,50 @@ public class ConnectionTableProcedurePane extends BasicPane {
 				}
 			}
 		});
-		JPanel filterPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		UIScrollPane tableViewListPane = new UIScrollPane(tableViewList);
+		tableViewListPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+		JPanel tableViewBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+		tableViewBorderPane.add(tableViewListPane, BorderLayout.CENTER);
 		JPanel checkBoxgroupPane = createCheckBoxgroupPane();
 		if (checkBoxgroupPane != null) {
-			filterPane.add(createCheckBoxgroupPane(), BorderLayout.NORTH);
+			tableViewBorderPane.add(createCheckBoxgroupPane(), BorderLayout.SOUTH);
 		}
+		return tableViewBorderPane;
+	}
+
+	/**
+	 * 创建搜索Panel，用于搜索表或视图
+	 * @return
+	 */
+	private JPanel createSearchPane() {
+		JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		JPanel searchPane = new JPanel(new BorderLayout(10, 0));
+		searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR));
+		searchPane.setBackground(Color.WHITE);
 		searchField = new UITextField();
-		searchPane.add(searchField, BorderLayout.CENTER);
+		searchField.setBorderPainted(false);
+		searchField.setPlaceholder(Toolkit.i18nText("Fine-Design_Basic_Table_Search"));
 		searchField.getDocument().addDocumentListener(searchListener);
-		filterPane.add(searchPane, BorderLayout.CENTER);
+		searchField.addMouseListener(new MouseAdapter() {
-		UIScrollPane tableViewListPane = new UIScrollPane(tableViewList);
+			@Override
-		tableViewListPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+			public void mouseEntered(MouseEvent e) {
-		this.add(connectionComboBox, BorderLayout.NORTH);
+				super.mouseEntered(e);
-		this.add(tableViewListPane, BorderLayout.CENTER);
+				searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.CHECKBOX_HOVER_SELECTED));
-		this.add(filterPane, BorderLayout.SOUTH);
+			}
-		this.setPreferredSize(new Dimension(WIDTH, getPreferredSize().height));
+
-		addKeyMonitor();
+			@Override
+			public void mouseExited(MouseEvent e) {
+				super.mouseExited(e);
+				searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR));
+			}
+		});
+		// 搜索图标
+		UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/images/data/search"));
+		searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
+		searchPane.add(searchField, BorderLayout.CENTER);
+		searchPane.add(searchLabel, BorderLayout.EAST);
+		panel.add(searchPane, BorderLayout.CENTER);
+		return panel;
 	}
 
 	protected void filter(Connection connection, String conName, List<String> nameList) {

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

@@ -127,10 +127,12 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() + 1);
 						itemComboBox.setMaximumRowCount(itemComboBox.getMaximumRowCount() - 1);
 					}
+					afterRefreshItems();
 				} catch (Exception e) {
 					if (!(e instanceof CancellationException)) {
 						FineLoggerFactory.getLogger().error(e.getMessage(), e);
 					}
+					refreshItemsError();
 				}
 
 			}
@@ -160,6 +162,20 @@ public abstract class ItemEditableComboBoxPanel extends JPanel {
 	 */
 	protected abstract java.util.Iterator<String> items();
 
+	/**
+	 * 刷新ComboBox.items之后
+	 */
+	protected void afterRefreshItems() {
+		// 空实现，供子类重写
+	}
+
+	/**
+	 * 刷新ComboBox.items时出现异常
+	 */
+	protected void refreshItemsError() {
+		// 空实现，供子类重写
+	}
+
 	/*
 	 * 弹出对话框编辑Items
 	 */

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

@@ -16,8 +16,8 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
 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.i18n.UrlI18nManager;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.StringUtils;
@@ -159,7 +159,7 @@ public class JDBCDefPane extends JPanel {
         odbcTipsLink.setPreferredSize(new Dimension(GraphHelper.getWidth(Toolkit.i18nText("Fine-Design_Basic_Odbc_Tips")), odbcTipsLink.getPreferredSize().height));
         odbcTipsLink.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent evt) {
-                String url = CloudCenter.getInstance().acquireUrlByKind("odbc.help");
+                String url = UrlI18nManager.getInstance().getI18nUrl("odbc.help");
                 BrowseUtils.browser(url);
             }
         });

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

@@ -106,6 +106,7 @@ public class CopyableJTable extends SortableJTable {
                     self.updateEndPoint(-1, column);
                     self.refreshTable();
                 }
+                self.requestFocusInWindow();
             }
 
             private int getColumn(MouseEvent e) {
@@ -249,14 +250,29 @@ public class CopyableJTable extends SortableJTable {
         FineLoggerFactory.getLogger().info("copy cell value");
         java.util.List<java.util.List<Object>> table = new ArrayList<>();
         if ((startRow != endRow || startCol != endCol) && Math.min(startCol, endCol) > -1) {
+            copyAreaData(table);
+        } else if (pointList.size() > 0) {
+            copyPointsData(table);
+        }
+
+        Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
+        Transferable tText = new StringSelection(ClipboardHelper.formatExcelString(table));
+        clip.setContents(tText, null);
+    }
+
+    private void copyAreaData(java.util.List<java.util.List<Object>> table) {
         for (int i = Math.min(startRow, endRow); i <= Math.max(startRow, endRow); i++) {
             table.add(new ArrayList<>());
             for (int j = Math.min(startCol, endCol); j <= Math.max(startCol, endCol); j++) {
                 Object text = this.getTableValue(i, j);
+                if (text != null) {
                     table.get(table.size() - 1).add(text);
                 }
             }
-        } else if (pointList.size() > 0) {
+        }
+    }
+
+    private void copyPointsData(java.util.List<java.util.List<Object>> table) {
         Collections.sort(pointList, Comparator.comparing(Point::getX).thenComparing(Point::getY));
         int startRow = pointList.get(0).x;
         int currentRow = startRow;
@@ -267,13 +283,10 @@ public class CopyableJTable extends SortableJTable {
                 currentRow++;
             }
             Object text = this.getTableValue(point.x, point.y);
+            if (text != null) {
                 table.get(table.size() - 1).add(text);
             }
         }
-
-        Clipboard clip = Toolkit.getDefaultToolkit().getSystemClipboard();
-        Transferable tText = new StringSelection(ClipboardHelper.formatExcelString(table));
-        clip.setContents(tText, null);
     }
 
     private Object getTableValue(int row, int col) {

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

@@ -18,6 +18,8 @@ import com.fr.design.data.datapane.connect.ConnectionTableProcedurePane.DoubleCl
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.datapane.preview.sql.PreviewPerformedSqlPane;
 import com.fr.design.data.datapane.sqlpane.SQLEditPane;
+import com.fr.design.data.tabledata.tabledatapane.loading.SwitchableTableDataPane;
+import com.fr.design.data.tabledata.tabledatapane.loading.TipsPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -30,6 +32,7 @@ import com.fr.design.gui.itableeditorpane.UITableEditorPane;
 import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
 import com.fr.design.gui.syntax.ui.rtextarea.RTextScrollPane;
+import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ToolBarDef;
@@ -54,6 +57,7 @@ import javax.swing.JToolBar;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -64,7 +68,7 @@ import java.awt.event.KeyListener;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
+public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implements SwitchableTableDataPane {
     private static final int BOTTOM = 6;
     private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview");
     private static final String REFRESH_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh");
@@ -78,8 +82,42 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
     private String pageQuery = null;
     private DBTableData dbTableData;
 
+    private CardLayout card;
+    /** 数据库查询面板真正的内容面板 */
+    private JPanel contentPane;
+    /** 加载中面板 */
+    private JPanel loadingPane;
+
+    public DBTableDataPane() {
+        initCards();
+        initContentPane();
+    }
+
+    /**
+     * 初始化cardLayout以及LoadingPane等，并且布局切到LoadingPane
+     */
+    protected void initCards() {
+        card = new CardLayout();
+        setLayout(card);
+
+        loadingPane = new TipsPane(true);
+        contentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+
+        add(LOADING_PANE_NAME, loadingPane);
+        add(CONTENT_PANE_NAME, contentPane);
+        switchTo(LOADING_PANE_NAME);
+    }
+
+    /**
+     * 初始化内容面板
+     */
+    protected void initContentPane() {
+        init();
+        initMainSplitPane();
+    }
+
     private void init() {
-        this.setLayout(new BorderLayout(4, 4));
+        contentPane.setLayout(new BorderLayout(4, 4));
 
         sqlTextPane = new SQLEditPane();
         sqlTextPane.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL);
@@ -93,7 +131,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         editorPane = new UITableEditorPane<ParameterProvider>(model);
 
         // 左边的Panel,上面是选择DatabaseConnection的ComboBox,下面DatabaseConnection对应的Table
-        connectionTableProcedurePane = new ConnectionTableProcedurePane() {
+        connectionTableProcedurePane = new ConnectionTableProcedurePane(this) {
             @Override
             protected void filter(Connection connection, String conName, List<String> nameList) {
 
@@ -194,14 +232,22 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
         JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, connectionTableProcedurePane, sqlSplitPane);
         mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor()));
         mainSplitPane.setOneTouchExpandable(true);
-        this.add(mainSplitPane, BorderLayout.CENTER);
+        contentPane.add(mainSplitPane, BorderLayout.CENTER);
     }
 
-    public DBTableDataPane() {
+    @Override
-        init();
+    public void switchTo(String panelName) {
-        initMainSplitPane();
+        try {
+            if (panelName != null) {
+                card.show(this, panelName);
+            }
+        } catch (IllegalArgumentException ingore) {
+            // 有些直接继承此面板或者替换掉此面板的插件，在未适配此功能时会出现报错，因为不是CardLayout，无法切换，这里处理下
+            FineLoggerFactory.getLogger().info("cannot switch pane by {}", this.getClass().getName());
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
     }
-
 
     private boolean isPreviewOrRefreshButton(FocusEvent e) {
         if (e.getOppositeComponent() != null) {

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

@@ -0,0 +1,23 @@
+package com.fr.design.data.tabledata.tabledatapane.loading;
+
+
+
+/**
+ * 可切换的DBTableData对应的数据集面板，需要使用CardLayout布局
+ * 主要是给插件适配用的
+ * @author Yvan
+ */
+public interface SwitchableTableDataPane {
+
+    /** Loading面板 */
+    String LOADING_PANE_NAME = "Loading";
+    /** 内容面板 */
+    String CONTENT_PANE_NAME = "Content";
+
+    /**
+     * 根据面板名称切换面板
+     * @param paneName 面板名称
+     */
+    void switchTo(String paneName);
+
+}

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

@@ -0,0 +1,54 @@
+package com.fr.design.data.tabledata.tabledatapane.loading;
+
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.i18n.Toolkit;
+
+import javax.swing.JPanel;
+import java.awt.CardLayout;
+
+/**
+ * @author Yvan
+ */
+public class TableDataLoadingPane extends BasicPane {
+
+    /** Loading面板 */
+    public static final String LOADING_PANE_NAME = "Loading";
+    /** 无权限提示面板 */
+    public static final String NO_AUTH_PANE_NAME = "NoAuthority";
+    /** 错误提示面板 */
+    public static final String ERROR_NAME = "Error";
+
+    private CardLayout card;
+
+    /** 加载中面板 */
+    private JPanel loadingPane;
+    /** 错误提示面板 */
+    private JPanel errorPane;
+    /** 数据连接无权限面板 */
+    private JPanel noAuthorityPane;
+
+    public TableDataLoadingPane() {
+        initPanes();
+    }
+
+    private void initPanes() {
+        card = new CardLayout();
+        this.setLayout(card);
+        loadingPane = new TipsPane(true);
+        errorPane = new TipsPane(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Error"));
+        noAuthorityPane = new TipsPane(Toolkit.i18nText("Fine-Design_Basic_Database_Connection_No_Auth"));
+        add(LOADING_PANE_NAME, loadingPane);
+        add(NO_AUTH_PANE_NAME, noAuthorityPane);
+        add(ERROR_NAME, errorPane);
+        switchTo(LOADING_PANE_NAME);
+    }
+
+    public void switchTo(String panelName) {
+        card.show(this, panelName);
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_DS-Database_Query");
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.fr.design.data.tabledata.tabledatapane.loading;
+
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+
+/**
+ * 提示面板，支持自定义提示，支持进度条配置可选
+ * @author Yvan
+ */
+public class TipsPane extends JPanel {
+
+    /**
+     * 默认提示
+     */
+    private static final String LOADING = Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting");
+
+    public TipsPane () {
+        this(LOADING, false);
+    }
+
+    public TipsPane (String tip) {
+        this(tip, false);
+    }
+
+    public TipsPane (boolean needProgressBar) {
+        this(LOADING, needProgressBar);
+    }
+
+    public TipsPane (String tips, boolean needProgressBar) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        UILabel tipsLabel = new UILabel(tips, SwingConstants.CENTER);
+        this.add(tipsLabel, BorderLayout.CENTER);
+        if (needProgressBar) {
+            JProgressBar progressBar = new JProgressBar();
+            progressBar.setIndeterminate(true);
+            this.add(progressBar, BorderLayout.SOUTH);
+        }
+    }
+}

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

@@ -65,24 +65,25 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
     }
 
     /**
-     * @param: component loadingBar的父弹框（如果不设置父弹框的话，可能出现loadingBar隐藏在一个弹框后的情况）
+     * @param component          loadingBar的父弹框（如果不设置父弹框的话，可能出现loadingBar隐藏在一个弹框后的情况）
-     * @param: storeProcedure 存储过程
+     * @param storeProcedure     存储过程
-     * @param: storeprocedureName 存储过程的名字(某些情况下可以为空)
+     * @param storeprocedureName 存储过程的名字(某些情况下可以为空)
-     * @param: dsName 存储过程一个返回数据集的名字
+     * @param dsName             存储过程一个返回数据集的名字
-     * @param: needLoad 是否要加载
+     * @param needLoad           是否要加载
      **/
     public StoreProcedureDataWrapper(Component component, StoreProcedure storeProcedure, String storeprocedureName, String dsName, boolean needLoad) {
         this.dsName = dsName;
         this.storeProcedure = storeProcedure;
         this.storeProcedure.setCalculating(false);
         this.storeprocedureName = storeprocedureName;
-        if (needLoad) {
-            setWorker();
-        }
         if (component == null) {
             component = new JFrame();
         }
+        if (needLoad) {
+            setWorker(component);
+        }
         loadingBar = new AutoProgressBar(component, Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
+            @Override
             public void doMonitorCanceled() {
                 getWorker().cancel(true);
             }
@@ -93,16 +94,17 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
      * 数据集执行结果返回的所有字段
      *
      * @return 数据集执行结果返回的所有字段
-	 *
-	 *
      * @date 2014-12-3-下午7:43:17
-	 *
      */
+    @Override
     public List<String> calculateColumnNameList() {
         if (columnNameList != null) {
             return columnNameList;
         }
-        if (!createStore(false)) {
+
+        try {
+            createStore(false);
+        } catch (Exception e) {
             FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Engine_No_TableData"));
             return new ArrayList<String>();
         }
@@ -114,11 +116,9 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
      * 生成子节点
      *
      * @return 节点数组
-	 *
-	 *
      * @date 2014-12-3-下午7:06:47
-	 *
      */
+    @Override
     public ExpandMutableTreeNode[] load() {
         List<String> namelist;
         if (storeProcedure.isCalculating()) {
@@ -134,23 +134,16 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
         return res;
     }
 
-    private boolean createStore(boolean needLoadingBar) {
+    private void createStore(boolean needLoadingBar) throws Exception {
-        try {
         dataModels = DesignTableDataManager.createLazyDataModel(storeProcedure, needLoadingBar);
-            if (dataModels == null || dataModels.length == 0) {
+        if (dataModels != null && dataModels.length != 0) {
-                return false;
+            for (ProcedureDataModel dataModel : dataModels) {
-            }
+                if (ComparatorUtils.equals(this.dsName, storeprocedureName + "_" + dataModel.getName())) {
-            for (int i = 0; i < dataModels.length; i++) {
+                    procedureDataModel = dataModel;
-                if (ComparatorUtils.equals(this.dsName, storeprocedureName + "_" + dataModels[i].getName())) {
-                    procedureDataModel = dataModels[i];
                     break;
                 }
             }
-            return true;
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
-        return false;
     }
 
     @Override
@@ -162,14 +155,12 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
      * 预览数据
      *
      * @param previewModel 预览模式, 全部还是一个
-	 *
-	 *
      * @date 2014-12-3-下午7:05:50
-	 *
      */
     public void previewData(final int previewModel) {
         this.previewModel = previewModel;
         connectionBar = new AutoProgressBar(new JFrame(), Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) {
+            @Override
             public void doMonitorCanceled() {
                 connectionBar.close();
                 worker.cancel(true);
@@ -178,8 +169,9 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
         worker.execute();
     }
 
-    private void setWorker() {
+    private void setWorker(final Component parent) {
         worker = new SwingWorker<Void, Void>() {
+            @Override
             protected Void doInBackground() throws Exception {
                 loadingBar.close();
                 PreviewTablePane.resetPreviewTable();
@@ -195,6 +187,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                 return null;
             }
 
+            @Override
             public void done() {
                 try {
                     get();
@@ -206,13 +199,15 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                         case StoreProcedureDataWrapper.PREVIEW_ONE:
                             previewData();
                             break;
+                        default:
+                            break;
                     }
                 } catch (Exception e) {
+                    loadingBar.close();
                     if (!(e instanceof CancellationException)) {
                         FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage());
+                        FineJOptionPane.showMessageDialog(parent, e.getMessage());
                     }
-                    loadingBar.close();
                 }
             }
         };
@@ -226,11 +221,10 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
 
     /**
      * 预览返回的一个数据集
-     *
      *
      * @date 2014-12-3-下午7:42:53
-	 *
      */
+    @Override
     public void previewData() {
         previewData(-1, -1);
     }
@@ -242,11 +236,9 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
      *
      * @param keyIndex   实际值
      * @param valueIndex 显示值
-	 *
-	 *
      * @date 2014-12-3-下午7:42:27
-	 *
      */
+    @Override
     public void previewData(final int keyIndex, final int valueIndex) {
         PreviewTablePane.previewStoreData(procedureDataModel, keyIndex, valueIndex);
     }
@@ -257,7 +249,9 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
      */
     public void previewAllTable() {
         if (procedureDataModel == null) {
-            if (!createStore(true)) {
+            try {
+                createStore(true);
+            } catch (Exception e) {
                 return;
             }
         }
@@ -269,6 +263,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
         return dsName;
     }
 
+    @Override
     public TableData getTableData() {
         return storeProcedure;
     }
@@ -282,10 +277,12 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
      *
      * @return 是否异常
      */
+    @Override
     public boolean isUnusual() {
         return false;
     }
 
+    @Override
     public boolean equals(Object obj) {
         return obj instanceof StoreProcedureDataWrapper
                 && ComparatorUtils.equals(this.dsName, ((StoreProcedureDataWrapper) obj).getTableDataName())

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

@@ -38,6 +38,17 @@ public class InformationWarnPane extends JPanel{
 		showWindow(SwingUtilities.getWindowAncestor(this)).setVisible(true);
 	}
 
+	public void showOnFront() {
+		SwingUtilities.invokeLater(new Runnable() {
+			@Override
+			public void run() {
+				AlertDialog dialog = showWindow(SwingUtilities.getWindowAncestor(InformationWarnPane.this));
+				dialog.setVisible(true);
+				dialog.toFront();
+			}
+		});
+	}
+	
 	public InformationWarnPane(String infor, String moreInfo, String title) {
 		this.title = title;
 		this.setLayout(null);

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

@@ -92,7 +92,7 @@ public class UIDetailErrorLinkDialog extends UIDialog {
         contentPane.add(link, BorderLayout.SOUTH);
 
         // 确定 + 取消
-        JPanel actionPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, GAP_10, GAP_10));
+        JPanel actionPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, GAP_10, GAP_5));
         actionPane.add(createButton(Toolkit.i18nText("Fine-Design_Report_OK")));
         actionPane.add(createButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")));
         this.getContentPane().add(topPane, BorderLayout.NORTH);

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

@@ -18,6 +18,7 @@ import java.awt.BorderLayout;
 import java.awt.Dialog;
 import java.awt.FlowLayout;
 import java.awt.Frame;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -43,6 +44,10 @@ public abstract class UIDialog extends JDialog {
         super(parent);
     }
 
+    public UIDialog(Window parent) {
+        super(parent);
+    }
+
 
     public UIDialog(Frame parent, BasicPane pane) {
         this(parent, pane, true);

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

@@ -1,16 +1,18 @@
 package com.fr.design.dialog.link;
 
-import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.utils.LinkStrUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JEditorPane;
 import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
 import java.awt.Color;
 import java.awt.Desktop;
 import java.awt.Font;
 import java.net.URI;
+import java.net.URL;
+
+import static com.fr.design.utils.LinkStrUtils.LABEL;
 
 /**
  * 用来构建JOptionPane带超链的消息提示
@@ -21,8 +23,32 @@ import java.net.URI;
  */
 public class MessageWithLink extends JEditorPane {
 
-    private static final UILabel LABEL = new UILabel();
+    private static final String HTML_BODY = "<body";
+    private static final String HTML_STYLE_FORMAT = " style=\"%s\"";
+
+
+
+    /**
+     * 直接放入 html 内容
+     * 如果有超链接标签， 如 <a href=""></a> 的话，将会自动点击匹配 url
+     *
+     * @param htmlText html内容
+     */
+    public MessageWithLink(String htmlText) {
+
+        super("text/html", htmlText);
+        initListener();
+        setEditable(false);
+        setBorder(null);
+    }
+
+    public MessageWithLink(String htmlText, Runnable action) {
 
+        super("text/html", htmlText);
+        initListener(action);
+        setEditable(false);
+        setBorder(null);
+    }
 
     public MessageWithLink(String message, String linkName, String link) {
         this(message, linkName, link, LABEL.getBackground(), LABEL.getFont());
@@ -37,43 +63,85 @@ public class MessageWithLink extends JEditorPane {
     }
 
     public MessageWithLink(String frontMessage, String linkName, String link, String backMessage) {
-        this(frontMessage, linkName, link, backMessage, LABEL.getBackground(), LABEL.getFont());
+        this(frontMessage, linkName, link, backMessage, LABEL.getBackground(), LABEL.getFont(), LABEL.getForeground());
     }
 
     public MessageWithLink(String message, String linkName, String link, Color color, Font font) {
-        this(message, linkName, link, StringUtils.EMPTY, color, font);
+        this(message, linkName, link, StringUtils.EMPTY, color, font, LABEL.getForeground());
     }
 
     public MessageWithLink(String frontMessage, String linkName, String link, String backMessage, Color color, Font font) {
-        super("text/html", "<html><body style=\"" + generateStyle(color, font) + "\">" + frontMessage + "<a href=\"" + link + "\">" + linkName + "</a>" + backMessage + "</body></html>");
+        this(frontMessage, linkName, link, backMessage, color, font, LABEL.getForeground());
+    }
+
+    public MessageWithLink(String htmlText, Font font) {
+        this(setHtmlFont(htmlText, font));
+    }
+
+
+
+    /**
+     * 将指定的字体赋给html文本
+     * 任何失败，返回原html文本
+     * */
+    private static String setHtmlFont(String htmlText, Font font) {
+
+        try {
+            int bodyIndex = htmlText.indexOf(HTML_BODY);
+            StringBuilder sb = new StringBuilder();
+            String left = htmlText.substring(0, bodyIndex + HTML_BODY.length());
+            String right = htmlText.substring(bodyIndex + HTML_BODY.length());
+            sb.append(left);
+            sb.append(String.format(HTML_STYLE_FORMAT, LinkStrUtils.generateStyle(Color.WHITE, font, Color.BLACK)));
+            sb.append(right);
+            return sb.toString();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e, e.getMessage());
+        }
+
+        return htmlText;
+    }
+
+    public MessageWithLink(String frontMessage, String linkName, String link, String backMessage, Color backgroundColor, Font font, Color fontColor) {
+
+        super("text/html", "<html><body style=\"" + LinkStrUtils.generateStyle(backgroundColor, font, fontColor) + "\">" + frontMessage + "<a href=\"" + link + "\">" + linkName + "</a>" + backMessage + "</body></html>");
         initListener(link);
         setEditable(false);
         setBorder(null);
     }
 
-    protected void initListener(String link) {
+    protected void initListener() {
-        addHyperlinkListener(new HyperlinkListener() {
+
-            @Override
+        addHyperlinkListener(hyperlinkEvent -> {
-            public void hyperlinkUpdate(HyperlinkEvent e) {
-                if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
             try {
-                        Desktop.getDesktop().browse(URI.create(link));
+                if (hyperlinkEvent.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
-                    } catch (Exception exception) {
+                    URL url = hyperlinkEvent.getURL();
-                        FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
+                    Desktop.getDesktop().browse(url.toURI());
                 }
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
+        });
+    }
+
+    protected void initListener(Runnable runnable) {
+
+        addHyperlinkListener(e -> {
+            if (e.getEventType().equals(HyperlinkEvent.EventType.ACTIVATED)) {
+                runnable.run();
             }
         });
     }
 
-    private static StringBuilder generateStyle(Color color, Font font) {
+    protected void initListener(String link) {
-        // 构建相同风格样式
-        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;");
-        style.append("background-color: rgb(").append(color.getRed()).append(",").append(color.getGreen()).append(",").append(color.getBlue()).append(");");
 
-        return style;
+        initListener(() -> {
+            try {
+                Desktop.getDesktop().browse(URI.create(link));
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        });
     }
 
 }

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@@ -3,6 +3,7 @@ package com.fr.design.extra.exe.callback;
 import com.fr.design.bridge.exec.JSCallback;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
+import com.fr.design.extra.exe.callback.handle.PluginCallBackHelper;
 import com.fr.design.i18n.Toolkit;
 
 import com.fr.log.FineLoggerFactory;
@@ -73,7 +74,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
-            FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), FineJOptionPane.ERROR_MESSAGE);
+            PluginCallBackHelper.showErrorMessage(result, pluginInfo);
         }
     }
 }

designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@@ -4,6 +4,7 @@ import com.fr.design.bridge.exec.JSCallback;
 import com.fr.design.bridge.exec.JSExecutor;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
+import com.fr.design.extra.exe.callback.handle.PluginCallBackHelper;
 import com.fr.design.i18n.Toolkit;
 
 import com.fr.log.FineLoggerFactory;
@@ -63,7 +64,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed"));
-            FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), FineJOptionPane.ERROR_MESSAGE);
+            PluginCallBackHelper.showErrorMessage(result, pluginInfo);
         }
     }
 

designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@@ -3,6 +3,7 @@ package com.fr.design.extra.exe.callback;
 import com.fr.design.bridge.exec.JSCallback;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
+import com.fr.design.extra.exe.callback.handle.PluginCallBackHelper;
 import com.fr.design.i18n.Toolkit;
 
 import com.fr.log.FineLoggerFactory;
@@ -72,7 +73,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
         }else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
-            FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), FineJOptionPane.ERROR_MESSAGE);
+            PluginCallBackHelper.showErrorMessage(result, pluginInfo);
         }
     }
 }

designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java

@@ -3,6 +3,7 @@ package com.fr.design.extra.exe.callback;
 import com.fr.design.bridge.exec.JSCallback;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
+import com.fr.design.extra.exe.callback.handle.PluginCallBackHelper;
 import com.fr.design.i18n.Toolkit;
 
 import com.fr.log.FineLoggerFactory;
@@ -38,7 +39,7 @@ public class UpdateOnlineCallback extends AbstractDealPreTaskCallback {
         } else {
             jsCallback.execute("failed");
             FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed"));
-            FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), FineJOptionPane.ERROR_MESSAGE);
+            PluginCallBackHelper.showErrorMessage(result, pluginInfo);
         }
     }
 }

designer-base/src/main/java/com/fr/design/extra/exe/callback/handle/PluginCallBackHelper.java

@@ -0,0 +1,70 @@
+package com.fr.design.extra.exe.callback.handle;
+
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.dialog.link.MessageWithLink;
+import com.fr.design.i18n.Toolkit;
+import com.fr.plugin.error.PluginErrorCode;
+import com.fr.plugin.manage.control.PluginTaskResult;
+
+/**
+ * 帮助处理插件操作（安装、更新等）的弹窗
+ * @author Yvan
+ */
+public class PluginCallBackHelper {
+
+    private static final String NEW_LINE_TAG = "<br/>";
+    private static final String REFERENCE = Toolkit.i18nText("Fine-Design_Basic_Plugin_File_Validate_Reference");
+    private static final String HELP_DOCUMENT_NAME = Toolkit.i18nText("Fine-Design_Basic_Plugin_File_Validate_HELP_DOCUMENT_NAME");
+    private static final String CONNECTOR = "-";
+    private static final String HELP_DOCUMENT_LINK = Toolkit.i18nText("Fine-Design_Basic_Plugin_File_Validate_HELP_DOCUMENT_LINK");
+
+
+    /**
+     * 展示插件操作失败后的提示弹窗
+     * @param result
+     * @param pluginInfo
+     */
+    public static void showErrorMessage(PluginTaskResult result, String pluginInfo) {
+        // 单独处理下插件完整性校验失败的提示
+        if (PluginCallBackHelper.needHandleInvalidatePackage(result)) {
+            MessageWithLink messageWithLink = PluginCallBackHelper.generate4InvalidatePackage(pluginInfo);
+            PluginTaskResultErrorDialog resultDialog = new PluginTaskResultErrorDialog(null, messageWithLink);
+            resultDialog.showResult();
+        } else {
+            FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), FineJOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    /**
+     * 判断是否需要处理 插件安装包校验失败 导致的安装失败任务
+     * @param result
+     * @return
+     */
+    private static boolean needHandleInvalidatePackage(PluginTaskResult result) {
+        return !result.isSuccess() && result.getCode() == PluginErrorCode.InstallPackageValidateFailed;
+    }
+
+    /**
+     * 根据插件原始报错信息，构建MessageWithLink
+     * @param originInfo
+     * @return
+     */
+    private static MessageWithLink generate4InvalidatePackage(String originInfo) {
+
+        return new MessageWithLink(getSupplementaryMessage(originInfo), HELP_DOCUMENT_NAME, HELP_DOCUMENT_LINK);
+    }
+
+    /**
+     * 根据插件原始报错信息，获取增加了补充说明后的信息
+     * @param originInfo
+     * @return
+     */
+    private static String getSupplementaryMessage(String originInfo) {
+        return new StringBuilder()
+                .append(originInfo)
+                .append(NEW_LINE_TAG)
+                .append(REFERENCE)
+                .append(CONNECTOR)
+                .toString();
+    }
+}

designer-base/src/main/java/com/fr/design/extra/exe/callback/handle/PluginTaskResultErrorDialog.java

@@ -0,0 +1,86 @@
+package com.fr.design.extra.exe.callback.handle;
+
+import com.fr.base.svg.IconUtils;
+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.layout.VerticalFlowLayout;
+import com.fr.design.utils.gui.GUICoreUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * 当前仅处理Error提示，之后有需要再扩展
+ * @author Yvan
+ */
+public class PluginTaskResultErrorDialog extends JDialog {
+
+    private static final Dimension LABEL = new Dimension(60, 90);
+
+    private JPanel contentPane;
+
+    private UILabel errorLabel;
+
+    private UIButton confirmButton;
+
+    private MessageWithLink messageWithLink;
+
+    public PluginTaskResultErrorDialog(Frame parent, MessageWithLink messageWithLink) {
+        super(parent, true);
+        this.setTitle(Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"));
+        this.messageWithLink = messageWithLink;
+
+        initContentPane();
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        this.setResizable(false);
+        this.add(contentPane, BorderLayout.CENTER);
+        this.setSize(new Dimension( 380, 160));
+        GUICoreUtils.centerWindow(this);
+    }
+
+    /**
+     * 初始化内容面板
+     */
+    private void initContentPane() {
+        this.contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        // error图标
+        errorLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/error_tips.svg"));
+        errorLabel.setPreferredSize(LABEL);
+        errorLabel.setBorder(BorderFactory.createEmptyBorder(10, 20, 40, 20));
+        // 提示内容
+        JPanel messagePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        messagePane.add(errorLabel, BorderLayout.WEST);
+        messagePane.add(messageWithLink, BorderLayout.CENTER);
+        messagePane.setBorder(BorderFactory.createEmptyBorder(20, 10, 0, 10));
+        this.contentPane.add(messagePane, BorderLayout.CENTER);
+        // 确定按钮
+        confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Button_OK"));
+        confirmButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                hideResult();
+            }
+        });
+        JPanel confirmPane = new JPanel(new VerticalFlowLayout());
+        confirmPane.add(confirmButton);
+        confirmPane.setBorder(BorderFactory.createEmptyBorder(0, 160, 10, 0));
+        this.contentPane.add(confirmPane, BorderLayout.SOUTH);
+    }
+
+    public void showResult() {
+        this.setVisible(true);
+    }
+
+    public void hideResult() {
+        this.setVisible(false);
+    }
+}

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

@@ -12,11 +12,9 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.JVirtualTemplate;
-import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
-import com.fr.file.StashedFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.invoke.ClassHelper;
 import com.fr.log.FineLoggerFactory;
@@ -26,7 +24,7 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StringUtils;
 import com.fr.third.org.apache.commons.io.FilenameUtils;
 
-import java.io.ByteArrayOutputStream;
+import javax.swing.SwingWorker;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -34,7 +32,6 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
-import javax.swing.SwingWorker;
 
 /**
  * 历史模板缓存
@@ -361,22 +358,15 @@ public class HistoryTemplateListCache implements CallbackEvent {
         int size = historyList.size();
         for (int i = 0; i < size; i++) {
             JTemplate<?, ?> template = historyList.get(i);
-            FILE file = template.getEditingFILE();
+            FILE file = template.templateToStashFile();
-            try {
+            if (file != null) {
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                stashFILEMap.put(i, file);
-                BaseBook target = template.getTarget();
-                if (target != null) {
-                    target.export(outputStream);
-                    stashFILEMap.put(i, new StashedFILE(file, outputStream.toByteArray()));
-                }
-                // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
-            } catch (Exception e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         FineLoggerFactory.getLogger().info("Env Change Template Stashed.");
     }
 
+
     private boolean checkStash() {
         try {
             return stashWorker.get();
@@ -455,22 +445,13 @@ public class HistoryTemplateListCache implements CallbackEvent {
         int size = historyList.size();
         for (int i = 0; i < size; i++) {
             JTemplate<?, ?> template = historyList.get(i);
+            // 判断刷新逻辑比较耗时，且可能出现插件安装后误判导致不刷新
+            // 插件安装/启用场景比较少，因此插件安装/启用后每次均进行刷新
             FILE file = template.getEditingFILE();
-            boolean needReload = context == null || needReloadTemplate(context, template);
+            FILE stashFile = template.templateToStashFile();
-            if (needReload) {
+            if (stashFile != null) {
-                try {
-                    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                    BaseBook target = template.getTarget();
-                    if (target != null) {
                 FineLoggerFactory.getLogger().info("{} is being reloaded", file.getName());
-                        target.export(outputStream);
+                template.refreshResource(stashFile);
-                        FILE stashedFile = new StashedFILE(file, outputStream.toByteArray());
-                        template.refreshResource(stashedFile);
-                    }
-                    // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
-                } catch (Exception e) {
-                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
-                }
             }
         }
         FineLoggerFactory.getLogger().info("Plugin env change reload all template ended");
@@ -492,28 +473,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
         _reloadAllEditingTemplate(null);
     }
 
-    private boolean needReloadTemplate(PluginContext context, JTemplate<?, ?> template) {
-        BaseBook baseBook = template.getTarget();
-        if (baseBook != null) {
-            String name = template.getEditingFILE().getName();
-            String pluginId = context.getID();
-            long start = System.currentTimeMillis();
-            Set<ClassLoader> set = ClassHelper.getClassLoadersByFilter(baseBook, ClassFilter.getInstance());
-            FineLoggerFactory.getLogger().info("{} find plugin classloader spend: {} ms", name, (System.currentTimeMillis() - start));
-            if (set != null) {
-                for (ClassLoader classLoader : set) {
-                    if (ComparatorUtils.equals(pluginId, PluginManager.detectLeakingPlugin(classLoader))) {
-                        return true;
-                    }
-                }
-            } else {
-                // set为null说明 检测classloader 这里返回true直接刷新 兜底行为
-                return true;
-            }
-        }
-        return false;
-    }
-
     public void replaceCurrentEditingTemplate(JTemplate<?, ?> jt) {
         int index = contains(this.editingTemplate);
         this.editingTemplate = jt;

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

@@ -4,6 +4,7 @@ package com.fr.design.file;
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.vcs.DesignerMode;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.imenu.UIMenuItem;
@@ -753,7 +754,7 @@ public class MutilTempalteTabPane extends JComponent {
     /**
      * 关闭掉一个模板之后激活新的待显示模板
      */
-    private void activePrevTemplateAfterClose() {
+    public void activePrevTemplateAfterClose() {
         if (openedTemplate.isEmpty()) {
             //新建并激活模板
             DesignerContext.getDesignerFrame().addAndActivateJTemplate();
@@ -765,8 +766,8 @@ public class MutilTempalteTabPane extends JComponent {
             // 如果关闭的模板是当前选中的模板，则重新激活当前 selectIndex 的模板；
             // selectIndex 没有变化，但是对应的模板已经变成了前一张模板
             if (closeIconIndex == selectedIndex || isCloseCurrent) {
-                // 如果 closeIconIndex 是最后一个被渲染画出的，那么预览上一个，防止数组越界
+                // 如果当前关闭的模板在最右侧，那么预览上一个，防止数组越界
-                if (closeIconIndex >= maxPaintIndex) {
+                if (selectedIndex >= maxPaintIndex) {
                     // selectIndex 不会 <0 因为如果关闭的是打开的最后一个模板，那么关闭之后 openedTemplate.isEmpty() = true
                     selectedIndex--;
                 }
@@ -952,6 +953,10 @@ public class MutilTempalteTabPane extends JComponent {
                         return;
                     }
                 }
+                //参考CloseCurrentTemplateAction，在closeFormat与closeSpecifiedTemplate之前要先设定isCloseCurrent，这样关闭之后才会自动切换tab
+                if (checkCurrentClose(template)) {
+                    setIsCloseCurrent(true);
+                }
                 closeFormat(template);
                 closeSpecifiedTemplate(template);
                 DesignerContext.getDesignerFrame().getContentFrame().repaint();
@@ -984,6 +989,12 @@ public class MutilTempalteTabPane extends JComponent {
 
 
     }
+    private boolean checkCurrentClose(JTemplate template) {
+        JTemplate currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        //10.0无JTemplate.isValid
+        return currentTemplate != null && ComparatorUtils.equals(template.getPath(), currentTemplate.getPath());
+    }
+
 
     private class MultiTemplateTabMouseMotionListener implements MouseMotionListener {
         /**

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

@@ -0,0 +1,11 @@
+package com.fr.design.fun;
+
+import com.fr.design.gui.frpane.RegFieldPane;
+import com.fr.stable.fun.mark.Immutable;
+
+public interface RegPaneProvider extends Immutable {
+    int CURRENT_LEVEL = 1;
+    String XML_TAG = "RegPaneProvider";
+
+    RegFieldPane createRegPane();
+}

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

@@ -0,0 +1,11 @@
+package com.fr.design.fun;
+
+import com.fr.design.beans.ErrorMsgTextFieldAdapter;
+import com.fr.stable.fun.mark.Immutable;
+
+public interface TextFieldAdapterProvider extends Immutable {
+    String XML_TAG = "TextFieldAdapterProvider";
+    int CURRENT_LEVEL = 1;
+
+    ErrorMsgTextFieldAdapter createTextFieldAdapter();
+}

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

@@ -0,0 +1,22 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.RegPaneProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * @author Joe
+ * 2021/10/8 15:19
+ */
+@API(level = RegPaneProvider.CURRENT_LEVEL)
+public abstract class AbstractRegPaneProvider implements RegPaneProvider {
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.TextFieldAdapterProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * @author Joe
+ * 2021/10/8 15:17
+ */
+@API(level = TextFieldAdapterProvider.CURRENT_LEVEL)
+public abstract class AbstractTextFieldAdapterProvider implements TextFieldAdapterProvider {
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+}

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

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

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

@@ -9,10 +9,16 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.Filter;
 import com.fr.stable.Nameable;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
-import java.awt.*;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.util.Arrays;
+import java.util.stream.Stream;
 
 /**
  * Coder: zack
@@ -27,6 +33,8 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S
 
     ShortCut4JControlPane[] shorts;
     NameableCreator[] creators;
+
+    protected Filter<NameableCreator> creatorsFilter;
     private ToolBarDef toolbarDef;
 
     UIToolbar toolBar;
@@ -38,6 +46,7 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S
 
     JControlPane() {
         this.initShortCutFactory();
+        this.initCreatorsFilter();
         this.initComponentPane();
     }
 
@@ -106,6 +115,10 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S
         this.checkButtonEnabled();
     }
 
+    protected void initCreatorsFilter() {
+        this.creatorsFilter = nameableCreator -> true;
+    }
+
     protected void initCardPane() {
         this.controlUpdatePane = createControlUpdatePane();
 
@@ -183,7 +196,12 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S
     }
 
     public NameableCreator[] creators() {
-        return creators == null ? new NameableCreator[0] : creators;
+        if (creators == null) {
+            return new NameableCreator[0];
+        } else {
+            Stream<NameableCreator> nameableCreatorStream = Arrays.stream(creators).filter(creator -> creatorsFilter.accept(creator));
+            return nameableCreatorStream.toArray(NameableCreator[]::new);
+        }
     }
 
     /**

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

@@ -125,7 +125,9 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li
         for (int i = 0, size = widget.getListenerSize(); i < size; i++) {
             Listener listener = widget.getListener(i);
             if (!listener.isDefault()) {
-                nameObjectList.add(i, new NameObject(switchLang(listener.getEventName()) + (i + 1), listener));
+                String eventName = switchLang(listener.getEventName()) + (nameObjectList.size() + 1);
+                NameObject nameObject = new NameObject(eventName, listener);
+                nameObjectList.add(nameObject);
             }
         }
         populate(getHelper().processCatalog(nameObjectList));

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

@@ -142,10 +142,6 @@ public class ShortCutFactory extends AbstractShortCutFactory {
 
         private void wrapActionListener(NameableCreator[] creators) {
             for (final NameableCreator creator : creators) {
-                Filter<Class<? extends JavaScript>> filter = DesignModuleFactory.getHyperlinkGroupType().getFilter();
-                if (!filter.accept(creator.getHyperlink())) {
-                    continue;
-                }
                 boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) ||
                         ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database"));
                 if (isTrue) {

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

@@ -1,21 +1,25 @@
 package com.fr.design.gui.frpane;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.ErrorMsgTextFieldAdapter;
+import com.fr.design.beans.UITextFieldAdapter;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.TextFieldAdapterProvider;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.TextEditor;
 import com.fr.form.ui.reg.NoneReg;
 import com.fr.form.ui.reg.RegExp;
+import com.fr.log.FineLoggerFactory;
 
-
+import javax.swing.BorderFactory;
-import javax.swing.*;
+import javax.swing.JPanel;
-import javax.swing.event.DocumentEvent;
+import java.awt.BorderLayout;
-import javax.swing.event.DocumentListener;
+import java.awt.Component;
-import java.awt.*;
+import java.awt.Dimension;
 
 /**
  * Created by kerry on 2017/9/4.
@@ -67,33 +71,35 @@ public class RegFieldPane extends RegPane {
     }
 
     private static class RegErrorMsgPane extends BasicPane {
-        private UITextField regErrorMsgField;
+        private ErrorMsgTextFieldAdapter errorMsgTextFieldAdapter;
 
         public RegErrorMsgPane() {
+            initRegErrorMsgField();
+            setStyle();
+        }
+
+        private void setStyle() {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
-            initRegErrorMsgField();
             UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"));
             tipLabel.setPreferredSize(new Dimension(60, 20));
-            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, regErrorMsgField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
+            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, errorMsgTextFieldAdapter.getErrorMsgTextField()}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
             this.add(panel);
         }
 
         private void initRegErrorMsgField() {
-            regErrorMsgField = new UITextField();
+            TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
-            regErrorMsgField.getDocument().addDocumentListener(new DocumentListener() {
+            if (provider == null) {
-                public void changedUpdate(DocumentEvent e) {
+                errorMsgTextFieldAdapter = new UITextFieldAdapter();
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
+                return;
-                }
-
-                public void insertUpdate(DocumentEvent e) {
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
             }
+            try {
+                errorMsgTextFieldAdapter = provider.createTextFieldAdapter();
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                errorMsgTextFieldAdapter = new UITextFieldAdapter();
 
-                public void removeUpdate(DocumentEvent e) {
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
             }
-            });
         }
 
         @Override
@@ -102,11 +108,11 @@ public class RegFieldPane extends RegPane {
         }
 
         public void populate(TextEditor textEditor) {
-            regErrorMsgField.setText(textEditor.getRegErrorMessage());
+            errorMsgTextFieldAdapter.setText(textEditor.getRegErrorMessage());
         }
 
         public void update(TextEditor textEditor) {
-            textEditor.setRegErrorMessage(regErrorMsgField.getText());
+            textEditor.setRegErrorMessage(errorMsgTextFieldAdapter.getText());
         }
     }
 

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

@@ -61,6 +61,14 @@ public class UIButton extends JButton implements UIObserver, UITextComponent {
 		init();
 	}
 
+	public UIButton(Icon icon, boolean decorate) {
+		this(icon);
+		if (!decorate) {
+			setContentAreaFilled(false);
+			setFocusPainted(false);
+			setBorderPainted(false);
+		}
+	}
 
 	public UIButton(Icon icon) {
 		super(icon);

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

@@ -379,7 +379,10 @@ public class UIButtonGroup<T> extends JPanel implements GlobalNameObserver {
      * @param l
      */
     public void removeChangeListener(ChangeListener l) {
-        this.listenerList.remove(ChangeListener.class, l);
+        for (int i = 0; i < labelButtonList.size(); i++) {
+            labelButtonList.get(i).removeChangeListener(l);
+            listenerList.remove(ChangeListener.class, l);
+        }
     }
 
 

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

@@ -248,7 +248,7 @@ public class FRTreeComboBox extends UIComboBox {
 
     private static TreePopup treePopup;
 
-    private static class FRTreeComboBoxUI extends BasicComboBoxUI implements MouseListener{
+    protected static class FRTreeComboBoxUI extends BasicComboBoxUI implements MouseListener{
         private boolean isRollover = false;
 
         public FRTreeComboBoxUI() {
@@ -535,7 +535,7 @@ public class FRTreeComboBox extends UIComboBox {
     public class FrTreeSearchComboBoxEditor extends UIComboBoxEditor implements DocumentListener {
         private volatile boolean setting = false;
         private FRTreeComboBox comboBox;
-        private Object item;
+        protected Object item;
 
         public FrTreeSearchComboBoxEditor(FRTreeComboBox comboBox) {
             super();

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

@@ -1,77 +0,0 @@
-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/icombobox/TableSearchTreeComboBox.java

@@ -0,0 +1,236 @@
+package com.fr.design.gui.icombobox;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.data.core.DataCoreUtils;
+import com.fr.data.core.db.TableProcedure;
+import com.fr.data.impl.Connection;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.data.datapane.ChoosePane;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.log.FineLoggerFactory;
+import com.fr.module.ModuleContext;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.Filter;
+import com.fr.stable.StringUtils;
+
+import javax.swing.JOptionPane;
+import javax.swing.JTree;
+import javax.swing.SwingWorker;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeCellRenderer;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
+import java.util.Enumeration;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * 实现模糊搜索表名的FRTreeComboBox
+ * FRTreeComboBox：搜索后滚动到首个匹配节点
+ * SearchFRTreeComboBox：显示所有匹配的节点
+ *
+ * @author Lucian.Chen
+ * @version 10.0
+ * Created by Lucian.Chen on 2021/4/14
+ */
+public class TableSearchTreeComboBox extends FRTreeComboBox {
+    // 持有父容器，需要实时获取其他组件值
+    private final ChoosePane parent;
+    /**
+     * 保证模糊搜索的原子性操作
+     */
+    private final ExecutorService singleExecutor = ModuleContext.getExecutor().newSingleThreadScheduledExecutor(new NamedThreadFactory("TableSearchTreeComboBox"));
+
+    public TableSearchTreeComboBox(ChoosePane parent, JTree tree, TreeCellRenderer renderer) {
+        super(tree, renderer);
+        this.parent = parent;
+        initPopupListener();
+    }
+
+    protected UIComboBoxEditor createEditor() {
+        return new TableSearchComboBoxEditor(this);
+    }
+
+    @Override
+    protected String pathToString(TreePath path) {
+        Object obj = ((DefaultMutableTreeNode) path.getLastPathComponent()).getUserObject();
+        if (obj instanceof TableProcedure) {
+            return ((TableProcedure) obj).getName();
+        }
+        return super.pathToString(path);
+    }
+
+    @Override
+    public void setSelectedItemString(String _name) {
+        super.setSelectedItemString(_name);
+        // 会因为连续两次选中的值一致，导致未触发编辑框联动
+        this.getEditor().setItem(_name);
+    }
+
+    /**
+     * 执行模糊搜索
+     */
+    private void searchExecute() {
+        UIComboBoxEditor searchEditor = (UIComboBoxEditor) this.getEditor();
+        String searchText = (String) searchEditor.getItem();
+        singleExecutor.execute(new SwingWorker<Void, Void>() {
+            @Override
+            protected Void doInBackground() {
+                processTableDataNames(
+                        parent.getDSName(),
+                        parent.getConnection(),
+                        parent.getSchema(),
+                        createFilter(searchText));
+                return null;
+            }
+
+            @Override
+            protected void done() {
+                expandTree();
+                // 输入框获取焦点
+                searchEditor.getEditorComponent().requestFocus();
+            }
+        });
+    }
+
+    private TableNameFilter createFilter(String text) {
+        return StringUtils.isEmpty(text) ? EMPTY_FILTER : new TableNameFilter(text);
+    }
+
+    /**
+     * 查询数据库表，并构建节点目录
+     *
+     * @param databaseName 数据库名
+     * @param connection   数据连接
+     * @param schema       模式
+     * @param filter       模糊搜索过滤器
+     */
+    private void processTableDataNames(String databaseName, Connection connection, String schema, TableNameFilter filter) {
+        if (tree == null) {
+            return;
+        }
+        DefaultMutableTreeNode rootTreeNode = (DefaultMutableTreeNode) tree.getModel().getRoot();
+        rootTreeNode.removeAllChildren();
+
+        if (connection == null) {
+            return;
+        }
+        try {
+            schema = StringUtils.isEmpty(schema) ? null : schema;
+            TableProcedure[] sqlTableArray = DataCoreUtils.getTables(connection, TableProcedure.TABLE, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
+            if (ArrayUtils.isNotEmpty(sqlTableArray)) {
+                ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(databaseName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"));
+                rootTreeNode.add(tableTreeNode);
+                addArrayNode(tableTreeNode, sqlTableArray, filter);
+            }
+            TableProcedure[] sqlViewArray = DataCoreUtils.getTables(connection, TableProcedure.VIEW, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace());
+            if (ArrayUtils.isNotEmpty(sqlViewArray)) {
+                ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(databaseName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"));
+                rootTreeNode.add(viewTreeNode);
+                addArrayNode(viewTreeNode, sqlViewArray, filter);
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    private void addArrayNode(ExpandMutableTreeNode rootNode, TableProcedure[] sqlArray, TableNameFilter filter) {
+        if (sqlArray != null) {
+            for (TableProcedure procedure : sqlArray) {
+                if (filter.accept(procedure)) {
+                    ExpandMutableTreeNode viewChildTreeNode = new ExpandMutableTreeNode(procedure);
+                    rootNode.add(viewChildTreeNode);
+                }
+            }
+        }
+    }
+
+    /**
+     * 展开节点
+     */
+    private void expandTree() {
+        ((DefaultTreeModel) tree.getModel()).reload();
+        // daniel 展开所有tree
+        TreeNode root = (TreeNode) tree.getModel().getRoot();
+        TreePath parent = new TreePath(root);
+        TreeNode node = (TreeNode) parent.getLastPathComponent();
+        for (Enumeration e = node.children(); e.hasMoreElements(); ) {
+            TreeNode n = (TreeNode) e.nextElement();
+            TreePath path = parent.pathByAddingChild(n);
+            tree.expandPath(path);
+        }
+    }
+
+    /**
+     * 表名模糊搜索实现
+     */
+    private static class TableNameFilter implements Filter<TableProcedure> {
+        private String searchFilter;
+
+        public TableNameFilter() {
+        }
+
+        public TableNameFilter(String searchFilter) {
+            this.searchFilter = searchFilter.toLowerCase().trim();
+        }
+
+        // 表名匹配
+        @Override
+        public boolean accept(TableProcedure procedure) {
+            return procedure.getName().toLowerCase().contains(searchFilter);
+        }
+    }
+
+    private static final TableNameFilter EMPTY_FILTER = new TableNameFilter() {
+        public boolean accept(TableProcedure procedure) {
+            return true;
+        }
+    };
+
+    private void initPopupListener() {
+        // 点击下拉时触发模糊搜索
+        this.addPopupMenuListener(new PopupMenuListener() {
+
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                searchExecute();
+            }
+
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+
+            }
+        });
+    }
+
+    /**
+     * 重写输入框编辑器，实现输入框模糊搜索逻辑
+     */
+    private class TableSearchComboBoxEditor extends FrTreeSearchComboBoxEditor {
+
+        public TableSearchComboBoxEditor(FRTreeComboBox comboBox) {
+            super(comboBox);
+        }
+
+        @Override
+        protected void changeHandler() {
+            if (isSetting()) {
+                return;
+            }
+            setPopupVisible(true);
+            this.item = textField.getText();
+            searchExecute();
+        }
+    }
+}

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

@@ -296,10 +296,9 @@ public class UIEastResizableContainer extends JPanel {
                     model = UIConstants.MODEL_NORMAL;
                     refreshContainer();
                 }
-
                 @Override
-                public void mouseClicked(MouseEvent e) {
+                public void mouseReleased(MouseEvent e) {
-                    if (e.getX() <= ARROW_RANGE) {
+                    if (isInPane(e)) {
                         if (containerWidth == leftPaneWidth) {
                             showContainer();
                         } else {
@@ -309,7 +308,9 @@ public class UIEastResizableContainer extends JPanel {
                 }
             });
         }
-
+        public boolean isInPane(MouseEvent e){
+            return e.getX() <= ARROW_RANGE && e.getX() >= 0 && e.getY() <= topToolPaneHeight && e.getY() >= 0;
+        }
         @Override
         public void paint(Graphics g) {
             Image button;

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

@@ -0,0 +1,25 @@
+package com.fr.design.gui.ifilechooser;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/29
+ */
+public class ExtensionFilter {
+
+    private final String des;
+    private final String[] extensions;
+
+    public ExtensionFilter(String des, String... extensions) {
+        this.des = des;
+        this.extensions = extensions;
+    }
+
+    public String getDes() {
+        return des;
+    }
+
+    public String[] getExtensions() {
+        return extensions;
+    }
+}

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

@@ -0,0 +1,109 @@
+package com.fr.design.gui.ifilechooser;
+
+/**
+ * 文件选择器可设置的参数集合
+ *
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+public class FileChooserArgs {
+
+    private final FileSelectionMode fileSelectionMode;
+    private final String filterDes;
+    private final String[] extensions;
+    private final String selectedPath;
+    private final ExtensionFilter[] filters;
+    private final String tipText;
+    private final boolean multiSelectionEnabled;
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    private FileChooserArgs(Builder builder) {
+        this.fileSelectionMode = builder.fileSelectionMode;
+        this.filterDes = builder.filterDes;
+        this.extensions = builder.extensions;
+        this.selectedPath = builder.selectedPath;
+        this.filters = builder.filters;
+        this.tipText = builder.tipText;
+        this.multiSelectionEnabled = builder.multiSelectionEnabled;
+    }
+
+    public FileSelectionMode getFileSelectionMode() {
+        return fileSelectionMode;
+    }
+
+    public String getFilterDes() {
+        return filterDes;
+    }
+
+    public String[] getExtensions() {
+        return extensions;
+    }
+
+    public String getSelectedPath() {
+        return selectedPath;
+    }
+
+    public ExtensionFilter[] getFilters() {
+        return filters;
+    }
+
+    public String getTipText() {
+        return tipText;
+    }
+
+    public boolean isMultiSelectionEnabled() {
+        return multiSelectionEnabled;
+    }
+
+    public static class Builder {
+
+        private FileSelectionMode fileSelectionMode;
+        private String filterDes;
+        private String[] extensions;
+        private String selectedPath;
+        private ExtensionFilter[] filters = new ExtensionFilter[0];
+        private String tipText;
+        private boolean multiSelectionEnabled;
+
+        public Builder setFileSelectionMode(FileSelectionMode fileSelectionMode) {
+            this.fileSelectionMode = fileSelectionMode;
+            return this;
+        }
+
+        public Builder setFilter(String filterDes, String... extensions) {
+            this.filterDes = filterDes;
+            this.extensions = extensions;
+            return this;
+        }
+
+        public Builder setSelectedPath(String selectedPath) {
+            this.selectedPath = selectedPath;
+            return this;
+        }
+
+        public Builder setFilters(ExtensionFilter[] filters) {
+            this.filters = filters;
+            return this;
+        }
+
+        public Builder setTipText(String tipText) {
+            this.tipText = tipText;
+            return this;
+        }
+
+        public Builder setMultiSelectionEnabled(boolean multiSelectionEnabled) {
+            this.multiSelectionEnabled = multiSelectionEnabled;
+            return this;
+        }
+
+        public FileChooserArgs build() {
+            return new FileChooserArgs(this);
+        }
+    }
+
+
+}

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

@@ -0,0 +1,44 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.os.impl.SupportOSImpl;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+public class FileChooserFactory {
+
+    public static FileChooserProvider createFileChooser(FileChooserArgs fileChooserArgs) {
+        if (SupportOSImpl.OLD_STYLE_CHOOSER.support()) {
+            return new SwingFileChooser.Builder().
+                    setFileSelectionMode(fileChooserArgs.getFileSelectionMode()).
+                    setFileFilter(fileChooserArgs.getFilterDes(), fileChooserArgs.getExtensions()).
+                    setSelectedFile(fileChooserArgs.getSelectedPath()).
+                    setMultiSelectionEnabled(fileChooserArgs.isMultiSelectionEnabled()).
+                    setTipText(fileChooserArgs.getTipText()).
+                    setFileFilter(fileChooserArgs.getFilters()).build();
+        } else {
+            return new JavaFxNativeFileChooser.Builder().
+                    fileSelectionMode(fileChooserArgs.getFileSelectionMode()).
+                    filter(fileChooserArgs.getFilterDes(), fileChooserArgs.getExtensions()).
+                    currentDirectory(fileChooserArgs.getSelectedPath()).
+                    title(fileChooserArgs.getTipText()).
+                    filters(fileChooserArgs.getFilters()).build();
+        }
+    }
+
+    public static FileChooserProvider createImageFileChooser() {
+        if (SupportOSImpl.OLD_STYLE_CHOOSER.support()) {
+            return new SwingImageFileChooser();
+        } else {
+            return new JavaFxNativeFileChooser.Builder().
+                    fileSelectionMode(FileSelectionMode.FILE).
+                    title(Toolkit.i18nText("Fine-Design_Basic_Open")).
+                    filter(Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"), "*.jpg", "*.gif", "*.png", "*.bmp").
+                    build();
+        }
+    }
+
+}

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

@@ -9,4 +9,17 @@ public interface FileChooserProvider {
     File getSelectedFile();
 
     int showDialog(Component parent);
+
+
+    default int showOpenDialog(Component parent, String approveButtonText) {
+        return -1;
+    }
+
+    default void setMultiSelectionEnabled(boolean multiple) {
+
+    }
+
+    default void setCurrentDirectory(File file) {
+
+    }
 }

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

@@ -4,6 +4,8 @@ package com.fr.design.gui.ifilechooser;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
 import com.sun.javafx.application.PlatformImpl;
 import javafx.application.Platform;
 import javafx.scene.Scene;
@@ -163,6 +165,8 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
         try {
             latch.await();
         } catch (InterruptedException ignore) {
+        } finally {
+            setShowDialogState(false);
         }
         return selectedFiles.length > 0 ? JFileChooser.APPROVE_OPTION : JFileChooser.CANCEL_OPTION;
     }
@@ -171,10 +175,20 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
         this.fileSelectionMode = fileSelectionMode;
     }
 
+    @Override
     public void setCurrentDirectory(File currentDirectory) {
         this.currentDirectory = currentDirectory;
     }
 
+    @Override
+    public void setMultiSelectionEnabled(boolean multiple) {
+        this.setSelectionMode(multiple ? FileSelectionMode.MULTIPLE_FILE : FileSelectionMode.FILE);
+    }
+
+    @Override
+    public int showOpenDialog(Component parent, String approveButtonText) {
+        return this.showDialog(parent);
+    }
 
     public static class Builder {
         private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE;
@@ -183,17 +197,32 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
         private File currentDirectory;
 
         public Builder fileSelectionMode(FileSelectionMode fileSelectionMode) {
+            if (fileSelectionMode != null) {
                 this.fileSelectionMode = fileSelectionMode;
+            }
             return this;
         }
 
         public Builder title(String title) {
+            if (StringUtils.isNotEmpty(title)) {
                 this.title = title;
+            }
             return this;
         }
 
         public Builder filters(FileChooser.ExtensionFilter[] filters) {
+            if (filters != null) {
                 this.filters = filters;
+            }
+            return this;
+        }
+
+        public Builder filters(ExtensionFilter[] filters) {
+            if (filters != null) {
+                for (ExtensionFilter filter : filters) {
+                    this.filters = ArrayUtils.add(this.filters, new FileChooser.ExtensionFilter(filter.getDes(), filter.getExtensions()));
+                }
+            }
             return this;
         }
 
@@ -204,7 +233,6 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
             return this;
         }
 
-
         public Builder currentDirectory(File currentDirectory) {
             if (currentDirectory != null) {
                 if (!currentDirectory.isDirectory()) {

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

@@ -0,0 +1,134 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.common.annotations.Negative;
+import com.fr.design.upm.UpmUtils;
+import com.fr.stable.ArrayUtils;
+import com.fr.stable.StringUtils;
+import java.awt.Component;
+import java.io.File;
+import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
+import javax.swing.filechooser.FileNameExtensionFilter;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/21
+ */
+@Negative(until = "2022-6-1")
+class SwingFileChooser implements FileChooserProvider {
+
+    private final JFileChooser fileChooser;
+    private final Builder builder;
+
+    private SwingFileChooser(Builder builder) {
+        fileChooser = new JFileChooser();
+        fileChooser.setFileSelectionMode(builder.fileSelectionMode);
+        fileChooser.setFileFilter(builder.fileFilter);
+        fileChooser.setSelectedFile(builder.selectedFile);
+        fileChooser.setMultiSelectionEnabled(builder.multiSelectionEnabled);
+        this.builder = builder;
+    }
+
+    @Override
+    public File[] getSelectedFiles() {
+        if (ArrayUtils.isNotEmpty(fileChooser.getSelectedFiles())) {
+            return fileChooser.getSelectedFiles();
+        } else {
+            return new File[]{fileChooser.getSelectedFile()};
+        }
+    }
+
+    @Override
+    public File getSelectedFile() {
+        return fileChooser.getSelectedFile();
+    }
+
+    @Override
+    public int showDialog(Component parent) {
+        if (StringUtils.isEmpty(builder.tipText)) {
+            return fileChooser.showOpenDialog(parent);
+        } else {
+            return fileChooser.showDialog(parent, builder.tipText);
+        }
+    }
+
+    @Override
+    public int showOpenDialog(Component parent, String approveButtonText) {
+        return fileChooser.showDialog(parent, approveButtonText);
+    }
+
+    @Override
+    public void setCurrentDirectory(File file) {
+        fileChooser.setCurrentDirectory(file);
+    }
+
+    @Override
+    public void setMultiSelectionEnabled(boolean multiple) {
+        fileChooser.setMultiSelectionEnabled(multiple);
+    }
+
+    /**
+     * 和一般builder不同的是 setXXX还做参数转换逻辑
+     */
+    public static class Builder {
+
+        private int fileSelectionMode = JFileChooser.FILES_ONLY;
+        private FileFilter fileFilter;
+        private File selectedFile;
+        private boolean multiSelectionEnabled;
+        private String tipText;
+
+        public Builder setFileSelectionMode(FileSelectionMode fileSelectionMode) {
+            if (FileSelectionMode.DIR.equals(fileSelectionMode)) {
+                this.fileSelectionMode = JFileChooser.DIRECTORIES_ONLY;
+            } else if (FileSelectionMode.FILE.equals(fileSelectionMode)) {
+                this.fileSelectionMode = JFileChooser.FILES_ONLY;
+            } else if (FileSelectionMode.MULTIPLE_FILE.equals(fileSelectionMode)) {
+                this.fileSelectionMode = JFileChooser.FILES_AND_DIRECTORIES;
+            }
+            return this;
+        }
+
+        public Builder setFileFilter(String des, String... extension) {
+            if (StringUtils.isNotEmpty(des) && ArrayUtils.isNotEmpty(extension)) {
+                this.fileFilter = new FileNameExtensionFilter(des, UpmUtils.findMatchedExtension(extension));
+            }
+            return this;
+        }
+
+        public Builder setFileFilter(ExtensionFilter[] extensionFilters) {
+            StringBuilder desBuilder = new StringBuilder();
+            String[] extensions = new String[0];
+            for (ExtensionFilter extensionFilter : extensionFilters) {
+                desBuilder.append(extensionFilter.getDes()).append(" ");
+                extensions = ArrayUtils.addAll(extensions, UpmUtils.findMatchedExtension(extensionFilter.getExtensions()));
+            }
+            if (ArrayUtils.isNotEmpty(extensionFilters)) {
+                this.fileFilter = new FileNameExtensionFilter(desBuilder.toString().trim(), extensions);
+            }
+            return this;
+        }
+
+        public Builder setSelectedFile(String selectedPath) {
+            if (StringUtils.isNotEmpty(selectedPath)) {
+                this.selectedFile = new File(selectedPath);
+            }
+            return this;
+        }
+
+        public Builder setMultiSelectionEnabled(boolean multiSelectionEnabled) {
+            this.multiSelectionEnabled = multiSelectionEnabled;
+            return this;
+        }
+
+        public Builder setTipText(String tipText) {
+            this.tipText = tipText;
+            return this;
+        }
+
+        public SwingFileChooser build() {
+            return new SwingFileChooser(this);
+        }
+    }
+}

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

@@ -0,0 +1,276 @@
+package com.fr.design.gui.ifilechooser;
+
+import com.fr.base.BaseUtils;
+import com.fr.common.annotations.Negative;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.style.ChooseFileView;
+import com.fr.design.style.background.image.ExpandFileChooser;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import javax.swing.filechooser.FileFilter;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/30
+ */
+@Negative(until = "2022-6-1")
+class SwingImageFileChooser extends ExpandFileChooser implements FileChooserProvider {
+
+    public SwingImageFileChooser() {
+        super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
+        ExampleFileFilter bothFilter = new ExampleFileFilter(
+                new String[]{"jpg", "gif", "png", "bmp"},
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"));
+        bothFilter.setExtensionListInDescription(true);
+        this.addChoosableFileFilter(bothFilter);
+        this.setAcceptAllFileFilterUsed(false);
+
+        // Create Custom FileView
+        ChooseFileView fileView = new ChooseFileView();
+        fileView.putIcon("jpg", BaseUtils.readIcon("/com/fr/base/images/dialog/file/jpgFile.gif"));
+        fileView.putIcon("gif", BaseUtils.readIcon("/com/fr/base/images/dialog/file/gifFile.gif"));
+        fileView.putIcon("png", BaseUtils.readIcon("/com/fr/base/images/dialog/file/pngFile.png"));
+        fileView.putIcon("bmp", BaseUtils.readIcon("/com/fr/base/images/dialog/file/bmpFile.gif"));
+
+        this.setFileView(fileView);
+    }
+
+    @Override
+    public int showDialog(Component parent, String approveButtonText) {
+        return super.showDialog(parent, approveButtonText);
+    }
+
+    @Override
+    public ActionListener checkAction() {
+        return new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                DesignerEnvManager.getEnvManager().setImageCompress(isCheckSelected());
+                DesignerEnvManager.getEnvManager().saveXMLFile();
+            }
+        };
+
+    }
+
+    @Override
+    public int showDialog(Component parent) {
+        return showOpenDialog(parent);
+    }
+
+    /**
+     * A convenience implementation of FileFilter that filters out
+     * all files except for those type extensions that it knows about.
+     * <p/>D:\finereport\develop\code\test\TestCase\WEB-INF\reportlets\TestCase\01903.cpt
+     * <p>
+     * Extensions are of the type ".foo", which is typically found on
+     * Windows and Unix boxes, but not on Macinthosh. Case is ignored.
+     * <p/>
+     * Example - create a new filter that filerts out all files
+     * but gif and jpg image files:
+     * <p/>
+     * JFileChooser chooser = new JFileChooser();
+     * ExampleFileFilter filter = new ExampleFileFilter(
+     * new String{"gif", "jpg"}, "JPEG & GIF Images")
+     * chooser.addChoosableFileFilter(filter);
+     * chooser.showOpenDialog(this);
+     *
+     * @author Jeff Dinkins
+     * @version 1.12 12/03/01
+     */
+    class ExampleFileFilter extends FileFilter {
+        private Hashtable filters = null;
+        private String description = null;
+        private String fullDescription = null;
+        private boolean useExtensionsInDescription = true;
+
+        /**
+         * Creates a file filter. If no filters are added, then all
+         * files are accepted.
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter() {
+            this.filters = new Hashtable();
+        }
+
+        /**
+         * Creates a file filter that accepts files with the given extension.
+         * Example: new ExampleFileFilter("jpg");
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter(String extension) {
+            this(extension, null);
+        }
+
+        /**
+         * Creates a file filter that accepts the given file type.
+         * Example: new ExampleFileFilter("jpg", "JPEG Image Images");
+         * <p/>
+         * Note that the "." before the extension is not needed. If
+         * provided, it will be ignored.
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter(String extension, String description) {
+            this();
+            if (extension != null) addExtension(extension);
+            if (description != null) setDescription(description);
+        }
+
+        /**
+         * Creates a file filter from the given string array.
+         * Example: new ExampleFileFilter(String {"gif", "jpg"});
+         * <p/>
+         * Note that the "." before the extension is not needed adn
+         * will be ignored.
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter(String[] filters) {
+            this(filters, null);
+        }
+
+        /**
+         * Creates a file filter from the given string array and description.
+         * Example: new ExampleFileFilter(String {"gif", "jpg"}, "Gif and JPG Images");
+         * <p/>
+         * Note that the "." before the extension is not needed and will be ignored.
+         *
+         * @see #addExtension
+         */
+        public ExampleFileFilter(String[] filters, String description) {
+            this();
+            for (int i = 0; i < filters.length; i++) {
+                // add filters one by one
+                addExtension(filters[i]);
+            }
+            if (description != null) setDescription(description);
+        }
+
+        /**
+         * Return true if this file should be shown in the directory pane,
+         * false if it shouldn't.
+         * <p/>
+         * Files that begin with "." are ignored.
+         *
+         * @see #getExtension
+         */
+        @Override
+        public boolean accept(File f) {
+            if (f != null) {
+                if (f.isDirectory()) {
+                    return true;
+                }
+                String extension = getExtension(f);
+                if (extension != null && filters.get(getExtension(f)) != null) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Return the extension portion of the file's name .
+         *
+         * @see #getExtension
+         * @see FileFilter#accept
+         */
+        public String getExtension(File f) {
+            if (f != null) {
+                String filename = f.getName();
+                int i = filename.lastIndexOf('.');
+                if (i > 0 && i < filename.length() - 1) {
+                    return filename.substring(i + 1).toLowerCase();
+                }
+            }
+            return null;
+        }
+
+        /**
+         * Adds a filetype "dot" extension to filter against.
+         * <p/>
+         * For example: the following code will create a filter that filters
+         * out all files except those that end in ".jpg" and ".tif":
+         * <p/>
+         * ExampleFileFilter filter = new ExampleFileFilter();
+         * filter.addExtension("jpg");
+         * filter.addExtension("tif");
+         * <p/>
+         * Note that the "." before the extension is not needed and will be ignored.
+         */
+        public void addExtension(String extension) {
+            if (filters == null) {
+                filters = new Hashtable(5);
+            }
+            filters.put(extension.toLowerCase(), this);
+            fullDescription = null;
+        }
+
+
+        /**
+         * Returns the human readable description of this filter. For
+         * example: "JPEG and GIF Image Files (*.jpg, *.gif)"
+         *
+         * @see FileFilter#getDescription
+         */
+        @Override
+        public String getDescription() {
+            if (fullDescription == null) {
+                if (description == null || isExtensionListInDescription()) {
+                    fullDescription = description == null ? "(" : description + " (";
+                    // build the description from the extension list
+                    Enumeration extensions = filters.keys();
+                    if (extensions != null) {
+                        fullDescription += "." + extensions.nextElement();
+                        while (extensions.hasMoreElements()) {
+                            fullDescription += ", ." + extensions.nextElement();
+                        }
+                    }
+                    fullDescription += ")";
+                } else {
+                    fullDescription = description;
+                }
+            }
+            return fullDescription;
+        }
+
+        /**
+         * Sets the human readable description of this filter. For
+         * example: filter.setDescription("Gif and JPG Images");
+         */
+        public void setDescription(String description) {
+            this.description = description;
+            fullDescription = null;
+        }
+
+        /**
+         * Determines whether the extension list (.jpg, .gif, etc) should
+         * show up in the human readable description.
+         * <p/>
+         * Only relevent if a description was provided in the constructor
+         * or using setDescription();
+         */
+        public void setExtensionListInDescription(boolean b) {
+            useExtensionsInDescription = b;
+            fullDescription = null;
+        }
+
+        /**
+         * Returns whether the extension list (.jpg, .gif, etc) should
+         * show up in the human readable description.
+         * <p/>
+         * Only relevent if a description was provided in the constructor
+         * or using setDescription();
+         */
+        public boolean isExtensionListInDescription() {
+            return useExtensionsInDescription;
+        }
+    }
+
+}

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

@@ -13,11 +13,23 @@ import java.awt.event.MouseEvent;
  */
 public class ActionLabel extends UILabel {
     private ActionListener actionListener;
+    private Color color;
+    // 文字是否有下划线
+    private boolean drawUnderLine = true;
 
     public ActionLabel(String text) {
-        super(text);
+        this(text, Color.blue);
+    }
 
-        this.setForeground(Color.blue);
+    public ActionLabel(String text, boolean drawUnderLine) {
+        this(text, Color.blue);
+        this.drawUnderLine = drawUnderLine;
+    }
+
+    public ActionLabel(String text, Color color) {
+        super(text);
+        this.color = color;
+        this.setForeground(color);
         this.addMouseListener(mouseInputAdapter);
         this.addMouseMotionListener(mouseInputAdapter);
     }
@@ -33,9 +45,11 @@ public class ActionLabel extends UILabel {
     public void paintComponent(Graphics _gfx) {
         super.paintComponent(_gfx);
 
-        _gfx.setColor(Color.blue);
+        _gfx.setColor(this.color);
+        if (drawUnderLine) {
             _gfx.drawLine(0, this.getHeight() - 1, this.getWidth(), this.getHeight() - 1);
         }
+    }
 
     private MouseInputAdapter mouseInputAdapter = new MouseInputAdapter() {
         @Override
@@ -90,4 +104,12 @@ public class ActionLabel extends UILabel {
             }
         }
     };
+
+    public boolean isDrawUnderLine() {
+        return drawUnderLine;
+    }
+
+    public void setDrawUnderLine(boolean drawUnderLine) {
+        this.drawUnderLine = drawUnderLine;
+    }
 }

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

@@ -4,6 +4,7 @@ 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;
@@ -164,10 +165,16 @@ public class UINumberField extends UITextField {
                     || ComparatorUtils.equals(s, "D")
                     || ComparatorUtils.equals(s, "d")
                     || (ComparatorUtils.equals(str.trim(), "0") && !ComparatorUtils.equals(s.substring(0, 1), ".") && offset != 0)// 第一位是0时,第二位只能为小数点
-                    || (ComparatorUtils.equals(s, ".") && maxDecimalLength == 0));
+                    || (ComparatorUtils.equals(s, ".") && maxDecimalLength == 0))
+                    || s.contains(" ")//不允许空格
+                    || (ComparatorUtils.equals(s.substring(0, 1),"-") && offset != 0)//负号只允许出现在第一位
+                    || (ComparatorUtils.equals(s.substring(0, 1),".") && offset == 0)//小数点不能在第一位
+                    || s.contains("-.")
+                    || s.contains(".-")//不能包含-.或.-非法格式
+                    || (str.startsWith("-") && ComparatorUtils.equals(s.substring(0, 1), ".") && offset == 1 )//负号不能接小数点
+                    || (s.contains("-") && !ComparatorUtils.equals(s.substring(0,1), "-"));//输入的字符串如果包含负号，负号必须在第一位
 
         }
-
         public void insertString(int offset, String s, AttributeSet a) throws BadLocationException {
             String str = getText(0, getLength());
 

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

@@ -17,14 +17,19 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.style.color.NewColorSelectBox;
-
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.GridLayout;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -198,7 +203,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     public Style update(Style style) {
 
         if (style == null) {
-            style = Style.DEFAULT_STYLE;
+            style = AdjustWorkBookDefaultStyleUtils.adjustCellElement(Style.DEFAULT_STYLE);
         }
 
         if (backgroundPane.currentPane.isBackgroundChange()) {

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

@@ -279,8 +279,8 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane<ExportJavaScript
             this.browserButton.setEnabled(false);
         } else {
             this.browserButton.setEnabled(true);
-            this.reportPathTextField.setText(ob.getTemplatePath());
         }
+        this.reportPathTextField.setText(ob.getTemplatePath());
         this.exportTypeComboBox.setSelectedItem(ob.getExportType());
         this.fileNameRadioGroup.selectIndexButton(ob.isDefaultFileName() ? 0 : 1);
         if (ob.isDefaultFileName()) {

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

@@ -0,0 +1,26 @@
+package com.fr.design.locale.impl;
+
+import com.fr.general.GeneralContext;
+import com.fr.general.locale.LocaleMark;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+public class ShowOnlineWidgetMark implements LocaleMark<Boolean> {
+    private Map<Locale, Boolean> map = new HashMap<>();
+
+    public ShowOnlineWidgetMark() {
+        map.put(Locale.CHINA, true);
+        map.put(Locale.TAIWAN, true);
+        map.put(Locale.US, false);
+        map.put(Locale.KOREA, false);
+        map.put(Locale.JAPAN, false);
+    }
+
+    @Override
+    public Boolean getValue() {
+        Boolean result = map.get(GeneralContext.getLocale());
+        return result == null ? false : result;
+    }
+}

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

@@ -171,5 +171,17 @@ public enum SupportLocaleImpl implements SupportLocale {
             set.add(Locale.TAIWAN);
             return set;
         }
+    },
+
+    /**
+     * 帮助-服务平台（只针对中国大陆）
+     */
+    SERVICE_PLATFORM {
+        @Override
+        public Set<Locale> support() {
+            Set<Locale> set = new HashSet<>();
+            set.add(Locale.CHINA);
+            return set;
+        }
     }
 }

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

@@ -47,7 +47,7 @@ public class DesignerLoginHelper {
     }
 
     public static void showLoginDialog(DesignerLoginSource source, Map<String, String> params, Window window) {
-        if (!SupportOSImpl.DESIGNER_LOGIN.support()) {
+        if (!SupportOSImpl.DESIGNER_LOGIN.support() || DesignerEnvManager.getEnvManager().isUseOldVersionLogin()) {
             WebViewDlgHelper.createLoginDialog(window);
             return;
         }

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

@@ -0,0 +1,48 @@
+package com.fr.design.login.config;
+
+import com.fr.log.FineLoggerFactory;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @author Lanlan
+ * @version 10.0
+ * Created by Lanlan on 2022/6/20
+ */
+public class DefaultLoginKeys {
+
+    private static final String FILENAME = "com/fr/design/config/default";
+
+    private static final DefaultLoginKeys INSTANCE = new DefaultLoginKeys();
+
+    public static DefaultLoginKeys getInstance() {
+        return INSTANCE;
+    }
+
+    private final Map<String, String> keys = new HashMap<>();
+
+    private DefaultLoginKeys() {
+        Properties properties = load();
+        for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+            String name = entry.getKey().toString();
+            keys.put(name, entry.getValue().toString());
+        }
+    }
+
+    public String getKey(String name) {
+        return keys.get(name);
+    }
+
+    private Properties load() {
+        Properties properties = new Properties();
+        try (InputStream inputStream = DefaultLoginKeys.class.getClassLoader().getResourceAsStream(FILENAME)) {
+            properties.load(inputStream);
+        } catch (IOException e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return properties;
+    }
+}

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

@@ -70,6 +70,10 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
      * 插件管理第一次启动时的提醒
      */
     private boolean pluginRemindOnFirstLaunch = true;
+    /**
+     * 使用旧版登录
+     */
+    private boolean useOldVersionLogin = false;
 
     private DesignerLoginConfigManager() {
 
@@ -98,6 +102,7 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
             this.setLastLoginAccount(reader.getAttrAsString("lastLoginAccount", StringUtils.EMPTY));
             this.setLoginRemindBeforeJumpBBS(reader.getAttrAsBoolean("loginRemindBeforeJumpBBS", true));
             this.setPluginRemindOnFirstLaunch(reader.getAttrAsBoolean("pluginRemindOnFirstLaunch", true));
+            this.setUseOldVersionLogin(reader.getAttrAsBoolean("useOldVersionLogin", false));
         }
     }
 
@@ -117,6 +122,7 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
         writer.attr("lastLoginAccount", lastLoginAccount);
         writer.attr("loginRemindBeforeJumpBBS", loginRemindBeforeJumpBBS);
         writer.attr("pluginRemindOnFirstLaunch", pluginRemindOnFirstLaunch);
+        writer.attr("useOldVersionLogin", useOldVersionLogin);
         writer.end();
     }
 
@@ -223,4 +229,12 @@ public class DesignerLoginConfigManager implements XMLReadable, XMLWriter {
     public void setPluginRemindOnFirstLaunch(boolean pluginRemindOnFirstLaunch) {
         this.pluginRemindOnFirstLaunch = pluginRemindOnFirstLaunch;
     }
+
+    public boolean isUseOldVersionLogin() {
+        return useOldVersionLogin;
+    }
+
+    public void setUseOldVersionLogin(boolean useOldVersionLogin) {
+        this.useOldVersionLogin = useOldVersionLogin;
+    }
 }

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

@@ -8,9 +8,7 @@ import com.fr.design.login.utils.DesignerLoginUtils;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.update.push.DesignerPushUpdateManager;
-import com.fr.general.CloudCenter;
+import com.fr.log.FineLoggerFactory;
-import com.fr.general.CloudCenterConfig;
-import com.fr.general.http.HttpToolbox;
 import com.fr.stable.StringUtils;
 import javax.swing.WindowConstants;
 
@@ -39,7 +37,11 @@ public class DesignerGuideHelper {
 
     public static void prepareShowGuideDialog() {
         // 如果存在更新升级的弹窗，则不显示引导页面
-        if (!DesignerLoginUtils.isOnline() || !SupportOSImpl.DESIGNER_LOGIN.support() || !FRContext.isChineseEnv() || DesignerPushUpdateManager.getInstance().isShouldPopUp()) {
+        if (!DesignerLoginUtils.isOnline()
+                || !SupportOSImpl.DESIGNER_LOGIN.support()
+                || !FRContext.isChineseEnv()
+                || DesignerPushUpdateManager.getInstance().isShouldPopUp()
+                || DesignerEnvManager.getEnvManager().isUseOldVersionLogin()) {
             return;
         }
         if (isActivatedForOneWeek()) {
@@ -52,7 +54,11 @@ public class DesignerGuideHelper {
             DesignerContext.getDesignerFrame().addDesignerOpenedListener(new DesignerOpenedListener() {
                 @Override
                 public void designerOpened() {
+                    try {
                         showGuideDialog();
+                    } catch (Throwable t) {
+                        FineLoggerFactory.getLogger().warn(t.getMessage(), t);
+                    }
                 }
             });
         }

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

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

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

@@ -1,6 +1,7 @@
 package com.fr.design.login.utils;
 
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.login.config.DefaultLoginKeys;
 import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
 import com.fr.general.CloudCenter;
 import com.fr.general.CloudCenterConfig;
@@ -28,8 +29,6 @@ public class DesignerLoginUtils {
 
     private static final String PRODUCT_FINEREPORT = "product-finereport";
 
-    private static final String KEY = "i7hP48WAcuTrmxfN";
-
     public static Map<String, String> renderMap() {
         Map<String, String> map4Tpl = new HashMap<>();
         map4Tpl.put("language", GeneralContext.getLocale().toString());
@@ -86,7 +85,11 @@ public class DesignerLoginUtils {
         jo.put("username", manager.getDesignerLoginUsername());
         jo.put("source", PRODUCT_FINEREPORT);
         byte[] iv = randomIv();
-        return new String(Hex.encode(iv)) + encrypt(jo.toString(), KEY.getBytes(), iv);
+        return new String(Hex.encode(iv)) + encrypt(
+                jo.toString(),
+                DefaultLoginKeys.getInstance().getKey("Fine-Designer_Login").getBytes(),
+                iv
+        );
     }
 
     private static byte[] randomIv() {

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

@@ -356,7 +356,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
     public void fireDesignerOpened() {
 
         for (DesignerOpenedListener listener : designerOpenedListenerList) {
+            // 捕获下异常 避免造成启动过程监听触发异常导致设计器闪退
+            try {
                 listener.designerOpened();
+            } catch (Throwable e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
         }
 
         designerOpened = true;

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

@@ -34,6 +34,7 @@ import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.event.Event;
@@ -101,6 +102,23 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
                 return context.contain(PluginModule.ExtraDesign, ShortCut.TEMPLATE_TREE);
             }
         });
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                UIUtil.invokeLaterIfNeeded(new Runnable() {
+                    @Override
+                    public void run() {
+                        DesignerFrameFileDealerPane.getInstance().refresh();
+                        DesignerFrameFileDealerPane.getInstance().stateChange();
+                    }
+                });
+            }
+        }, new PluginFilter() {
+            @Override
+            public boolean accept(PluginContext context) {
+                return context.contain(PluginModule.ExtraDesign, App.MARK_STRING);
+            }
+        });
     }
 
     private List<FileToolbarStateChangeListener> otherToolbarStateChangeListeners = new ArrayList<>();

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

@@ -10,9 +10,11 @@ import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
+import com.fr.design.utils.LoadingUtils;
 
 import javax.swing.JComponent;
 import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
 import java.awt.BorderLayout;
 import java.awt.Component;
 
@@ -31,7 +33,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
     private static final long serialVersionUID = 1L;
     private JTemplate<?, ?> component;
     private TransparentPane transparentPane = new TransparentPane();
-    private OpenLoadingPane loadingPane = new OpenLoadingPane();
+    private JPanel loadingPane = LoadingUtils.createLoadingPane();
     private OpenFailedPane failedPane = new OpenFailedPane();
     private JLayeredPane layeredPane = new JLayeredPane() {
         @Override
@@ -86,7 +88,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         } else if (jt.isOpening()) {
             showOpenStatus();
         } else if (jt.isOpenFailed()) {
-            showOpenFailedCover();
+            showOpenFailedCover(jt.getTemplateOpenFailedTip());
         } else {
             hideCover();
         }
@@ -115,7 +117,8 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
         layeredPane.moveToFront(loadingPane);
     }
 
-    public void showOpenFailedCover() {
+    public void showOpenFailedCover(String text) {
+        failedPane.setFailedTip(text);
         layeredPane.moveToFront(failedPane);
     }
 

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

@@ -50,12 +50,14 @@ import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.design.worker.save.EmptyCallBackSaveWorker;
+import com.fr.design.worker.save.SaveFailureHandler;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.event.EventDispatcher;
 import com.fr.file.FILE;
 import com.fr.file.FILEChooserPane;
 import com.fr.file.MemFILE;
+import com.fr.file.StashedFILE;
 import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
@@ -84,6 +86,7 @@ import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.swing.undo.UndoManager;
 import java.awt.BorderLayout;
+import java.io.ByteArrayOutputStream;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
@@ -114,6 +117,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     private JComponent centerPane;
     private DesignModelAdapter<T, ?> designModel;
     private PreviewProvider previewType;
+    private String templateOpenFailedTip;
+
     /**
      * 统计模板制作耗时
      *
@@ -369,6 +374,22 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         PluginListenerRegistration.getInstance().stopListen(this.pluginListener);
     }
 
+    public FILE templateToStashFile() {
+        FILE file = this.getEditingFILE();
+        try {
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            BaseBook target = this.getTarget();
+            if (target != null) {
+                target.export(outputStream);
+                return new StashedFILE(file, outputStream.toByteArray(), template.suffix());
+            }
+            // 如果 target == null 那么这个模板是被模板内存优化功能处理过的，不用处理
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
 
     /**
      * 刷新内部资源
@@ -379,8 +400,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
      */
     @Deprecated
     public void refreshResource() {
+        if (JTemplateFactory.isAvailable()) {
             refreshResource(this.editingFILE);
         }
+    }
 
     public void refreshResource(FILE file) {
 
@@ -402,9 +425,12 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     private void setTargetByFile(FILE file) {
-        this.template = JTemplateFactory.asIOFile(file, this.suffix());
+        T newTemplate = JTemplateFactory.asIOFile(file, this.suffix());
+        if (newTemplate != null) {
+            this.template = newTemplate;
             setTarget(this.template);
         }
+    }
 
     private void addCenterPane() {
 
@@ -574,6 +600,16 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         fireSuperTargetModified();
     }
 
+    public void undoToCurrent() {
+        UIUtil.invokeLaterIfNeeded(new Runnable() {
+            @Override
+            public void run() {
+                BaseUndoState current = JTemplate.this.getUndoState();
+                current.applyState();
+            }
+        });
+    }
+
     /**
      * 模板更新
      */
@@ -865,7 +901,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             export();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
+            SaveFailureHandler.getInstance().process(e);
             return false;
         }
         this.editingFILE = editingFILE;
@@ -877,7 +913,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     protected boolean export() throws Exception {
-        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(getEditingFILE()));
 
     }
 
@@ -1051,35 +1087,49 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     /**
      * 判断是否是新版设计器
      *
+     * @param showTipPane 是否需要展示弹窗
      * @return 是返回true
      */
-    public boolean isNewDesigner() {
+    public boolean isNewDesigner(boolean showTipPane) {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isLowerThanHBB(xmlDesignerVersion)) {
             String info = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open-New_Form_Tip");
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
-            new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
+            if (showTipPane) {
+                new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).showOnFront();
+            }
             return true;
         }
         return false;
     }
 
+    public boolean isNewDesigner() {
+        return isNewDesigner(true);
+    }
+
     /**
      * 是否是就版本设计器
      *
+     * @param showTipPane 是否需要展示弹窗
      * @return 是就返回true
      */
-    public boolean isOldDesigner() {
+    public boolean isOldDesigner(boolean showTipPane) {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isHigherThanCurrent(xmlDesignerVersion)) {
             String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", DesignUtils.parseVersion(xmlDesignerVersion));
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info");
-            new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show();
+            if (showTipPane) {
+                new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).showOnFront();
+            }
             return true;
         }
         return false;
     }
 
+    public boolean isOldDesigner() {
+        return isOldDesigner(true);
+    }
+
     /**
      *
      */
@@ -1460,7 +1510,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (editingFILE == null || editingFILE instanceof MemFILE) {
             return false;
         }
-        this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+        export();
         this.editingFILE = editingFILE;
         return true;
     }
@@ -1505,6 +1555,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                     refreshToolArea();
                 }
                 DesignerFrameFileDealerPane.getInstance().refresh();
+                DesignerFrameFileDealerPane.getInstance().stateChange();
             }
         });
 
@@ -1628,4 +1679,12 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public String getRuntimeId() {
         return runtimeId;
     }
+
+    public String getTemplateOpenFailedTip() {
+        return templateOpenFailedTip;
+    }
+
+    public void setTemplateOpenFailedTip(String templateOpenFailedTip) {
+        this.templateOpenFailedTip = templateOpenFailedTip;
+    }
 }

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

@@ -93,4 +93,7 @@ public final class JTemplateFactory {
             ALL_APP.remove(app);
         }
     }
-}
+
+    public static boolean isAvailable() {
+        return !ALL_APP.isEmpty();
+    }}

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

@@ -3,8 +3,10 @@ package com.fr.design.mainframe;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.gui.itree.filetree.TemplateFileTree;
 import com.fr.stable.StringUtils;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.tree.DefaultMutableTreeNode;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -27,19 +29,18 @@ public class JTemplateNameHelper {
         DefaultMutableTreeNode gen = (DefaultMutableTreeNode) tt.getModel().getRoot();
         String[] str = new String[gen.getChildCount()];
 
-        List<Integer> reportNum = new ArrayList<>();
+        List<BigInteger> reportNum = new ArrayList<>();
         for (int j = 0; j < gen.getChildCount(); j++) {
             str[j] = gen.getChildAt(j).toString();
             //返回文件名中的index(算法中没有再匹配文件后缀了，因为DefaultMutableTreeNode中已经匹配过了)
-            Integer index = getFileNameIndex(prefix, str[j]);
+            BigInteger index = getFileNameIndex(prefix, str[j]);
             if (index != null) {
                 reportNum.add(index);
             }
         }
         Collections.sort(reportNum);
-        int idx = reportNum.size() > 0 ? reportNum.get(reportNum.size() - 1) + 1 : 1;
+        BigInteger idx = reportNum.size() > 0 ? reportNum.get(reportNum.size() - 1).add(BigInteger.valueOf(1)) : BigInteger.valueOf(1);
-
+        idx = idx.add(BigInteger.valueOf(currentIndex));
-        idx = idx + currentIndex;
         currentIndex++;
         return prefix + idx;
     }
@@ -52,35 +53,58 @@ public class JTemplateNameHelper {
      * @Author Henry.Wang
      * @Date 2021/4/9 11:13
      **/
-    private static Integer getFileNameIndex(String prefix, String fileName) {
+    @Nullable
-		if (fileName.length() <= prefix.length()) {
+    private static BigInteger getFileNameIndex(String prefix, String fileName) {
+        //如果文件名长度小于等于前缀长度或者匹配前缀失败，直接返回就可以了
+        if ((prefix.length() >= fileName.length()) || (!StringUtils.equals(prefix, fileName.substring(0, prefix.length())))) {
             return null;
         }
-        char[] chars = new char[fileName.length()];
+        BigInteger integer = null;
-        int i = 0;
+        integer = matchFileNameIndex(prefix, fileName);
-        for (; i < fileName.length(); i++) {
+        return integer;
-            char c = fileName.charAt(i);
-            //匹配前缀
-            if (i < prefix.length()) {
-                if (c != prefix.charAt(i)) {
-                    return null;
     }
-            } else {
+
-                if (c == '.') {
+    /**
+     * 匹配文件名称的数字后缀Index
+     * @param prefix 前缀
+     * @param fileName 文件名称全名
+     * @return 返回对应的数字后缀Index
+     */
+    @Nullable
+    private static BigInteger matchFileNameIndex(String prefix, String fileName) {
+        StringBuilder result = new StringBuilder();
+        for (int i = prefix.length(); i < fileName.length(); i++) {
+            char c = fileName.charAt(i);
+            if (isDot(c)) {
                 break;
             } else {
-                    //匹配0~9
+                if (isNotNumber(c)) {
-                    if (c < 48 || c > 57) {
                     return null;
                 }
-                    chars[i - prefix.length()] = c;
+                result.append(c);
-                }
             }
         }
-        String s = new String(chars).substring(0, i - prefix.length());
+        if (StringUtils.isBlank(result.toString())) {
-        if (StringUtils.isBlank(s)) {
             return null;
         }
-        return Integer.valueOf(s);
+        return new BigInteger(result.toString(), 10);
+    }
+
+    /**
+     * 是否不属于数字0-9
+     * @param c 用于判断的char
+     * @return 返回对应判断结果
+     */
+    private static boolean isNotNumber(char c) {
+        return c < 48 || c > 57;
+    }
+
+    /**
+     * 是否属于'.'
+     * @param c 用于判断的char
+     * @return 返回对应判断结果
+     */
+    private static boolean isDot(char c) {
+        return c == '.';
     }
 }

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

@@ -17,6 +17,7 @@ import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.manage.PluginFilter;
 import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
+import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.os.support.OSBasedAction;
 import com.fr.stable.os.support.OSSupportCenter;
 
@@ -38,6 +39,17 @@ public class NorthRegionContainerPane extends JPanel {
 
     private JMenuBar menuBar;
 
+    private PluginFilter pluginFilter = new PluginFilter() {
+
+        @Override
+        public boolean accept(PluginContext context) {
+
+            return context.contain(PluginModule.ExtraDesign);
+        }
+    };
+
+    private volatile boolean existDesignExtraPlugin;
+
     public static NorthRegionContainerPane getInstance() {
         if (THIS == null) {
             synchronized (NorthRegionContainerPane.class) {
@@ -66,12 +78,52 @@ public class NorthRegionContainerPane extends JPanel {
         //hugh: private修改为protected方便oem的时候修改右上的组件构成
         //顶部日志+登陆按钮
         final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        initPluginListener(northEastPane, ad);
+        refreshNorthEastPane(northEastPane, ad);
+        return northEastPane;
+    }
+
+    private void initPluginListener(JPanel northEastPane, ToolBarMenuDock ad) {
         //优先级为-1，保证最后全面刷新一次
-        GeneralContext.listenPluginRunningChanged(new PluginEventListener(-1) {
+        PluginEventListener pluginOnRunOrStopListener = new PluginEventListener(-1) {
 
             @Override
             public void on(PluginEvent event) {
+                refreshAll(northEastPane, ad);
+            }
+        };
 
+        // 在设计器启动时仅在最后一个插件启用时候进行刷新一次  如果插件启用过程中存在实现了设计器接口的插件
+        PluginEventListener afterAllPluginsActiveListener = new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                //优先级为-1，保证最后全面刷新一次
+                GeneralContext.listenPluginRunningChanged(pluginOnRunOrStopListener, pluginFilter);
+                // 在设计器启动时仅在最后一个插件启用时候进行刷新一次  如果插件启用过程中存在实现了设计器接口的插件
+                if (existDesignExtraPlugin) {
+                    refreshAll(northEastPane, ad);
+                }
+            }
+        };
+        PluginEventListener beforeAllPluginStopListener = new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                GeneralContext.stopListenPlugin(pluginOnRunOrStopListener);
+            }
+        };
+        PluginEventListener pluginEventListener = new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                existDesignExtraPlugin = true;
+            }
+        };
+        GeneralContext.listenPluginRunningChanged(pluginEventListener, pluginFilter);
+        GeneralContext.listenPlugin(PluginEventType.AfterAllActive, afterAllPluginsActiveListener);
+        GeneralContext.listenPlugin(PluginEventType.BeforeAllStop, beforeAllPluginStopListener);
+
+    }
+
+    private void refreshAll(JPanel northEastPane, ToolBarMenuDock ad) {
         refreshNorthEastPane(northEastPane, ad);
         SwingUtilities.invokeLater(new Runnable() {
             @Override
@@ -84,17 +136,6 @@ public class NorthRegionContainerPane extends JPanel {
             }
         });
     }
-        }, new PluginFilter() {
-
-            @Override
-            public boolean accept(PluginContext context) {
-
-                return context.contain(PluginModule.ExtraDesign);
-            }
-        });
-        refreshNorthEastPane(northEastPane, ad);
-        return northEastPane;
-    }
 
     private void refreshNorthEastPane(final JPanel northEastPane, final ToolBarMenuDock ad) {