@nocobase/plugin-data-visualization 1.7.0-beta.8 → 1.8.0-beta.1

package/dist/client/utils.d.ts

@@ -148,9 +148,6 @@ export declare const getSelectedFields: (fields: FieldOption[], query: QueryProp
     target?: string;
     targetFields?: FieldOption[];
 }[];
-export declare const processData: (selectedFields: (FieldOption & {
-    query?: any;
-})[], data: any[], scope: any) => {}[];
 export declare const removeUnparsableFilter: (filter: any) => any;
 export declare const getValuesByPath: (values: any, path: string) => any;
 export declare const getFormulaComponent: (type: string) => string;

package/dist/externalVersion.js

@@ -8,24 +8,24 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.7.0-beta.8",
-  "dayjs": "1.11.10",
+  "@nocobase/client": "1.8.0-beta.1",
   "@formily/react": "2.3.0",
+  "dayjs": "1.11.13",
   "@formily/shared": "2.3.2",
   "lodash": "4.17.21",
-  "@nocobase/cache": "1.7.0-beta.8",
-  "@nocobase/server": "1.7.0-beta.8",
-  "@nocobase/test": "1.7.0-beta.8",
+  "@nocobase/cache": "1.8.0-beta.1",
+  "@nocobase/server": "1.8.0-beta.1",
+  "@nocobase/test": "1.8.0-beta.1",
+  "@nocobase/utils": "1.8.0-beta.1",
   "react": "18.2.0",
   "@emotion/css": "11.13.0",
   "@ant-design/icons": "5.6.1",
   "ahooks": "3.7.8",
-  "antd": "5.12.8",
-  "@formily/antd-v5": "1.1.9",
+  "antd": "5.24.2",
+  "@formily/antd-v5": "1.2.3",
   "@formily/core": "2.3.0",
-  "@nocobase/utils": "1.7.0-beta.8",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "1.7.0-beta.8",
-  "@nocobase/database": "1.7.0-beta.8",
+  "@nocobase/actions": "1.8.0-beta.1",
+  "@nocobase/database": "1.8.0-beta.1",
   "sequelize": "6.35.2"
 };

package/dist/node_modules/koa-compose/package.json

@@ -1 +1 @@
-{"name":"koa-compose","description":"compose Koa middleware","repository":"koajs/compose","version":"4.1.0","keywords":["koa","middleware","compose"],"files":["index.js"],"dependencies":{},"devDependencies":{"codecov":"^3.0.0","jest":"^21.0.0","matcha":"^0.7.0","standard":"^10.0.3"},"scripts":{"bench":"matcha bench/bench.js","lint":"standard --fix .","test":"jest --forceExit --coverage"},"jest":{"testEnvironment":"node"},"license":"MIT","_lastModified":"2025-03-23T04:57:02.617Z"}
+{"name":"koa-compose","description":"compose Koa middleware","repository":"koajs/compose","version":"4.1.0","keywords":["koa","middleware","compose"],"files":["index.js"],"dependencies":{},"devDependencies":{"codecov":"^3.0.0","jest":"^21.0.0","matcha":"^0.7.0","standard":"^10.0.3"},"scripts":{"bench":"matcha bench/bench.js","lint":"standard --fix .","test":"jest --forceExit --coverage"},"jest":{"testEnvironment":"node"},"license":"MIT","_lastModified":"2025-06-03T16:05:15.259Z"}

package/dist/node_modules/moment-timezone/package.json

