Pull request #14716: REPORT-114392 FR-FBP版本本地设计适配 修复bug

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp/release to fbp/release

* commit '9aeb494f93b7dd1415c6e5336b4bc999da7498d3':
  REPORT-114392 FR-FBP版本本地设计适配 优化web资源读取
  REPORT-130034 - 邮件入口屏蔽
  REPORT-131068 远程设计权限校验不生效
  REPORT-114392 FR-FBP版本本地设计适配 优化关闭模板

designer-base/src/main/java/com/fr/design/backup/DesignContext.java

@@ -7,6 +7,7 @@ import com.fr.stable.StringUtils;
 
 import javax.servlet.ServletContext;
 
+import java.io.File;
 import java.util.Properties;
 
 /**
@@ -17,7 +18,7 @@ import java.util.Properties;
  * Created on 2024/5/14
  */
 public class DesignContext extends CarinaApplicationContext {
-    public static final String WEB_INF = "\\WEB-INF";
+    public static final String WEB_INF = "WEB-INF";
     private String designWebInfPath;
     private String designDataPath;
 
@@ -39,7 +40,7 @@ public class DesignContext extends CarinaApplicationContext {
     public void setDesignWebInfPath(String designWebInfPath) {
         this.designWebInfPath = designWebInfPath;
         if (StringUtils.isNotEmpty(this.designWebInfPath)) {
-            this.designDataPath =  this.designWebInfPath.replace(WEB_INF, StringUtils.EMPTY);
+            this.designDataPath =  this.designWebInfPath.replace(File.separatorChar + WEB_INF, StringUtils.EMPTY);
         }
         FineLoggerFactory.getLogger().info("[DesignContext] designWebInfPath:{}, designDataPath:{}", this.designWebInfPath, this.designDataPath);
     }

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

@@ -4,10 +4,10 @@ import com.fanruan.workplace.http.HttpConstants;
 import com.fanruan.workplace.http.HttpServiceMap;
 import com.fanruan.workplace.http.RepositoryManager;
 import com.fanruan.workplace.http.info.Stub;
-import com.fr.exception.RemoteDesignPermissionDeniedException;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.engine.exception.RemoteDesignConnectionException;
+import com.fr.workspace.engine.exception.RemoteDesignNoAuthException;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 import com.fr.workspace.server.repository.compatible.register.CompatibleRegister;
 import com.fr.workspace.server.repository.connect.FineWorkspaceHttpClient;
@@ -89,7 +89,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
         // 检查远程权限
         if (!checkRemoteAuthority(connection)) {
             // 无权限则抛出无权限的错
-            throw new RemoteDesignPermissionDeniedException();
+            throw new RemoteDesignNoAuthException();
         }
     }
 

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

@@ -847,7 +847,7 @@ public class MultiTemplateTabPane extends Row {
                     setIsCloseCurrent(true);
                 }
                 closeFormat(template);
-                closeSpecifiedTemplate(template);
+                DesignCacheManager.processByCacheTableData(() -> closeSpecifiedTemplate(template));
                 DesignerContext.getDesignerFrame().getContentFrame().repaint();
                 isShowList = false;
             } else {

designer-realize/src/main/java/com/fanruan/boot/env/function/DesignComponent.java

@@ -335,7 +335,6 @@ public class DesignComponent {
     private static NameableCreator[] hyperlinkTypes() {
         return new NameableCreator[]{
                 new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet"), ReportletHyperlink.class, ReportletHyperlinkPane.ChartNoRename.class),
-                new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), EmailJavaScript.class, EmailPane.class),
                 new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), WebHyperlink.class, WebHyperlinkPane.ChartNoRename.class),
                 new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Dynamic_Parameters"), ParameterJavaScript.class, ParameterJavaScriptPane.ChartNoRename.class),
                 new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"), JavaScriptImpl.class, JavaScriptImplPane.ChartNoRename.class),

designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

@@ -458,7 +458,6 @@ public class EditToolBar extends BasicPane {
             centerPane.setLayout(card);
             centerPane.add(CUSTOM, wrapComponentWithTitle(getCustomPane(), com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit") + "JS")));
             centerPane.add(EXPORT, wrapComponentWithTitle(getExport(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property")));
-            centerPane.add(EMAIL, wrapComponentWithTitle(getEmail(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property")));
             centerPane.add(NONE, FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane());
             centerPane.add(APPEND_COUNT, column(LayoutConstants.VERTICAL_GAP,cell(getAppendCountPane())).getComponent());
             centerPane.add(SUBMIT, wrapComponentWithTitle(getSubmitPane(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property")));

designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java

@@ -46,16 +46,16 @@ public class ReportWebWidgetConstants {
     }
 
     public static WidgetOption[] getPageToolBarInstance() {
-        return new WidgetOption[]{FIRST, PREVIOUS, PAGENAVI, NEXT, LAST, SCALE, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT,
+        return new WidgetOption[]{FIRST, PREVIOUS, PAGENAVI, NEXT, LAST, SCALE, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT,
                 SETPRINTEROFFSET, CUSTOM_BUTTON};
     }
 
     public static WidgetOption[] getViewToolBarInstance() {
-        return new WidgetOption[]{PAGESETUP, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, SETPRINTEROFFSET, PRINTPREVIEW, CUSTOM_BUTTON};
+        return new WidgetOption[]{PAGESETUP, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, SETPRINTEROFFSET, PRINTPREVIEW, CUSTOM_BUTTON};
     }
 
     public static WidgetOption[] getWriteToolBarInstance() {
-        return new WidgetOption[]{SUBMIT, VERIFY, EMAIL, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, IMPORTEXCELDATA, SHOWCELLVALUE,
+        return new WidgetOption[]{SUBMIT, VERIFY, EXPORT, PDF, EXCELP, EXCELO, EXCELS, WORD, NEW_PRINT, PRINT, FLASHPRINT, APPLETPRINT, PDFPRINT, IMPORTEXCELDATA, SHOWCELLVALUE,
                 APPENDCOLUMNROW, DELETECOLUMNROW, SETPRINTEROFFSET, CUSTOM_BUTTON, WRITESTASH, WRITESTASHCLEAR, IMPORTEXCELDATA_CUSTOMIZED,
                 IMPORTEXCEL, IMPORTEXCEL_COVER, IMPORTEXCEL_CLEAN, IMPORTEXCEL_APPEND};
     }