@nocobase/plugin-data-visualization 1.0.0-alpha.13 → 1.0.0-alpha.15

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.0.0-alpha.13",
+  "@nocobase/client": "1.0.0-alpha.15",
   "dayjs": "1.11.10",
   "@formily/react": "2.3.0",
   "@formily/shared": "2.3.0",
   "lodash": "4.17.21",
-  "@nocobase/cache": "1.0.0-alpha.13",
-  "@nocobase/server": "1.0.0-alpha.13",
+  "@nocobase/cache": "1.0.0-alpha.15",
+  "@nocobase/server": "1.0.0-alpha.15",
   "react": "18.2.0",
   "@ant-design/icons": "5.2.6",
   "ahooks": "3.7.8",
@@ -22,8 +22,9 @@ module.exports = {
   "antd": "5.12.8",
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
-  "@nocobase/utils": "1.0.0-alpha.13",
+  "@nocobase/utils": "1.0.0-alpha.15",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "1.0.0-alpha.13",
-  "@nocobase/database": "1.0.0-alpha.13"
+  "sequelize": "6.35.2",
+  "@nocobase/actions": "1.0.0-alpha.15",
+  "@nocobase/database": "1.0.0-alpha.15"
 };

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-05-14T09:28:18.166Z"}
+{"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-05-21T03:00:54.874Z"}

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

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare const dateFormatFn: (sequelize: any, dialect: string, field: string, format: string) => any;
-export declare const formatFn: (sequelize: any, dialect: string, field: string, format: string) => any;
-export declare const formatter: (sequelize: any, type: string, field: string, format: string) => any;
+import { Sequelize } from 'sequelize';
+export declare const dateFormatFn: (sequelize: Sequelize, dialect: string, field: string, format: string, timezone?: string) => import("sequelize/types/utils").Col | import("sequelize/types/utils").Fn;
+export declare const formatFn: (sequelize: Sequelize, dialect: string, field: string, format: string) => string | import("sequelize/types/utils").Fn;
+export declare const formatter: (sequelize: Sequelize, type: string, field: string, format: string, timezone?: string) => string | import("sequelize/types/utils").Col | import("sequelize/types/utils").Fn;

package/dist/server/actions/formatter.js

@@ -31,17 +31,42 @@ __export(formatter_exports, {
   formatter: () => formatter
 });
 module.exports = __toCommonJS(formatter_exports);
-const dateFormatFn = (sequelize, dialect, field, format) => {
+const getOffsetMinutesFromTimezone = (timezone) => {
+  const sign = timezone.charAt(0);
+  timezone = timezone.slice(1);
+  const [hours, minutes] = timezone.split(":");
+  const hoursNum = Number(hours);
+  const minutesNum = Number(minutes);
+  const offset = hoursNum * 60 + minutesNum;
+  return `${sign}${offset} minutes`;
+};
+const dateFormatFn = (sequelize, dialect, field, format, timezone) => {
   switch (dialect) {
     case "sqlite":
       format = format.replace(/YYYY/g, "%Y").replace(/MM/g, "%m").replace(/DD/g, "%d").replace(/hh/g, "%H").replace(/mm/g, "%M").replace(/ss/g, "%S");
+      if (timezone) {
+        return sequelize.fn("strftime", format, sequelize.col(field), getOffsetMinutesFromTimezone(timezone));
+      }
       return sequelize.fn("strftime", format, sequelize.col(field));
     case "mysql":
     case "mariadb":
       format = 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");
+      if (timezone) {
+        return sequelize.fn(
+          "date_format",
+          sequelize.fn("convert_tz", sequelize.col(field), process.env.DB_TIMEZONE || "+00:00", timezone),
+          format
+        );
+      }
       return sequelize.fn("date_format", sequelize.col(field), format);
     case "postgres":
       format = format.replace(/hh/g, "HH24").replace(/mm/g, "MI").replace(/ss/g, "SS");
+      if (timezone) {
+        const fieldWithTZ = sequelize.literal(
+          `(${sequelize.getQueryInterface().quoteIdentifiers(field)} AT TIME ZONE CURRENT_SETTING('TIMEZONE') AT TIME ZONE '${timezone}')`
+        );
+        return sequelize.fn("to_char", fieldWithTZ, format);
+      }
       return sequelize.fn("to_char", sequelize.col(field), format);
     default:
       return sequelize.col(field);
@@ -57,13 +82,13 @@ const formatFn = (sequelize, dialect, field, format) => {
       return field;
   }
 };
-const formatter = (sequelize, type, field, format) => {
+const formatter = (sequelize, type, field, format, timezone) => {
   const dialect = sequelize.getDialect();
   switch (type) {
     case "date":
     case "datetime":
     case "time":
-      return dateFormatFn(sequelize, dialect, field, format);
+      return dateFormatFn(sequelize, dialect, field, format, timezone);
     default:
       return formatFn(sequelize, dialect, field, format);
   }

package/dist/server/actions/query.js

@@ -116,7 +116,7 @@ const parseBuilder = async (ctx, next) => {
     const attribute = [];
     const col = sequelize.col(field);
     if (format) {
-      attribute.push((0, import_formatter.formatter)(sequelize, type, field, format));
+      attribute.push((0, import_formatter.formatter)(sequelize, type, field, format, ctx.timezone));
     } else {
       attribute.push(col);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.15",
   "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.",
@@ -33,7 +33,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "bd97adef70762a6691b5b58ca6572672a8cdf838",
+  "gitHead": "2793d371368e094ea2bba04cfbe9b9b73c44edba",
   "keywords": [
     "Blocks"
   ]