@nocobase/plugin-data-visualization 2.1.0-beta.15 → 2.1.0-beta.16

package/dist/externalVersion.js

@@ -8,18 +8,18 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.15",
+  "@nocobase/client": "2.1.0-beta.16",
   "@formily/react": "2.3.7",
-  "@nocobase/plugin-ai": "2.1.0-beta.15",
-  "@nocobase/flow-engine": "2.1.0-beta.15",
+  "@nocobase/plugin-ai": "2.1.0-beta.16",
+  "@nocobase/flow-engine": "2.1.0-beta.16",
   "react-i18next": "11.18.6",
   "dayjs": "1.11.13",
   "@formily/shared": "2.3.7",
   "lodash": "4.18.1",
-  "@nocobase/cache": "2.1.0-beta.15",
-  "@nocobase/server": "2.1.0-beta.15",
-  "@nocobase/test": "2.1.0-beta.15",
-  "@nocobase/utils": "2.1.0-beta.15",
+  "@nocobase/cache": "2.1.0-beta.16",
+  "@nocobase/server": "2.1.0-beta.16",
+  "@nocobase/test": "2.1.0-beta.16",
+  "@nocobase/utils": "2.1.0-beta.16",
   "react": "18.2.0",
   "@emotion/css": "11.13.0",
   "@ant-design/icons": "5.6.1",
@@ -27,10 +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.15",
-  "@nocobase/database": "2.1.0-beta.15",
-  "@nocobase/acl": "2.1.0-beta.15",
-  "@nocobase/plugin-flow-engine": "2.1.0-beta.15",
-  "sequelize": "6.35.2",
+  "@nocobase/actions": "2.1.0-beta.16",
+  "@nocobase/acl": "2.1.0-beta.16",
+  "@nocobase/plugin-acl": "2.1.0-beta.16",
+  "@nocobase/plugin-flow-engine": "2.1.0-beta.16",
+  "@nocobase/database": "2.1.0-beta.16",
   "@formily/reactive": "2.3.7"
 };

package/dist/node_modules/koa-compose/index.js

