@nocobase/acl 1.6.0-alpha.1 → 1.6.0-alpha.10

package/lib/acl.js

@@ -360,6 +360,18 @@ const _ACL = class _ACL extends import_events.default {
             ctx.permission.parsedParams = parsedParams;
             ((_d = ctx.log) == null ? void 0 : _d.debug) && ctx.log.debug("acl parsedParams", parsedParams);
             ctx.permission.rawParams = import_lodash.default.cloneDeep(resourcerAction.params);
+            if (parsedParams.appends && resourcerAction.params.fields) {
+              for (const queryField of resourcerAction.params.fields) {
+                if (parsedParams.appends.indexOf(queryField) !== -1) {
+                  if (!resourcerAction.params.appends) {
+                    resourcerAction.params.appends = [];
+                  }
+                  resourcerAction.params.appends.push(queryField);
+                  resourcerAction.params.fields = resourcerAction.params.fields.filter((f) => f !== queryField);
+                }
+              }
+            }
+            const isEmptyFields = resourcerAction.params.fields && resourcerAction.params.fields.length === 0;
             resourcerAction.mergeParams(parsedParams, {
               appends: /* @__PURE__ */ __name((x, y) => {
                 if (!x) {
@@ -371,6 +383,9 @@ const _ACL = class _ACL extends import_events.default {
                 return x.filter((i) => y.includes(i.split(".").shift()));
               }, "appends")
             });
+            if (isEmptyFields) {
+              resourcerAction.params.fields = [];
+            }
             ctx.permission.mergedParams = import_lodash.default.cloneDeep(resourcerAction.params);
           }
         } catch (e) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/acl",
-  "version": "1.6.0-alpha.1",
+  "version": "1.6.0-alpha.10",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/resourcer": "1.6.0-alpha.1",
-    "@nocobase/utils": "1.6.0-alpha.1",
+    "@nocobase/resourcer": "1.6.0-alpha.10",
+    "@nocobase/utils": "1.6.0-alpha.10",
     "minimatch": "^5.1.1"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/acl"
   },
-  "gitHead": "a4c91015e34ec0c9a427451b5fbdfb5fedc4f3d7"
+  "gitHead": "8ba8204282be7bf6674ef427fdbe31caa65977d5"
 }