@nocobase/plugin-data-visualization 0.20.0-alpha.9 → 0.21.0-alpha.10

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

@@ -13,6 +13,7 @@ export type TransformProps = {
     field: string;
     type: string;
     format: string;
+    argument?: string | number;
 };
 export type QueryProps = Partial<{
     measures: MeasureProps[];

package/dist/client/transformers.d.ts

@@ -0,0 +1,12 @@
+export type Transformer = (val: any, ...args: any[]) => string | number;
+export type TransformerConfig = Transformer | {
+    label?: string;
+    schema?: any;
+    fn: Transformer;
+};
+declare const transformers: {
+    [key: string]: {
+        [key: string]: TransformerConfig;
+    };
+};
+export default transformers;

package/dist/client/utils.d.ts

@@ -9,6 +9,8 @@ export declare const createRendererSchema: (decoratorProps: any, componentProps?
     'x-component': string;
     'x-component-props': {
         size: string;
+        title: any;
+        bordered: any;
     };
     'x-initializer': string;
     properties: {

package/dist/externalVersion.js

@@ -1,20 +1,20 @@
 module.exports = {
-  "@nocobase/client": "0.20.0-alpha.9",
+  "@nocobase/client": "0.21.0-alpha.10",
+  "dayjs": "1.11.10",
   "@formily/react": "2.3.0",
   "@formily/shared": "2.3.0",
   "lodash": "4.17.21",
-  "@nocobase/cache": "0.20.0-alpha.9",
-  "@nocobase/server": "0.20.0-alpha.9",
+  "@nocobase/cache": "0.21.0-alpha.10",
+  "@nocobase/server": "0.21.0-alpha.10",
   "react": "18.2.0",
   "@ant-design/icons": "5.2.6",
   "ahooks": "3.7.8",
-  "dayjs": "1.11.10",
   "@emotion/css": "11.11.2",
   "antd": "5.12.8",
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
-  "@nocobase/utils": "0.20.0-alpha.9",
-  "@nocobase/database": "0.20.0-alpha.9",
+  "@nocobase/utils": "0.21.0-alpha.10",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "0.20.0-alpha.9"
+  "@nocobase/actions": "0.21.0-alpha.10",
+  "@nocobase/database": "0.21.0-alpha.10"
 };

package/dist/locale/en-US.json

@@ -80,5 +80,12 @@
   "Time range": "Time range",
   "Edit field properties": "Edit field properties",
   "Select a source field to use metadata of the field": "Select a source field to use metadata of the field",
-  "Original field": "Original field"
+  "Original field": "Original field",
+  "Transformation": "Transformation",
+  "Add transformation": "Add transformation",
+  "Container": "Container",
+  "Show border": "Show border",
+  "Transformation tip": "Fields allow multiple transformations, applied sequentially. Pay attention to data type changes after each transformation. Drag-and-drop functionality enables adjustment of transformation order.",
+  "Type conversion": "Type conversion",
+  "Transformer": "Transformer"
 }

package/dist/locale/zh-CN.json

@@ -81,5 +81,12 @@
   "Time range": "时间范围",
   "Edit field properties": "编辑字段属性",
   "Select a source field to use metadata of the field": "选择来源字段可以复用字段的元数据配置",
-  "Original field": "原始字段"
+  "Original field": "原始字段",
+  "Transformation": "数据转换",
+  "Add transformation": "添加数据转换",
+  "Container": "容器",
+  "Show border": "显示边框",
+  "Transformation tip": "一个字段可以应用多次转换，会按照顺序执行，请注意每次转换后的数据类型，拖动可以调整转换顺序。",
+  "Type conversion": "类型转换",
+  "Transformer": "转换方法"
 }

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-03-12T13:23:16.143Z"}
+{"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-04-16T16:08:33.460Z"}

package/dist/server/actions/formatter.js

@@ -38,6 +38,7 @@ const dateFormatFn = (sequelize, dialect, field, format) => {
       return sequelize.col(field);
   }
 };
