REPORT-59919 && REPORT-59921 && REPORT-59922

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

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe.authority;
 
 import com.fr.base.Formula;
+import com.fr.stable.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
@@ -10,18 +11,71 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class FormulaAuthorityChecker extends ElementAuthorityChecker<Formula> {
-    private static final Pattern FORMULA_PATTERN = Pattern.compile("^=SQL\\(\"(.+?)\",");
+    private static final Set<FormulaPattern> CONNECTION_NAME_FORMULA_PATTERN = new HashSet<>();
+    private static final Set<FormulaPattern> DATASET_NAME_FORMULA_PATTERN = new HashSet<>();
+
+    static {
+        CONNECTION_NAME_FORMULA_PATTERN.add(new FormulaPattern("^=SQL\\(\"(.+?)\",", 1));
+        DATASET_NAME_FORMULA_PATTERN.add(new FormulaPattern("^=VALUE\\(\"(.+?)\",", 1));
+    }
 
     @Override
     @Nullable
     public Set<String> getNoAuthConnectionNames(Formula formula, Set<String> authConnectionNames) {
-        String content = formula.getContent();
+        return getNoAuthNames(formula, CONNECTION_NAME_FORMULA_PATTERN, authConnectionNames);
-        Matcher matcher = FORMULA_PATTERN.matcher(content);
-        if (matcher.find()) {
-            if (!authConnectionNames.contains(matcher.group(1))) {
-                return new HashSet<>(Arrays.asList(matcher.group(1)));
     }
+
+    @Override
+    @Nullable
+    Set<String> getNoAuthDatasetNames(Formula formula, Set<String> authDatasetNames) {
+        return getNoAuthNames(formula, DATASET_NAME_FORMULA_PATTERN, authDatasetNames);
+    }
+
+    private Set<String> getNoAuthNames(Formula formula, Set<FormulaPattern> formulaPatterns, Set<String> authNames) {
+        Set<String> noAuthNames = new HashSet<>();
+        for (FormulaPattern formulaPattern : formulaPatterns) {
+            String noAuthName = getNoAuthName(formula, formulaPattern, authNames);
+            if (noAuthName != null) {
+                noAuthNames.add(noAuthName);
+            }
+        }
+        return noAuthNames;
+    }
+
+    private String getNoAuthName(Formula formula, FormulaPattern formulaPattern, Set<String> authNames) {
+        String parameter = getFormulaParameter(formula, formulaPattern);
+        if (!authNames.contains(parameter)) {
+            return parameter;
         }
         return null;
     }
+
+    private String getFormulaParameter(Formula formula, FormulaPattern formulaPattern) {
+        String content = transformFormulaContent(formula.getContent());
+        Matcher matcher = formulaPattern.pattern.matcher(content);
+        if (matcher.find()) {
+            return matcher.group(formulaPattern.index);
+        }
+        return null;
+    }
+
+    private String transformFormulaContent(String content) {
+        int index = content.indexOf('(');
+        if (index > 0) {
+            return content.substring(0, index).toUpperCase() + content.substring(index);
+        } else {
+            return StringUtils.EMPTY;
+        }
+    }
+
+    static class FormulaPattern {
+        public Pattern pattern;
+        public int index;
+
+        FormulaPattern(String regex, int index) {
+            this.pattern = Pattern.compile(regex);
+            this.index = index;
+        }
+    }
+
 }

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

@@ -7,11 +7,11 @@ import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mod.ModClassFilter;
+import com.fr.file.ConnectionConfig;
+import com.fr.file.TableDataConfig;
 import com.fr.invoke.ClassHelper;
 
 import com.fr.log.FineLoggerFactory;
-import com.fr.rpc.ExceptionHandler;
-import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.Filter;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.authority.user.UserAuthority;
@@ -19,7 +19,6 @@ import com.fr.workspace.server.authority.user.UserAuthority;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -29,7 +28,9 @@ import static javax.swing.JOptionPane.WARNING_MESSAGE;
 
 public class JTemplateAuthorityChecker {
     JTemplate<?, ?> jTemplate;
+    Set<String> allConnectionNames;
     Set<String> authConnectionNames;
+    Set<String> allDatasetNames;
     Set<String> authDatasetNames;
     Map<String, ElementAuthorityChecker> checkerMap = new HashMap<>();
     Set<String> authFailConnectionNames = new HashSet<>();
@@ -45,18 +46,20 @@ public class JTemplateAuthorityChecker {
     }
 
     private void initAuthNames() {
+        allDatasetNames = new HashSet<>();
+        for (String authServerDataSetName : TableDataConfig.getInstance().getTableDatas().keySet()) {
+            allDatasetNames.add(authServerDataSetName);
+        }
+
+        allConnectionNames = ConnectionConfig.getInstance().getConnections().keySet();
+
         UserAuthority templateAuthority = WorkContext.getCurrent().get(UserAuthority.class);
         Map<String, Set<String>> authNamesMap = templateAuthority.getAuthServerDataSetAndConnectionNames();
         if (authNamesMap != null) {
             //有权限的数据连接名称
             authConnectionNames = authNamesMap.get(UserAuthority.AUTH_CONNECTION_NAMES);
-            //有权限的数据集名称(模板数据集和服务器数据集)
+            //有权限的数据集名称
             authDatasetNames = authNamesMap.get(UserAuthority.AUTH_SERVER_DATASET_NAMES);
-            Iterator<String> iterator = jTemplate.getTarget().getTableDataNameIterator();
-            while (iterator.hasNext()) {
-                String datasetName = iterator.next();
-                authDatasetNames.add(datasetName);
-            }
         }
     }
 
@@ -95,7 +98,8 @@ public class JTemplateAuthorityChecker {
                 }
             }
         }
-
+        authFailConnectionNames.retainAll(allConnectionNames);
+        authFailDatasetNames.retainAll(allDatasetNames);
         FineLoggerFactory.getLogger().info("JTemplateAuthorityChecker check time consume:" + (System.currentTimeMillis() - s));
         return authFailConnectionNames.size() == 0 && authFailDatasetNames.size() == 0;
     }