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

package/dist/externalVersion.js

@@ -1,10 +1,10 @@
 module.exports = {
-  "@nocobase/client": "0.20.0-alpha.9",
+  "@nocobase/client": "0.21.0-alpha.2",
   "@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.2",
+  "@nocobase/server": "0.21.0-alpha.2",
   "react": "18.2.0",
   "@ant-design/icons": "5.2.6",
   "ahooks": "3.7.8",
@@ -13,8 +13,8 @@ module.exports = {
   "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.2",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "0.20.0-alpha.9"
+  "@nocobase/actions": "0.21.0-alpha.2",
+  "@nocobase/database": "0.21.0-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-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-03T15:40:14.050Z"}

package/dist/server/actions/query.js

@@ -40,6 +40,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 +66,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 +77,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 +141,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 +169,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}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "0.20.0-alpha.9",
+  "version": "0.21.0-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.",
@@ -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": "90628f2e2da846208fb2d7966ddb4e467d187ffb",
   "keywords": [
     "Blocks"
   ]