@@ -1 +1 @@
-(function(){"use strict";var e={979:function(e){e.exports=compose;function compose(e){if(!Array.isArray(e))throw new TypeError("Middleware stack must be an array!");for(const r of e){if(typeof r!=="function")throw new TypeError("Middleware must be composed of functions!")}return function(r,t){let i=-1;return dispatch(0);function dispatch(n){if(n<=i)return Promise.reject(new Error("next() called multiple times"));i=n;let o=e[n];if(n===e.length)o=t;if(!o)return Promise.resolve();try{return Promise.resolve(o(r,dispatch.bind(null,n+1)))}catch(e){return Promise.reject(e)}}}}}};var r={};function __nccwpck_require__(t){var i=r[t];if(i!==undefined){return i.exports}var n=r[t]={exports:{}};var o=true;try{e[t](n,n.exports,__nccwpck_require__);o=false}finally{if(o)delete r[t]}return n.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(979);module.exports=t})();
+(()=>{"use strict";var e={979:e=>{e.exports=compose;function compose(e){if(!Array.isArray(e))throw new TypeError("Middleware stack must be an array!");for(const r of e){if(typeof r!=="function")throw new TypeError("Middleware must be composed of functions!")}return function(r,t){let i=-1;return dispatch(0);function dispatch(o){if(o<=i)return Promise.reject(new Error("next() called multiple times"));i=o;let n=e[o];if(o===e.length)n=t;if(!n)return Promise.resolve();try{return Promise.resolve(n(r,dispatch.bind(null,o+1)))}catch(e){return Promise.reject(e)}}}}}};var r={};function __nccwpck_require__(t){var i=r[t];if(i!==undefined){return i.exports}var o=r[t]={exports:{}};var n=true;try{e[t](o,o.exports,__nccwpck_require__);n=false}finally{if(n)delete r[t]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(979);module.exports=t})();

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-04-24T08:10:54.611Z"}
+{"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-24T10:37:12.884Z"}

package/dist/server/actions/query.d.ts

@@ -7,10 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Context, Next } from '@nocobase/actions';
-export declare const postProcess: (ctx: Context, next: Next) => Promise<void>;
+export declare const checkPermission: (ctx: Context, next: Next) => Promise<void>;
 export declare const queryData: (ctx: Context, next: Next) => Promise<void>;
-export declare const parseFieldAndAssociations: (ctx: Context, next: Next) => Promise<void>;
 export declare const parseVariables: (ctx: Context, next: Next) => Promise<void>;
 export declare const cacheMiddleware: (ctx: Context, next: Next) => Promise<void>;
-export declare const checkPermission: (ctx: Context, next: Next) => Promise<any>;
-export declare const query: (ctx: Context, next: Next) => Promise<void>;
+export declare const queryDataAction: (ctx: Context, next: Next) => Promise<void>;

package/dist/server/actions/query.js

@@ -38,193 +38,58 @@ var query_exports = {};
 __export(query_exports, {
   cacheMiddleware: () => cacheMiddleware,
   checkPermission: () => checkPermission,
-  parseFieldAndAssociations: () => parseFieldAndAssociations,
   parseVariables: () => parseVariables,
-  postProcess: () => postProcess,
-  query: () => query,
-  queryData: () => queryData
+  queryData: () => queryData,
+  queryDataAction: () => queryDataAction
 });
 module.exports = __toCommonJS(query_exports);
-var import_database = require("@nocobase/database");
 var import_koa_compose = __toESM(require("koa-compose"));
-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_acl = require("@nocobase/plugin-acl");
+var import_server = require("@nocobase/server");
 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 getTimezone = (ctx) => {
+  var _a, _b, _c, _d, _e, _f;
+  return ((_b = (_a = ctx == null ? void 0 : ctx.request) == null ? void 0 : _a.get) == null ? void 0 : _b.call(_a, "x-timezone")) ?? ((_d = (_c = ctx == null ? void 0 : ctx.request) == null ? void 0 : _c.header) == null ? void 0 : _d["x-timezone"]) ?? ((_f = (_e = ctx == null ? void 0 : ctx.req) == null ? void 0 : _e.headers) == null ? void 0 : _f["x-timezone"]);
 };
-const postProcess = async (ctx, next) => {
-  const { data, fieldMap } = ctx.action.params.values;
-  ctx.body = data.map((record) => {
-    Object.entries(record).forEach(([key, value]) => {
-      if (!value) {
-        return;
-      }
-      const { type } = fieldMap[key] || {};
-      switch (type) {
-        case "bigInt":
-        case "integer":
-        case "float":
-        case "double":
-        case "decimal":
-          record[key] = Number(value);
-          break;
-      }
+const checkPermission = async (ctx, next) => {
+  var _a, _b, _c, _d;
+  const values = ctx.action.params.values || {};
+  const acl = ((_a = ctx.app.dataSourceManager.get(values.dataSource)) == null ? void 0 : _a.acl) || ctx.app.acl;
+  try {
+    const result = await (0, import_plugin_acl.applyQueryPermission)({
+      acl,
+      db: getDB(ctx, values.dataSource) || ctx.db,
+      resourceName: values.collection,
+      query: values,
+      currentUser: (_b = ctx.state) == null ? void 0 : _b.currentUser,
+      currentRole: (_c = ctx.state) == null ? void 0 : _c.currentRole,
+      currentRoles: (_d = ctx.state) == null ? void 0 : _d.currentRoles,
+      timezone: getTimezone(ctx),
+      state: ctx.state
     });
-    return record;
-  });
+    ctx.action.params.values = result.query;
+  } catch (err) {
+    if (!(err instanceof import_acl.NoPermissionError)) {
+      throw err;
+    }
+    ctx.throw(403, "No permissions");
+  }
   await next();
 };
 const queryData = async (ctx, next) => {
-  const { dataSource, collection, queryParams, fieldMap } = ctx.action.params.values;
-  const db = getDB(ctx, dataSource) || ctx.db;
-  const model = db.getModel(collection);
-  const data = await model.findAll(queryParams);
-  ctx.action.params.values = {
-    data,
-    fieldMap
-  };
-  await next();
-};
-const parseFieldAndAssociations = async (ctx, next) => {
   var _a;
-  const {
-    dataSource,
-    collection: collectionName,
-    measures,
-    dimensions,
-    orders,
-    filter
-  } = ctx.action.params.values;
+  const { dataSource, collection, ...queryOptions } = ctx.action.params.values;
   const db = getDB(ctx, dataSource) || ctx.db;
-  const collection = db.getCollection(collectionName);
-  const fields = collection.fields;
-  const associations = collection.model.associations;
-  const models = {};
-  const parseField = (selected) => {
-    var _a2, _b, _c, _d, _e, _f;
-    let target;
-    let name;
-    if (!Array.isArray(selected.field)) {
-      name = selected.field;
-    } else if (selected.field.length === 1) {
-      name = selected.field[0];
-    } else if (selected.field.length > 1) {
-      [target, name] = selected.field;
-    }
-    const rawAttributes = collection.model.getAttributes();
-    let field = ((_a2 = rawAttributes[name]) == null ? void 0 : _a2.field) || name;
-    let fieldType = (_b = fields.get(name)) == null ? void 0 : _b.type;
-    let fieldOptions = (_c = fields.get(name)) == null ? void 0 : _c.options;
-    if (target) {
-      const targetField = fields.get(target);
-      const targetCollection = db.getCollection(targetField.target);
-      const targetFields = targetCollection.fields;
-      fieldType = (_d = targetFields.get(name)) == null ? void 0 : _d.type;
-      fieldOptions = (_e = targetFields.get(name)) == null ? void 0 : _e.options;
-      field = `${target}.${field}`;
-      name = `${target}.${name}`;
-      const targetType = (_f = fields.get(target)) == null ? void 0 : _f.type;
-      if (!models[target]) {
-        models[target] = { type: targetType };
-      }
-    } else {
-      field = `${collectionName}.${field}`;
-    }
-    return {
-      ...selected,
-      field,
-      name,
-      type: fieldType,
-      options: fieldOptions,
-      alias: selected.alias || name
-    };
-  };
-  const parsedMeasures = (measures == null ? void 0 : measures.map(parseField)) || [];
-  const parsedDimensions = (dimensions == null ? void 0 : dimensions.map(parseField)) || [];
-  const parsedOrders = (orders == null ? void 0 : orders.map(parseField)) || [];
-  const include = Object.entries(models).map(([target, { type }]) => {
-    let options = {
-      association: target,
-      attributes: []
-    };
-    if (type === "belongsToMany") {
-      options["through"] = { attributes: [] };
-    }
-    if (type === "belongsToArray") {
-      const association = associations[target];
-      if (association) {
-        options = {
-          ...options,
-          ...association.generateInclude()
-        };
-      }
-    }
-    return options;
+  const repository = db.getRepository(collection);
+  ctx.body = await repository.query({
+    ...queryOptions,
+    timezone: (_a = ctx.get) == null ? void 0 : _a.call(ctx, "x-timezone")
   });
-  const filterParser = new import_database.FilterParser(filter, {
-    collection
-  });
-  const { where, include: filterInclude } = filterParser.toSequelizeParams();
-  if (filterInclude) {
-    const stack = [...filterInclude];
-    while (stack.length) {
-      const item = stack.pop();
-      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 ((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);
-        }
-      }
-    }
-  }
-  ctx.action.params.values = {
-    ...ctx.action.params.values,
-    where,
-    measures: parsedMeasures,
-    dimensions: parsedDimensions,
-    orders: parsedOrders,
-    include: [...include, ...filterInclude || []]
-  };
   await next();
 };
 const parseVariables = async (ctx, next) => {
@@ -259,44 +124,9 @@ const cacheMiddleware = async (ctx, next) => {
     await cache.set(uid, ctx.body, (cacheConfig == null ? void 0 : cacheConfig.ttl) * 1e3);
   }
 };
-const checkPermission = async (ctx, next) => {
-  var _a, _b;
-  const { collection, dataSource } = ctx.action.params.values;
-  const acl = ((_a = ctx.app.dataSourceManager.get(dataSource)) == null ? void 0 : _a.acl) || ctx.app.acl;
-  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), filterParams);
-    } catch (e) {
-      if (e instanceof import_acl.NoPermissionError) {
-        ctx.throw(403, "No permissions");
-      }
-    }
-    const filter = ctx.action.params.values.filter || {};
-    ctx.action.params.values = {
-      ...ctx.action.params.values,
-      filter: (0, import_utils.assign)(filter, filterParams, {
-        filter: "andMerge"
-      })
-    };
-  }
-  return next();
-};
-const query = async (ctx, next) => {
-  const { dataSource } = ctx.action.params.values;
-  const db = getDB(ctx, dataSource) || ctx.db;
-  const queryParser = (0, import_query_parser.createQueryParser)(db);
+const queryDataAction = async (ctx, next) => {
   try {
-    await (0, import_koa_compose.default)([
-      checkPermission,
-      cacheMiddleware,
-      parseVariables,
-      parseFieldAndAssociations,
-      queryParser.parse(),
-      queryData,
-      postProcess
-    ])(ctx, next);
+    await (0, import_koa_compose.default)([checkPermission, cacheMiddleware, parseVariables, queryData])(ctx, next);
   } catch (err) {
     ctx.throw(500, err);
   }
@@ -305,9 +135,7 @@ const query = async (ctx, next) => {
 0 && (module.exports = {
   cacheMiddleware,
   checkPermission,
-  parseFieldAndAssociations,
   parseVariables,
-  postProcess,
-  query,
-  queryData
+  queryData,
+  queryDataAction
 });

package/dist/server/plugin.js

@@ -40,10 +40,10 @@ class PluginDataVisualizationServer extends import_server.Plugin {
     this.app.resourceManager.define({
       name: "charts",
       actions: {
-        query: import_query.query
+        queryData: import_query.queryDataAction
       }
     });
-    this.app.acl.allow("charts", "query", "loggedIn");
+    this.app.acl.allow("charts", "queryData", "loggedIn");
   }
   async load() {
     this.cache = await this.app.cacheManager.createCache({

package/dist/server/types.d.ts

@@ -35,6 +35,7 @@ export type QueryParams = Partial<{
     dimensions: DimensionProps[];
     orders: OrderProps[];
     filter: any;
+    having: any;
     contextParams: Record<string, unknown>;
     limit: number;
     offset: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "2.1.0-beta.15",
+  "version": "2.1.0-beta.16",
   "displayName": "Data visualization",
   "displayName.ru-RU": "Визуализация данных",
   "displayName.zh-CN": "数据可视化",
@@ -40,6 +40,7 @@
     "@nocobase/cache": "2.x",
     "@nocobase/client": "2.x",
     "@nocobase/database": "2.x",
+    "@nocobase/plugin-acl": "2.x",
     "@nocobase/plugin-ai": "2.x",
     "@nocobase/plugin-data-source-main": "2.x",
     "@nocobase/plugin-flow-engine": "2.x",
@@ -47,7 +48,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "dc1aceea6357e6ab149976c2a236fc4b6bee1370",
+  "gitHead": "b9a191705a440a336c85d82fd877fdf152bec70f",
   "keywords": [
     "Blocks"
   ],