@nocobase/plugin-data-visualization 1.5.0-alpha.5 → 1.5.0-beta.10

package/dist/externalVersion.js

@@ -8,24 +8,24 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.5.0-alpha.5",
+  "@nocobase/client": "1.5.0-beta.10",
   "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.5.0-alpha.5",
-  "@nocobase/server": "1.5.0-alpha.5",
-  "@nocobase/test": "1.5.0-alpha.5",
+  "@nocobase/cache": "1.5.0-beta.10",
+  "@nocobase/server": "1.5.0-beta.10",
+  "@nocobase/test": "1.5.0-beta.10",
   "@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.5.0-alpha.5",
+  "@nocobase/utils": "1.5.0-beta.10",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "1.5.0-alpha.5",
-  "@nocobase/database": "1.5.0-alpha.5",
+  "@nocobase/actions": "1.5.0-beta.10",
+  "@nocobase/database": "1.5.0-beta.10",
   "sequelize": "6.35.2"
 };

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-11-23T15:54:42.781Z"}
+{"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-18T04:45:55.885Z"}

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-11-23T15:54:43.499Z"}
+{"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-18T04:45:56.579Z"}

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

@@ -102,13 +102,14 @@ class QueryParser {
   }
   parse() {
     return async (ctx, next) => {
+      var _a;
       const { measures, dimensions, orders, include, where, limit } = ctx.action.params.values;
       const { attributes: measureAttributes, fieldMap: measureFieldMap, hasAgg } = this.parseMeasures(ctx, measures);
       const {
         attributes: dimensionAttributes,
         group,
         fieldMap: dimensionFieldMap
-      } = this.parseDimensions(ctx, dimensions, hasAgg, ctx.timezone);
+      } = this.parseDimensions(ctx, dimensions, hasAgg, (_a = ctx.get) == null ? void 0 : _a.call(ctx, "x-timezone"));
       const order = this.parseOrders(ctx, orders, hasAgg);
       ctx.action.params.values = {
         ...ctx.action.params.values,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.5.0-alpha.5",
+  "version": "1.5.0-beta.10",
   "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": "8d24e8d2c0f3f57ceaa271438fd93db2b4150011",
+  "gitHead": "379133b1104f8c609d7c5ac5bee23f9ba93934d5",
   "keywords": [
     "Blocks"
   ]