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

package/dist/externalVersion.js

@@ -8,18 +8,18 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.11",
+  "@nocobase/client": "2.1.0-alpha.13",
   "@formily/react": "2.3.7",
-  "@nocobase/plugin-ai": "2.1.0-alpha.11",
-  "@nocobase/flow-engine": "2.1.0-alpha.11",
+  "@nocobase/plugin-ai": "2.1.0-alpha.13",
+  "@nocobase/flow-engine": "2.1.0-alpha.13",
   "react-i18next": "11.18.6",
   "dayjs": "1.11.13",
   "@formily/shared": "2.3.7",
   "lodash": "4.17.21",
-  "@nocobase/cache": "2.1.0-alpha.11",
-  "@nocobase/server": "2.1.0-alpha.11",
-  "@nocobase/test": "2.1.0-alpha.11",
-  "@nocobase/utils": "2.1.0-alpha.11",
+  "@nocobase/cache": "2.1.0-alpha.13",
+  "@nocobase/server": "2.1.0-alpha.13",
+  "@nocobase/test": "2.1.0-alpha.13",
+  "@nocobase/utils": "2.1.0-alpha.13",
   "react": "18.2.0",
   "@emotion/css": "11.13.0",
   "@ant-design/icons": "5.6.1",
@@ -27,9 +27,9 @@ module.exports = {
   "antd": "5.24.2",
   "@formily/antd-v5": "1.2.3",
   "@formily/core": "2.3.7",
-  "@nocobase/actions": "2.1.0-alpha.11",
-  "@nocobase/database": "2.1.0-alpha.11",
-  "@nocobase/acl": "2.1.0-alpha.11",
+  "@nocobase/actions": "2.1.0-alpha.13",
+  "@nocobase/database": "2.1.0-alpha.13",
+  "@nocobase/acl": "2.1.0-alpha.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-25T08:54:45.593Z"}
+{"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-27T05:54:37.841Z"}

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-25T08:54:46.127Z"}
+{"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-27T05:54:38.431Z"}

package/dist/server/actions/query.js

