@nocobase/plugin-acl 1.2.27-alpha → 1.2.29-alpha

package/dist/externalVersion.js

@@ -8,24 +8,24 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.2.27-alpha",
+  "@nocobase/client": "1.2.29-alpha",
   "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": "1.2.27-alpha",
-  "@nocobase/actions": "1.2.27-alpha",
-  "@nocobase/cache": "1.2.27-alpha",
-  "@nocobase/database": "1.2.27-alpha",
-  "@nocobase/server": "1.2.27-alpha",
+  "@nocobase/utils": "1.2.29-alpha",
+  "@nocobase/actions": "1.2.29-alpha",
+  "@nocobase/cache": "1.2.29-alpha",
+  "@nocobase/database": "1.2.29-alpha",
+  "@nocobase/server": "1.2.29-alpha",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
-  "@nocobase/test": "1.2.27-alpha",
+  "@nocobase/test": "1.2.29-alpha",
   "@formily/core": "2.3.0",
   "ahooks": "3.7.8",
   "@formily/antd-v5": "1.1.9",
   "antd-style": "3.4.5",
-  "@nocobase/acl": "1.2.27-alpha"
+  "@nocobase/acl": "1.2.29-alpha"
 };

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

@@ -210,12 +210,21 @@ function createWithACLMetaMiddleware() {
         },
         Model
       );
-      const whereCase = actionSql.match(/WHERE (.*?);/)[1];
-      conditions.push({
-        whereCase,
-        action,
-        include: queryParams.include
-      });
+      const whereCaseMatch = actionSql.match(/WHERE (.*?);/);
+      if (!whereCaseMatch) {
+        conditions.push({
+          whereCase: "1=1",
+          action,
+          include: queryParams.include
+        });
+      } else {
+        const whereCase = actionSql.match(/WHERE (.*?);/)[1];
+        conditions.push({
+          whereCase,
+          action,
+          include: queryParams.include
+        });
+      }
     }
     const results = await collection.model.findAll({
       where: {

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.2.27-alpha",
+  "version": "1.2.29-alpha",
   "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": "b40e402f6ffd57c89475af21c56fdf99d3bbc931"
+  "gitHead": "859f001e3e1399bc825a7ad04316e8d5f82f370d"
 }