+/* istanbul ignore next -- @preserve */
 const formatFn = (sequelize, dialect, field, format) => {
   switch (dialect) {
     case "sqlite":

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

@@ -5,4 +5,5 @@ 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 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

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var query_exports = {};
 __export(query_exports, {
   cacheMiddleware: () => cacheMiddleware,
+  checkPermission: () => checkPermission,
   parseBuilder: () => parseBuilder,
   parseFieldAndAssociations: () => parseFieldAndAssociations,
   parseVariables: () => parseVariables,
@@ -40,6 +41,10 @@ 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");
+const getDB = (ctx, dataSource) => {
+  const ds = ctx.app.dataSourceManager.dataSources.get(dataSource);
+  return ds == null ? void 0 : ds.collectionManager.db;
+};
 const postProcess = async (ctx, next) => {
   const { data, fieldMap } = ctx.action.params.values;
   ctx.body = data.map((record) => {
@@ -62,8 +67,9 @@ const postProcess = async (ctx, next) => {
   await next();
 };
 const queryData = async (ctx, next) => {
-  const { collection, queryParams, fieldMap } = ctx.action.params.values;
-  const model = ctx.db.getModel(collection);
+  const { dataSource, collection, queryParams, fieldMap } = ctx.action.params.values;
+  const db = getDB(ctx, dataSource) || ctx.db;
+  const model = db.getModel(collection);
   const data = await model.findAll(queryParams);
   ctx.action.params.values = {
     data,
@@ -72,8 +78,9 @@ const queryData = async (ctx, next) => {
   await next();
 };
 const parseBuilder = async (ctx, next) => {
-  const { sequelize } = ctx.db;
-  const { measures, dimensions, orders, include, where, limit } = ctx.action.params.values;
+  const { dataSource, measures, dimensions, orders, include, where, limit } = ctx.action.params.values;
+  const db = getDB(ctx, dataSource) || ctx.db;
+  const { sequelize } = db;
   const attributes = [];
   const group = [];
   const order = [];
@@ -135,8 +142,16 @@ const parseBuilder = async (ctx, next) => {
   await next();
 };
 const parseFieldAndAssociations = async (ctx, next) => {
-  const { collection: collectionName, measures, dimensions, orders, filter } = ctx.action.params.values;
-  const collection = ctx.db.getCollection(collectionName);
+  const {
+    dataSource,
+    collection: collectionName,
+    measures,
+    dimensions,
+    orders,
+    filter
+  } = ctx.action.params.values;
+  const db = getDB(ctx, dataSource) || ctx.db;
+  const collection = db.getCollection(collectionName);
   const fields = collection.fields;
   const models = {};
   const parseField = (selected) => {
@@ -155,7 +170,7 @@ const parseFieldAndAssociations = async (ctx, next) => {
     let fieldType = (_b = fields.get(name)) == null ? void 0 : _b.type;
     if (target) {
       const targetField = fields.get(target);
-      const targetCollection = ctx.db.getCollection(targetField.target);
+      const targetCollection = db.getCollection(targetField.target);
       const targetFields = targetCollection.fields;
       fieldType = (_c = targetFields.get(name)) == null ? void 0 : _c.type;
       field = `${target}.${field}`;
@@ -296,6 +311,7 @@ const query = async (ctx, next) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cacheMiddleware,
+  checkPermission,
   parseBuilder,
   parseFieldAndAssociations,
   parseVariables,

package/dist/server/plugin.d.ts

@@ -1,6 +1,6 @@
 import { Cache } from '@nocobase/cache';
 import { InstallOptions, Plugin } from '@nocobase/server';
-export declare class DataVisualizationPlugin extends Plugin {
+export declare class PluginDataVisualizationServer extends Plugin {
     cache: Cache;
     afterAdd(): void;
     beforeLoad(): void;
@@ -10,4 +10,4 @@ export declare class DataVisualizationPlugin extends Plugin {
     afterDisable(): Promise<void>;
     remove(): Promise<void>;
 }
-export default DataVisualizationPlugin;
+export default PluginDataVisualizationServer;

package/dist/server/plugin.js

@@ -17,14 +17,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var plugin_exports = {};
 __export(plugin_exports, {
-  DataVisualizationPlugin: () => DataVisualizationPlugin,
+  PluginDataVisualizationServer: () => PluginDataVisualizationServer,
   default: () => plugin_default
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_server = require("@nocobase/server");
 var import_query = require("./actions/query");
 var import_path = require("path");
-class DataVisualizationPlugin extends import_server.Plugin {
+class PluginDataVisualizationServer extends import_server.Plugin {
   cache;
   afterAdd() {
   }
@@ -62,8 +62,8 @@ class DataVisualizationPlugin extends import_server.Plugin {
   async remove() {
   }
 }
-var plugin_default = DataVisualizationPlugin;
+var plugin_default = PluginDataVisualizationServer;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DataVisualizationPlugin
+  PluginDataVisualizationServer
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "0.20.0-alpha.9",
+  "version": "0.21.0-alpha.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.",
@@ -10,7 +10,7 @@
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/data-visualization",
   "devDependencies": {
     "@ant-design/icons": "5.x",
-    "@ant-design/plots": "^1.2.5",
+    "@ant-design/plots": "^2.1.4",
     "@emotion/css": "^11.7.1",
     "@formily/antd-v5": "1.x",
     "@formily/core": "2.x",
@@ -33,7 +33,7 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5",
+  "gitHead": "98adf5ec996a4f359c6ca1c4a6ac837c43b6e268",
   "keywords": [
     "Blocks"
   ]

package/dist/client/block/transformers.d.ts

@@ -1,7 +0,0 @@
-export type Transformer = (val: any, locale?: string) => string | number;
-declare const transformers: {
-    [key: string]: {
-        [key: string]: Transformer;
-    };
-};
-export default transformers;