@nocobase/plugin-acl 1.8.18 → 1.8.20

package/dist/externalVersion.js

@@ -8,7 +8,7 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.8.18",
+  "@nocobase/client": "1.8.20",
   "antd": "5.24.2",
   "react": "18.2.0",
   "react-i18next": "11.18.6",
@@ -17,14 +17,14 @@ module.exports = {
   "@formily/react": "2.3.0",
   "@ant-design/icons": "5.6.1",
   "lodash": "4.17.21",
-  "@nocobase/utils": "1.8.18",
-  "@nocobase/actions": "1.8.18",
-  "@nocobase/cache": "1.8.18",
-  "@nocobase/database": "1.8.18",
-  "@nocobase/server": "1.8.18",
-  "@nocobase/test": "1.8.18",
+  "@nocobase/utils": "1.8.20",
+  "@nocobase/actions": "1.8.20",
+  "@nocobase/cache": "1.8.20",
+  "@nocobase/database": "1.8.20",
+  "@nocobase/server": "1.8.20",
+  "@nocobase/test": "1.8.20",
   "@formily/core": "2.3.0",
   "@formily/antd-v5": "1.2.3",
   "antd-style": "3.7.1",
-  "@nocobase/acl": "1.8.18"
+  "@nocobase/acl": "1.8.20"
 };

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

@@ -167,6 +167,9 @@ function createWithACLMetaMiddleware() {
         ...params,
         context: actionCtx
       });
+      const include = (0, import_database.filterIncludes)(queryParams.where, queryParams.include || [], {
+        underscored: db.options.underscored
+      });
       const actionSql = ctx.db.sequelize.queryInterface.queryGenerator.selectQuery(
         Model.getTableName(),
         {
@@ -224,17 +227,18 @@ function createWithACLMetaMiddleware() {
         conditions.push({
           whereCase: "1=1",
           action,
-          include: queryParams.include
+          include: []
         });
       } else {
         const whereCase = actionSql.match(/WHERE (.*?);/)[1];
         conditions.push({
           whereCase,
           action,
-          include: queryParams.include
+          include
         });
       }
     }
+    const finalIncludes = (0, import_database.mergeIncludes)(conditions.map((condition) => condition.include || []).flat());
     const results = await collection.model.findAll({
       where: {
         [primaryKeyField]: ids
@@ -245,7 +249,7 @@ 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: finalIncludes,
       raw: true
     });
     const allowedActions = inspectActions.map((action) => {

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.8.18",
+  "version": "1.8.20",
   "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": "709b6e836ccb2179766da361bac75be455971f66"
+  "gitHead": "11fd72435f80231a0114de34e63259743d0a55c4"
 }