@nocobase/plugin-data-visualization 1.6.0-alpha.2 → 1.6.0-alpha.21

package/dist/client/renderer/ChartRendererProvider.d.ts

@@ -32,6 +32,7 @@ export type QueryProps = Partial<{
     }[];
     filter: any;
     limit: number;
+    offset: number;
     sql: {
         fields?: string;
         clauses?: string;

package/dist/externalVersion.js

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

package/dist/locale/en-US.json

@@ -23,6 +23,7 @@
   "Filter": "Filter",
   "Sort": "Sort",
   "Limit": "Limit",
+  "Offset": "Offset",
   "Enable cache": "Enable cache",
   "TTL (second)": "TTL (second)",
   "Field": "Field",

package/dist/locale/ja-JP.json

@@ -23,6 +23,7 @@
   "Filter": "フィルター",
   "Sort": "ソート",
   "Limit": "制限",
+  "Offset": "スキップする件数",
   "Enable cache": "キャッシュを有効化",
   "TTL (second)": "TTL（秒）",
   "Field": "フィールド",
@@ -97,4 +98,4 @@
   "Show padding": "パディングを表示",
   "Distinct": "重複排除",
   "Collapse": "折りたたみ"
-}
+}

package/dist/locale/ko-KR.json

@@ -23,6 +23,7 @@
   "Filter": "필터",
   "Sort": "정렬",
   "Limit": "결과 제한",
+  "Offset": "건너뛸 개수",
   "Enable cache": "캐시 활성화",
   "TTL (second)": "TTL (초)",
   "Field": "필드",

package/dist/locale/zh-CN.json

@@ -23,6 +23,7 @@
   "Filter": "过滤",
   "Sort": "排序",
   "Limit": "结果数量",
+  "Offset": "跳过数量",
   "Enable cache": "启用缓存",
   "TTL (second)": "缓存时间 (秒)",
   "Field": "字段",

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":"2024-12-03T16:01:29.051Z"}
+{"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-02-07T02:41:01.028Z"}

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":"2024-12-03T16:01:29.764Z"}
+{"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-02-07T02:41:01.715Z"}

package/dist/server/actions/query.js

@@ -87,6 +87,7 @@ const queryData = async (ctx, next) => {
   await next();
 };
 const parseFieldAndAssociations = async (ctx, next) => {
+  var _a;
   const {
     dataSource,
     collection: collectionName,
@@ -101,7 +102,7 @@ const parseFieldAndAssociations = async (ctx, next) => {
   const associations = collection.model.associations;
   const models = {};
   const parseField = (selected) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a2, _b, _c, _d, _e, _f;
     let target;
     let name;
     if (!Array.isArray(selected.field)) {
@@ -112,7 +113,7 @@ const parseFieldAndAssociations = async (ctx, next) => {
       [target, name] = selected.field;
     }
     const rawAttributes = collection.model.getAttributes();
-    let field = ((_a = rawAttributes[name]) == null ? void 0 : _a.field) || name;
+    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) {
@@ -165,20 +166,25 @@ const parseFieldAndAssociations = async (ctx, next) => {
     collection
   });
   const { where, include: filterInclude } = filterParser.toSequelizeParams();
-  const parsedFilterInclude = filterInclude == null ? void 0 : filterInclude.map((item) => {
-    var _a;
-    if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
-      item.through = { attributes: [] };
+  if (filterInclude) {
+    const stack = [...filterInclude];
+    while (stack.length) {
+      const item = stack.pop();
+      if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
+        item.through = { attributes: [] };
+      }
+      if (item.include) {
+        stack.push(...item.include);
+      }
     }
-    return item;
-  });
+  }
   ctx.action.params.values = {
     ...ctx.action.params.values,
     where,
     measures: parsedMeasures,
     dimensions: parsedDimensions,
     orders: parsedOrders,
-    include: [...include, ...parsedFilterInclude || []]
+    include: [...include, ...filterInclude || []]
   };
   await next();
 };

package/dist/server/formatter/mysql-formatter.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -23,6 +25,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var mysql_formatter_exports = {};
 __export(mysql_formatter_exports, {
@@ -30,19 +40,16 @@ __export(mysql_formatter_exports, {
 });
 module.exports = __toCommonJS(mysql_formatter_exports);
 var import_formatter = require("./formatter");
+var import_moment_timezone = __toESM(require("moment-timezone"));
 class MySQLFormatter extends import_formatter.Formatter {
   convertFormat(format) {
     return format.replace(/YYYY/g, "%Y").replace(/MM/g, "%m").replace(/DD/g, "%d").replace(/hh/g, "%H").replace(/mm/g, "%i").replace(/ss/g, "%S");
   }
   formatDate(field, format, timezoneOffset) {
-    const timezone = this.getTimezoneByOffset(timezoneOffset);
+    const tz = import_moment_timezone.default.tz(process.env.TZ || "UTC").format("Z");
     format = this.convertFormat(format);
-    if (timezone) {
-      return this.sequelize.fn(
-        "date_format",
-        this.sequelize.fn("convert_tz", field, process.env.TZ || "UTC", timezone),
-        format
-      );
+    if (timezoneOffset && tz !== timezoneOffset) {
+      return this.sequelize.fn("date_format", this.sequelize.fn("convert_tz", field, tz, timezoneOffset), format);
     }
     return this.sequelize.fn("date_format", field, format);
   }

package/dist/server/query-parser/query-parser.js

@@ -103,7 +103,7 @@ class QueryParser {
   parse() {
     return async (ctx, next) => {
       var _a;
-      const { measures, dimensions, orders, include, where, limit } = ctx.action.params.values;
+      const { measures, dimensions, orders, include, where, limit, offset } = ctx.action.params.values;
       const { attributes: measureAttributes, fieldMap: measureFieldMap, hasAgg } = this.parseMeasures(ctx, measures);
       const {
         attributes: dimensionAttributes,
@@ -111,18 +111,22 @@ class QueryParser {
         fieldMap: dimensionFieldMap
       } = this.parseDimensions(ctx, dimensions, hasAgg, (_a = ctx.get) == null ? void 0 : _a.call(ctx, "x-timezone"));
       const order = this.parseOrders(ctx, orders, hasAgg);
+      const queryParams = {
+        where,
+        attributes: [...measureAttributes, ...dimensionAttributes],
+        include,
+        group,
+        order,
+        subQuery: false,
+        raw: true
+      };
+      if (!hasAgg || dimensions.length) {
+        queryParams["limit"] = limit || 2e3;
+        queryParams["offset"] = offset || 0;
+      }
       ctx.action.params.values = {
         ...ctx.action.params.values,
-        queryParams: {
-          where,
-          attributes: [...measureAttributes, ...dimensionAttributes],
-          include,
-          group,
-          order,
-          limit: limit || 2e3,
-          subQuery: false,
-          raw: true
-        },
+        queryParams,
         fieldMap: { ...measureFieldMap, ...dimensionFieldMap }
       };
       await next();

package/dist/server/types.d.ts

@@ -34,6 +34,7 @@ export type QueryParams = Partial<{
     orders: OrderProps[];
     filter: any;
     limit: number;
+    offset: number;
     sql: {
         fields?: string;
         clauses?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.6.0-alpha.2",
+  "version": "1.6.0-alpha.21",
   "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": "08bbc34c21727fc0ad0880f397a42bf7741091ee",
+  "gitHead": "873cbaec9554e684781b8dc6cfd4386bb5cfa5b0",
   "keywords": [
     "Blocks"
   ]