@nocobase/plugin-data-visualization 2.0.28 → 2.0.30

package/dist/externalVersion.js

@@ -8,18 +8,18 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.28",
+  "@nocobase/client": "2.0.30",
   "@formily/react": "2.3.7",
-  "@nocobase/plugin-ai": "2.0.28",
-  "@nocobase/flow-engine": "2.0.28",
+  "@nocobase/plugin-ai": "2.0.30",
+  "@nocobase/flow-engine": "2.0.30",
   "react-i18next": "11.18.6",
   "dayjs": "1.11.13",
   "@formily/shared": "2.3.7",
   "lodash": "4.17.21",
-  "@nocobase/cache": "2.0.28",
-  "@nocobase/server": "2.0.28",
-  "@nocobase/test": "2.0.28",
-  "@nocobase/utils": "2.0.28",
+  "@nocobase/cache": "2.0.30",
+  "@nocobase/server": "2.0.30",
+  "@nocobase/test": "2.0.30",
+  "@nocobase/utils": "2.0.30",
   "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.0.28",
-  "@nocobase/database": "2.0.28",
-  "@nocobase/acl": "2.0.28",
+  "@nocobase/actions": "2.0.30",
+  "@nocobase/database": "2.0.30",
+  "@nocobase/acl": "2.0.30",
+  "@nocobase/plugin-flow-engine": "2.0.30",
   "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-27T15:56:12.848Z"}
+{"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-30T15:14:08.998Z"}

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-27T15:56:13.388Z"}
+{"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-30T15:14:09.576Z"}

package/dist/server/actions/query.js

@@ -51,6 +51,7 @@ 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;
@@ -227,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 () => {

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.0.28",
+  "version": "2.0.30",
   "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": "7a3e96a74b05f2beaa5a87d8ef28ccf269ea90f4",
+  "gitHead": "6ac70f8dda4e7970242435bc1d1a5b70954e643f",
   "keywords": [
     "Blocks"
   ],

package/dist/client/flow/components/AntdFilterSelector.d.ts

@@ -1,35 +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 React from 'react';
-import type { CSSProperties } from 'react';
-import type { VariableFilterItemValue } from '@nocobase/client';
-import type { FlowModel } from '@nocobase/flow-engine';
-type LogicOp = '$and' | '$or';
-export type FilterCondition = VariableFilterItemValue;
-export type FilterGroupValue = {
-    logic: LogicOp;
-    items: Array<FilterCondition | FilterGroupValue>;
-};
-export interface AntdFilterSelectorProps {
-    value?: FilterGroupValue;
-    onChange?: (next: FilterGroupValue) => void;
-    model: FlowModel;
-    rightAsVariable?: boolean;
-    collectionPath?: string[];
-    className?: string;
-    style?: CSSProperties;
-}
-/**
- * AntdFilterSelector
- * - antd Form.Item 子组件
- * - 内部用响应式对象驱动 FilterGroup/VariableFilterItem
- * - reaction 桥接所有深层变更为 antd 的 onChange
- */
-export declare const AntdFilterSelector: React.FC<AntdFilterSelectorProps>;
-export default AntdFilterSelector;