@@ -55,6 +55,37 @@ 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) => {
@@ -220,17 +251,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 +267,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/plugin.d.ts

@@ -7,11 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Cache } from '@nocobase/cache';
-import type { FlowSchemaContribution } from '@nocobase/flow-engine';
 import { InstallOptions, Plugin } from '@nocobase/server';
 export declare class PluginDataVisualizationServer extends Plugin {
     cache: Cache;
-    getFlowSchemaContributions(): FlowSchemaContribution;
     afterAdd(): void;
     beforeLoad(): void;
     load(): Promise<void>;

package/dist/server/plugin.js

@@ -32,12 +32,8 @@ __export(plugin_exports, {
 module.exports = __toCommonJS(plugin_exports);
 var import_server = require("@nocobase/server");
 var import_query = require("./actions/query");
-var import_flow_schema_contributions = require("./flow-schema-contributions");
 class PluginDataVisualizationServer extends import_server.Plugin {
   cache;
-  getFlowSchemaContributions() {
-    return import_flow_schema_contributions.flowSchemaContribution;
-  }
   afterAdd() {
   }
   beforeLoad() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "2.1.0-alpha.11",
+  "version": "2.1.0-alpha.13",
   "displayName": "Data visualization",
   "displayName.ru-RU": "Визуализация данных",
   "displayName.zh-CN": "数据可视化",
@@ -46,7 +46,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "bb96d633a6371afb586072ff516bd0613c757db0",
+  "gitHead": "2807a8948412d9c235115a31a81a66f7c82dd173",
   "keywords": [
     "Blocks"
   ],

package/dist/server/flow-schema-contributions/index.d.ts

@@ -1,10 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import type { FlowSchemaContribution } from '@nocobase/flow-engine';
-export declare const flowSchemaContribution: FlowSchemaContribution;

package/dist/server/flow-schema-contributions/index.js

@@ -1,240 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var flow_schema_contributions_exports = {};
-__export(flow_schema_contributions_exports, {
-  flowSchemaContribution: () => flowSchemaContribution
-});
-module.exports = __toCommonJS(flow_schema_contributions_exports);
-const chartBlockModelSchemaContribution = {
-  use: "ChartBlockModel",
-  title: "Chart block",
-  source: "plugin",
-  strict: false,
-  stepParamsSchema: {
-    type: "object",
-    properties: {
-      chartSettings: {
-        type: "object",
-        properties: {
-          configure: {
-            type: "object",
-            properties: {
-              query: {
-                type: "object",
-                properties: {
-                  mode: {
-                    type: "string",
-                    enum: ["builder", "sql"]
-                  },
-                  collectionPath: {
-                    type: "array",
-                    items: { type: "string" },
-                    minItems: 2,
-                    maxItems: 2
-                  },
-                  measures: {
-                    type: "array",
-                    items: {
-                      type: "object",
-                      properties: {
-                        field: { type: "string" },
-                        aggregation: { type: "string" },
-                        alias: { type: "string" }
-                      },
-                      additionalProperties: true
-                    }
-                  },
-                  dimensions: {
-                    type: "array",
-                    items: {
-                      type: "object",
-                      properties: {
-                        field: { type: "string" },
-                        alias: { type: "string" },
-                        format: { type: "string" }
-                      },
-                      additionalProperties: true
-                    }
-                  },
-                  sqlDatasource: { type: "string" },
-                  sql: { type: "string" }
-                },
-                additionalProperties: true
-              },
-              chart: {
-                type: "object",
-                properties: {
-                  option: {
-                    type: "object",
-                    properties: {
-                      mode: {
-                        type: "string",
-                        enum: ["basic", "custom"]
-                      },
-                      builder: {
-                        type: "object",
-                        additionalProperties: true
-                      },
-                      raw: { type: "string" }
-                    },
-                    additionalProperties: true
-                  },
-                  events: {
-                    type: "object",
-                    properties: {
-                      raw: { type: "string" }
-                    },
-                    additionalProperties: true
-                  }
-                },
-                additionalProperties: true
-              }
-            },
-            additionalProperties: true
-          }
-        },
-        additionalProperties: true
-      }
-    },
-    additionalProperties: true
-  },
-  skeleton: {
-    uid: "todo-chart-block-uid",
-    use: "ChartBlockModel",
-    stepParams: {
-      chartSettings: {
-        configure: {
-          query: {
-            mode: "builder",
-            collectionPath: ["main", "orders"],
-            measures: [
-              {
-                field: "id",
-                aggregation: "count",
-                alias: "count_id"
-              }
-            ],
-            dimensions: [
-              {
-                field: "createdAt"
-              }
-            ]
-          },
-          chart: {
-            option: {
-              mode: "basic",
-              builder: {
-                type: "line",
-                xField: "createdAt",
-                yField: "count_id"
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  docs: {
-    minimalExample: {
-      uid: "chart-users",
-      use: "ChartBlockModel",
-      stepParams: {
-        chartSettings: {
-          configure: {
-            query: {
-              mode: "builder",
-              collectionPath: ["main", "orders"],
-              measures: [
-                {
-                  field: "id",
-                  aggregation: "count",
-                  alias: "count_id"
-                }
-              ],
-              dimensions: [
-                {
-                  field: "createdAt"
-                }
-              ]
-            },
-            chart: {
-              option: {
-                mode: "basic",
-                builder: {
-                  type: "line",
-                  xField: "createdAt",
-                  yField: "count_id"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    dynamicHints: [
-      {
-        kind: "dynamic-ui-schema",
-        path: "ChartBlockModel.stepParams.chartSettings.configure.query",
-        message: "Chart query configuration depends on runtime collections and query builders. Builder charts are renderable only when collectionPath includes datasource+collection and measures are present.",
-        "x-flow": {
-          contextRequirements: ["collection metadata", "query builder", "optional SQL resource"],
-          unresolvedReason: "runtime-chart-query-config",
-          recommendedFallback: {
-            mode: "builder"
-          }
-        }
-      },
-      {
-        kind: "dynamic-ui-schema",
-        path: "ChartBlockModel.stepParams.chartSettings.configure.chart",
-        message: "Chart option builders and event scripts depend on runtime chart builders and RunJS execution. Basic mode still needs option.builder; custom mode does not bypass query/dataSource requirements.",
-        "x-flow": {
-          contextRequirements: ["chart builder", "RunJS"],
-          unresolvedReason: "runtime-chart-option-builder",
-          recommendedFallback: {
-            option: {
-              mode: "basic"
-            }
-          }
-        }
-      }
-    ]
-  }
-};
-const flowSchemaContribution = {
-  inventory: {
-    publicTreeRoots: ["ChartBlockModel"]
-  },
-  models: [chartBlockModelSchemaContribution],
-  defaults: {
-    source: "plugin"
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  flowSchemaContribution
-});