@nocobase/plugin-data-visualization 0.15.0-alpha.3 → 0.15.0-alpha.5

package/dist/externalVersion.js

@@ -1,10 +1,10 @@
 module.exports = {
-  "@nocobase/client": "0.15.0-alpha.3",
+  "@nocobase/client": "0.15.0-alpha.5",
   "react": "18.2.0",
   "@formily/react": "2.2.27",
   "@formily/shared": "2.2.27",
-  "@nocobase/cache": "0.15.0-alpha.3",
-  "@nocobase/server": "0.15.0-alpha.3",
+  "@nocobase/cache": "0.15.0-alpha.5",
+  "@nocobase/server": "0.15.0-alpha.5",
   "@ant-design/icons": "5.1.4",
   "dayjs": "1.11.9",
   "@formily/antd-v5": "1.1.7",
@@ -14,7 +14,7 @@ module.exports = {
   "@emotion/css": "11.11.2",
   "react-i18next": "11.18.6",
   "ahooks": "3.7.8",
-  "@nocobase/actions": "0.15.0-alpha.3",
-  "@nocobase/database": "0.15.0-alpha.3",
-  "@nocobase/utils": "0.15.0-alpha.3"
+  "@nocobase/actions": "0.15.0-alpha.5",
+  "@nocobase/database": "0.15.0-alpha.5",
+  "@nocobase/utils": "0.15.0-alpha.5"
 };

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":"2023-11-16T07:18:48.802Z"}
+{"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":"2023-11-20T09:31:55.821Z"}

package/dist/server/actions/formatter.js

@@ -28,13 +28,14 @@ const dateFormatFn = (sequelize, dialect, field, format) => {
       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");
       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");
       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");
       return sequelize.fn("to_char", sequelize.col(field), format);
     default:
-      return field;
+      return sequelize.col(field);
   }
 };
 const formatFn = (sequelize, dialect, field, format) => {

package/dist/server/actions/query.js

@@ -261,8 +261,7 @@ const parseVariables = async (ctx, next) => {
 };
 const cacheMiddleware = async (ctx, next) => {
   const { uid, cache: cacheConfig, refresh } = ctx.action.params.values;
-  const plugin = ctx.app.getPlugin("data-visualization");
-  const cache = plugin.cache;
+  const cache = ctx.app.cacheManager.getCache("data-visualization");
   const useCache = (cacheConfig == null ? void 0 : cacheConfig.enabled) && uid;
   if (useCache && !refresh) {
     const data = await cache.get(uid);
@@ -273,7 +272,7 @@ const cacheMiddleware = async (ctx, next) => {
   }
   await next();
   if (useCache) {
-    await cache.set(uid, ctx.body, (cacheConfig == null ? void 0 : cacheConfig.ttl) || 30);
+    await cache.set(uid, ctx.body, (cacheConfig == null ? void 0 : cacheConfig.ttl) * 1e3);
   }
 };
 const checkPermission = (ctx, next) => {

package/dist/server/plugin.js

@@ -21,7 +21,6 @@ __export(plugin_exports, {
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_cache = require("@nocobase/cache");
 var import_server = require("@nocobase/server");
 var import_query = require("./actions/query");
 var import_path = require("path");
@@ -46,11 +45,12 @@ class DataVisualizationPlugin extends import_server.Plugin {
         plugin: this
       }
     });
-    this.cache = (0, import_cache.createCache)({
-      ttl: 30,
-      // seconds
-      max: 1e3,
-      store: "memory"
+    this.cache = await this.app.cacheManager.createCache({
+      name: "data-visualization",
+      store: "memory",
+      ttl: 30 * 1e3,
+      // millseconds
+      max: 1e3
     });
   }
   async install(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "0.15.0-alpha.3",
+  "version": "0.15.0-alpha.5",
   "displayName": "Data Visualization",
   "displayName.zh-CN": "数据可视化",
   "description": "Provides business intelligence and data visualization features",
@@ -33,5 +33,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "8f39868bd613a465efb20123094ebbc2390c1eef"
+  "gitHead": "4713b1a887dad4dadf27b65e3b3e2a46c6986cbf"
 }