@nocobase/plugin-data-visualization 2.1.0-beta.11 → 2.1.0-beta.13

package/dist/externalVersion.js

@@ -8,18 +8,18 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.11",
+  "@nocobase/client": "2.1.0-beta.13",
   "@formily/react": "2.3.7",
-  "@nocobase/plugin-ai": "2.1.0-beta.11",
-  "@nocobase/flow-engine": "2.1.0-beta.11",
+  "@nocobase/plugin-ai": "2.1.0-beta.13",
+  "@nocobase/flow-engine": "2.1.0-beta.13",
   "react-i18next": "11.18.6",
   "dayjs": "1.11.13",
   "@formily/shared": "2.3.7",
   "lodash": "4.17.21",
-  "@nocobase/cache": "2.1.0-beta.11",
-  "@nocobase/server": "2.1.0-beta.11",
-  "@nocobase/test": "2.1.0-beta.11",
-  "@nocobase/utils": "2.1.0-beta.11",
+  "@nocobase/cache": "2.1.0-beta.13",
+  "@nocobase/server": "2.1.0-beta.13",
+  "@nocobase/test": "2.1.0-beta.13",
+  "@nocobase/utils": "2.1.0-beta.13",
   "react": "18.2.0",
   "@emotion/css": "11.13.0",
   "@ant-design/icons": "5.6.1",
@@ -27,9 +27,10 @@ module.exports = {
   "antd": "5.24.2",
   "@formily/antd-v5": "1.2.3",
   "@formily/core": "2.3.7",
-  "@nocobase/actions": "2.1.0-beta.11",
-  "@nocobase/database": "2.1.0-beta.11",
-  "@nocobase/acl": "2.1.0-beta.11",
+  "@nocobase/actions": "2.1.0-beta.13",
+  "@nocobase/database": "2.1.0-beta.13",
+  "@nocobase/acl": "2.1.0-beta.13",
+  "@nocobase/plugin-flow-engine": "2.1.0-beta.13",
   "sequelize": "6.35.2",
   "@formily/reactive": "2.3.7"
 };

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":"2026-03-20T08:10:49.007Z"}
+{"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":"2026-04-08T16:23:33.534Z"}

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":"2026-03-20T08:10:49.707Z"}
+{"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":"2026-04-08T16:23:34.232Z"}

package/dist/server/actions/query.js

@@ -51,10 +51,42 @@ var import_server = require("@nocobase/server");
 var import_query_parser = require("../query-parser");
 var import_utils = require("@nocobase/utils");
 var import_acl = require("@nocobase/acl");
+var import_plugin_flow_engine = require("@nocobase/plugin-flow-engine");
 const getDB = (ctx, dataSource) => {
   const ds = ctx.app.dataSourceManager.dataSources.get(dataSource);
   return ds == null ? void 0 : ds.collectionManager.db;
 };
+const getChartQueryPermission = async (ctx, collection, acl) => {
+  var _a;
+  const actionCtx = {
+    app: ctx.app,
+    db: ctx.db,
+    database: ctx.database ?? ctx.db,
+    getCurrentRepository: ctx.getCurrentRepository,
+    request: ctx.request,
+    req: ctx.req,
+    action: {
+      actionName: "list",
+      name: "list",
+      params: {},
+      resourceName: collection,
+      mergeParams() {
+      }
+    },
+    state: {
+      ...ctx.state,
+      currentRole: ctx.state.currentRole,
+      currentRoles: ctx.state.currentRoles,
+      currentUser: ((_a = ctx.state.currentUser) == null ? void 0 : _a.toJSON) ? ctx.state.currentUser.toJSON() : ctx.state.currentUser
+    },
+    permission: {},
+    throw(...args) {
+      ctx.throw(...args);
+    }
+  };
+  await acl.getActionParams(actionCtx);
+  return actionCtx.permission;
+};
 const postProcess = async (ctx, next) => {
   const { data, fieldMap } = ctx.action.params.values;
   ctx.body = data.map((record) => {
@@ -196,6 +228,14 @@ const parseFieldAndAssociations = async (ctx, next) => {
   await next();
 };
 const parseVariables = async (ctx, next) => {
+  const { mode, contextParams, ...values } = ctx.action.params.values;
+  if (mode !== "sql") {
+    const resolvedValues = await (0, import_plugin_flow_engine.resolveVariablesTemplate)(ctx, values, contextParams || {});
+    ctx.action.params.values = {
+      ...ctx.action.params.values,
+      ...resolvedValues
+    };
+  }
   const { filter } = ctx.action.params.values;
   ctx.action.params.filter = filter;
   await import_server.middlewares.parseVariables(ctx, async () => {
@@ -220,17 +260,14 @@ const cacheMiddleware = async (ctx, next) => {
   }
 };
 const checkPermission = async (ctx, next) => {
-  var _a, _b, _c;
+  var _a, _b;
   const { collection, dataSource } = ctx.action.params.values;
-  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({ roles: roleNames, resource: collection, action: "list" });
-  if (!can && !roleNames.includes("root")) {
-    ctx.throw(403, "No permissions");
-  }
-  if ((_b = can == null ? void 0 : can.params) == null ? void 0 : _b.filter) {
+  const permission = await getChartQueryPermission(ctx, collection, acl);
+  const filterParams = (_b = permission == null ? void 0 : permission.parsedParams) == null ? void 0 : _b.filter;
+  if (filterParams) {
     try {
-      (0, import_acl.checkFilterParams)(ctx.database.getCollection(collection), (_c = can.params) == null ? void 0 : _c.filter);
+      (0, import_acl.checkFilterParams)(ctx.database.getCollection(collection), filterParams);
     } catch (e) {
       if (e instanceof import_acl.NoPermissionError) {
         ctx.throw(403, "No permissions");
@@ -239,7 +276,7 @@ const checkPermission = async (ctx, next) => {
     const filter = ctx.action.params.values.filter || {};
     ctx.action.params.values = {
       ...ctx.action.params.values,
-      filter: (0, import_utils.assign)(filter, can == null ? void 0 : can.params.filter, {
+      filter: (0, import_utils.assign)(filter, filterParams, {
         filter: "andMerge"
       })
     };

package/dist/server/types.d.ts

@@ -28,12 +28,14 @@ export type OrderProps = {
 };
 export type QueryParams = Partial<{
     uid: string;
+    mode: 'builder' | 'sql';
     dataSource: string;
     collection: string;
     measures: MeasureProps[];
     dimensions: DimensionProps[];
     orders: OrderProps[];
     filter: any;
+    contextParams: Record<string, unknown>;
     limit: number;
     offset: number;
     sql: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "2.1.0-beta.11",
+  "version": "2.1.0-beta.13",
   "displayName": "Data visualization",
   "displayName.ru-RU": "Визуализация данных",
   "displayName.zh-CN": "数据可视化",
@@ -42,11 +42,12 @@
     "@nocobase/database": "2.x",
     "@nocobase/plugin-ai": "2.x",
     "@nocobase/plugin-data-source-main": "2.x",
+    "@nocobase/plugin-flow-engine": "2.x",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "b02e78b928f476d848b88bc545d3acddca00fe3c",
+  "gitHead": "691716e5f4e5f8bd3859d65bc8a29b4e3c32209b",
   "keywords": [
     "Blocks"
   ],