@nocobase/plugin-acl 1.4.0-alpha → 1.4.0-alpha.1

package/dist/externalVersion.js

@@ -11,21 +11,21 @@ module.exports = {
   "antd": "5.12.8",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
-  "@nocobase/client": "1.4.0-alpha",
-  "@formily/shared": "2.3.0",
+  "@nocobase/client": "1.4.0-alpha.1",
+  "@formily/shared": "2.3.2",
   "@formily/react": "2.3.0",
   "@ant-design/icons": "5.2.6",
-  "@nocobase/utils": "1.4.0-alpha",
-  "@nocobase/actions": "1.4.0-alpha",
-  "@nocobase/cache": "1.4.0-alpha",
-  "@nocobase/database": "1.4.0-alpha",
-  "@nocobase/server": "1.4.0-alpha",
+  "@nocobase/utils": "1.4.0-alpha.1",
+  "@nocobase/actions": "1.4.0-alpha.1",
+  "@nocobase/cache": "1.4.0-alpha.1",
+  "@nocobase/database": "1.4.0-alpha.1",
+  "@nocobase/server": "1.4.0-alpha.1",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.4.0-alpha",
+  "@nocobase/test": "1.4.0-alpha.1",
   "@formily/core": "2.3.0",
   "ahooks": "3.7.8",
   "@formily/antd-v5": "1.1.9",
-  "antd-style": "3.4.5",
-  "@nocobase/acl": "1.4.0-alpha"
+  "antd-style": "3.7.1",
+  "@nocobase/acl": "1.4.0-alpha.1"
 };

package/dist/server/middlewares/with-acl-meta.js

@@ -65,6 +65,9 @@ function createWithACLMetaMiddleware() {
       return;
     }
     const Model = collection.model;
+    if (collection.isMultiFilterTargetKey()) {
+      return;
+    }
     const primaryKeyField = Model.primaryKeyField || Model.primaryKeyAttribute;
     let listData;
     if ((_a = ctx.body) == null ? void 0 : _a.data) {
@@ -143,6 +146,9 @@ function createWithACLMetaMiddleware() {
       }
       return listData.map((item) => item[primaryKeyField]);
     })();
+    if (ids.filter(Boolean).length == 0) {
+      return;
+    }
     const conditions = [];
     const allAllowed = [];
     for (const [action, params, actionCtx] of actionsParams) {

package/dist/server/server.js

@@ -414,11 +414,11 @@ class PluginACLServer extends import_server.Plugin {
         }
       };
     });
-    this.app.resourcer.use(async (ctx, next) => {
+    this.app.resourceManager.use(async function showAnonymous(ctx, next) {
       const { actionName, resourceName, params } = ctx.action;
-      const { showAnonymous } = params || {};
+      const { showAnonymous: showAnonymous2 } = params || {};
       if (actionName === "list" && resourceName === "roles") {
-        if (!showAnonymous) {
+        if (!showAnonymous2) {
           ctx.action.mergeParams({
             filter: {
               "name.$ne": "anonymous"
@@ -492,6 +492,13 @@ class PluginACLServer extends import_server.Plugin {
             await next();
             return;
           }
+          const hasFilterByTk = (params) => {
+            return JSON.stringify(params).includes("filterByTk");
+          };
+          if (!hasFilterByTk(ctx.permission.mergedParams) || !hasFilterByTk(ctx.permission.rawParams)) {
+            await next();
+            return;
+          }
           const filteredCount = await repository.count(ctx.permission.mergedParams);
           const queryCount = await repository.count(ctx.permission.rawParams);
           if (queryCount > filteredCount) {
@@ -508,7 +515,7 @@ class PluginACLServer extends import_server.Plugin {
     );
     const withACLMeta = (0, import_with_acl_meta.createWithACLMetaMiddleware)();
     this.app.use(
-      async (ctx, next) => {
+      async function withACLMetaMiddleware(ctx, next) {
         try {
           await withACLMeta(ctx, next);
         } catch (error) {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "权限控制",
   "description": "Based on roles, resources, and actions, access control can precisely manage interface configuration permissions, data operation permissions, menu access permissions, and plugin permissions.",
   "description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
-  "version": "1.4.0-alpha",
+  "version": "1.4.0-alpha.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
@@ -34,5 +34,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "f097a2bddec152522b5645bd5d451f4c866d2060"
+  "gitHead": "b42379db55cd8774d3543c8d6cdc566434d3f170"
 }