Pull request #1813: REPORT-35379 && REPORT-35205

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '2a262c3227a4a9e5753dc4b40ae46f8a98857367':
  REPORT-35205 fix
  REPORT-35379 && REPORT-35205

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

@@ -12,6 +12,7 @@ import com.fr.design.dialog.UIDialog;
 import com.fr.design.env.DesignerWorkspaceInfo;
 import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.file.HistoryTemplateListPane;
+import com.fr.design.file.NodeAuthProcessor;
 import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonUI;
@@ -916,7 +917,8 @@ public class FILEChooserPane extends BasicPane {
         try {
             access = FRContext.getOrganizationOperator().canAccess(selectedFile.getPath());
             if (selectedFile.isEnvFile() && selectedFile instanceof FileNodeFILE) {
-                access = access && ((FileNodeFILE) selectedFile).hasFullAuth();
+                FileNodeFILE fileNodeFILE = ((FileNodeFILE) selectedFile);
+                access = access && fileNodeFILE.hasFullAuth() && NodeAuthProcessor.getInstance().checkFileNodeAuth(new FileNode(fileNodeFILE.getPath(), fileNodeFILE.isDirectory()));
             }
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);

designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

@@ -1,5 +1,6 @@
 package com.fr.quickeditor;
 
+import com.fr.base.GraphHelper;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -49,7 +50,6 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
 
     protected static final Dimension LABEL_DIMENSION = new Dimension(60, 20);
     protected static final int VGAP = 10, HGAP = 8, VGAP_INNER = 3;
-    private static final int INSERT_CONTENT_LABEL_WIDTH = 60;
 
     /**
      * 滚动条相关配置
@@ -208,7 +208,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
     private JPanel initTopContent() {
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
-        double[] columnSize = {INSERT_CONTENT_LABEL_WIDTH, f};
+        double[] columnSize = {GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Cell_Element")), f};
         double[] rowSize = {p, p};
         UILabel cellLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"));
         UILabel insertContentLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Cell_Element"));