@nocobase/plugin-acl 1.5.16 → 1.5.18

package/dist/externalVersion.js

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

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

@@ -241,13 +241,16 @@ function createWithACLMetaMiddleware() {
           return [ctx.db.sequelize.literal(`CASE WHEN ${condition.whereCase} THEN 1 ELSE 0 END`), condition.action];
         })
       ],
-      include: conditions.map((condition) => condition.include).flat()
+      include: conditions.map((condition) => condition.include).flat(),
+      raw: true
     });
     const allowedActions = inspectActions.map((action) => {
       if (allAllowed.includes(action)) {
         return [action, ids];
       }
-      return [action, results.filter((item) => Boolean(item.get(action))).map((item) => item.get(primaryKeyField))];
+      let actionIds = results.filter((item) => Boolean(item[action])).map((item) => item[primaryKeyField]);
+      actionIds = Array.from(new Set(actionIds));
+      return [action, actionIds];
     }).reduce((acc, [action, ids2]) => {
       acc[action] = ids2;
       return acc;

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.5.16",
+  "version": "1.5.18",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/acl",
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/plugins/acl"
   },
-  "gitHead": "b2cfb5c8e233263a23b8b3258aa7700837755429"
+  "gitHead": "ab85e258744fa0e2baf812498c14160726d8b37b"
 }