@nocobase/plugin-data-visualization 1.3.0-alpha.20240710141659 → 1.3.0-alpha.20240719150832

package/dist/externalVersion.js

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

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-07-10T14:29:34.020Z"}
+{"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-07-19T15:19:11.064Z"}

package/dist/server/actions/query.js

@@ -166,6 +166,7 @@ const parseFieldAndAssociations = async (ctx, next) => {
   const db = getDB(ctx, dataSource) || ctx.db;
   const collection = db.getCollection(collectionName);
   const fields = collection.fields;
+  const associations = collection.model.associations;
   const models = {};
   const parseField = (selected) => {
     var _a, _b, _c, _d;
@@ -206,11 +207,25 @@ const parseFieldAndAssociations = async (ctx, next) => {
   const parsedMeasures = (measures == null ? void 0 : measures.map(parseField)) || [];
   const parsedDimensions = (dimensions == null ? void 0 : dimensions.map(parseField)) || [];
   const parsedOrders = (orders == null ? void 0 : orders.map(parseField)) || [];
-  const include = Object.entries(models).map(([target, { type }]) => ({
-    association: target,
-    attributes: [],
-    ...type === "belongsToMany" ? { through: { attributes: [] } } : {}
-  }));
+  const include = Object.entries(models).map(([target, { type }]) => {
+    let options = {
+      association: target,
+      attributes: []
+    };
+    if (type === "belongsToMany") {
+      options["through"] = { attributes: [] };
+    }
+    if (type === "belongsToArray") {
+      const association = associations[target];
+      if (association) {
+        options = {
+          ...options,
+          ...association.generateInclude()
+        };
+      }
+    }
+    return options;
+  });
   const filterParser = new import_database.FilterParser(filter, {
     collection
   });
@@ -257,9 +272,11 @@ const cacheMiddleware = async (ctx, next) => {
   }
 };
 const checkPermission = (ctx, next) => {
-  const { collection } = ctx.action.params.values;
+  var _a;
+  const { collection, dataSource } = ctx.action.params.values;
   const roleName = ctx.state.currentRole || "anonymous";
-  const can = ctx.app.acl.can({ role: roleName, resource: collection, action: "list" });
+  const acl = ((_a = ctx.app.dataSourceManager.get(dataSource)) == null ? void 0 : _a.acl) || ctx.app.acl;
+  const can = acl.can({ role: roleName, resource: collection, action: "list" });
   if (!can && roleName !== "root") {
     ctx.throw(403, "No permissions");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.3.0-alpha.20240710141659",
+  "version": "1.3.0-alpha.20240719150832",
   "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.",
@@ -28,12 +28,13 @@
     "@nocobase/actions": "1.x",
     "@nocobase/cache": "1.x",
     "@nocobase/client": "1.x",
+    "@nocobase/data-source-main": "1.x",
     "@nocobase/database": "1.x",
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "cb8b234443034da0dfa57dd5d6cca1f3b3db6f08",
+  "gitHead": "df502d5ebb2c9d7a11ee12b6d4a1b58453e6e176",
   "keywords": [
     "Blocks"
   ]