@nocobase/plugin-data-visualization 1.0.0-alpha.9 → 1.0.1-alpha.2

package/dist/externalVersion.js

@@ -8,13 +8,13 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.0.0-alpha.9",
+  "@nocobase/client": "1.0.1-alpha.2",
   "dayjs": "1.11.10",
   "@formily/react": "2.3.0",
   "@formily/shared": "2.3.0",
   "lodash": "4.17.21",
-  "@nocobase/cache": "1.0.0-alpha.9",
-  "@nocobase/server": "1.0.0-alpha.9",
+  "@nocobase/cache": "1.0.1-alpha.2",
+  "@nocobase/server": "1.0.1-alpha.2",
   "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.9",
+  "@nocobase/utils": "1.0.1-alpha.2",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "1.0.0-alpha.9",
-  "@nocobase/database": "1.0.0-alpha.9"
+  "sequelize": "6.35.2",
+  "@nocobase/actions": "1.0.1-alpha.2",
+  "@nocobase/database": "1.0.1-alpha.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-05-09T15:22:37.757Z"}
+{"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-06-11T12:22:49.907Z"}

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.d.ts

@@ -11,7 +11,7 @@ export declare const postProcess: (ctx: Context, next: Next) => Promise<void>;
 export declare const queryData: (ctx: Context, next: Next) => Promise<void>;
 export declare const parseBuilder: (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<any>;
+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>;

package/dist/server/actions/query.js

@@ -49,7 +49,7 @@ module.exports = __toCommonJS(query_exports);
 var import_database = require("@nocobase/database");
 var import_formatter = require("./formatter");
 var import_koa_compose = __toESM(require("koa-compose"));
-var import_utils = require("@nocobase/utils");
+var import_server = require("@nocobase/server");
 const getDB = (ctx, dataSource) => {
   const ds = ctx.app.dataSourceManager.dataSources.get(dataSource);
   return ds == null ? void 0 : ds.collectionManager.db;
@@ -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);
     }
@@ -230,52 +230,11 @@ const parseFieldAndAssociations = async (ctx, next) => {
 };
 const parseVariables = async (ctx, next) => {
   const { filter } = ctx.action.params.values;
-  if (!filter) {
-    return next();
-  }
-  const isNumeric = (str) => {
-    if (typeof str === "number")
-      return true;
-    if (typeof str != "string")
-      return false;
-    return !isNaN(str) && !isNaN(parseFloat(str));
-  };
-  const getUser = () => {
-    return async ({ fields }) => {
-      var _a, _b;
-      const userFields = fields.filter((f) => f && ctx.db.getFieldByPath("users." + f));
-      (_a = ctx.logger) == null ? void 0 : _a.info("parse filter variables", { userFields, method: "parseVariables" });
-      if (!ctx.state.currentUser) {
-        return;
-      }
-      if (!userFields.length) {
-        return;
-      }
-      const user = await ctx.db.getRepository("users").findOne({
-        filterByTk: ctx.state.currentUser.id,
-        fields: userFields
-      });
-      (_b = ctx.logger) == null ? void 0 : _b.info("parse filter variables", {
-        $user: user == null ? void 0 : user.toJSON(),
-        method: "parseVariables"
-      });
-      return user;
-    };
-  };
-  ctx.action.params.values.filter = await (0, import_utils.parseFilter)(filter, {
-    timezone: ctx.get("x-timezone"),
-    now: (/* @__PURE__ */ new Date()).toISOString(),
-    getField: (path) => {
-      const fieldPath = path.split(".").filter((p) => !p.startsWith("$") && !isNumeric(p)).join(".");
-      const { resourceName } = ctx.action;
-      return ctx.db.getFieldByPath(`${resourceName}.${fieldPath}`);
-    },
-    vars: {
-      $nDate: (0, import_utils.getDateVars)(),
-      $user: getUser()
-    }
+  ctx.action.params.filter = filter;
+  await import_server.middlewares.parseVariables(ctx, async () => {
+    ctx.action.params.values.filter = ctx.action.params.filter;
+    await next();
   });
-  await next();
 };
 const cacheMiddleware = async (ctx, next) => {
   const { uid, cache: cacheConfig, refresh } = ctx.action.params.values;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.1-alpha.2",
   "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": "562d6ae965317098df05db756d160e03363dcec5",
+  "gitHead": "fc5a8e3c812516f787cb22d3d198f058f45b1963",
   "keywords": [
     "Blocks"
   ]