Pull request #12078: REPORT-94400 && REPORT-91253 && REPORT-94510 决策报表-tab块组件大小设置0-样式设置"菜单式"-预览模板空白; FR源码中存在密钥硬编码;【FVS支持多开】来回切换fvs模板，tab栏会晃动

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit '4ebd18d6ee53cdc844d72c01d83be96a76e1d4d6':
  REPORT-94510 决策报表-tab块组件大小设置0-样式设置"菜单式"-预览模板空白
  REPORT-91253 FR源码中存在密钥硬编码
  添加注释
  REPORT-94400【FVS支持多开】来回切换fvs模板，tab栏会晃动

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

@@ -335,9 +335,10 @@ public class MultiTemplateTabPane extends JComponent {
                 if (openedTemplate.size() == 0) {
                     DesignerContext.getDesignerFrame().addAndActivateJTemplate();
                 } else if (option == CloseOption.All){
-                    DesignerContext.getDesignerFrame().activateJTemplate(openedTemplate.get(0));
+                    //openedTemplate(0)是JVirtualTemplate时需重新打开
+                    openedTemplate.get(0).activeOldJTemplate();
                 } else {
-                    DesignerContext.getDesignerFrame().activateJTemplate(currentTemplate);
+                    currentTemplate.activeOldJTemplate();
                 }
 
                 MultiTemplateTabPane.getInstance().repaint();

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

@@ -852,7 +852,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (jt == null || jt.getEditingFILE() == null) {
             return;
         }
-        if (currentTemplateDeactivateFail()) {
+        if (currentTemplateDeactivateFail(jt)) {
             return;
         }
         jt.addJTemplateActionListener(this);
@@ -877,7 +877,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         if (jt == null || jt.getEditingFILE() == null) {
             return;
         }
-        if (currentTemplateDeactivateFail()) {
+        if (currentTemplateDeactivateFail(jt)) {
             return;
         }
         getCenterTemplateCardPane().showJTemplate(jt);
@@ -939,9 +939,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      *
      * @return 是否停用失败
      */
-    private boolean currentTemplateDeactivateFail() {
+    private boolean currentTemplateDeactivateFail(JTemplate  jt) {
         JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
-        return currentEditingTemplate != null && !currentEditingTemplate.deactivateTemplate();
+        return currentEditingTemplate != null && !currentEditingTemplate.deactivateTemplate(jt);
     }
 
 

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

@@ -1373,6 +1373,16 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
 
+    /**
+     * 将要激活打开其他模板，使当前模板灭活
+     * 默认 do nothing 返回true
+     *
+     * @return true：成功停用当前模板
+     */
+    public boolean deactivateTemplate(JTemplate jTemplate) {
+        return true;
+    }
+
     /**
      * 返回当前支持的超链界面pane
      *

designer-base/src/main/resources/com/fr/design/config/default

@@ -1 +1,2 @@
 Fine-Designer_Login=i7hP48WAcuTrmxfN
+Fine-Designer_Reu_Share_CERTIFICATE_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtsz62CPSWXZE/IYZRiAuTSZkw1WOwer8+JFktK0uKLAUuQoBr+UjAMFtRA8W7JgKMDwZy/2liEAiXEOSPU/hrdV8DtT541LnGi1X/hXiRwuttPWYN3L2GYm/d5blU+FBNwghBIrdAxXTzYBc6P4KL/oYXnMdTIrkz8tYkG3QoFQIDAQAB

designer-form/src/main/java/com/fr/design/mainframe/share/util/DownloadUtils.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe.share.util;
 import com.fr.base.theme.FormTheme;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.extra.PluginConstants;
+import com.fr.design.login.config.DefaultLoginKeys;
 import com.fr.form.share.base.CancelCheck;
 import com.fr.form.share.constants.ShareComponentConstants;
 import com.fr.ftp.util.Base64;
@@ -45,10 +46,7 @@ import java.util.Set;
  * created by Harrison on 2020/05/27
  **/
 public class DownloadUtils {
-    private static final String CERTIFICATE_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtsz62CPSWXZE/IYZRiAuTSZkw\n" +
+    private static final String CERTIFICATE_PUBLIC_KEY = DefaultLoginKeys.getInstance().getKey("Fine-Designer_Reu_Share_CERTIFICATE_PUBLIC_KEY");
-            "1WOwer8+JFktK0uKLAUuQoBr+UjAMFtRA8W7JgKMDwZy/2liEAiXEOSPU/hrdV8D\n" +
-            "tT541LnGi1X/hXiRwuttPWYN3L2GYm/d5blU+FBNwghBIrdAxXTzYBc6P4KL/oYX\n" +
-            "nMdTIrkz8tYkG3QoFQIDAQAB";
 
     private static String getReusesUrl() {
         return StableUtils.pathJoin(OnlineShopUtils.getReuInfoPath(), "file/download");

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

@@ -29,7 +29,7 @@ public class WidgetCardTagBoundPane extends WidgetBoundPane {
 
     @Override
     public void initBoundPane() {
-        cardTagWidth = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
+        cardTagWidth = new UIBoundSpinner(0, Integer.MAX_VALUE, 1, 0);
         cardTagWidth.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"));
         this.add(WidgetBoundsPaneFactory.createCardTagBoundPane(cardTagWidth));
     }