@nocobase/plugin-acl 0.21.0-alpha.1 → 0.21.0-alpha.2

package/dist/externalVersion.js

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

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

@@ -35,7 +35,7 @@ var import_acl = require("@nocobase/acl");
 var import_database = require("@nocobase/database");
 function createWithACLMetaMiddleware() {
   return async (ctx, next) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     await next();
     const dataSourceKey = ctx.get("x-data-source");
     const dataSource = ctx.app.dataSourceManager.dataSources.get(dataSourceKey);
@@ -57,8 +57,17 @@ function createWithACLMetaMiddleware() {
     }
     const Model = collection.model;
     const primaryKeyField = Model.primaryKeyField || Model.primaryKeyAttribute;
-    const dataPath = ((_a = ctx.body) == null ? void 0 : _a.rows) ? "body.rows" : "body";
-    let listData = import_lodash.default.get(ctx, dataPath);
+    let listData;
+    if ((_a = ctx.body) == null ? void 0 : _a.data) {
+      listData = ctx.data;
+    } else if ((_b = ctx.body) == null ? void 0 : _b.rows) {
+      listData = ctx.body.rows;
+    } else if (ctx.body) {
+      listData = ctx.body;
+    }
+    if (!listData) {
+      return;
+    }
     if (actionName == "get") {
       listData = import_lodash.default.castArray(listData);
     }
@@ -112,7 +121,7 @@ function createWithACLMetaMiddleware() {
       }
       actionsParams.push([
         action,
-        ((_b = actionCtx.permission) == null ? void 0 : _b.can) === null && !actionCtx.permission.skip ? null : ((_c = actionCtx.permission) == null ? void 0 : _c.parsedParams) || {},
+        ((_c = actionCtx.permission) == null ? void 0 : _c.can) === null && !actionCtx.permission.skip ? null : ((_d = actionCtx.permission) == null ? void 0 : _d.parsedParams) || {},
         actionCtx
       ]);
     }

package/dist/server/server.js

@@ -599,7 +599,7 @@ class PluginACL extends import_server.Plugin {
           ctx.logger.error(error);
         }
       },
-      { after: "restApi", group: "after" }
+      { after: "dataSource", group: "with-acl-meta" }
     );
   }
   async install() {

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": "0.21.0-alpha.1",
+  "version": "0.21.0-alpha.2",
   "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": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
+  "gitHead": "90628f2e2da846208fb2d7966ddb4e467d187ffb"
 }