Merge remote-tracking branch 'origin/feature/x' into feature/x

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

@@ -1,14 +1,22 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
 
-import com.fr.general.CloudCenter;
+import javax.swing.KeyStroke;
-
-import javax.swing.*;
 
 public class BBSAction extends AbstractDesignerSSO {
 
+    /**
+     * 云中心帆软社区页在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Bbs";
+
+    /**
+     * 云中心帆软社区页默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Bbs_Default";
 
     public BBSAction() {
         this.setMenuKeySet(BBS);
@@ -20,7 +28,7 @@ public class BBSAction extends AbstractDesignerSSO {
 
 	@Override
 	public String getJumpUrl() {
-		return CloudCenter.getInstance().acquireUrlByKind("bbs", "http://bbs.fanruan.com/");
+		return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
 	}
 
     public static final MenuKeySet BBS = new MenuKeySet() {

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

@@ -1,13 +1,23 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.CloudCenter;
 
-import javax.swing.*;
+import javax.swing.KeyStroke;
 
 public class BugAction extends AbstractDesignerSSO {
 
+    /**
+     * 云中心产品反馈页在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Bugs";
+
+    /**
+     * 云中心产品反馈页默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Bugs_Default";
+
     public BugAction() {
         this.setMenuKeySet(BUG);
         this.setName(getMenuKeySet().getMenuName());
@@ -17,7 +27,7 @@ public class BugAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.bugs", "https://service.fanruan.com/PF/FR/feedback?type=2");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     }
 
     public static final MenuKeySet BUG = new MenuKeySet() {

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

@@ -1,7 +1,7 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.CloudCenter;
 
 import javax.swing.KeyStroke;
 
@@ -9,6 +9,17 @@ import javax.swing.KeyStroke;
  * Created by XINZAI on 2018/8/23.
  */
 public class CenterAction extends UpAction {
+
+    /**
+     * 云中心活动中心页在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Act_Center";
+
+    /**
+     * 云中心活动中心页默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Act_Center_Default";
+
     public CenterAction() {
         this.setMenuKeySet(CENTER);
         this.setName(getMenuKeySet().getMenuName());
@@ -18,7 +29,7 @@ public class CenterAction extends UpAction {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.center", "http://bbs.fanruan.com/events/");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     }
 
     public static final MenuKeySet CENTER = new MenuKeySet() {

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

@@ -1,18 +1,28 @@
 package com.fr.design.actions.community;
 
 import com.fr.base.BaseUtils;
-
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
-import com.fr.general.CloudCenter;
-import javax.swing.KeyStroke;
 
+import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
 
 /**
  * Created by XINZAI on 2018/8/23.
  */
 public class CusDemandAction extends  UpAction{
+
+    /**
+     * 云中心发布需求页在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Demand";
+
+    /**
+     * 云中心发布需求页默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Demand_Default";
+
     public CusDemandAction()
     {
         this.setMenuKeySet(DEMAND);
@@ -25,7 +35,7 @@ public class CusDemandAction extends  UpAction{
     @Override
     public void actionPerformed(ActionEvent arg0)
     {
-        String url = CloudCenter.getInstance().acquireUrlByKind("bbs.demand", "https://market.fanruan.com/demand");
+        String url = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
         BrowseUtils.browser(url);
 
     }

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

@@ -1,14 +1,24 @@
 package com.fr.design.actions.community;
 
-import com.fr.base.svg.IconUtils;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.utils.BrowseUtils;
-import com.fr.general.CloudCenter;
+
 import javax.swing.KeyStroke;
 import java.awt.event.ActionEvent;
 
 public class FacebookFansAction extends UpAction {
 
+    /**
+     * 云中心facebook页在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_FaceBook";
+
+    /**
+     * 云中心facebook页默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_FaceBook_Default";
+
     public FacebookFansAction() {
         this.setMenuKeySet(FACEBOOKFANS);
         this.setName(getMenuKeySet().getMenuName());
@@ -18,7 +28,7 @@ public class FacebookFansAction extends UpAction {
 
     @Override
     public void actionPerformed(ActionEvent arg0) {
-        BrowseUtils.browser(CloudCenter.getInstance().acquireUrlByKind("facebook.fans.tw", "https://www.facebook.com/twfinereport"));
+        BrowseUtils.browser(LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT));
     }
 
     public static final MenuKeySet FACEBOOKFANS = new MenuKeySet() {

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

@@ -1,13 +1,23 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.CloudCenter;
 
-import javax.swing.*;
+import javax.swing.KeyStroke;
 
 public class NeedAction extends AbstractDesignerSSO {
 
+    /**
+     * 云中心产品反馈页在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Need";
+
+    /**
+     * 云中心产品反馈页默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Need_Default";
+
     public NeedAction() {
         this.setMenuKeySet(NEED);
         this.setName(getMenuKeySet().getMenuName());
@@ -18,7 +28,7 @@ public class NeedAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.needs", "https://service.fanruan.com/PF/FR/feedback?type=1");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY ,PROPS_LINK_KEY_DEFAULT);
     }
 
     public static final MenuKeySet NEED = new MenuKeySet() {

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

@@ -1,13 +1,23 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.CloudCenter;
 
-import javax.swing.*;
+import javax.swing.KeyStroke;
 
 public class QuestionAction extends AbstractDesignerSSO {
 
+    /**
+     * 云中心问答页在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Question";
+
+    /**
+     * 云中心问答页默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Question_Default";
+
     public QuestionAction() {
         this.setMenuKeySet(QUESTIONS);
         this.setName(getMenuKeySet().getMenuName());
@@ -18,7 +28,7 @@ public class QuestionAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.questions", "https://home.fanruan.com/finereport/wenda");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY ,PROPS_LINK_KEY_DEFAULT);
     }
 
     public static final MenuKeySet QUESTIONS = new MenuKeySet() {

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

@@ -1,14 +1,23 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
 
-import com.fr.general.CloudCenter;
+import javax.swing.KeyStroke;
-
-import javax.swing.*;
 
 public class SignAction extends AbstractDesignerSSO {
 
+    /**
+     * 云中心认证落地页在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Aut";
+
+    /**
+     * 云中心认证落地页默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Aut_Default";
+
     public SignAction() {
         this.setMenuKeySet(SIGN);
         this.setName(getMenuKeySet().getMenuName());
@@ -18,7 +27,7 @@ public class SignAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.aut", "https://cert.fanruan.com/");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY ,PROPS_LINK_KEY_DEFAULT);
     }
 
     public static final MenuKeySet SIGN = new MenuKeySet() {

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

@@ -1,10 +1,21 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.login.AbstractDesignerSSO;
-import com.fr.general.CloudCenter;
 
 public class StudyPlanAction extends AbstractDesignerSSO {
+
+    /**
+     * 云中心帆软学院在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Study";
+
+    /**
+     * 云中心帆软学院默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Study_Default";
+
     public StudyPlanAction() {
         this.setName(Toolkit.i18nText("Fine-Design_Study_Plan"));
         this.setSmallIcon("/com/fr/design/images/bbs/studyPlan");
@@ -12,6 +23,6 @@ public class StudyPlanAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.studyPlan", "https://edu.fanruan.com/studypath/finereport");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY ,PROPS_LINK_KEY_DEFAULT);
     }
 }

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

@@ -1,8 +1,8 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.CloudCenter;
 
 import javax.swing.KeyStroke;
 
@@ -10,6 +10,17 @@ import javax.swing.KeyStroke;
  * Created by XINZAI on 2018/8/23.
  */
 public class TechSolutionAction extends AbstractDesignerSSO {
+
+    /**
+     * 云中心社区在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Community";
+
+    /**
+     * 云中心社区默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Community_Default";
+
     public TechSolutionAction() {
         this.setMenuKeySet(TSO);
         this.setName(getMenuKeySet().getMenuName());
@@ -20,7 +31,7 @@ public class TechSolutionAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.solution", "https://home.fanruan.com/finereport/forum");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY ,PROPS_LINK_KEY_DEFAULT);
     }
 
     public static final MenuKeySet TSO = new MenuKeySet() {

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

@@ -1,21 +1,28 @@
 package com.fr.design.actions.community;
 
 import com.fr.base.BaseUtils;
-import com.fr.design.actions.UpdateAction;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.design.utils.BrowseUtils;
-import com.fr.general.CloudCenter;
 
 import javax.swing.KeyStroke;
-import java.awt.event.ActionEvent;
 
 /**
  * created by Harrison on 2020/03/24
  **/
 public class TemplateStoreAction extends AbstractDesignerSSO {
-    
+
+    /**
+     * 云中心组件商城模板在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Market_Template";
+
+    /**
+     * 云中心组件商城模板默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Market_Template_Default";
+
     public TemplateStoreAction() {
 
         this.setMenuKeySet(TEMPLATE);
@@ -47,6 +54,6 @@ public class TemplateStoreAction extends AbstractDesignerSSO {
     @Override
     public String getJumpUrl() {
         ComponentCollector.getInstance().collectTepMenuEnterClick();
-        return CloudCenter.getInstance().acquireUrlByKind("design.market.template", "https://market.fanruan.com/template");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY ,PROPS_LINK_KEY_DEFAULT);
     }
 }

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

@@ -1,14 +1,24 @@
 package com.fr.design.actions.community;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.login.AbstractDesignerSSO;
 import com.fr.design.menu.MenuKeySet;
-import com.fr.general.CloudCenter;
 
 import javax.swing.KeyStroke;
 
 public class UpAction extends AbstractDesignerSSO {
 
+    /**
+     * 云中心工单中心在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Bbs_Update";
+
+    /**
+     * 云中心工单中心默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Bbs_Update_Default";
+
     public UpAction() {
         this.setMenuKeySet(UPDATE);
         this.setName(getMenuKeySet().getMenuName());
@@ -18,7 +28,7 @@ public class UpAction extends AbstractDesignerSSO {
 
 	@Override
 	public String getJumpUrl() {
-		return CloudCenter.getInstance().acquireUrlByKind("bbs.update", "http://bbs.fanruan.com/forum.php?mod=collection&action=view&ctid=10");
+		return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY ,PROPS_LINK_KEY_DEFAULT);
 	}
 
     public static final MenuKeySet UPDATE = new MenuKeySet() {

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

@@ -1,7 +1,7 @@
 package com.fr.design.actions.community;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
-import com.fr.general.CloudCenter;
 
 /**
  * @Description 工单中心
@@ -9,6 +9,17 @@ import com.fr.general.CloudCenter;
  * @Date 2021/3/8 14:02
  **/
 public class WorkOrderCenterAction extends UpAction {
+
+    /**
+     * 云中心工单中心在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Work_Order_Center";
+
+    /**
+     * 云中心工单中心默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Work_Order_Center_Default";
+
     public WorkOrderCenterAction() {
         this.setSmallIcon("/com/fr/design/images/bbs/workOrderCenter");
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Commuinity_Work_Order_Center"));
@@ -16,6 +27,6 @@ public class WorkOrderCenterAction extends UpAction {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind("bbs.work.order.center", "https://service.fanruan.com/ticket");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     }
 }

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

@@ -68,7 +68,7 @@ public class SwitchExistEnv extends MenuDef {
                 EnvChangeEntrance.getInstance().chooseEnv(envName);
             } else {
                 SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true);
-                if (saveSomeTemplatePane.showSavePane()) {
+                if (saveSomeTemplatePane.showSavePane(true)) {
                     // 用户模板保存后，才进行切换目录操作
                     EnvChangeEntrance.getInstance().switch2Env(envName);
                 }

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

@@ -1,9 +1,9 @@
 package com.fr.design.actions.help;
 
+import com.fr.design.i18n.LocaleLinkProvider;
 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.stable.CommonUtils;
@@ -18,6 +18,16 @@ import java.awt.event.KeyEvent;
 
 public class TutorialAction extends AbstractDesignerSSO {
 
+    /**
+     * 云中心社区帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Help";
+
+    /**
+     * 云中心社区帮助文档默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Help_Default";
+
     public TutorialAction() {
         this.setMenuKeySet(HELP_TUTORIAL);
         this.setName(getMenuKeySet().getMenuName());
@@ -28,7 +38,7 @@ public class TutorialAction extends AbstractDesignerSSO {
 
     @Override
     public String getJumpUrl() {
-        return CloudCenter.getInstance().acquireUrlByKind(createDocKey(), "http://help.finereport.com");
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     }
 
     // 生成帮助文档 sitecenter key, help.zh_CN.10

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

@@ -669,6 +669,7 @@ public abstract class DesignTableDataManager {
         if (needLoadingBar) {
             MultiResultTableDataWrapper.loadingBar.start();
         }
+        parameterMap.put(SqlNoteConstants.SQL_NOTE_TEMPLATE, HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath());
         return DataOperator.getInstance().previewMultiResultTableData(tableData, parameterMap, 0);
     }
 

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

@@ -6,6 +6,7 @@ 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.itextfield.UITextField;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.esd.common.CacheConstants;
@@ -29,8 +30,8 @@ import java.net.URI;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author rinoux
@@ -38,7 +39,18 @@ import java.util.Date;
  * Created by rinoux on 2020/7/22
  */
 public class ESDStrategyConfigPane extends BasicBeanPane<StrategyConfig> {
-    private static final String CRON_HELP_URL = "http://help.fanruan.com/finereport/doc-view-693.html";
+
+    /**
+     * 云中心定时调度执行频率表达式设定帮助文档链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Cron_Help";
+
+    /**
+     * 云中心定时调度执行频率表达式设定帮助文档默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Cron_Help_Default";
+
+    private static final String CRON_HELP_URL = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     private UIRadioButton selectAutoUpdate;
     private UIRadioButton selectBySchema;
     private UICheckBox shouldEvolve;

designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/common/DesensitizationOpenPane.java

@@ -8,10 +8,12 @@ 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.locale.impl.DataMaskMark;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
 import com.fr.log.FineLoggerFactory;
 
 import javax.swing.JPanel;
-import java.awt.BorderLayout;
 import java.awt.Desktop;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -58,7 +60,8 @@ public class DesensitizationOpenPane extends JPanel {
             @Override
             public void mouseClicked(MouseEvent event) {
                 try {
-                    URL url = new URL(Toolkit.i18nText("Fine-Design_Report_Desensitization_Help_Document_Url"));
+                    LocaleMark<String> dataMaskMark = LocaleCenter.getMark(DataMaskMark.class);
+                    URL url = new URL(dataMaskMark.getValue());
                     Desktop.getDesktop().browse(url.toURI());
                 } catch (Exception e) {
                     FineLoggerFactory.getLogger().error(e, "open browse of table data desensitization help document failed for {}", e.getMessage());

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

@@ -11,12 +11,12 @@ import com.fr.design.dialog.DialogActionAdapter;
 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.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.parameter.ParameterInputPane;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.CloudCenter;
 import com.fr.general.GeneralContext;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.injectable.PluginModule;
@@ -63,6 +63,16 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
 
     private UILabel imageLabel;
 
+    /**
+     * 云中心防止sql注入帮助文档链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design_Basic_Sql_Injection_Prevention_Help";
+
+    /**
+     * 云中心防止sql注入帮助文档默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design_Basic_Sql_Injection_Prevention_Help_Default";
+
     public PreviewPerformedSqlPane(Frame frame, String sql) {
         this(frame, sql, null, null, false);
     }
@@ -84,7 +94,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
                 JLabel label = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Preview_Performed_Sql_Message") + Toolkit.i18nText("Fine-Design_Basic_Sql_Injection_Prevention") + Toolkit.i18nText("Fine-Design_Basic_Preview_Special_Char_Sql_Back_Message"));
                 messagePanel.add(label);
             } else {
-                MessageWithLink message = new MessageWithLink(Toolkit.i18nText("Fine-Design_Basic_Preview_Special_Char_Sql_Front_Message"), Toolkit.i18nText("Fine-Design_Basic_Sql_Injection_Prevention"), CloudCenter.getInstance().acquireConf(Toolkit.i18nText("Fine-Design_Basic_Sql_Injection_Prevention_Help"), "https://help.fanruan.com/finereport/doc-view-2219.html"), Toolkit.i18nText("Fine-Design_Basic_Preview_Special_Char_Sql_Back_Message"));
+                MessageWithLink message = new MessageWithLink(Toolkit.i18nText("Fine-Design_Basic_Preview_Special_Char_Sql_Front_Message"), Toolkit.i18nText("Fine-Design_Basic_Sql_Injection_Prevention"), LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT), Toolkit.i18nText("Fine-Design_Basic_Preview_Special_Char_Sql_Back_Message"));
                 messagePanel.add(message);
             }
             // 提示图标

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

@@ -2,6 +2,7 @@ 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.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.manage.control.PluginTaskResult;
@@ -16,7 +17,19 @@ public class PluginCallBackHelper {
     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");
+
+    /**
+     * 云中心第三方插件安装失败说明帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design_Basic_Plugin_File_Validate_HELP_DOCUMENT_LINK";
+
+    /**
+     * 云中心第三方插件安装失败说明帮助文档默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design_Basic_Plugin_File_Validate_HELP_DOCUMENT_LINK_Default";
+
+
+    private static final String HELP_DOCUMENT_LINK = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
 
 
     /**

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

@@ -268,7 +268,8 @@ public class HistoryTemplateListCache implements CallbackEvent {
             boolean replaceWithJVirtualTemplate = overTemplate.getEditingFILE().exists()
                                                     && overTemplate.isALLSaved()
                                                     && overTemplate != editingTemplate
-                                                    && overTemplate.checkEnable();
+                                                    && overTemplate.checkEnable()
+                                                    && overTemplate.supportCache();
             if (replaceWithJVirtualTemplate) {
                 closeVirtualSelectedReport(overTemplate);
                 historyList.set(i, new JVirtualTemplate(overTemplate.getEditingFILE()));
@@ -297,7 +298,9 @@ public class HistoryTemplateListCache implements CallbackEvent {
                 int index = iterator.nextIndex();
                 if (size == index + 1 && index > 0) {
                     //如果删除的是后一个Tab，则定位到前一个
-                    MultiTemplateTabPane.getInstance().setSelectedIndex(index - 1);
+                    MultiTemplateTabPane.getInstance().setSelectedIndex(
+                            MultiTemplateTabPane.getInstance().calNextShowJTemplateIndex(index - 1));
+
                 }
             }
         }

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

@@ -0,0 +1,349 @@
+package com.fr.design.file;
+
+import com.fr.design.constants.UIConstants;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.imenu.UIMenuItem;
+import com.fr.design.gui.imenu.UIScrollPopUpMenu;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.utils.TemplateUtils;
+import com.fr.general.IOUtils;
+import com.fr.stable.StringUtils;
+import com.fr.stable.collections.CollectionUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 右侧下拉菜单的工厂类
+ * @author Carlson
+ * @since 11.0
+ * created on 2023-04-14
+ **/
+public class MultiTemplateTabMenuFactory {
+
+    private static final Icon CLOSE = IOUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
+    private static final Icon MOUSE_OVER_CLOSE = IOUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png");
+    private static final Icon MOUSE_PRESS_CLOSE = IOUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png");
+
+    private static final int ITEM_SIZE = 25;
+
+    private UIScrollPopUpMenu menu = null;
+
+    private static MultiTemplateTabMenuFactory INSTANCE = new MultiTemplateTabMenuFactory();
+
+    private MultiTemplateTabMenuFactory() {
+
+    }
+
+    /**
+     * 返回右侧下拉菜单的工厂类
+     * @return
+     */
+    public static MultiTemplateTabMenuFactory getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * tab上的下拉菜单
+     */
+    public UIScrollPopUpMenu createMenu() {
+        menu = new UIScrollPopUpMenu();
+        menu.setBorder(BorderFactory.createEmptyBorder(-3, 3, 3, 0));
+
+        menu.add(initCloseOther());
+        menu.add(createEmptyRow());
+        menu.addSeparator();
+        menu.add(createEmptyRow());
+        menu.add(createCategory(Toolkit.i18nText("Fine-Design_Basic_Tab_Current_Category_Templates")));
+        Component[] items = createCurrentCategory();
+        for (Component item : items) {
+            menu.add(item);
+        }
+        items = createOtherCategory();
+        if (items.length > 0) {
+            menu.addSeparator();
+            menu.add(createEmptyRow());
+            menu.add(createCategory(Toolkit.i18nText("Fine-Design_Basic_Tab_Other_Category_Templates")));
+            for (Component item : items) {
+                menu.add(item);
+            }
+        }
+        Dimension dimension = menu.getPreferredSize();
+        dimension.width += ITEM_SIZE;
+        menu.setPreferredSize(dimension);
+        return menu;
+    }
+
+    /**
+     * 关闭其它按钮
+     */
+    private UIMenuItem initCloseOther() {
+        UIMenuItem closeOther = new UIMenuItem(Toolkit.i18nText("Fine-Design_Basic_Tab_Close_Other_Templates_Of_Current_Category"));
+        closeOther.setHorizontalAlignment(SwingConstants.CENTER);
+        Dimension dimension = closeOther.getPreferredSize();
+        dimension.height = ITEM_SIZE;
+        closeOther.setPreferredSize(dimension);
+        String currentOperator = getCurrentTabOperatorType();
+        closeOther.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                MultiTemplateTabPane.getInstance().closeOtherByOperatorType(currentOperator);
+            }
+        });
+        if (MultiTemplateTabPane.getInstance().getOpenedJTemplatesByOperator(currentOperator).size() <= 1) {
+            closeOther.setEnabled(false);
+        }
+        return closeOther;
+    }
+
+
+    /**
+     * 美观用
+     */
+    private JPanel createEmptyRow() {
+        return new JPanel() {
+            @Override
+            public Dimension getPreferredSize() {
+                Dimension d = super.getPreferredSize();
+                d.height = 1;
+                return d;
+            }
+        };
+    }
+
+    /**
+     * 模板分类item
+     */
+    private UIButton createCategory(String categoryName) {
+        UIButton button = new UIButton(categoryName);
+        button.setBorderPainted(false);
+        button.setExtraPainted(false);
+        button.setPreferredSize(new Dimension(menu.getWidth(), ITEM_SIZE));
+        button.setOpaque(true);
+        button.setBackground(UIConstants.NORMAL_BACKGROUND);
+        button.setHorizontalAlignment(SwingConstants.LEFT);
+        button.setForeground(UIConstants.FLESH_BLUE);
+        return button;
+    }
+
+    /**
+     * 创建 当前分类模板 item数组
+     */
+    private Component[] createCurrentCategory() {
+        return createListDownItem(MultiTemplateTabPane.getInstance().getOpenedJTemplatesByOperator(getCurrentTabOperatorType()));
+    }
+
+    private String getCurrentTabOperatorType(){
+        JTemplate jTemplate= HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        return jTemplate.getTemplateTabOperatorType();
+    }
+
+    /**
+     * 创建 其它分类模板 item数组
+     */
+    private Component[] createOtherCategory() {
+        String currentOperator = getCurrentTabOperatorType();
+        List<JTemplate<?, ?>> openedTemplates = new ArrayList<>();
+        Map<String, List<JTemplate<?, ?>>> map = MultiTemplateTabPane.getInstance().getOpenedJTemplatesByCategory();
+        for (Map.Entry<String, List<JTemplate<?, ?>>> entry : map.entrySet()) {
+            if (!StringUtils.equals(currentOperator, entry.getKey())) {
+                openedTemplates.addAll(entry.getValue());
+            }
+        }
+        return createListDownItem(openedTemplates);
+    }
+
+    /**
+     * 根据template列表创建多个item
+     */
+    private Component[] createListDownItem(List<JTemplate<?, ?>> openedTemplates) {
+        if (!CollectionUtils.isEmpty(openedTemplates)) {
+            Component[] templates = new Component[openedTemplates.size()];
+            for (int i = 0; i < openedTemplates.size(); i++) {
+                templates[i] = createListDownMenuItem(openedTemplates.get(i));
+            }
+            return templates;
+        }
+        return new Component[0];
+    }
+
+    /**
+     * 根据template对象创建item
+     */
+    private Component createListDownMenuItem(JTemplate<?, ?> template) {
+        JPanel jPanel = new JPanel();
+        jPanel.setPreferredSize(new Dimension(menu.getWidth(), ITEM_SIZE));
+        jPanel.setLayout(new BorderLayout());
+
+        MenuItemButtonGroup menuItemButtonGroup = new MenuItemButtonGroup(template);
+        if (template == HistoryTemplateListCache.getInstance().getCurrentEditingTemplate()) {
+            menuItemButtonGroup.templateButton.setForeground(UIConstants.FLESH_BLUE);
+        }
+
+        jPanel.add(menuItemButtonGroup.iconButton, BorderLayout.WEST);
+        jPanel.add(menuItemButtonGroup.templateButton, BorderLayout.CENTER);
+        jPanel.add(menuItemButtonGroup.closeButton, BorderLayout.EAST);
+
+        return jPanel;
+    }
+
+    /**
+     * menu的item由模板图标、模板名、模板关闭按钮组成
+     */
+    private class MenuItemButtonGroup {
+
+        private final UIButton iconButton;
+        private final UIButton templateButton;
+        private final UIButton closeButton;
+
+        public MenuItemButtonGroup(JTemplate<?, ?> template) {
+            iconButton = createIconButton(template);
+            templateButton = createTemplateButton(template);
+            closeButton = createCloseButton();
+            initListener(template);
+        }
+
+        /**
+         * item[0] 模板图标按钮初始化
+         */
+        private UIButton createIconButton(JTemplate<?, ?> template) {
+            UIButton button = new UIButton(template.getIcon(), template.getIcon(), template.getIcon());
+            button.setPreferredSize(new Dimension(ITEM_SIZE, ITEM_SIZE));
+            button.setOpaque(true);
+            button.setBackground(UIConstants.NORMAL_BACKGROUND);
+            return button;
+        }
+
+        /**
+         * item[1] 切换模板按钮初始化
+         */
+        private UIButton createTemplateButton(JTemplate<?, ?> template) {
+            UIButton button = new UIButton(TemplateUtils.createLockeTemplatedName(template, template.getTemplateName()));
+            button.setBorderPainted(false);
+            button.setExtraPainted(false);
+            button.setPreferredSize(new Dimension(menu.getWidth() - ITEM_SIZE * 2, ITEM_SIZE));
+            button.setOpaque(true);
+            button.setBackground(UIConstants.NORMAL_BACKGROUND);
+            button.setHorizontalAlignment(SwingConstants.LEFT);
+            return button;
+        }
+
+        /**
+         * item[2] 关闭模板图标按钮初始化
+         */
+        private UIButton createCloseButton() {
+            UIButton button = new UIButton(CLOSE, MOUSE_OVER_CLOSE, MOUSE_PRESS_CLOSE);
+            button.setPreferredSize(new Dimension(ITEM_SIZE, ITEM_SIZE));
+            button.setOpaque(true);
+            button.setBackground(UIConstants.NORMAL_BACKGROUND);
+            button.setVisible(false);
+            return button;
+        }
+
+        private void initListener(JTemplate<?, ?> template) {
+            initIconButtonListener();
+            initTemplateButtonListener(template);
+            initCloseButtonListener(template);
+        }
+
+        /**
+         * item[0] 模板图标按钮鼠标事件
+         */
+        private void initIconButtonListener() {
+            iconButton.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseEntered(MouseEvent e) {
+                    fireMouseEnteredEvent();
+                }
+
+                @Override
+                public void mouseExited(MouseEvent e) {
+                    fireMouseExitedEvent();
+                }
+            });
+        }
+
+        /**
+         * item[1] 切换模板按钮鼠标事件
+         */
+        private void initTemplateButtonListener(JTemplate<?, ?> template) {
+            templateButton.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseClicked(MouseEvent e) {
+                    menu.setVisible(false);
+                    MultiTemplateTabPane.getInstance().switchJTemplate(template);
+                }
+
+                @Override
+                public void mouseEntered(MouseEvent e) {
+                    fireMouseEnteredEvent();
+                }
+
+                @Override
+                public void mouseExited(MouseEvent e) {
+                    fireMouseExitedEvent();
+                }
+            });
+        }
+
+        /**
+         * item[2] 关闭模板按钮鼠标事件
+         */
+        private void initCloseButtonListener(JTemplate<?, ?> template) {
+            closeButton.addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseClicked(MouseEvent e) {
+                    menu.setVisible(false);
+                    MultiTemplateTabPane.getInstance().setIsCloseCurrent(template == HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
+                    MultiTemplateTabPane.getInstance().closeFormat(template);
+                    MultiTemplateTabPane.getInstance().closeSpecifiedTemplate(template);
+                }
+
+                @Override
+                public void mouseEntered(MouseEvent e) {
+                    fireMouseEnteredEvent();
+                }
+
+                @Override
+                public void mouseExited(MouseEvent e) {
+                    fireMouseExitedEvent();
+                }
+            });
+        }
+
+        /**
+         * mouse移入item范围
+         */
+        private void fireMouseEnteredEvent() {
+            iconButton.setBackground(UIConstants.HOVER_BLUE);
+            templateButton.setBackground(UIConstants.HOVER_BLUE);
+            closeButton.setBackground(UIConstants.HOVER_BLUE);
+            closeButton.setVisible(true);
+        }
+
+        /**
+        * mouse移出item范围
+        */
+        private void fireMouseExitedEvent() {
+            iconButton.setBackground(UIConstants.NORMAL_BACKGROUND);
+            templateButton.setBackground(UIConstants.NORMAL_BACKGROUND);
+            closeButton.setBackground(UIConstants.NORMAL_BACKGROUND);
+            closeButton.setVisible(false);
+        }
+
+    }
+
+}

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