@@ -1 +1 @@
-{"name":"moment-timezone","version":"0.5.43","description":"Parse and display moments in any timezone.","homepage":"http://momentjs.com/timezone/","author":"Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)","keywords":["moment","date","time","timezone","olson","iana","zone","tz"],"main":"./index.js","typings":"./index.d.ts","engines":{"node":"*"},"repository":{"type":"git","url":"https://github.com/moment/moment-timezone.git"},"bugs":{"url":"https://github.com/moment/moment-timezone/issues"},"license":"MIT","dependencies":{"moment":"^2.29.4"},"devDependencies":{"grunt":"^1.5.3","grunt-contrib-clean":"^2.0.1","grunt-contrib-jshint":"^3.2.0","grunt-contrib-nodeunit":"^4.0.0","grunt-contrib-uglify":"^5.2.2","grunt-exec":"^3.0.0","typescript":"^3.5.1"},"jspm":{"main":"builds/moment-timezone-with-data","shim":{"moment-timezone":{"deps":["moment"]}}},"scripts":{"test":"grunt"},"_lastModified":"2025-03-23T04:57:03.319Z"}
+{"name":"moment-timezone","version":"0.5.43","description":"Parse and display moments in any timezone.","homepage":"http://momentjs.com/timezone/","author":"Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)","keywords":["moment","date","time","timezone","olson","iana","zone","tz"],"main":"./index.js","typings":"./index.d.ts","engines":{"node":"*"},"repository":{"type":"git","url":"https://github.com/moment/moment-timezone.git"},"bugs":{"url":"https://github.com/moment/moment-timezone/issues"},"license":"MIT","dependencies":{"moment":"^2.29.4"},"devDependencies":{"grunt":"^1.5.3","grunt-contrib-clean":"^2.0.1","grunt-contrib-jshint":"^3.2.0","grunt-contrib-nodeunit":"^4.0.0","grunt-contrib-uglify":"^5.2.2","grunt-exec":"^3.0.0","typescript":"^3.5.1"},"jspm":{"main":"builds/moment-timezone-with-data","shim":{"moment-timezone":{"deps":["moment"]}}},"scripts":{"test":"grunt"},"_lastModified":"2025-06-03T16:05:15.880Z"}

package/dist/server/actions/query.js

@@ -170,11 +170,16 @@ const parseFieldAndAssociations = async (ctx, next) => {
     const stack = [...filterInclude];
     while (stack.length) {
       const item = stack.pop();
-      if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
+      const parentCollection = db.getCollection(item.parentCollection || collectionName);
+      const field = parentCollection.fields.get(item.association);
+      if ((field == null ? void 0 : field.type) === "belongsToMany") {
         item.through = { attributes: [] };
       }
-      if (item.include) {
-        stack.push(...item.include);
+      if ((field == null ? void 0 : field.target) && ((_a = item.include) == null ? void 0 : _a.length)) {
+        for (const child of item.include) {
+          child.parentCollection = field.target;
+          stack.push(child);
+        }
       }
     }
   }
@@ -215,10 +220,10 @@ const cacheMiddleware = async (ctx, next) => {
 const checkPermission = (ctx, next) => {
   var _a;
   const { collection, dataSource } = ctx.action.params.values;
-  const roleName = ctx.state.currentRole || "anonymous";
+  const roleNames = ctx.state.currentRoles || ["anonymous"];
   const acl = ((_a = ctx.app.dataSourceManager.get(dataSource)) == null ? void 0 : _a.acl) || ctx.app.acl;
-  const can = acl.can({ role: roleName, resource: collection, action: "list" });
-  if (!can && roleName !== "root") {
+  const can = acl.can({ roles: roleNames, resource: collection, action: "list" });
+  if (!can && !roleNames.includes("root")) {
     ctx.throw(403, "No permissions");
   }
   return next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.7.0-beta.8",
+  "version": "1.8.0-beta.1",
   "displayName": "Data visualization",
   "displayName.zh-CN": "数据可视化",
   "description": "Provides data visualization feature, including chart block and chart filter block, support line charts, area charts, bar charts and more than a dozen kinds of charts, you can also extend more chart types.",
@@ -34,7 +34,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "9ad35ee90db98d95dfa660645d155f4f4e81b47c",
+  "gitHead": "103935669123174f2942247202e3d9ff15f0d4ed",
   "keywords": [
     "Blocks"
   ]