@@ -1,7 +1,6 @@
 package com.fr.design.file;
 
 
-import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.svg.IconUtils;
 import com.fr.base.vcs.DesignerMode;
@@ -19,7 +18,6 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.TemplateSavingChecker;
 import com.fr.design.mainframe.manager.search.TemplateTreeSearchManager;
 import com.fr.design.utils.DesignUtils;
-import com.fr.design.utils.TemplateUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.design.worker.WorkerManager;
@@ -42,7 +40,6 @@ import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
-import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.MenuElement;
 import javax.swing.SwingConstants;
@@ -70,6 +67,8 @@ import java.awt.geom.Line2D;
 import java.awt.geom.Path2D;
 import java.awt.geom.RoundRectangle2D;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog;
 import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
@@ -333,8 +332,10 @@ public class MultiTemplateTabPane extends JComponent {
                 JTemplate<?, ?> currentTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
                 closeTemplate(templates, currentTemplate);
 
-                if (option == CloseOption.All) {
+                if (openedTemplate.size() == 0) {
                     DesignerContext.getDesignerFrame().addAndActivateJTemplate();
+                } else if (option == CloseOption.All){
+                    DesignerContext.getDesignerFrame().activateJTemplate(openedTemplate.get(0));
                 } else {
                     DesignerContext.getDesignerFrame().activateJTemplate(currentTemplate);
                 }
@@ -344,8 +345,9 @@ public class MultiTemplateTabPane extends JComponent {
         }
 
         private void closeTemplate(JTemplate<?, ?>[] templates, JTemplate<?, ?> currentTemplate) {
+            String operator =  currentTemplate.getTemplateTabOperatorType();
             for (int i = 0; i < templates.length; i++) {
-                if (option.shouldClose(tplIndex, i)) {
+                if (option.shouldClose(tplIndex, i) && ComparatorUtils.equals(operator, templates[i].getTemplateTabOperatorType())) {
                     JTemplate<?, ?> jTemplate = templates[i];
                     if (jTemplate == currentTemplate) {
                         currentTemplate = option == CloseOption.All ? null : templates[tplIndex];
@@ -378,6 +380,46 @@ public class MultiTemplateTabPane extends JComponent {
         return openedTemplate.get(selectedIndex);
     }
 
+    /**
+     * 关闭所有指定模板tab操作类型的模板
+     * @param operatorType
+     */
+    public void closeOtherByOperatorType(String operatorType){
+        JTemplate<?, ?> currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(false);
+        if (saveSomeTempaltePane.showSavePane()) {
+            List<JTemplate<?, ?>> openedTemplate = HistoryTemplateListCache.getInstance().getHistoryList();
+
+            JTemplate<?, ?>[] templates = new JTemplate<?, ?>[openedTemplate.size()];
+            for (int i = 0; i < openedTemplate.size(); i++) {
+                templates[i] = openedTemplate.get(i);
+            }
+            closeTemplate(templates, currentEditingTemplate, operatorType);
+
+            DesignerContext.getDesignerFrame().activateJTemplate(currentEditingTemplate);
+            MultiTemplateTabPane.getInstance().repaint();
+        }
+    }
+
+    /**
+     * 关闭指定的非当前编辑模板
+     * @param templates
+     * @param operatorType
+     */
+    private static void closeTemplate(JTemplate<?, ?>[] templates, JTemplate<?, ?> currentEditingTemplate, String operatorType) {
+        for (int i = 0; i < templates.length; i++) {
+            JTemplate<?, ?> jTemplate = templates[i];
+            boolean needClose = ComparatorUtils.equals(operatorType, jTemplate.getTemplateTabOperatorType())
+                    && jTemplate != currentEditingTemplate;
+            if (!needClose) {
+                continue;
+            }
+            MultiTemplateTabPane.getInstance().closeFormat(jTemplate);
+            HistoryTemplateListCache.getInstance().closeSelectedReport(jTemplate);
+            MultiTemplateTabPane.getInstance().closeAndFreeLock(jTemplate);
+        }
+    }
+
 
     /**
      * 关闭掉当前已打开文件列表中指定的文件
@@ -478,11 +520,7 @@ public class MultiTemplateTabPane extends JComponent {
 
 
     private String tempalteShowName(JTemplate<?, ?> template) {
-        String name = TemplateUtils.createLockeTemplatedName(template, template.getTemplateName());
+        return template.getTabShowName(template);
-        if (!template.isSaved() && !name.endsWith(" *")) {
-            name += " *";
-        }
-        return name;
     }
 
     /**
@@ -500,40 +538,7 @@ public class MultiTemplateTabPane extends JComponent {
 
 
     private void showListDown() {
-
+        UIScrollPopUpMenu menu = MultiTemplateTabMenuFactory.getInstance().createMenu();
-        UIScrollPopUpMenu menu = new UIScrollPopUpMenu();
-        menu.setBorder(BorderFactory.createEmptyBorder(-3, 3, 3, 0));
-        menu.add(initCloseOther());
-        JSeparator separator = new JSeparator() {
-            @Override
-            public Dimension getPreferredSize() {
-                Dimension d = super.getPreferredSize();
-                d.height = 1;
-                return d;
-            }
-        };
-        menu.add(new JPanel() {
-            @Override
-            public Dimension getPreferredSize() {
-                Dimension d = super.getPreferredSize();
-                d.height = 1;
-                return d;
-            }
-        });
-        separator.setForeground(UIConstants.LINE_COLOR);
-        menu.add(separator);
-        menu.add(new JPanel() {
-            @Override
-            public Dimension getPreferredSize() {
-                Dimension d = super.getPreferredSize();
-                d.height = 1;
-                return d;
-            }
-        });
-        UIMenuItem[] items = createListDownTemplate();
-        for (int i = 0; i < items.length; i++) {
-            menu.add(items[i]);
-        }
         GUICoreUtils.showPopupMenu(menu, MultiTemplateTabPane.getInstance(), MultiTemplateTabPane.getInstance().getWidth() - menu.getPreferredSize().width, getY() - 1 + getHeight());
     }
 
@@ -583,6 +588,9 @@ public class MultiTemplateTabPane extends JComponent {
         //从可以开始展示在tab面板上的tab开始画
         for (int i = minPaintIndex; i <= maxPaintIndex; i++) {
             JTemplate template = openedTemplate.get(i);
+            if (!showJTemplateTab(template)){
+                continue;
+            }
             Icon icon = template.getIcon();
             String name = tempalteShowName(template);
             //如果tab名字的长度大于最大能显示的英文字符长度，则进行省略号处理
@@ -722,8 +730,10 @@ public class MultiTemplateTabPane extends JComponent {
 
     //个数小于最多能容纳的个数的情况下，看看宽度每个要画多少
     private void calculateRealAverageWidth(double maxwidth, int templateNum) {
+        JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        List<JTemplate<?, ?>> showTemplates = getOpenedJTemplatesByOperator(jTemplate.getTemplateTabOperatorType());
 
-        int num = openedTemplate.size() > templateNum ? templateNum : openedTemplate.size();
+        int num = Math.min(showTemplates.size(), templateNum);
         realWidth = (int) (maxwidth / (num));
         if (realWidth > MAXWIDTH) {
             realWidth = MAXWIDTH;
@@ -932,7 +942,7 @@ public class MultiTemplateTabPane extends JComponent {
         activePrevTemplateAfterClose();
     }
 
-    private void closeAndFreeLock(@Nonnull JTemplate<?, ?> template) {
+    public void closeAndFreeLock(@Nonnull JTemplate<?, ?> template) {
         FILE file = template.getEditingFILE();
         // 只有是环境内的文件，才执行释放锁
         if (file != null && file.isEnvFile()) {
@@ -988,7 +998,7 @@ public class MultiTemplateTabPane extends JComponent {
                 // 如果当前关闭的模板在最右侧，那么预览上一个，防止数组越界
                 if (selectedIndex >= maxPaintIndex) {
                     // selectIndex 不会 <0 因为如果关闭的是打开的最后一个模板，那么关闭之后 openedTemplate.isEmpty() = true
-                    selectedIndex--;
+                    selectedIndex = calNextShowJTemplateIndex(selectedIndex - 1);
                 }
                 isCloseCurrent = false;
             }
@@ -1005,6 +1015,26 @@ public class MultiTemplateTabPane extends JComponent {
         }
     }
 
+    /**
+     * 计算下一个可以展示的模板index
+     * @param currentIndex
+     * @return
+     */
+    public int calNextShowJTemplateIndex(int currentIndex) {
+        //先看是否有可以展示的模板
+        for (int i = currentIndex; i >= 0; i--) {
+            if (showJTemplateTab(openedTemplate.get(i))) {
+                return i;
+            }
+        }
+        for (int i = currentIndex; i >= 0; i--) {
+            if (!showJTemplateTab(openedTemplate.get(i))) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
 
     private boolean isOverCloseIcon(int evtX) {
         boolean isOverCloseIcon = false;
@@ -1027,7 +1057,7 @@ public class MultiTemplateTabPane extends JComponent {
     private int getTemplateIndex(int evtX) {
         int textX = 0;
         for (int i = minPaintIndex; i <= maxPaintIndex; i++) {
-            int textWidth = realWidth;
+            int textWidth = showJTemplateTab(openedTemplate.get(i)) ? realWidth : 0;
             if (evtX >= textX && evtX < textX + textWidth) {
                 return i;
             }
@@ -1184,29 +1214,44 @@ public class MultiTemplateTabPane extends JComponent {
                 //没有点击关闭和ListDown按钮，则切换到点击的模板处
                 closeIconIndex = -1;
                 clodeMode = CLOSE;
-                int tempSelectedIndex = selectedIndex;
+                switchJTemplate(getTemplateIndex(evtX));
-                if (selectedIndex != getTemplateIndex(evtX) && getTemplateIndex(evtX) != -1) {
-                    openedTemplate.get(selectedIndex).stopEditing();
-                    selectedIndex = getTemplateIndex(evtX);
-                    //如果在权限编辑情况下，不允许切换到表单类型的工作簿
-                    if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) {
-                        DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
-                        FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
-                                + "!", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
-                        MultiTemplateTabPane.this.repaint();
-                        return;
-                    }
-                    JTemplate evtXTemplate = openedTemplate.get(getTemplateIndex(evtX));
-                    evtXTemplate.activeNewJTemplate();
-                }
                 isShowList = false;
             }
             MultiTemplateTabPane.this.repaint();
-
-
         }
+    }
 
+    /**
+     * 切换到指定模板
+     * @param jTemplate
+     */
+    public void switchJTemplate(JTemplate jTemplate) {
+        int switchIndex = this.openedTemplate.indexOf(jTemplate);
+        if (switchIndex >= 0) {
+            switchJTemplate(switchIndex);
+        }
+    }
 
+    /**
+     * 切换到指定index
+     * @param switchIndex
+     */
+    private void switchJTemplate(int switchIndex){
+        int tempSelectedIndex = selectedIndex;
+        if (selectedIndex != switchIndex && switchIndex != -1) {
+            openedTemplate.get(selectedIndex).stopEditing();
+            selectedIndex = switchIndex;
+            //如果在权限编辑情况下，不允许切换到表单类型的工作簿
+            if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) {
+                DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
+                        + "!", Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
+                MultiTemplateTabPane.this.repaint();
+                return;
+            }
+            JTemplate evtXTemplate = openedTemplate.get(switchIndex);
+            evtXTemplate.activeNewJTemplate();
+        }
     }
 
     private boolean checkCurrentClose(JTemplate template) {
@@ -1251,5 +1296,34 @@ public class MultiTemplateTabPane extends JComponent {
         }
     }
 
+    /**
+     * 判断是否显示在tab栏上
+     * @param jTemplate
+     * @return
+     */
+    private boolean showJTemplateTab(JTemplate jTemplate){
+        JTemplate current = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        return ComparatorUtils.equals(current.getTemplateTabOperatorType(), jTemplate.getTemplateTabOperatorType());
+    }
+
+    /**
+     * 获取tab操作类型的模板
+     * @param operator
+     * @return
+     */
+    public  List<JTemplate<?, ?>> getOpenedJTemplatesByOperator(String operator) {
+        return openedTemplate.stream().filter((jTemplate) -> ComparatorUtils.equals(jTemplate.getTemplateTabOperatorType(), operator))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 根据tab操作类型进行分类
+     * @return
+     */
+    public Map<String, List<JTemplate<?, ?>>> getOpenedJTemplatesByCategory() {
+      return openedTemplate.stream()
+              .collect(Collectors.groupingBy(JTemplate::getTemplateTabOperatorType));
+    }
+
 
 }

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

@@ -81,11 +81,19 @@ public abstract class NewTemplatePane extends JComponent implements MouseListene
 		}
 		if (isOverNewIcon(evtX) && newWorkBookIconMode != GRAY_NEW_CPT) {
 			newWorkBookIconMode = getMousePressNew();
-			DesignerContext.getDesignerFrame().addAndActivateJTemplate();
+			createNewTemplate();
 		}
 		this.repaint();
 	}
 
+
+	/**
+	 * 新建模板
+	 */
+	protected void createNewTemplate() {
+		DesignerContext.getDesignerFrame().addAndActivateJTemplate();
+	}
+
     /**
      *鼠标松开
      * @param e 事件

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

@@ -47,6 +47,7 @@ public class SaveSomeTemplatePane extends BasicPane {
 
     /**
      * 支持自定义设置 dialog的父窗口
+     *
      * @param isNeedTojudgeCurrent
      * @param parent
      */
@@ -79,11 +80,14 @@ public class SaveSomeTemplatePane extends BasicPane {
         this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent;
     }
 
-    private void initTemplatesChoosePane() {
+
+    private void initTemplatesChoosePane(boolean judgeJTemplateMustSave) {
         templatesChoosePane.setBorder(BorderFactory.createTitledBorder(""));
         for (int i = 0; i < unSavedTemplate.size(); i++) {
             templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName());
             templateCheckBoxes[i].setSelected(true);
+            boolean needSave = judgeJTemplateMustSave && unSavedTemplate.get(i).needSaveBeforeSwitchEnv();
+            templateCheckBoxes[i].setEnabled(!needSave);
         }
 
         final UIList templatesList = new UIList(templateCheckBoxes);
@@ -103,7 +107,10 @@ public class SaveSomeTemplatePane extends BasicPane {
                 boolean isSelected = chooseAllCheckBox.isSelected();
                 for (int i = 0; i < templatesList.getModel().getSize(); i++) {
                     UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i);
-                    checkBox.setSelected(isSelected);
+                    boolean mustSaveBeforeSwitchEnv = judgeJTemplateMustSave && unSavedTemplate.get(i).needSaveBeforeSwitchEnv();
+                    checkBox.setSelected(mustSaveBeforeSwitchEnv || isSelected);
+                    templateCheckBoxes[i].setEnabled(!mustSaveBeforeSwitchEnv);
+
                 }
                 templatesList.repaint();
             }
@@ -139,7 +146,7 @@ public class SaveSomeTemplatePane extends BasicPane {
 
     /**
      * 获取templateCheckBoxes中状态为选中状态的CheckBox数量
-     * */
+     */
     private int calculateSelectedNum() {
         int count = 0;
         for (UICheckBox checkBox : templateCheckBoxes) {
@@ -152,7 +159,11 @@ public class SaveSomeTemplatePane extends BasicPane {
 
 
     public boolean showSavePane() {
-        populate();
+        return showSavePane(false);
+    }
+
+    public boolean showSavePane(boolean judgeJTemplateMustSave) {
+        populate(judgeJTemplateMustSave);
         //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目
         if (!unSavedTemplate.isEmpty()) {
             dialog.setVisible(true);
@@ -162,8 +173,12 @@ public class SaveSomeTemplatePane extends BasicPane {
         return isAllSaved;
     }
 
-    public void populate() {
+    protected  java.util.List<JTemplate<?, ?>> getOpenedTemplatesToProcess(){
-        java.util.List<JTemplate<?, ?>> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList();
+        return HistoryTemplateListPane.getInstance().getHistoryList();
+    }
+
+    public void populate(boolean judgeJTemplateMustSave) {
+        java.util.List<JTemplate<?, ?>> opendedTemplate = getOpenedTemplatesToProcess();
         JTemplate<?, ?> currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
         for (int i = 0; i < opendedTemplate.size(); i++) {
             if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) {
@@ -171,10 +186,10 @@ public class SaveSomeTemplatePane extends BasicPane {
             }
         }
         templateCheckBoxes = new UICheckBox[unSavedTemplate.size()];
-        initTemplatesChoosePane();
+        initTemplatesChoosePane(judgeJTemplateMustSave);
     }
 
-    private boolean isneedToAdd(JTemplate<?, ?> template, JTemplate<?, ?> currentTemplate) {
+    protected boolean isneedToAdd(JTemplate<?, ?> template, JTemplate<?, ?> currentTemplate) {
         //所有模板都判断是不是保存
         if (isJudgeCurrentEditingTemplate) {
             return !template.isALLSaved();
@@ -194,7 +209,7 @@ public class SaveSomeTemplatePane extends BasicPane {
             specifiedTemplate.stopEditing();
             return specifiedTemplate.saveTemplate();
         }
-        FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
+        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
         return true;
     }
 

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

@@ -376,16 +376,16 @@ public abstract class JListControlPane extends JControlPane implements ListContr
                 Nameable nameable = element.wrapper;
                 this.textLabel.setText(nameable.getName());
                 boolean iconSet = false;
+                if(isSelected) {
+                    this.textLabel.setBackground(selectedBgColor);
+                    this.textLabel.setForeground(Color.WHITE);
+                } else {
+                    this.textLabel.setBackground(Color.WHITE);
+                    this.textLabel.setForeground(Color.BLACK);
+                }
                 for (NameableCreator creator : JListControlPane.this.creators()) {
                     if (creator.menuIcon() != null && creator.acceptObject2Populate(nameable) != null) {
                         this.iconLabel.setIcon(creator.menuIcon());
-                        if(isSelected) {
-                            this.textLabel.setBackground(selectedBgColor);
-                            this.textLabel.setForeground(Color.WHITE);
-                        } else {
-                            this.textLabel.setBackground(Color.WHITE);
-                            this.textLabel.setForeground(Color.BLACK);
-                        }
                         this.setToolTipText(creator.createTooltip());
                         iconSet = true;
                         break;

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

@@ -16,6 +16,7 @@ import com.fr.design.gui.frpane.UIPercentDragPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
@@ -26,8 +27,8 @@ import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.env.utils.DesignerInteractionHistory;
 import com.fr.general.Background;
 import com.fr.general.IOUtils;
-import com.fr.i18n.UrlI18nManager;
 import com.fr.general.act.BorderPacker;
+import com.fr.i18n.UrlI18nManager;
 import com.fr.stable.Constants;
 import com.fr.stable.GraphDrawHelper;
 import com.fr.stable.ProjectLibrary;
@@ -78,7 +79,18 @@ import java.util.Arrays;
 public class TranslucentBorderSpecialPane extends AbstractBorderPackerPane implements UIObserver {
     private final int SETTING_LABEL_WIDTH = 60;
     private final Style DEFAULT_IMAGE_LAYOUT_STYLE = Style.DEFAULT_STYLE.deriveImageLayout(Constants.IMAGE_DEFAULT);
-    private final String TWEAK_NINE_POINT_HELP_URL = "https://help.fanruan.com/finereport/doc-view-4135.html";
+
+    /**
+     * 云中心点九图帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Nine_Patch";
+
+    /**
+     * 云中心点九图帮助文档默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Nine_Patch_Default";
+
+    private final String TWEAK_NINE_POINT_HELP_URL = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
 
     private UIObserverListener uiObserverListener;
 

designer-base/src/main/java/com/fr/design/i18n/LocaleLinkProvider.java

@@ -0,0 +1,47 @@
+package com.fr.design.i18n;
+
+import com.fr.general.CloudCenter;
+import com.fr.stable.StringUtils;
+
+/**
+ * 国际化链接获取工具
+ * 根据配置文件key获取云中心key对应的链接或者默认链接
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2023/4/7
+ */
+public final class LocaleLinkProvider {
+
+    private LocaleLinkProvider(){};
+
+    /**
+     * 单一实例
+     */
+    private static final LocaleLinkProvider INSTANCE = new LocaleLinkProvider();
+
+    /**
+     * 返回LocaleLinkProvider的单一实例
+     *
+     * @return LocaleLinkProvider单一实例
+     */
+    public static LocaleLinkProvider getInstance(){
+        return INSTANCE;
+    }
+
+    /**
+     * 根据配置文件项中的key获取链接
+     *
+     * @param propsKey   配置项key
+     * @param defaultKey 默认链接项key
+     * @return 对应的生成器
+     */
+    public String getLink(String propsKey, String defaultKey) {
+        String cloudKey = DesignI18nImpl.getInstance().i18nText(propsKey);
+        String url = CloudCenter.getInstance().acquireUrlByKind(cloudKey);
+        if(StringUtils.isEmpty(url)) {
+            return DesignI18nImpl.getInstance().i18nText(defaultKey);
+        }
+        return url;
+    }
+}

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

@@ -14,11 +14,11 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.design.gui.itextfield.PlaceholderTextField;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.javascript.jsapi.JSAPITreeHelper;
 import com.fr.design.javascript.jsapi.JSAPIUserObject;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONArray;
@@ -26,6 +26,26 @@ import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListModel;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.SwingWorker;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
@@ -51,25 +71,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
-import javax.swing.JComponent;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.SwingWorker;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
 
 public class JSContentWithDescriptionPane extends JSContentPane implements KeyListener {
 
@@ -119,6 +120,15 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
     private static final String RELOAD_CARD = "reloadCard";
     private static final String DOC_LIST_CARD = "docListCard";
 
+    /**
+     * 云中心Js高级编辑器帮助链接前缀在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Js_Editor";
+
+    /**
+     * 云中心Js高级编辑器帮助链接前缀在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Js_Editor_Default";
     public JSContentWithDescriptionPane(String[] args) {
         this.setLayout(new BorderLayout());
         //===============================
@@ -381,7 +391,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi
     }
 
     private void updateHelpDocuments(Object value, List<HelpDocument> helpDocuments) {
-        String url = CloudCenter.getInstance().acquireUrlByKind("af.doc_search", DOCUMENT_SEARCH_URL) + value.toString();
+        String url = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT) + value.toString();
         try {
             String result = HttpToolbox.get(url);
             JSONObject jsonObject = new JSONObject(result);

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

@@ -1,13 +1,8 @@
 package com.fr.design.locale.impl;
 
-import com.fr.general.CloudCenter;
+import com.fr.design.i18n.LocaleLinkProvider;
-import com.fr.general.GeneralContext;
 import com.fr.general.locale.LocaleMark;
 
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
 /**
  * @author hades
  * @version 10.0
@@ -15,24 +10,19 @@ import java.util.Map;
  */
 public class BbsRegisterMark implements LocaleMark<String> {
 
-    private final Map<Locale, String> map = new HashMap<>();
+    /**
-    private static final String BBS_REGISTER_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "https://id.fanruan.com/register/register.php?clueSource=activityfr");
+     * 云中心新账户中心链接在配置文件中对应的配置文件key
-    private static final String BBS_REGISTER_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.register", "https://id.fanruan.com/register/register.php?clueSource=activityfr");
+     */
-    private static final String BBS_REGISTER_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_New_Account_Center";
-    private static final String BBS_REGISTER_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
-    private static final String BBS_REGISTER_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.register.en_US", "https://id.fanruan.com/en/register/register.php");
 
-    public BbsRegisterMark() {
+    /**
-        map.put(Locale.CHINA, BBS_REGISTER_CN);
+     * 云中心新账户中心链接在配置文件中对应的配置文件key
-        map.put(Locale.KOREA, BBS_REGISTER_KR);
+     */
-        map.put(Locale.JAPAN, BBS_REGISTER_JP);
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_New_Account_Center_Default";
-        map.put(Locale.US, BBS_REGISTER_EN);
+    public BbsRegisterMark() {}
-        map.put(Locale.TAIWAN, BBS_REGISTER_TW);
-    }
 
     @Override
     public String getValue() {
-        String result = map.get(GeneralContext.getLocale());
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
-        return result == null ? BBS_REGISTER_EN : result;
     }
 }

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

@@ -1,13 +1,8 @@
 package com.fr.design.locale.impl;
 
-import com.fr.general.CloudCenter;
+import com.fr.design.i18n.LocaleLinkProvider;
-import com.fr.general.GeneralContext;
 import com.fr.general.locale.LocaleMark;
 
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
 /**
  * @author hades
  * @version 10.0
@@ -15,24 +10,21 @@ import java.util.Map;
  */
 public class BbsResetMark implements LocaleMark<String> {
 
-    private final Map<Locale, String> map = new HashMap<>();
-    private static final String BBS_RESET_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "https://id.fanruan.com/forget/forget.php?clue=activityfr");
-    private static final String BBS_RESET_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.reset", "https://id.fanruan.com/forget/forget.php?clue=activityfr");
-    private static final String BBS_RESET_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
-    private static final String BBS_RESET_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
-    private static final String BBS_RESET_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.reset.en_US", "https://id.fanruan.com/en/forget/forget.php");
 
-    public BbsResetMark() {
+    /**
-        map.put(Locale.CHINA, BBS_RESET_CN);
+     * 云中心老账户中心链接在配置文件中对应的配置文件key
-        map.put(Locale.KOREA, BBS_RESET_KR);
+     */
-        map.put(Locale.JAPAN, BBS_RESET_JP);
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Account_Center";
-        map.put(Locale.US, BBS_RESET_EN);
+
-        map.put(Locale.TAIWAN, BBS_RESET_TW);
+    /**
-    }
+     * 云中心老账户中心链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Account_Center_Default";
+
+    public BbsResetMark() {}
 
     @Override
     public String getValue() {
-        String result = map.get(GeneralContext.getLocale());
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
-        return result == null ? BBS_RESET_EN : result;
     }
 }

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

@@ -1,13 +1,8 @@
 package com.fr.design.locale.impl;
 
-import com.fr.general.CloudCenter;
+import com.fr.design.i18n.LocaleLinkProvider;
-import com.fr.general.GeneralContext;
 import com.fr.general.locale.LocaleMark;
 
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
 /**
  * @author hades
  * @version 10.0
@@ -15,25 +10,20 @@ import java.util.Map;
  */
 public class BbsSpaceMark implements LocaleMark<String> {
 
-    private final Map<Locale, String> map = new HashMap<>();
+    /**
-    private static final String BBS_SPACE_CN = CloudCenter.getInstance().acquireUrlByKind("bbs.default", "http://bbs.fanruan.com/home.php?mod=space&do=pm");
+     * 云中心帆软社区消息中心链接在配置文件中对应的配置文件key
-    private static final String BBS_SPACE_TW = CloudCenter.getInstance().acquireUrlByKind("bbs.default", "http://bbs.fanruan.com/home.php?mod=space&do=pm");
+     */
-    private static final String BBS_SPACE_EN = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US", "https://community.finereport.com/home.php?mod=space&do=pm");
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Message_Center";
-    private static final String BBS_SPACE_KR = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US", "https://community.finereport.com/home.php?mod=space&do=pm");
-    private static final String BBS_SPACE_JP = CloudCenter.getInstance().acquireUrlByKind("bbs.default.en_US", "https://community.finereport.com/home.php?mod=space&do=pm");
 
-    public BbsSpaceMark() {
+    /**
-        map.put(Locale.CHINA, BBS_SPACE_CN);
+     * 云中心帆软社区消息中心链接在配置文件中对应的配置文件key
-        map.put(Locale.KOREA, BBS_SPACE_KR);
+     */
-        map.put(Locale.JAPAN, BBS_SPACE_JP);
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Message_Center_Default";
-        map.put(Locale.US, BBS_SPACE_EN);
-        map.put(Locale.TAIWAN, BBS_SPACE_TW);
-    }
 
+
+    public BbsSpaceMark() {}
     @Override
     public String getValue() {
-        String result = map.get(GeneralContext.getLocale());
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
-        return result == null ? BBS_SPACE_EN : result;
     }
-
 }

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

@@ -0,0 +1,30 @@
+package com.fr.design.locale.impl;
+
+import com.fr.design.i18n.LocaleLinkProvider;
+import com.fr.general.locale.LocaleMark;
+
+
+/**
+ * 根据图片信息生成获取国际化服务器图标工具
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2023/4/19
+ */
+public class DataMaskMark implements LocaleMark<String> {
+
+    /**
+     * 云中心数据脱敏帮助链接链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Data_Mask";
+
+    /**
+     * 云中心数据脱敏默认帮助链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design_Report_Desensitization_Help_Document_Url";
+
+    @Override
+    public String getValue() {
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.fr.design.locale.impl;
+
+import com.fr.design.i18n.LocaleLinkProvider;
+import com.fr.general.locale.LocaleMark;
+
+/**
+ * 根据国际化获取启用行式引擎执行层式报表帮助文档链接
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2023/4/19
+ */
+public class LineEngineMark implements LocaleMark<String> {
+
+    /**
+     * 云中心启用行式引擎执行层式报表帮助链接链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Line_Engine";
+
+    /**
+     * 云中心启用行式引擎执行层式报表默认帮助链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Line_Engine_Default";
+    @Override
+    public String getValue() {
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
+    }
+}

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

@@ -5,6 +5,7 @@ import com.fr.design.bridge.exec.JSCallback;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.locale.impl.BbsResetMark;
@@ -23,15 +24,16 @@ import com.fr.log.FineLoggerFactory;
 import com.teamdev.jxbrowser.chromium.Browser;
 import com.teamdev.jxbrowser.chromium.JSFunction;
 import com.teamdev.jxbrowser.chromium.JSObject;
+
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.net.URI;
 import java.util.Map;
 import java.util.Set;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
 
 /**
  * @author Lanlan
@@ -40,6 +42,16 @@ import javax.swing.SwingUtilities;
  */
 public class DesignerLoginBridge {
 
+    /**
+     * 云中心组件商城模板在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Market_Template";
+
+    /**
+     * 云中心组件商城模板默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Market_Template_Default";
+
     private Map<String, String> params;
 
     public static DesignerLoginBridge getBridge(Browser browser, Map<String, String> params) {
@@ -71,7 +83,7 @@ public class DesignerLoginBridge {
                         getHyperlinkPane(
                                 com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Guide_Login_Success_Title"),
                                 com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Guide_Login_Success_Hyperlink_Text"),
-                                CloudCenter.getInstance().acquireUrlByKind("designer.premium.template", "https://market.fanruan.com/template")
+                                LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT)
                         )
                 );
             } else if (source == DesignerLoginSource.BBS_JUMP) {

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

@@ -230,12 +230,11 @@ public class CenterRegionContainerPane extends JPanel {
 
         // 颜色，字体那些按钮的工具栏
         toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BorderLayout.CENTER);
-        if (strategy.hasToolBarPane(plus)) {
+        JPanel customNorthPane = strategy.customNorthPane(toolbarPane,plus);
-            this.add(toolbarPane, BorderLayout.NORTH);
+        if (!isExist(customNorthPane)){
-        } else {
+            this.removeNorth();
-            this.remove(toolbarPane);
+            this.add(customNorthPane, BorderLayout.NORTH);
         }
-
         if (strategy.hasTemplateTabPane(plus)) {
             eastCenterPane.add(templateTabPane, BorderLayout.CENTER);
         } else {
@@ -250,6 +249,26 @@ public class CenterRegionContainerPane extends JPanel {
         resetByDesignMode();
     }
 
+    private void removeNorth(){
+        Component[] components = this.getComponents();
+        for(Component c : components){
+            if (c!= centerTemplateCardPane){
+                this.remove(c);
+            }
+        }
+    }
+
+
+    private boolean isExist(JPanel customNorthPane) {
+        Component[] components = this.getComponents();
+        for (Component component : components) {
+            if (component == customNorthPane) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void resetByDesignMode() {
         if (DesignModeContext.isDuchampMode()) {
             eastPane.remove(largeToolbar);
@@ -292,4 +311,11 @@ public class CenterRegionContainerPane extends JPanel {
         return toolbarComponentState;
     }
 
+    /**
+     * 重置下RegionContainerpane
+     */
+    public void resetCenterRegionContainerPane(){
+        templateTabPane.add(MultiTemplateTabPane.getInstance(), BorderLayout.CENTER);
+    }
+
 }

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

@@ -2,6 +2,8 @@ package com.fr.design.mainframe;
 
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
+import javax.swing.JPanel;
+
 
 public class DefaultToolKitConfig implements ToolKitConfigStrategy {
     @Override
@@ -18,4 +20,10 @@ public class DefaultToolKitConfig implements ToolKitConfigStrategy {
     public boolean hasToolBarPane(ToolBarMenuDockPlus plus) {
         return plus.hasToolBarPane();
     }
+
+    @Override
+    public JPanel customNorthPane(JPanel toolBarPane, ToolBarMenuDockPlus plus) {
+        CenterRegionContainerPane.getInstance().resetCenterRegionContainerPane();
+        return toolBarPane;
+    }
 }

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

@@ -58,9 +58,12 @@ import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.preview.PagePreview;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.DesignUtils;
+import com.fr.design.utils.TemplateUtils;
 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.worker.save.type.SaveType;
+import com.fr.design.worker.save.type.SaveTypeWorker;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.event.EventDispatcher;
@@ -118,6 +121,8 @@ import java.util.concurrent.Callable;
  * 报表设计和表单设计的编辑区域(设计器编辑的IO文件)
  */
 public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, DesignerProxy, JTemplateSave, TabChangeListener, ThemedTemplate {
+
+    private static final String DEFAULT_TAB_OPERATOR = "DefaultTabOperator";
     // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
 
     private static final int PREDEFINED_ICON_WIDTH = 27;
@@ -1687,24 +1692,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (!editingFILE.exists()) {
             return saveAs(showLoc);
         }
-
+        return getSaveCallBackSaveWorker();
-        CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {
-            @Override
-            public Boolean call() throws Exception {
-                return saveRealFileByWorker();
-            }
-        }, this);
-
-        worker.addSuccessCallback(new Runnable() {
-            @Override
-            public void run() {
-                callBackForSave();
-                //在保存后的回调中执行预编译流程
-                CptCompileUtil.compile(JTemplate.this);
-            }
-        });
-
-        return worker;
     }
 
     /**
@@ -1750,6 +1738,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         }
     }
 
+
+
     private CallbackSaveWorker saveAs(boolean showLoc) {
         FILE editingFILE = this.getEditingFILE();
         if (editingFILE == null) {
@@ -1771,7 +1761,6 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             // 目标文件
             editingFILE = fileChooser.getSelectedFILE();
         }
-
         FILE finalEditingFILE = editingFILE;
         CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {
             @Override
@@ -1872,10 +1861,95 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         return saveAs(true);
     }
 
+    /**
+     * 获取保存用到的saveWorker
+     */
+    private CallbackSaveWorker getSaveCallBackSaveWorker() {
+        CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return saveRealFileByWorker();
+            }
+        }, this);
+
+        worker.addSuccessCallback(new Runnable() {
+            @Override
+            public void run() {
+                callBackForSave();
+                //在保存后的回调中执行预编译流程
+                CptCompileUtil.compile(JTemplate.this);
+            }
+        });
+        return worker;
+    }
+
+    /**
+     * 获取保存的类别执行的callable
+     */
+    private Callable<SaveType.TypeEnum> getSaveTypeCallable() {
+        return () -> {
+            fireJTemplateSaveBefore();
+            FILE editingFILE = getEditingFILE();
+            // carl:editingFILE没有，当然不存了,虽然不会有这种情况
+            if (editingFILE == null) {
+                return SaveType.TypeEnum.EMPTY;
+            }
+            // 检查一下editingFILE是不是已存在的文件,如果不存在则用saveAs
+            if (!editingFILE.exists()) {
+                return SaveType.TypeEnum.SAVE_AS;
+            }
+            return SaveType.TypeEnum.SAVE;
+        };
+    }
+
+    /**
+     * 根据保存类型获取对应的saveWorker
+     *
+     * @param saveType 保存类型
+     */
+    private CallbackSaveWorker getSaveTypeWorker(SaveType saveType) {
+        CallbackSaveWorker callbackSaveWorker;
+        switch (saveType.getType()) {
+            case EMPTY:
+                callbackSaveWorker = new EmptyCallBackSaveWorker();
+                break;
+            case SAVE:
+                callbackSaveWorker = getSaveCallBackSaveWorker();
+                break;
+            default:
+                callbackSaveWorker = saveAs(true);
+        }
+        return callbackSaveWorker;
+    }
+
+
+
     @Override
     public void saveDirectly() {
-        CallbackSaveWorker worker = save();
+        new SaveTypeWorker(getSaveTypeCallable(), this) {
-        worker.start(getRuntimeId());
+            @Override
+            protected void done() {
+                try {
+                    SaveType saveType = get();
+                    CallbackSaveWorker callbackSaveWorker = getSaveTypeWorker(saveType);
+                    //告诉一下后面执行的saveWorker,当前判断文件是否存在的操作是否已经进行了开始转圈的那个等待动画，避免重复
+                    callbackSaveWorker.setSlowly(saveType.isSlowly());
+                    callbackSaveWorker.start(getRuntimeId());
+                    //如果是空也就是不保存,需要恢复一下界面(如果saveTypeWorker里进行了操作的话)
+                    if (callbackSaveWorker instanceof EmptyCallBackSaveWorker) {
+                        setSaving(false);
+                        if (saveType.isSlowly()) {
+                            if (ComparatorUtils.equals(getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) {
+                                DesignerContext.getDesignerFrame().getCenterTemplateCardPane().hideCover();
+                            }
+                        }
+                        DesignerFrameFileDealerPane.getInstance().stateChange();
+                    }
+                } catch (Exception e) {
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                }
+            }
+        }.start();
     }
 
     @Override
@@ -1979,7 +2053,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public void setDesignerUIMode() {
         DesignerUIModeConfig.getInstance().setAbsoluteMeasureUIMode();
     }
-    
+
     /**
      * 判断当前的模板是否是有效的模板
      *
@@ -1989,4 +2063,50 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public static boolean isValid(JTemplate jt) {
         return jt != null && jt != JNullTemplate.NULL;
     }
+
+    /**
+     * 获取此模板所使用的tab栏操作类型
+     * @return
+     */
+    public String getTemplateTabOperatorType(){
+        return DEFAULT_TAB_OPERATOR;
+    }
+
+    /**
+     * 当前模板是否可以被保存
+     * @return 是/否
+     */
+    public boolean canBeSaved(){
+        return true;
+    }
+
+    /**
+     * 当前的模板是否支持缓存
+     *
+     * @return 是/否
+     */
+    public boolean supportCache(){
+        return true;
+    }
+
+    /**
+     * 获取此模板在tab栏中显示的名称
+     * @return
+     */
+    public String getTabShowName(JTemplate<?, ?> jTemplate){
+        String name = TemplateUtils.createLockeTemplatedName(jTemplate, jTemplate.getTemplateName());
+        if (!jTemplate.isSaved() && !name.endsWith(" *")) {
+            name += " *";
+        }
+        return name;
+    }
+
+    /**
+     * 切换环境之前是否需要保存
+     * @return
+     */
+    public boolean needSaveBeforeSwitchEnv(){
+        return false;
+    }
+
 }

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

@@ -2,6 +2,9 @@ package com.fr.design.mainframe;
 
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
 
+import javax.swing.JPanel;
+
+
 public interface ToolKitConfigStrategy {
 
     /**
@@ -24,4 +27,11 @@ public interface ToolKitConfigStrategy {
      * @return
      */
     boolean hasToolBarPane(ToolBarMenuDockPlus plus);
+    /**
+     * 定制工具栏
+     * @param toolBarPane
+     * @param plus
+     * @return
+     */
+    JPanel customNorthPane(JPanel toolBarPane, ToolBarMenuDockPlus plus);
 }

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

@@ -4,10 +4,10 @@ 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.DesignSizeI18nManager;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.CloudCenter;
 import com.fr.general.IOUtils;
 
 import javax.swing.BorderFactory;
@@ -39,17 +39,27 @@ public class CheckFontInfoDialog extends JDialog implements ActionListener {
     private UILabel directUiLabel;
     private UILabel detailLabel;
 
+    /**
+     * 云中心插件管理帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Server_Install_Font";
+
+    /**
+     * 云中心插件管理默认帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Server_Install_Font_Default";
+
     public CheckFontInfoDialog(Frame parent, String areaText) {
         super(parent,true);
         //提示信息
         JPanel imagePanel = new JPanel();
         imageLabel = new UILabel(IOUtils.readIcon("com/fr/design/images/warnings/warning32.png"));
         imagePanel.add(imageLabel);
-
+        String link = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
         JPanel messagePanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
         MessageWithLink linkMessage = new MessageWithLink(Toolkit.i18nText("Fine_Designer_Check_Font_Message"),
                 Toolkit.i18nText("Fine_Designer_Check_Font_Install_Font"),
-                CloudCenter.getInstance().acquireUrlByKind("help.install.font", "https://help.fanruan.com/finereport/doc-view-3999.html"));
+                link);
         linkMessage.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink"));
         messagePanel.add(linkMessage);
 

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

@@ -1,9 +1,8 @@
 package com.fr.design.update.actions;
 
 
-import com.fr.common.util.Strings;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.utils.BrowseUtils;
-import com.fr.general.CloudCenter;
 import com.fr.log.FineLoggerFactory;
 
 import java.awt.event.ActionEvent;
@@ -16,17 +15,22 @@ import java.awt.event.ActionListener;
  * */
 public class NewFeatureAction implements ActionListener {
 
+    /**
+     * 云中心更新日志索引在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Latest_Update_Detail";
 
-    public static String DEFAULT_UPDATE_DETAIL_URL = "https://help.fanruan.com/finereport/doc-view-4699.html";
+    /**
+     * 云中心更新日志索引默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Latest_Update_Detail_Default";
+
+    public static String DEFAULT_UPDATE_DETAIL_URL = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
 
     @Override
     public void actionPerformed(ActionEvent e) {
         try {
-            String url = CloudCenter.getInstance().acquireConf("fr.latest.update.detil");
+            BrowseUtils.browser(DEFAULT_UPDATE_DETAIL_URL);
-            if (Strings.isEmpty(url)) {
-                url = DEFAULT_UPDATE_DETAIL_URL;
-            }
-            BrowseUtils.browser(url);
         } catch (Exception ex) {
             FineLoggerFactory.getLogger().error(ex.getMessage());
         }

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

@@ -44,4 +44,20 @@ public class ButtonConstants {
             StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class),
             StableFactory.getMarkedClass(BridgeMark.TREE_NODE_TOGGLE_BUTTON, Widget.class)
     };
+
+    public static final String[] TYPES_BUTTON_NO_FREE = {
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Row"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Delete_Row"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_TreeNode")
+    };
+
+    public static final Class[] CLASSES_BUTTON_NO_FREE = {
+            Button.class,
+            StableFactory.getMarkedClass(BridgeMark.APPEND_ROW_BUTTON, Widget.class),
+            StableFactory.getMarkedClass(BridgeMark.DELETE_ROW_BUTTON, Widget.class),
+            StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class),
+            StableFactory.getMarkedClass(BridgeMark.TREE_NODE_TOGGLE_BUTTON, Widget.class)
+    };
 }

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

@@ -1,11 +1,9 @@
 package com.fr.design.widget.btn;
 
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.icombobox.DictionaryComboBox;
 import com.fr.design.dialog.BasicPane;
-import com.fr.design.widget.btn.ButtonConstants;
 import com.fr.form.ui.Button;
-
-
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.event.ActionEvent;
@@ -13,6 +11,7 @@ import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
 
+
 /**
  * Created by IntelliJ IDEA.
  * Author : Richer
@@ -22,7 +21,7 @@ import java.util.List;
  */
 public abstract class ButtonDetailPane<T extends Button> extends BasicPane {
     private List<ChangeListener> ls = new ArrayList<ChangeListener>();
-
+    protected final List<BasicBeanPane<T>> extraPaneList = new ArrayList<>();
     @Override
     public String title4PopupWindow() {
         return com.fr.design.i18n.Toolkit.i18nText("Button");
@@ -49,7 +48,10 @@ public abstract class ButtonDetailPane<T extends Button> extends BasicPane {
     public abstract Class classType();
 
     protected DictionaryComboBox createButtonTypeComboBox() {
-        final DictionaryComboBox dictionaryComboBox = new DictionaryComboBox(ButtonConstants.CLASSES4BUTTON, ButtonConstants.TYPES4BUTTON, false);
+        return createButtonTypeComboBox(false);
+    }
+
+    private DictionaryComboBox initDictionaryComboBox(DictionaryComboBox dictionaryComboBox) {
         dictionaryComboBox.setSelectedItem(classType());
         dictionaryComboBox.addActionListener(new ActionListener() {
             @Override
@@ -59,4 +61,14 @@ public abstract class ButtonDetailPane<T extends Button> extends BasicPane {
         });
         return dictionaryComboBox;
     }
+
+    protected DictionaryComboBox createButtonTypeComboBox(Boolean containsExtraPane) {
+        final DictionaryComboBox dictionaryComboBox;
+        if (!containsExtraPane) {
+            dictionaryComboBox = new DictionaryComboBox(ButtonConstants.CLASSES4BUTTON, ButtonConstants.TYPES4BUTTON, false);
+        } else {
+            dictionaryComboBox = new DictionaryComboBox(ButtonConstants.CLASSES_BUTTON_NO_FREE, ButtonConstants.TYPES_BUTTON_NO_FREE, false);
+        }
+        return initDictionaryComboBox(dictionaryComboBox);
+    }
 }

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

@@ -6,6 +6,7 @@ import javax.swing.*;
 
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.gui.icombobox.DictionaryComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -42,8 +43,9 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
         JPanel labelPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         iconPane = new AccessibleIconEditor();
         labelPane.add(iconPane);
+        Component comp = createCenterPane();
         Component[][] n_components = {
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createButtonTypeComboBox()},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createCustomButtonTypeComboBox()},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField = new UITextField()},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon")), iconPane},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")), hotkeysTextField = new UITextField()},
@@ -52,7 +54,6 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         advancePane.add(panel, BorderLayout.NORTH);
-        Component comp = createCenterPane();
         if(comp != null	) {
             advancePane.add(comp,BorderLayout.CENTER);
         }
@@ -63,6 +64,13 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
 
     protected abstract Component createCenterPane();
 
+    /**
+     * 判断是按钮控件下拉框的种类：1.有自定义按钮 2.无自定义按钮
+     */
+    protected DictionaryComboBox createCustomButtonTypeComboBox() {
+        return createButtonTypeComboBox();
+    }
+
     @Override
     public void populate(T button) {
         if (button == null) {

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

@@ -5,12 +5,16 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrameFileDealerPane;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.JTemplate;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.design.worker.WorkerManager;
+import com.fr.design.worker.save.type.SaveTypeWorker;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+
 import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
+
-import java.util.concurrent.TimeoutException;
+import com.fr.third.org.apache.commons.lang3.time.StopWatch;
+
 import javax.swing.SwingWorker;
 
 /**
@@ -34,6 +38,14 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
 
     private boolean slowly;
 
+    public boolean isSlowly() {
+        return slowly;
+    }
+
+    public void setSlowly(boolean slowly) {
+        this.slowly = slowly;
+    }
+
     public SaveWorker(Callable<Boolean> callable, JTemplate<?, ?> template) {
         this.callable = callable;
         this.template = template;
@@ -47,10 +59,11 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
     @Override
     protected void done() {
         try {
-           success = get();
+            success = get();
         } catch (Exception e) {
             processResult();
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            WorkerManager.getInstance().removeWorker(taskName);
             SaveFailureHandler.getInstance().process(e);
             return;
         }
@@ -62,6 +75,7 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
         // 恢复界面
         if (slowly && ComparatorUtils.equals(this.template.getName(), HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getName())) {
             DesignerContext.getDesignerFrame().getCenterTemplateCardPane().hideCover();
+            slowly = false;
         }
         DesignerFrameFileDealerPane.getInstance().stateChange();
         WorkerManager.getInstance().removeWorker(taskName);
@@ -69,21 +83,29 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
 
     public void start(String taskName) {
         this.taskName = taskName;
+        StopWatch stopWatch = StopWatch.createStarted();
         this.template.setSaving(true);
         this.execute();
         // worker纳入管理
         WorkerManager.getInstance().registerWorker(taskName, this);
-        try {
+        SaveTypeWorker.SAVE_TYPE_POOL.execute(() -> {
-            this.get(TIME_OUT, TimeUnit.MILLISECONDS);
+            while (true) {
-        } catch (TimeoutException timeoutException) {
+                if (stopWatch.getTime() > TIME_OUT || isDone()) {
-            slowly = true;
+                    if (!isDone()) {
-            // 开始禁用
+                        slowly = true;
-            EastRegionContainerPane.getInstance().updateAllPropertyPane();
+                        UIUtil.invokeLaterIfNeeded(() -> {
-            DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showCover();
+                            // 开始禁用
-            DesignerFrameFileDealerPane.getInstance().stateChange();
+                            if (slowly) {
-        } catch (Exception exception) {
+                                EastRegionContainerPane.getInstance().updateAllPropertyPane();
-            FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
+                                DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showCover();
-            WorkerManager.getInstance().removeWorker(taskName);
+                                DesignerFrameFileDealerPane.getInstance().stateChange();
-        }
+                            }
+                        });
+                    }
+                    stopWatch.stop();
+                    break;
+                }
+            }
+        });
     }
 }

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

@@ -0,0 +1,50 @@
+package com.fr.design.worker.save.type;
+
+/**
+ * 保存的类别
+ *
+ * @author John.Ying
+ * @since 11.0
+ * Created on 2023/4/14
+ */
+public class SaveType {
+
+    private TypeEnum type;
+    //保存时间是否慢(是否展示了保存中的UI界面)
+    private boolean slowly;
+
+    public TypeEnum getType() {
+        return type;
+    }
+
+    public void setType(TypeEnum saveType) {
+        this.type = saveType;
+    }
+
+    public boolean isSlowly() {
+        return slowly;
+    }
+
+    public void setSlowly(boolean slowly) {
+        this.slowly = slowly;
+    }
+
+    /**
+     * 保存类型：save or saveAs or empty
+     */
+    public enum TypeEnum {
+        /**
+         * 保存
+         */
+        SAVE,
+        /**
+         * 另存
+         */
+        SAVE_AS,
+        /**
+         * 空保存
+         */
+        EMPTY;
+    }
+
+}

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

@@ -0,0 +1,81 @@
+package com.fr.design.worker.save.type;
+
+
+import com.fr.concurrent.FineExecutors;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrameFileDealerPane;
+import com.fr.design.mainframe.EastRegionContainerPane;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.ui.util.UIUtil;
+import com.fr.third.org.apache.commons.lang3.time.StopWatch;
+
+import javax.swing.SwingWorker;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * 判断保存类别时执行的worker
+ *
+ * @author John.Ying
+ * @since 11.0
+ * Created on 2023/4/14
+ */
+public class SaveTypeWorker extends SwingWorker<SaveType, Void> {
+
+    public static final ExecutorService SAVE_TYPE_POOL = FineExecutors.newSingleThreadExecutor();
+
+    private final Callable<SaveType.TypeEnum> callable;
+
+    private static final int TIME_OUT = 400;
+
+    private final JTemplate<?, ?> template;
+
+    private final SaveType saveType;
+
+
+
+    public SaveTypeWorker(Callable<SaveType.TypeEnum> callable, JTemplate<?, ?> template) {
+        this.callable = callable;
+        this.template = template;
+        this.saveType = new SaveType();
+    }
+
+    @Override
+    protected SaveType doInBackground() throws Exception {
+        this.saveType.setType(callable.call());
+        return this.saveType;
+    }
+
+    @Override
+    protected void done() {
+
+    }
+
+    /**
+     * 启动saveTypeWorker
+     */
+    public void start() {
+        StopWatch stopWatch = StopWatch.createStarted();
+        this.template.setSaving(true);
+        this.execute();
+        SAVE_TYPE_POOL.execute(() -> {
+            while (true) {
+                //大于最大等待时间或者worker已经完成该线程都要结束循环
+                if (stopWatch.getTime() > TIME_OUT || isDone()) {
+                    //如果是大于最大等待时间结束的,就需要进行等待中界面的覆盖
+                    if (!isDone()) {
+                        saveType.setSlowly(true);
+                        UIUtil.invokeLaterIfNeeded(() -> {
+                            // 开始禁用
+                            EastRegionContainerPane.getInstance().updateAllPropertyPane();
+                            DesignerContext.getDesignerFrame().getCenterTemplateCardPane().showCover();
+                            DesignerFrameFileDealerPane.getInstance().stateChange();
+                        });
+                    }
+                    stopWatch.stop();
+                    break;
+                }
+            }
+        });
+    }
+}

designer-base/src/main/java/com/fr/env/RemoteDesignLocaleMark.java

@@ -1,11 +1,7 @@
 package com.fr.env;
 
-import com.fr.general.CloudCenter;
+import com.fr.design.i18n.LocaleLinkProvider;
-import com.fr.general.GeneralContext;
 import com.fr.general.locale.LocaleMark;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
 
 /**
  * @author hades
@@ -14,23 +10,21 @@ import java.util.Map;
  */
 public class RemoteDesignLocaleMark implements LocaleMark<String> {
 
-    private Map<Locale, String> map = new HashMap<>();
+    /**
-    private static final String REMOTE_DESIGN_CN = CloudCenter.getInstance().acquireUrlByKind("help.remote.design.zh_CN", "https://help.fanruan.com/finereport/doc-view-3925.html");
+     * 云中心远程设计常见问题链接在配置文件中对应的配置文件key
-    private static final String REMOTE_DESIGN_EN = CloudCenter.getInstance().acquireUrlByKind("help.remote.design.en_US", "https://help.fanruan.com/finereport-en/doc-view-3862.html");
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Remote_Design_Question";
 
+    /**
+     * 云中心远程设计常见问题链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Remote_Design_Question_Default";
 
-    public RemoteDesignLocaleMark() {
+    public RemoteDesignLocaleMark() {}
-        map.put(Locale.CHINA, REMOTE_DESIGN_CN);
-        map.put(Locale.KOREA, REMOTE_DESIGN_EN);
-        map.put(Locale.JAPAN, REMOTE_DESIGN_EN);
-        map.put(Locale.US, REMOTE_DESIGN_EN);
-        map.put(Locale.TAIWAN, REMOTE_DESIGN_CN);
-    }
 
     @Override
     public String getValue() {
-        String result = map.get(GeneralContext.getLocale());
+        return LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
-        return result == null ? REMOTE_DESIGN_CN : result;
     }
 
 }

designer-base/src/main/java/com/fr/env/SyncFailedPluginsDialog.java

@@ -6,25 +6,18 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextarea.UITextArea;
 import com.fr.design.i18n.DesignSizeI18nManager;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
 import com.fr.stable.StringUtils;
-import java.awt.BorderLayout;
+
-import java.awt.Dimension;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.Locale;
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
 import javax.swing.JDialog;
@@ -33,6 +26,14 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.UIManager;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.Locale;
 
 /**
  * @author pengda
@@ -47,6 +48,16 @@ public class SyncFailedPluginsDialog extends JDialog {
     private RestartHelper restartHelper = new RestartHelper();
     private UIButton restartButton;
     private boolean show = false;
+
+    /**
+     * 云中心插件管理帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Plugin_Management";
+
+    /**
+     * 云中心插件管理默认帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Plugin_Management_Default";
     public SyncFailedPluginsDialog(JFrame parent, JSONArray syncFailedPlugins) {
         super(parent, true);
         JPanel body = FRGUIPaneFactory.createBorderLayout_L_Pane();
@@ -62,7 +73,7 @@ public class SyncFailedPluginsDialog extends JDialog {
 
         JPanel messagePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         MessageWithLink messageWithLink = new MessageWithLink(Toolkit.i18nText("Fine-Design_Basic_Sync_Plugin_Fail_Suggestion"),Toolkit.i18nText("Fine-Design_Basic_Sync_Deal_Immediately"),
-                CloudCenter.getInstance().acquireUrlByKind("help.installplugins", "https://help.fanruan.com/finereport/doc-view-2198.html"));
+                LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT));
         messageWithLink.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.env.SyncFailedPluginsDialog.messageWithLink"));
 
         messagePane.add(messageWithLink);

designer-base/src/main/java/com/fr/env/detect/base/DetectorConstants.java

@@ -1,13 +1,33 @@
 package com.fr.env.detect.base;
 
+import com.fr.design.i18n.LocaleLinkProvider;
+
 /**
  * created by Harrison on 2022/05/25
  **/
 public class DetectorConstants {
+    /**
+     * 云中心FineDB异常检测帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String FINE_DB_HELP_PROPS_LINK_KEY = "Fine-Design-CloudCenter_FineDB_Exception_Check";
+
+    /**
+     * 云中心FineDB异常检测帮助文档默认链接在配置文件中对应的配置文件key
+     */
+    private static final String FINE_DB_HELP_PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_FineDB_Exception_Check_Default";
+
+    /**
+     * 云中心FineDB异常检测帮助文档在配置文件中对应的配置文件key
+     */
+    private static final String JAR_HELP_PROPS_LINK_KEY = "Fine-Design-CloudCenter_Jar_Exception_Check";
+
+    /**
+     * 云中心FineDB异常检测帮助文档默认链接在配置文件中对应的配置文件key
+     */
+    private static final String JAR_HELP_PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Jar_Exception_Check_Default";
+    public static final String JAR_HELP_LINK = LocaleLinkProvider.getInstance().getLink(JAR_HELP_PROPS_LINK_KEY, JAR_HELP_PROPS_LINK_KEY_DEFAULT);;
     
-    public static final String JAR_HELP_LINK = "https://help.fanruan.com/finereport/doc-view-4700.html?source=3";
+    public static final String FINE_DB_HELP_LINK = LocaleLinkProvider.getInstance().getLink(FINE_DB_HELP_PROPS_LINK_KEY, FINE_DB_HELP_PROPS_LINK_KEY_DEFAULT);
-    
-    public static final String FINE_DB_HELP_LINK = "https://help.fanruan.com/finereport/doc-view-4701.html?source=3";
     
     public static final String SEPARATOR = "、";
     public static final String BR_TAG = "<br/>";

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

@@ -129,6 +129,10 @@ public class FILEChooserPane extends BasicPane {
 
     public static final int JOPTIONPANE_CANCEL_OPTION = 3;
 
+    public static final String SEPARATOR_STRING = "/";
+
+    public static final char SEPARATOR_CHAR = '/';
+
 
     /**
      * alex:之所以在Pattern那里加个+,是因为有些路径会有两个甚至多个分隔符放在一起
@@ -1466,10 +1470,17 @@ public class FILEChooserPane extends BasicPane {
             for (int i = 0; i < this.buttonList.size(); i++) {
                 this.buttonList.get(i).setForeground(null);
                 if (((SetDirectoryAction) this.buttonList.get(i).getAction()).getDir() != null
-                        && this.buttonList.get(i).getAction() instanceof SetDirectoryAction
+                        && this.buttonList.get(i).getAction() instanceof SetDirectoryAction) {
-                        && (ComparatorUtils.equals(((SetDirectoryAction) this.buttonList.get(i).getAction()).getDir().getPath(), dir.getPath()))) {
+                    String actionPath = ((SetDirectoryAction) this.buttonList.get(i).getAction()).getDir().getPath();
-
+                    String dirPath = dir.getPath();
-                    this.buttonList.get(i).setForeground(Color.BLUE);
+                    //如果是报表环境,button的Action最后会跟上"/",这个是特意处理的,但是对应代码没有说明原因,不做修改
+                    //FILE的getPath不会带"/",这边针对这种情况加个处理,不建议直接改FILE
+                    if (actionPath.endsWith(SEPARATOR_STRING) && !dirPath.endsWith(SEPARATOR_STRING)) {
+                        dirPath = dirPath + SEPARATOR_STRING;
+                    }
+                    if (ComparatorUtils.equals(actionPath, dirPath)) {
+                        this.buttonList.get(i).setForeground(Color.BLUE);
+                    }
                 }
             }
         }
@@ -1479,7 +1490,7 @@ public class FILEChooserPane extends BasicPane {
         }
 
         public void populate(FILE dir) {
-            if (popDir != null && dir != null && popDir.toString().indexOf(dir.toString()) == 0) {
+            if (checkOnlyHighLight(dir)) {
                 highLightButton(dir);
                 return;
             }
@@ -1530,6 +1541,24 @@ public class FILEChooserPane extends BasicPane {
             highLightButton(dir);
         }
 
+        /**
+         * 检查是不是只需要设置高亮即可
+         *
+         * @param dir FILE
+         * @return 如果还要进行别的设置就返回false,如果只需要更新下高亮(通过点击上面的路径才会只需要更新高亮),返回true
+         */
+        private boolean checkOnlyHighLight(FILE dir) {
+            if (popDir == null || dir == null) {
+                return false;
+            }
+            String popDirStr = popDir.toString();
+            String dirStr = dir.toString();
+            //前缀匹配是不够的,还要看下前缀匹配的下一位是不是'/'
+            //否则"test"和"test副本"明明不属于同个路径逻辑,也只更新高亮,应该是"test"和"test/副本"这样才可以通过
+            //如果通过了indexOf的检查,因为不会存在相同的路径,popDirStr只会比dirStr大,看一下前缀匹配的下一位是不是'/',如果不是就得更新路径文本,不能只设置高亮
+            return popDirStr.indexOf(dirStr) == 0 && popDirStr.length() > dirStr.length() && popDirStr.charAt(dirStr.length()) == SEPARATOR_CHAR;
+        }
+
         // doLayout
         @Override
         public void doLayout() {

designer-chart/src/main/java/com/fr/design/mainframe/ChartPropertyPane.java

@@ -9,6 +9,7 @@ import com.fr.base.chart.BaseChartCollection;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
+import com.fr.decision.webservice.v10.map.geojson.helper.GEOJSONHelper;
 import com.fr.design.ChartTypeInterfaceManager;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.gui.chart.BaseChartPropertyPane;
@@ -19,6 +20,7 @@ import com.fr.design.utils.gui.GUICoreUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
+import javax.swing.SwingWorker;
 import java.awt.BorderLayout;
 import java.awt.Component;
 

designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@@ -154,24 +154,23 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
         }
         HashMap paneMap = getHyperlinkMap();
 
-        //安装平台内打开插件时,添加相应按钮
-        Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
         java.util.List<UIMenuNameableCreator> list = refreshList(paneMap);
+        Map<String, NameObjectCreator> creators = new ListMap<>();
         int size = list.size();
-        NameObjectCreator[] creators = new NameObjectCreator[size + providers.size()];
         for (int i = 0; i < size; i++) {
             UIMenuNameableCreator uiMenuNameableCreator = list.get(i);
-            creators[i] = new NameObjectCreator(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj().getClass(), uiMenuNameableCreator.getPaneClazz());
+            NameObjectCreator creator = new NameObjectCreator(uiMenuNameableCreator.getName(), uiMenuNameableCreator.getObj().getClass(), uiMenuNameableCreator.getPaneClazz());
+            creators.put(uiMenuNameableCreator.getName(), creator);
         }
+        //安装平台内打开插件时, 添加/替换 相应按钮
+        Set<HyperlinkProvider> providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG);
         for (HyperlinkProvider provider : providers) {
             NameableCreator creator = provider.createHyperlinkCreator();
             if (creator != null) {
-                creators[size] = new NameObjectCreator(creator.menuName(), creator.getHyperlink(), creator.getUpdatePane());
+                creators.put(creator.menuName(), new NameObjectCreator(creator.menuName(), creator.getHyperlink(), creator.getUpdatePane()));
-                size++;
             }
         }
-
+        refreshNameableCreator(creators.values().toArray(new NameObjectCreator[0]));
-        refreshNameableCreator(creators);
     }
 
     public void populate(Plot plot) {
@@ -303,18 +302,30 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
 
     @Override
     protected void initCreatorsFilter() {
-        this.creatorsFilter =  nameableCreator -> {
+        this.creatorsFilter = nameableCreator -> {
             Class<? extends JavaScript> clazz = nameableCreator.getHyperlink();
             JTemplate template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
             if (!JTemplate.isValid(template)) {
                 return false;
             }
-            Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
+
-            for (Class aClass : classes) {
+            if (template.isJWorkBook()) {
-                if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
+                // 如果是普通报表单元格，那么没有 FormHyperlink 选项
-                    // 编辑的是决策报表中的图表，那么没有ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项，有FormHyperlink 选项
+                FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class);
-                    if (ComparatorUtils.equals(aClass, clazz)) {
+                return !ComparatorUtils.equals(clazz, formHyperlink.getClass());
-                        return false;
+            } else {
+                // 如果是决策报表
+                if (template.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB) {
+                    // 编辑的是决策报表中的报表块，那么没有 ChartHyperRelateFloatLink选项
+                    return !ComparatorUtils.equals(clazz, ChartHyperRelateFloatLink.class);
+                }
+                Class[] classes = new Class[]{ChartHyperRelateCellLink.class, ChartHyperRelateFloatLink.class};
+                for (Class aClass : classes) {
+                    if (template.getEditingReportIndex() == BaseJForm.FORM_TAB) {
+                        // 编辑的是决策报表中的图表，那么没有 ChartHyperRelateFloatLink 和 ChartHyperRelateCellLink 选项
+                        if (ComparatorUtils.equals(aClass, clazz)) {
+                            return false;
+                        }
                     }
                 }
             }

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

@@ -6,7 +6,9 @@ package com.fr.design.designer.creator;
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
+import com.fr.design.designer.properties.mobile.NumberEditorMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor;
 import com.fr.design.mainframe.widget.editors.SpinnerMaxNumberEditor;
 import com.fr.design.mainframe.widget.editors.SpinnerMinNumberEditor;
@@ -92,14 +94,18 @@ public class XNumberEditor extends XWrapperedFieldEditor {
 	}
 
 	@Override
-	protected JComponent initEditor() {
+    protected JComponent initEditor() {
-		setBorder(FIELDBORDER);
+        setBorder(FIELDBORDER);
-		return this;
+        return this;
-	}
+    }
 
-	@Override
+    @Override
-	protected String getIconName() {
+    protected String getIconName() {
-		return "number_field_16.png";
+        return "number_field_16.png";
-	}
+    }
 
+    @Override
+    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+        return new WidgetPropertyUIProvider[]{new NumberEditorMobilePropertyUI(this)};
+    }
 }

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

@@ -3,7 +3,9 @@
  */
 package com.fr.design.designer.creator;
 
+import com.fr.design.designer.properties.mobile.PasswordMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.gui.ibutton.UIPasswordField;
 import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
@@ -68,4 +70,8 @@ public class XPassword extends XWrapperedFieldEditor {
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
     }
 
+    @Override
+    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+        return new WidgetPropertyUIProvider[]{new PasswordMobilePropertyUI(this)};
+    }
 }

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

@@ -6,7 +6,9 @@ package com.fr.design.designer.creator;
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
+import com.fr.design.designer.properties.mobile.TextAreaMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
@@ -25,8 +27,9 @@ import java.beans.IntrospectionException;
 /**
  * @author richer
  * @since 6.5.3
+ * Created on 2016/3/29
  */
-public class XTextArea extends XFieldEditor {
+public class XTextArea extends XWrapperedFieldEditor {
 
     public XTextArea(TextArea widget, Dimension initSize) {
         super(widget, initSize);
@@ -81,4 +84,10 @@ public class XTextArea extends XFieldEditor {
     protected String getIconName() {
         return "text_area_16.png";
     }
+
+    @Override
+    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+        return new WidgetPropertyUIProvider[]{new TextAreaMobilePropertyUI(this)};
+    }
+
 }

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

@@ -6,7 +6,7 @@ package com.fr.design.designer.creator;
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
-import com.fr.design.designer.properties.mobile.ScanCodeMobilePropertyUI;
+import com.fr.design.designer.properties.mobile.TextEditorMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.widget.editors.RegexEditor;
@@ -86,6 +86,6 @@ public class XTextEditor extends XWrapperedFieldEditor {
 
     @Override
     public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-        return new WidgetPropertyUIProvider[] {new ScanCodeMobilePropertyUI(this)};
+        return new WidgetPropertyUIProvider[]{new TextEditorMobilePropertyUI(this)};
     }
 }

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

@@ -0,0 +1,37 @@
+package com.fr.design.designer.properties.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
+import com.fr.design.gui.itable.AbstractPropertyTable;
+import com.fr.design.widget.ui.designer.mobile.NumberEditorMobileDefinePane;
+
+/**
+ * 数字控件属性面板注册
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/30
+ */
+public class NumberEditorMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
+    private XCreator xCreator;
+
+    public NumberEditorMobilePropertyUI(XCreator xCreator) {
+        this.xCreator = xCreator;
+    }
+
+    @Override
+    public AbstractPropertyTable createWidgetAttrTable() {
+        return null;
+    }
+
+    @Override
+    public BasicPane createWidgetAttrPane() {
+        return new NumberEditorMobileDefinePane(xCreator);
+    }
+
+    @Override
+    public String tableTitle() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr");
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.fr.design.designer.properties.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
+import com.fr.design.gui.itable.AbstractPropertyTable;
+import com.fr.design.widget.ui.designer.mobile.PasswordMobileDefinePane;
+
+/**
+ * 密码控件移动端属性注册
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/30
+ */
+public class PasswordMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
+    private XCreator xCreator;
+
+    public PasswordMobilePropertyUI(XCreator xCreator) {
+        this.xCreator = xCreator;
+    }
+
+    @Override
+    public AbstractPropertyTable createWidgetAttrTable() {
+        return null;
+    }
+
+    @Override
+    public BasicPane createWidgetAttrPane() {
+        return new PasswordMobileDefinePane(xCreator);
+    }
+
+    @Override
+    public String tableTitle() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr");
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.fr.design.designer.properties.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
+import com.fr.design.gui.itable.AbstractPropertyTable;
+import com.fr.design.widget.ui.designer.mobile.TextAreaAdvancedDefinePane;
+
+/**
+ * 文本域控件移动端属性
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/29
+ */
+public class TextAreaMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
+    private XCreator xCreator;
+
+    public TextAreaMobilePropertyUI(XCreator xCreator) {
+        this.xCreator = xCreator;
+    }
+
+    @Override
+    public AbstractPropertyTable createWidgetAttrTable() {
+        return null;
+    }
+
+    @Override
+    public BasicPane createWidgetAttrPane() {
+        return new TextAreaAdvancedDefinePane(xCreator);
+    }
+
+    @Override
+    public String tableTitle() {
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr");
+    }
+}

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

@@ -5,13 +5,20 @@ import com.fr.design.designer.creator.XTextEditor;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
 import com.fr.design.gui.itable.AbstractPropertyTable;
-import com.fr.design.widget.ui.designer.mobile.ScanCodeMobileDefinePane;
+import com.fr.design.widget.ui.designer.mobile.TextEditorMobileDefinePane;
 
-public class ScanCodeMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
+/**
+ * 文本控件
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/30
+ */
+public class TextEditorMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
 
     private XCreator xCreator;
 
-    public ScanCodeMobilePropertyUI(XTextEditor xTextEditor) {
+    public TextEditorMobilePropertyUI(XTextEditor xTextEditor) {
         this.xCreator = xTextEditor;
     }
 
@@ -22,7 +29,7 @@ public class ScanCodeMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
 
     @Override
     public BasicPane createWidgetAttrPane() {
-        return new ScanCodeMobileDefinePane(xCreator);
+        return new TextEditorMobileDefinePane(xCreator);
     }
 
     @Override

designer-form/src/main/java/com/fr/design/mainframe/share/ui/actions/Jump2DetailAction.java

@@ -1,17 +1,11 @@
 package com.fr.design.mainframe.share.ui.actions;
 
-import com.fr.design.actions.UpdateAction;
+import com.fr.design.i18n.LocaleLinkProvider;
-import com.fr.design.gui.imenu.UIMenuItem;
-import com.fr.design.gui.imenu.UIMenuItemUI;
 import com.fr.design.i18n.Toolkit;
-import com.fr.design.mainframe.share.ui.constants.ColorConstants;
 import com.fr.design.mainframe.share.ui.online.CarouselStateManger;
 import com.fr.stable.StringUtils;
 
 import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.SwingConstants;
-import java.awt.Color;
 import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
@@ -24,7 +18,18 @@ import java.net.URISyntaxException;
  * Created by Starryi on 2021/9/28
  */
 public class Jump2DetailAction extends SharedComponentPopupAction {
-    private static final String ONLINE_WIDGET_DETAIL_FORMATTED_URL = "https://market.fanruan.com/reuse/%s";
+
+    /**
+     * 云中心组件市场组件详情在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Market_Detail";
+
+    /**
+     * 云中心组件市场组件详情默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Market_Detail_Default";
+
+    private static final String ONLINE_WIDGET_DETAIL_FORMATTED_URL = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     private final String id;
 
     public Jump2DetailAction(String id) {

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetRepoPane.java

@@ -2,35 +2,30 @@ package com.fr.design.mainframe.share.ui.online;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
-import com.fr.config.constant.Constant;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.form.util.FontTransformUtil;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.share.ui.base.LoadingPane;
 import com.fr.design.mainframe.share.ui.base.MouseClickListener;
 import com.fr.design.mainframe.share.ui.online.mini.MiniComponentShopDialog;
 import com.fr.design.mainframe.share.util.OnlineShopUtils;
-import com.fr.design.mainframe.theme.edit.ui.LabelUtils;
 import com.fr.form.share.bean.OnlineShareWidget;
 import com.fr.general.FRFont;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
-import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
 import javax.swing.JPanel;
-import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SwingConstants;
 import javax.swing.SwingWorker;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -47,7 +42,18 @@ import java.util.concurrent.ExecutionException;
  * Created by kerry on 2020-10-16
  */
 public class OnlineWidgetRepoPane extends BasicPane {
-    private static final String MARKET_URL = "https://market.fanruan.com/reuse";
+
+    /**
+     * 云中心组件市场在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Market";
+
+    /**
+     * 云中心组件市场默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Market_Default";
+
+    private static final String MARKET_URL = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     private static List<OnlineShareWidget>[] sharableWidgets;
     private OnlineWidgetTabPane componentTabPane;
     private boolean isShowPackagePanel = false;

designer-form/src/main/java/com/fr/design/widget/ui/btn/AbstractExtraButtonPane.java

@@ -0,0 +1,126 @@
+package com.fr.design.widget.ui.btn;
+
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.WidgetAdvancedPaneProvider;
+import com.fr.design.gui.icombobox.DictionaryComboBox;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
+import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane;
+import com.fr.form.ui.Button;
+import com.fr.general.GeneralContext;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.JPanel;
+import java.awt.Component;
+import java.util.Set;
+
+
+
+/**
+ * 用来处理额外的按钮属性
+ *
+ * @author John.Ying
+ * @since 11.0
+ * Created on 2023/4/19
+ */
+public abstract class AbstractExtraButtonPane<T extends Button> extends ButtonWithHotkeysDetailPane<T> {
+    protected JPanel extraPane;
+    protected boolean containsExtraPane;
+    protected static double F = TableLayout.FILL;
+    protected static double P = TableLayout.PREFERRED;
+
+    protected void initExtraPane() {
+        initPluginListener();
+        refreshExtraAdvancedPane(classType());
+    }
+
+
+    /**
+     * 根据按钮类别判断需要返回什么类型的属性界面
+     */
+    protected void refreshExtraAdvancedPane(Class cls) {
+        extraPaneList.clear();
+        boolean containsExtraPane = false;
+        Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
+        for (WidgetAdvancedPaneProvider<T> provider : providers) {
+            if (!provider.accept(cls)) {
+                continue;
+            }
+            insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
+            containsExtraPane = true;
+        }
+        if (containsExtraPane) {
+            extraPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+            for (BasicBeanPane<T> pane : extraPaneList) {
+                extraPane.add(pane);
+            }
+        }
+        this.containsExtraPane = containsExtraPane;
+
+    }
+
+    protected void initPluginListener() {
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                refreshExtraAdvancedPane(classType());
+            }
+        }, pluginContext -> pluginContext.getRuntime().contain(WidgetAdvancedPaneProvider.XML_TAG));
+    }
+
+    /**
+     * 插入配置项面板
+     *
+     * @param index    插入的位置
+     * @param pane 配置项面板
+     */
+    protected void insertShortCut(int index, BasicBeanPane<T> pane) {
+        int size = extraPaneList.size();
+        index = Math.min(index, size);
+        extraPaneList.add(index, pane);
+    }
+
+    @Override
+    public void populate(T button) {
+        super.populate(button);
+        for (BasicBeanPane<T> pane : extraPaneList) {
+            pane.populateBean(button);
+        }
+    }
+
+    @Override
+    public T update() {
+        T button = super.update();
+        for (BasicBeanPane<T> pane : extraPaneList) {
+            pane.updateBean(button);
+        }
+        return button;
+    }
+
+
+    @Override
+    protected DictionaryComboBox createCustomButtonTypeComboBox() {
+        return createButtonTypeComboBox(containsExtraPane);
+    }
+
+    /**
+     * 生成额外的属性界面
+     */
+    protected Component createExtraPane(@Nullable BasicPane pane) {
+        initExtraPane();
+        Component[][] components = new Component[][]{
+                new Component[]{pane, null},
+                new Component[]{extraPane, null}
+        };
+        double[] rowSize = {P, P};
+        double[] columnSize = {P, F};
+        int[][] rowCount = {{1, 1},{1, 1}};
+        return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 10, 7);
+    }
+
+}

designer-form/src/main/java/com/fr/design/widget/ui/btn/FormSubmitButtonDetailPane.java

@@ -1,22 +1,21 @@
 package com.fr.design.widget.ui.btn;
 
 import com.fr.form.parameter.FormSubmitButton;
-import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane;
 
 import java.awt.*;
 
 /**
- * Created by IntelliJ IDEA.
+ * 提交参数按钮
- * Author : Richer
+ *
- * Version: 6.5.6
+ * @author John.Ying
- * Date   : 11-11-15
+ * @since 11.0
- * Time   : 下午6:25
+ * Created on 2023/4/19
  */
-public class FormSubmitButtonDetailPane extends ButtonWithHotkeysDetailPane<FormSubmitButton> {
+public class FormSubmitButtonDetailPane extends AbstractExtraButtonPane<FormSubmitButton> {
 
     @Override
     protected Component createCenterPane() {
-        return null;
+        return createExtraPane(null);
     }
 
     @Override
@@ -37,4 +36,5 @@ public class FormSubmitButtonDetailPane extends ButtonWithHotkeysDetailPane<Form
     public Class classType() {
         return FormSubmitButton.class;
     }
+
 }

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

@@ -35,6 +35,7 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
     protected UITextField labelNameTextField;
     private final List<BasicBeanPane<T>> extraPaneList = new ArrayList<>();
     private JPanel extraPane;
+    protected boolean containsExtraPane;
 
     public ButtonDefinePane(XCreator creator){
         super(creator);
@@ -63,7 +64,7 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
 
     private void refreshAdvancedPane() {
         extraPaneList.clear();
-        boolean containsExtraPane = false;
+        containsExtraPane = false;
         Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
         for (WidgetAdvancedPaneProvider<T> provider : providers) {
             if (!provider.accept(creator)) {

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

@@ -41,10 +41,13 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
     }
 
     public void populateSubButtonPane(FreeButton e) {
+        if (containsExtraPane) {
+            return;
+        }
         backgroundCompPane.populate(e);
         frFontPane.setVisible(e.isCustomStyle());
         fontLabel.setVisible(e.isCustomStyle());
-        if(e.isCustomStyle()){
+        if (e.isCustomStyle()) {
             FRFont frFont = e.getFont();
             if (frFont != null) {
                 frFontPane.populateBean(e.getFont());
@@ -54,12 +57,14 @@ public class FreeButtonDefinePane extends ButtonDefinePane<FreeButton> {
 
     public FreeButton updateSubButtonPane() {
         FreeButton freeButton = (FreeButton) creator.toData();
-        backgroundCompPane.update(freeButton);
+        if (!containsExtraPane) {
-        frFontPane.setVisible(freeButton.isCustomStyle());
+            backgroundCompPane.update(freeButton);
-        fontLabel.setVisible(freeButton.isCustomStyle());
+            frFontPane.setVisible(freeButton.isCustomStyle());
-        if(freeButton.isCustomStyle()){
+            fontLabel.setVisible(freeButton.isCustomStyle());
-            FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
+            if (freeButton.isCustomStyle()) {
-            freeButton.setFont(frFontPane.update(frFont));
+                FRFont frFont = freeButton.getFont() == null ? FRFont.getInstance() : freeButton.getFont();
+                freeButton.setFont(frFontPane.update(frFont));
+            }
         }
         return freeButton;
     }

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BaseTextEditorMobileDefinePane.java

@@ -0,0 +1,94 @@
+package com.fr.design.widget.ui.designer.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.gui.frpane.AttributeChangeListener;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextEditSettingPane;
+import com.fr.form.ui.TextEditor;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+
+/**
+ * <p> 文本类组件移动端高级属性的定义面板，基础扩展可以直接继承此面板
+ * <p> 往内部添加其他配置
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/30
+ */
+public class BaseTextEditorMobileDefinePane extends MobileWidgetDefinePane {
+
+    private XCreator xCreator;
+    protected MobileTextEditSettingPane textSettingPane;
+
+    public BaseTextEditorMobileDefinePane(XCreator xCreator) {
+        this.xCreator = xCreator;
+    }
+
+    @Override
+    public void initPropertyGroups(Object source) {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        JPanel container = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5);
+        addPropertyPanesToContainer(container);
+        this.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, container), BorderLayout.NORTH);
+        this.repaint();
+    }
+
+    /**
+     * 添加其他属性面板
+     *
+     * @param container 展开容器
+     */
+    protected void addPropertyPanesToContainer(JPanel container) {
+        initSettingPane(container);
+    }
+
+    /**
+     * 初始化文本类基础面板
+     *
+     * @param container
+     */
+    protected void initSettingPane(JPanel container) {
+        textSettingPane = new MobileTextEditSettingPane();
+        container.add(textSettingPane);
+    }
+
+    @Override
+    public void populate(FormDesigner designer) {
+        TextEditor textEditor = (TextEditor) xCreator.toData();
+        textSettingPane.populateBean(textEditor.getMobileTextEditAttr());
+        this.bindListeners2Widgets();
+    }
+
+    protected void bindListeners2Widgets() {
+        reInitAllListeners();
+        AttributeChangeListener changeListener = new AttributeChangeListener() {
+            @Override
+            public void attributeChange() {
+                update();
+            }
+        };
+        this.addAttributeChangeListener(changeListener);
+    }
+
+    private void reInitAllListeners() {
+        initListener(this);
+    }
+
+    @Override
+    public void update() {
+        TextEditor textEditor = (TextEditor) xCreator.toData();
+        textSettingPane.updateBean(textEditor.getMobileTextEditAttr());
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+    }
+
+    public XCreator getxCreator() {
+        return xCreator;
+    }
+}

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/NumberEditorMobileDefinePane.java

@@ -0,0 +1,33 @@
+package com.fr.design.widget.ui.designer.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.form.ui.NumberEditor;
+
+/**
+ * 数字控件
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/30
+ */
+public class NumberEditorMobileDefinePane extends BaseTextEditorMobileDefinePane {
+    public NumberEditorMobileDefinePane(XCreator xCreator) {
+        super(xCreator);
+    }
+
+    @Override
+    public void populate(FormDesigner designer) {
+        NumberEditor numberEditor = (NumberEditor) getxCreator().toData();
+        textSettingPane.populateBean(numberEditor.getMobileTextEditAttr());
+        this.bindListeners2Widgets();
+    }
+
+    @Override
+    public void update() {
+        NumberEditor numberEditor = (NumberEditor) getxCreator().toData();
+        textSettingPane.updateBean(numberEditor.getMobileTextEditAttr());
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+    }
+}

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/PasswordMobileDefinePane.java

@@ -0,0 +1,25 @@
+package com.fr.design.widget.ui.designer.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.widget.ui.designer.mobile.component.MobilePasswordEditSettingPane;
+
+import javax.swing.JPanel;
+
+/**
+ * 密码控件移动端高级属性
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/30
+ */
+public class PasswordMobileDefinePane extends BaseTextEditorMobileDefinePane {
+    public PasswordMobileDefinePane(XCreator xCreator) {
+        super(xCreator);
+    }
+
+    @Override
+    protected void initSettingPane(JPanel container) {
+        textSettingPane = new MobilePasswordEditSettingPane();
+        container.add(textSettingPane);
+    }
+}

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ScanCodeMobileDefinePane.java

@@ -1,63 +0,0 @@
-package com.fr.design.widget.ui.designer.mobile;
-
-import com.fr.base.mobile.MobileScanCodeAttr;
-import com.fr.design.designer.creator.XCreator;
-import com.fr.design.foldablepane.UIExpandablePane;
-import com.fr.design.gui.frpane.AttributeChangeListener;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.mainframe.FormDesigner;
-import com.fr.design.widget.ui.designer.mobile.component.MobileTextFieldInputSettingPane;
-import com.fr.form.ui.TextEditor;
-
-import java.awt.BorderLayout;
-
-
-public class ScanCodeMobileDefinePane extends MobileWidgetDefinePane {
-
-    private XCreator xCreator;
-    private MobileTextFieldInputSettingPane settingPane;
-
-    public ScanCodeMobileDefinePane(XCreator xCreator) {
-        this.xCreator = xCreator;
-    }
-
-    @Override
-    public void initPropertyGroups(Object source) {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        settingPane = new MobileTextFieldInputSettingPane();
-        this.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, settingPane), BorderLayout.NORTH);
-        this.repaint();
-    }
-
-    private void bindListeners2Widgets() {
-        reInitAllListeners();
-        AttributeChangeListener changeListener = new AttributeChangeListener() {
-            @Override
-            public void attributeChange() {
-                update();
-            }
-        };
-        this.addAttributeChangeListener(changeListener);
-    }
-
-    private void reInitAllListeners() {
-        initListener(this);
-    }
-
-    @Override
-    public void populate(FormDesigner designer) {
-        MobileScanCodeAttr mobileScanCodeAttr = ((TextEditor) xCreator.toData()).getMobileScanCodeAttr();
-        settingPane.populateBean(mobileScanCodeAttr);
-        this.bindListeners2Widgets();
-    }
-
-    @Override
-    public void update() {
-        MobileScanCodeAttr mobileScanCodeAttr = ((TextEditor) xCreator.toData()).getMobileScanCodeAttr();
-        settingPane.updateBean(mobileScanCodeAttr);
-        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
-    }
-
-}

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextAreaAdvancedDefinePane.java

@@ -0,0 +1,25 @@
+package com.fr.design.widget.ui.designer.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextAreaSettingPane;
+
+import javax.swing.JPanel;
+
+/**
+ * 文本域控件
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/29
+ */
+public class TextAreaAdvancedDefinePane extends BaseTextEditorMobileDefinePane {
+    public TextAreaAdvancedDefinePane(XCreator xCreator) {
+        super(xCreator);
+    }
+
+    @Override
+    protected void initSettingPane(JPanel container) {
+        textSettingPane = new MobileTextAreaSettingPane();
+        container.add(textSettingPane);
+    }
+}

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TextEditorMobileDefinePane.java

@@ -0,0 +1,56 @@
+package com.fr.design.widget.ui.designer.mobile;
+
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.FormDesigner;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextEditSettingPane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextFieldInputSettingPane;
+import com.fr.form.ui.TextEditor;
+
+import javax.swing.JPanel;
+
+/**
+ * 文本控件移动端属性
+ * 输入方式：
+ * 输入框属性：
+ *
+ * @author hades
+ * @since 11.0
+ * Created on 2018/11/27
+ */
+public class TextEditorMobileDefinePane extends BaseTextEditorMobileDefinePane {
+    /**
+     * 输入方式
+     */
+    private MobileTextFieldInputSettingPane inputSettingPane;
+
+    public TextEditorMobileDefinePane(XCreator xCreator) {
+        super(xCreator);
+    }
+
+    @Override
+    protected void initSettingPane(JPanel container) {
+        inputSettingPane = new MobileTextFieldInputSettingPane();
+        textSettingPane = new MobileTextEditSettingPane();
+        container.add(inputSettingPane);
+        container.add(textSettingPane);
+    }
+
+
+    @Override
+    public void populate(FormDesigner designer) {
+        super.populate(designer);
+        TextEditor textEditor = (TextEditor) getxCreator().toData();
+        inputSettingPane.populateBean(textEditor.getMobileScanCodeAttr());
+        this.bindListeners2Widgets();
+    }
+
+    @Override
+    public void update() {
+        super.update();
+        TextEditor textEditor = (TextEditor) getxCreator().toData();
+        inputSettingPane.updateBean(textEditor.getMobileScanCodeAttr());
+        DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+    }
+
+}

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

@@ -0,0 +1,43 @@
+package com.fr.design.widget.ui.designer.mobile.component;
+
+import com.fr.base.mobile.MobileTextEditAttr;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.i18n.Toolkit;
+
+import java.awt.BorderLayout;
+
+/**
+ * 密码控件编辑属性设置面板
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/30
+ */
+public class MobilePasswordEditSettingPane extends MobileTextEditSettingPane {
+    // 显示密码
+    private UICheckBox showPassword;
+
+    public MobilePasswordEditSettingPane() {
+        super();
+        showPassword = new UICheckBox(Toolkit.i18nText("Fine-Design_Mobile_Show_Password"), false);
+        this.add(showPassword, BorderLayout.NORTH);
+    }
+
+    @Override
+    protected boolean getClearDefaultState() {
+        return true;
+    }
+
+    @Override
+    public void populateBean(MobileTextEditAttr ob) {
+        super.populateBean(ob);
+        // 要兼容处理一下，为null 的话赋默认值，默认开启
+        this.showPassword.setSelected(ob.isShowPassword() == null || ob.isShowPassword());
+    }
+
+    @Override
+    public void updateBean(MobileTextEditAttr ob) {
+        super.updateBean(ob);
+        ob.setShowPassword(showPassword.isSelected());
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.fr.design.widget.ui.designer.mobile.component;
+
+import com.fr.base.mobile.MobileTextEditAttr;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.i18n.Toolkit;
+
+import java.awt.BorderLayout;
+
+/**
+ * 文本域控件
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/29
+ */
+public class MobileTextAreaSettingPane extends MobileTextEditSettingPane {
+    // 显示字数统计
+    private UICheckBox showWordCount;
+
+    public MobileTextAreaSettingPane() {
+        super();
+        showWordCount = new UICheckBox(Toolkit.i18nText("Fine-Design_Mobile_Show_Word_Count"), false);
+        this.add(showWordCount, BorderLayout.NORTH);
+    }
+
+    @Override
+    public void populateBean(MobileTextEditAttr ob) {
+        super.populateBean(ob);
+        // 要兼容处理一下，为null 的话赋默认值，默认不开启
+        this.showWordCount.setSelected(ob.isShowWordCount() != null && ob.isShowWordCount());
+    }
+
+    @Override
+    public void updateBean(MobileTextEditAttr ob) {
+        super.updateBean(ob);
+        ob.setShowWordCount(showWordCount.isSelected());
+    }
+}

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

@@ -0,0 +1,59 @@
+package com.fr.design.widget.ui.designer.mobile.component;
+
+import com.fr.base.mobile.MobileTextEditAttr;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.VerticalFlowLayout;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+
+/**
+ * 文本类基础设置
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/3/29
+ */
+public class MobileTextEditSettingPane extends BasicBeanPane<MobileTextEditAttr> {
+    // 允许一键清空
+    protected UICheckBox allowOneClickClear;
+
+    public MobileTextEditSettingPane() {
+        initLayout();
+        allowOneClickClear = new UICheckBox(Toolkit.i18nText("Fine-Design_Mobile_Allow_One_Click_Clear"), getClearDefaultState());
+        this.add(allowOneClickClear, BorderLayout.NORTH);
+    }
+
+    protected boolean getClearDefaultState() {
+        return false;
+    }
+
+    protected void initLayout() {
+        VerticalFlowLayout verticalFlowLayout = new VerticalFlowLayout(FlowLayout.LEADING, 0, 5);
+        verticalFlowLayout.setAlignLeft(true);
+        this.setLayout(verticalFlowLayout);
+    }
+
+    @Override
+    public void populateBean(MobileTextEditAttr ob) {
+        allowOneClickClear.setSelected(ob.isAllowOneClickClear() != null && ob.isAllowOneClickClear());
+    }
+
+    @Override
+    public MobileTextEditAttr updateBean() {
+        // do nothing
+        return null;
+    }
+
+    @Override
+    public void updateBean(MobileTextEditAttr ob) {
+        ob.setAllowOneClickClear(allowOneClickClear.isSelected());
+    }
+
+    @Override
+    protected String title4PopupWindow() {
+        return null;
+    }
+}

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

@@ -2,16 +2,21 @@ package com.fr.design.widget.ui.designer.mobile.component;
 
 import com.fr.base.mobile.MobileScanCodeAttr;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 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 javax.swing.ButtonGroup;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
-import java.awt.FlowLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 
 /**
  * @author hades
@@ -31,7 +36,6 @@ public class MobileTextFieldInputSettingPane extends BasicBeanPane<MobileScanCod
 
     public MobileTextFieldInputSettingPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel settingPane = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5);
         manualInputCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Mobile_Manual_Input"), true);
         scanCodeCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Mobile_Scan_Code_Input"), true);
         nfcInputCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Mobile_NFC_Input"), false);
@@ -40,12 +44,25 @@ public class MobileTextFieldInputSettingPane extends BasicBeanPane<MobileScanCod
             // 更新面板是否可见
             updateNfcContentTypePane(source.isSelected(), nfcContentTypePane.getSelectedType());
         });
-        settingPane.add(manualInputCheckBox);
+        initComponents();
-        settingPane.add(scanCodeCheckBox);
-        settingPane.add(nfcInputCheckBox);
-        settingPane.add(nfcContentTypePane);
         // 初始状态，内容类型面板不可见
         nfcContentTypePane.setVisible(false);
+        nfcContentTypePane.setPreferredSize(new Dimension(0, 0));
+    }
+
+    private void initComponents() {
+        Component[][] components = new Component[][]{
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Input_Way")), manualInputCheckBox},
+                new Component[]{null, scanCodeCheckBox},
+                new Component[]{null, nfcInputCheckBox},
+                new Component[]{null, nfcContentTypePane},
+        };
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double[] rowSize = {p, p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        JPanel settingPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.HGAP_LARGE, LayoutConstants.VGAP_LARGE);
         this.add(settingPane, BorderLayout.NORTH);
     }
 
@@ -78,6 +95,11 @@ public class MobileTextFieldInputSettingPane extends BasicBeanPane<MobileScanCod
      * @param contentType 内容类型
      */
     private void updateNfcContentTypePane(boolean visible, MobileScanCodeAttr.NFCContentType contentType) {
+        if (visible) {
+            nfcContentTypePane.setPreferredSize(new Dimension(400, 60));
+        } else {
+            nfcContentTypePane.setPreferredSize(new Dimension(0, 0));
+        }
         nfcContentTypePane.setVisible(visible);
         nfcContentTypePane.setSelectedType(contentType);
     }
@@ -144,3 +166,4 @@ public class MobileTextFieldInputSettingPane extends BasicBeanPane<MobileScanCod
     }
 
 }
+

designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceWestPanel.java

@@ -4,10 +4,10 @@ import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.replace.info.Info;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.share.ui.base.MouseClickListener;
 import com.fr.design.utils.BrowseUtils;
-import com.fr.general.CloudCenter;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
@@ -35,7 +35,17 @@ public class ITReplaceWestPanel {
     private UIToggleButton contentButton;
     private UIToggleButton settingButton;
     private static final Icon HELP_ICON = IconUtils.readIcon("com/fr/design/images/buttonicon/replace_help.svg");
-    private static final String HELP_URL = CloudCenter.getInstance().acquireUrlByKind("design.replace.help", "https://help.fanruan.com/finereport/doc-view-4954.html?source=3");
+
+    /**
+     * 云中心定时调度执行频率表达式设定帮助文档链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Template_Level_Search_Replace";
+
+    /**
+     * 云中心定时调度执行频率表达式设定帮助文档默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Template_Level_Search_Replace_Default";
+    private static final String HELP_URL = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     private static final int FILL_COUNT = 11;
     public static final int LEFT_WIDTH = 100;
     public static final String CONTENT_TEXT = "<html><font color = 'rgb(255,255,255)'>" + Toolkit.i18nText("Fine-Design_Basic_Templates_Content") + "</font></html>";

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -20,6 +20,7 @@ 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.locale.impl.DataMaskMark;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.cell.settingpane.desensitization.CellDesensitizationGroupsPane;
@@ -28,6 +29,8 @@ import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.CellDesensitizationAttr;
 import com.fr.report.cell.cellattr.CellGUIAttr;
@@ -156,10 +159,11 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
 
         // 带超链的提示信息
         UILabel label = new UILabel();
+        LocaleMark<String> dataMaskMark = LocaleCenter.getMark(DataMaskMark.class);
         MessageWithLink hyperlink = new MessageWithLink(
                 Toolkit.i18nText("Fine-Design_Report_Desensitization_Tip"),
                 Toolkit.i18nText("Fine-Design_Report_Desensitization_Hyperlink"),
-                Toolkit.i18nText("Fine-Design_Report_Desensitization_Help_Document_Url"),
+                dataMaskMark.getValue(),
                 StringUtils.EMPTY,
                 label.getBackground(),
                 label.getFont(),

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

@@ -7,6 +7,7 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceInfoContext;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
@@ -17,7 +18,6 @@ import com.fr.design.mainframe.toast.ToastMsgDialog;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.BrowseUtils;
 import com.fr.event.EventDispatcher;
-import com.fr.general.CloudCenter;
 import com.fr.log.FineLoggerFactory;
 import com.fr.serialization.SerializerHelper;
 import com.fr.stable.ArrayUtils;
@@ -32,6 +32,7 @@ import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.base.WorkspaceConstants;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
+import com.fr.workspace.engine.exception.WorkspaceConnectionException;
 import com.fr.workspace.server.socket.CustomLogEvent;
 import com.fr.workspace.server.socket.LogEventConverter;
 import io.socket.client.IO;
@@ -58,7 +59,17 @@ public class DesignerSocketIO {
         Disconnecting
     }
 
-    private static final String WEBSOCKET_HELP_DOC = CloudCenter.getInstance().acquireUrlByKind("websocketConnect", "https://help.fanruan.com/finereport/doc-view-2512.html");
+    /**
+     * 云中心特殊字符导出在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_WebSocket";
+
+    /**
+     * 云中心特殊字符导出默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_WebSocket_Default";
+
+    private static final String WEBSOCKET_HELP_DOC = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
     private static final String HTTPS = "https";
     private static final String HTTP = "http";
     private static Socket socket = null;
@@ -261,6 +272,11 @@ public class DesignerSocketIO {
         httpGet.setConfig(requestConfig);
         try {
             CloseableHttpResponse response = httpclient.execute(httpGet);
+            if (isErrorStatus(response.getStatusLine().getStatusCode())) {
+                //这边nginx做负载，服务器被kill掉，返回的是502，不会抛错，导致checkRPCConnect通过
+                //针对500-600的错误码加个判断，其他类型的状态码暂不考虑，如果有遇到再处理，不然怕影响范围大
+                throw new WorkspaceConnectionException("Response " + response.getStatusLine().toString());
+            }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e, e.getMessage());
             return false;
@@ -268,6 +284,23 @@ public class DesignerSocketIO {
         return true;
     }
 
+    /**
+     * 错误状态码
+     * 5xx(服务器错误)这些状态代码表示服务器在尝试处理请求时发生内部错误。 这些错误可能是服务器本身的错误，而不是请求出错。代码 说明
+     * 500 (服务器内部错误) 服务器遇到错误，无法完成请求。
+     * 501 (尚未实施) 服务器不具备完成请求的功能。 例如，服务器无法识别请求方法时可能会返回此代码。
+     * 502 (错误网关) 服务器作为网关或代理，从上游服务器收到无效响应。
+     * 503 (服务不可用) 服务器目前无法使用(由于超载或停机维护)。 通常，这只是暂时状态。
+     * 504 (网关超时) 服务器作为网关或代理，但是没有及时从上游服务器收到请求。
+     * 505 (HTTP 版本不受支持) 服务器不支持请求中所用的 HTTP 协议版本。
+     *
+     * @param status 错误状态码
+     * @return 是否是错误状态码
+     */
+    private static boolean isErrorStatus(int status) {
+        return status >= 500 && status <= 600;
+    }
+
     //配置变更监听器
     private static final Emitter.Listener modifyConfig = new Emitter.Listener() {
         @Override

designer-realize/src/main/java/com/fr/design/report/ExportUniversalPane.java

@@ -6,10 +6,10 @@ 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.i18n.LocaleLinkProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.BrowseUtils;
-import com.fr.general.CloudCenter;
 import com.fr.io.attr.ReportExportAttr;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
@@ -30,7 +30,17 @@ import java.awt.event.ActionListener;
  */
 public class ExportUniversalPane extends BasicPane {
 
-    private static final String HELP_URL = CloudCenter.getInstance().acquireUrlByKind("help.alt_font.zh_CN", "https://help.fanruan.com/finereport/doc-view-4707.html");
+    /**
+     * 云中心特殊字符导出在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY = "Fine-Design-CloudCenter_Alt_Font_Export";
+
+    /**
+     * 云中心特殊字符导出默认链接在配置文件中对应的配置文件key
+     */
+    private static final String PROPS_LINK_KEY_DEFAULT = "Fine-Design-CloudCenter_Alt_Font_Export_Default";
+
+    private static final String HELP_URL = LocaleLinkProvider.getInstance().getLink(PROPS_LINK_KEY, PROPS_LINK_KEY_DEFAULT);
 
     private UICheckBox specialCharacterExport;
     // 密码支持公式

designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java

@@ -11,14 +11,15 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.design.locale.impl.LineEngineMark;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.widget.FRWidgetFactory;
-import com.fr.general.SiteCenter;
+import com.fr.general.locale.LocaleCenter;
+import com.fr.general.locale.LocaleMark;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.core.ReportUtils;
 import com.fr.report.stable.LayerReportAttr;
 import com.fr.report.worksheet.WorkSheet;
-import com.fr.stable.ProductConstants;
 
 import javax.swing.AbstractButton;
 import javax.swing.BorderFactory;
@@ -203,7 +204,8 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
             @Override
             public void mouseClicked(MouseEvent e) {
                 try {
-                    Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("standard.doc", ProductConstants.WEBSITE_URL)));
+                    LocaleMark<String> lineEngineMark = LocaleCenter.getMark(LineEngineMark.class);
+                    Desktop.getDesktop().browse(new URI(lineEngineMark.getValue()));
                 } catch (IOException | URISyntaxException ex) {
                     FineLoggerFactory.getLogger().error("io exception or not find website", ex);
                 }

designer-realize/src/main/java/com/fr/design/widget/WidgetMobilePaneFactory.java

@@ -4,8 +4,14 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.fun.CellWidgetOptionProvider;
 import com.fr.design.widget.mobile.WidgetMobilePane;
 import com.fr.design.widget.ui.mobile.MultiFileEditorMobilePane;
-import com.fr.design.widget.ui.mobile.ScanCodeMobilePane;
+import com.fr.design.widget.ui.mobile.NumberEditorMobilePane;
+import com.fr.design.widget.ui.mobile.PasswordMobilePane;
+import com.fr.design.widget.ui.mobile.TextAreaMobilePane;
+import com.fr.design.widget.ui.mobile.TextEditorMobilePane;
 import com.fr.form.ui.MultiFileEditor;
+import com.fr.form.ui.NumberEditor;
+import com.fr.form.ui.Password;
+import com.fr.form.ui.TextArea;
 import com.fr.form.ui.TextEditor;
 import com.fr.form.ui.Widget;
 import com.fr.general.GeneralContext;
@@ -28,7 +34,10 @@ public class WidgetMobilePaneFactory {
 
     static {
         mobilePaneMap.put(MultiFileEditor.class, MultiFileEditorMobilePane.class);
-        mobilePaneMap.put(TextEditor.class, ScanCodeMobilePane.class);
+        mobilePaneMap.put(TextEditor.class, TextEditorMobilePane.class);
+        mobilePaneMap.put(TextArea.class, TextAreaMobilePane.class);
+        mobilePaneMap.put(NumberEditor.class, NumberEditorMobilePane.class);
+        mobilePaneMap.put(Password.class, PasswordMobilePane.class);
         mobilePluginPaneMap.putAll(ExtraDesignClassManager.getInstance().getCellWidgetMobileOptionsMap());
 
         GeneralContext.listenPluginRunningChanged(new PluginEventListener() {

designer-realize/src/main/java/com/fr/design/widget/ui/btn/AppendRowButtonDefinePane.java

@@ -2,19 +2,23 @@ package com.fr.design.widget.ui.btn;
 
 import com.fr.base.IconManager;
 
+
+
+
 import com.fr.report.web.button.write.AppendRowButton;
-import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane;
+
 
 import java.awt.*;
 
+
 /**
- * Created by IntelliJ IDEA.
+ * 插入行按钮
- * Author : Richer
+ *
- * Version: 6.5.6
+ * @author John.Ying
- * Date   : 11-11-15
+ * @since 11.0
- * Time   : 下午8:02
+ * Created on 2023/4/19
  */
-public class AppendRowButtonDefinePane<T extends AppendRowButton> extends ButtonWithHotkeysDetailPane<AppendRowButton> {
+public class AppendRowButtonDefinePane<T extends AppendRowButton> extends AbstractExtraButtonPane<AppendRowButton> {
     private DefineAppendColumnRowPane defineColumnRowPane;
 
 //	@Override
@@ -26,7 +30,8 @@ public class AppendRowButtonDefinePane<T extends AppendRowButton> extends Button
 
     @Override
     protected Component createCenterPane() {
-        return defineColumnRowPane = new DefineAppendColumnRowPane();
+        defineColumnRowPane = new DefineAppendColumnRowPane();
+        return createExtraPane(defineColumnRowPane);
     }
 
     @Override
@@ -55,4 +60,5 @@ public class AppendRowButtonDefinePane<T extends AppendRowButton> extends Button
     public Class classType() {
         return AppendRowButton.class;
     }
+
 }

designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonDetailPane.java

@@ -1,20 +1,25 @@
 package com.fr.design.widget.ui.btn;
 
+
 import com.fr.form.ui.Button;
 import com.fr.form.ui.FreeButton;
-import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane;
+
 
 import java.awt.*;
 
+
 /**
- * Created by IntelliJ IDEA. Author : Richer Version: 6.5.6 Date : 11-11-15 Time
+ * 普通按钮
- * : 下午6:24
+ *
+ * @author John.Ying
+ * @since 11.0
+ * Created on 2023/4/19
  */
-public class DefaultButtonDetailPane extends ButtonWithHotkeysDetailPane<Button> {
+public class DefaultButtonDetailPane extends AbstractExtraButtonPane<Button> {
 
     @Override
     protected Component createCenterPane() {
-        return null;
+        return createExtraPane(null);
     }
 
     @Override
@@ -27,4 +32,5 @@ public class DefaultButtonDetailPane extends ButtonWithHotkeysDetailPane<Button>
     public Class classType() {
         return Button.class;
     }
+
 }

designer-realize/src/main/java/com/fr/design/widget/ui/btn/DeleteRowButtonDefinePane.java

@@ -3,23 +3,23 @@ package com.fr.design.widget.ui.btn;
 import com.fr.base.IconManager;
 
 import com.fr.report.web.button.write.DeleteRowButton;
-import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane;
 
 import java.awt.*;
 
 /**
- * Created by IntelliJ IDEA.
+ * 删除行按钮
- * Author : Richer
+ *
- * Version: 6.5.6
+ * @author John.Ying
- * Date   : 11-11-15
+ * @since 11.0
- * Time   : 下午8:04
+ * Created on 2023/4/19
  */
-public class DeleteRowButtonDefinePane<T extends DeleteRowButton> extends ButtonWithHotkeysDetailPane<DeleteRowButton> {
+public class DeleteRowButtonDefinePane<T extends DeleteRowButton> extends AbstractExtraButtonPane<DeleteRowButton> {
     private DefineDeleteColumnRowPane ddcp;
 
     @Override
     protected Component createCenterPane() {
-        return ddcp = new DefineDeleteColumnRowPane();
+        ddcp = new DefineDeleteColumnRowPane();
+        return createExtraPane(ddcp);
     }
 
     @Override
@@ -48,4 +48,5 @@ public class DeleteRowButtonDefinePane<T extends DeleteRowButton> extends Button
         ddcp.update(btn);
         return btn;
     }
+
 }

designer-realize/src/main/java/com/fr/design/widget/ui/btn/FreeButtonDetailPane.java

@@ -1,19 +1,25 @@
 package com.fr.design.widget.ui.btn;
 
 import java.awt.Component;
-import com.fr.form.ui.FreeButton;
-import com.fr.design.widget.btn.ButtonWithHotkeysDetailPane;
 
+import com.fr.form.ui.FreeButton;
 
-public class FreeButtonDetailPane extends ButtonWithHotkeysDetailPane<FreeButton> {
+/**
+ * 自定义按钮
+ *
+ * @author John.Ying
+ * @since 11.0
+ * Created on 2023/4/19
+ */
+public class FreeButtonDetailPane extends AbstractExtraButtonPane<FreeButton> {
 	private ButtonSytleDefinedPane buttonSytleDefinedPane;
 
 	@Override
 	protected Component createCenterPane() {
 		buttonSytleDefinedPane = new ButtonSytleDefinedPane();
-		return buttonSytleDefinedPane;
+		return createExtraPane(buttonSytleDefinedPane);
 	}
-	
+
 	@Override
 	public FreeButton createButton() {
 		return new FreeButton();
@@ -35,4 +41,5 @@ public class FreeButtonDetailPane extends ButtonWithHotkeysDetailPane<FreeButton
 	public Class classType() {
 		return FreeButton.class;
 	}
+
 }

designer-realize/src/main/java/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java

@@ -9,19 +9,18 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.Button;
 
 import com.fr.report.web.button.form.TreeNodeToggleButton;
-import com.fr.design.widget.btn.ButtonDetailPane;
 
 import javax.swing.*;
 import java.awt.*;
 
 /**
- * Created by IntelliJ IDEA.
+ * 树节点按钮
- * Author : Richer
+ *
- * Version: 6.5.6
+ * @author John.Ying
- * Date   : 11-11-15
+ * @since 11.0
- * Time   : 下午7:45
+ * Created on 2023/4/19
  */
-public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> extends ButtonDetailPane<Button> {
+public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> extends AbstractExtraButtonPane<Button> {
 
     public TreeNodeToogleButtonDefinePane() {
         initComponents();
@@ -33,8 +32,9 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
         double p = TableLayout.PREFERRED;
         double rowSize[] = {p};
         double columnSize[] = {p, f};
+        initExtraPane();
         Component[][] n_components = {
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createButtonTypeComboBox()},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createCustomButtonTypeComboBox()},
         };
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_L2, 8);
         JPanel borderPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -45,6 +45,11 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
 
     }
 
+    @Override
+    protected Component createCenterPane() {
+        return null;
+    }
+
     @Override
     public TreeNodeToggleButton update() {
         return createButton();

designer-realize/src/main/java/com/fr/design/widget/ui/mobile/NumberEditorMobilePane.java

@@ -0,0 +1,41 @@
+package com.fr.design.widget.ui.mobile;
+
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.widget.mobile.WidgetMobilePane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextEditSettingPane;
+import com.fr.form.ui.NumberEditor;
+import com.fr.form.ui.Widget;
+
+import java.awt.BorderLayout;
+
+/**
+ * 数字控件移动端属性
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/4/11
+ */
+public class NumberEditorMobilePane extends WidgetMobilePane {
+    private MobileTextEditSettingPane textSettingPane;
+
+    @Override
+    protected void init() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        textSettingPane = new MobileTextEditSettingPane();
+        this.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, textSettingPane), BorderLayout.NORTH);
+    }
+
+    @Override
+    public void populate(Widget widget) {
+        NumberEditor numberEditor = (NumberEditor) widget;
+        textSettingPane.populateBean(numberEditor.getMobileTextEditAttr());
+    }
+
+    @Override
+    public void update(Widget widget) {
+        NumberEditor numberEditor = (NumberEditor) widget;
+        textSettingPane.updateBean(numberEditor.getMobileTextEditAttr());
+    }
+}

designer-realize/src/main/java/com/fr/design/widget/ui/mobile/PasswordMobilePane.java

@@ -0,0 +1,42 @@
+package com.fr.design.widget.ui.mobile;
+
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.widget.mobile.WidgetMobilePane;
+import com.fr.design.widget.ui.designer.mobile.component.MobilePasswordEditSettingPane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextEditSettingPane;
+import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.Widget;
+
+import java.awt.BorderLayout;
+
+/**
+ * 密码控件移动端属性
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/4/11
+ */
+public class PasswordMobilePane extends WidgetMobilePane {
+    private MobileTextEditSettingPane textSettingPane;
+
+    @Override
+    protected void init() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        textSettingPane = new MobilePasswordEditSettingPane();
+        this.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, textSettingPane), BorderLayout.NORTH);
+    }
+
+    @Override
+    public void populate(Widget widget) {
+        TextEditor textEditor = (TextEditor) widget;
+        textSettingPane.populateBean(textEditor.getMobileTextEditAttr());
+    }
+
+    @Override
+    public void update(Widget widget) {
+        TextEditor textEditor = (TextEditor) widget;
+        textSettingPane.updateBean(textEditor.getMobileTextEditAttr());
+    }
+}

designer-realize/src/main/java/com/fr/design/widget/ui/mobile/ScanCodeMobilePane.java

@@ -1,39 +0,0 @@
-package com.fr.design.widget.ui.mobile;
-
-import com.fr.base.mobile.MobileScanCodeAttr;
-import com.fr.design.foldablepane.UIExpandablePane;
-import com.fr.design.i18n.Toolkit;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.widget.mobile.WidgetMobilePane;
-import com.fr.design.widget.ui.designer.mobile.component.MobileTextFieldInputSettingPane;
-import com.fr.form.ui.TextEditor;
-import com.fr.form.ui.Widget;
-
-import java.awt.BorderLayout;
-
-
-public class ScanCodeMobilePane extends WidgetMobilePane {
-
-    private MobileTextFieldInputSettingPane settingPane;
-
-    @Override
-    protected void init() {
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        settingPane = new MobileTextFieldInputSettingPane();
-        this.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, settingPane), BorderLayout.NORTH);
-    }
-
-    @Override
-    public void populate(Widget widget) {
-        MobileScanCodeAttr mobileScanCodeAttr = ((TextEditor) widget).getMobileScanCodeAttr();
-        settingPane.populateBean(mobileScanCodeAttr);
-    }
-
-    @Override
-    public void update(Widget widget) {
-        MobileScanCodeAttr mobileScanCodeAttr = ((TextEditor) widget).getMobileScanCodeAttr();
-        settingPane.updateBean(mobileScanCodeAttr);
-    }
-
-
-}

designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextAreaMobilePane.java

@@ -0,0 +1,42 @@
+package com.fr.design.widget.ui.mobile;
+
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.widget.mobile.WidgetMobilePane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextAreaSettingPane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextEditSettingPane;
+import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.Widget;
+
+import java.awt.BorderLayout;
+
+/**
+ * 文本域控件移动端属性
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/4/11
+ */
+public class TextAreaMobilePane extends WidgetMobilePane {
+    private MobileTextEditSettingPane textSettingPane;
+
+    @Override
+    protected void init() {
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        textSettingPane = new MobileTextAreaSettingPane();
+        this.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, textSettingPane), BorderLayout.NORTH);
+    }
+
+    @Override
+    public void populate(Widget widget) {
+        TextEditor textEditor = (TextEditor) widget;
+        textSettingPane.populateBean(textEditor.getMobileTextEditAttr());
+    }
+
+    @Override
+    public void update(Widget widget) {
+        TextEditor textEditor = (TextEditor) widget;
+        textSettingPane.updateBean(textEditor.getMobileTextEditAttr());
+    }
+}

designer-realize/src/main/java/com/fr/design/widget/ui/mobile/TextEditorMobilePane.java

@@ -0,0 +1,59 @@
+package com.fr.design.widget.ui.mobile;
+
+import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.widget.mobile.WidgetMobilePane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextEditSettingPane;
+import com.fr.design.widget.ui.designer.mobile.component.MobileTextFieldInputSettingPane;
+import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.Widget;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+
+/**
+ * 文本控件移动端属性面板
+ *
+ * @author Coral.Chen
+ * @since 11.0
+ * Created on 2023/4/12
+ */
+public class TextEditorMobilePane extends WidgetMobilePane {
+
+    /**
+     * 输入方式
+     */
+    private MobileTextFieldInputSettingPane settingPane;
+    /**
+     * 输入框属性配置
+     */
+    private MobileTextEditSettingPane textSettingPane;
+
+    @Override
+    protected void init() {
+        JPanel container = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+        settingPane = new MobileTextFieldInputSettingPane();
+        textSettingPane = new MobileTextEditSettingPane();
+        container.add(settingPane);
+        container.add(textSettingPane);
+        this.add(new UIExpandablePane(Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, container), BorderLayout.NORTH);
+    }
+
+    @Override
+    public void populate(Widget widget) {
+        TextEditor textEditor = (TextEditor) widget;
+        settingPane.populateBean(textEditor.getMobileScanCodeAttr());
+        textSettingPane.populateBean(textEditor.getMobileTextEditAttr());
+    }
+
+    @Override
+    public void update(Widget widget) {
+        TextEditor textEditor = (TextEditor) widget;
+        settingPane.updateBean(textEditor.getMobileScanCodeAttr());
+        textSettingPane.updateBean(textEditor.getMobileTextEditAttr());
+    }
+
+
+}