@tachybase/plugin-block-charts 0.23.48 → 0.23.58

package/dist/externalVersion.js

@@ -1,18 +1,18 @@
 module.exports = {
-  "@tachybase/client": "0.23.48",
-  "@tachybase/schema": "0.23.48",
+  "@tachybase/client": "0.23.58",
+  "@tachybase/schema": "0.23.58",
   "lodash": "4.17.21",
-  "@tachybase/cache": "0.23.48",
-  "@tachybase/server": "0.23.48",
-  "@tachybase/utils": "0.23.48",
+  "@tachybase/cache": "0.23.58",
+  "@tachybase/server": "0.23.58",
+  "@tachybase/utils": "0.23.58",
   "react": "18.3.1",
   "@ant-design/icons": "5.3.7",
   "ahooks": "3.8.4",
   "antd": "5.22.5",
   "dayjs": "1.11.13",
-  "@tachybase/components": "0.23.48",
+  "@tachybase/components": "0.23.58",
   "react-i18next": "15.2.0",
   "sequelize": "6.37.5",
-  "@tachybase/actions": "0.23.48",
-  "@tachybase/database": "0.23.48"
+  "@tachybase/actions": "0.23.58",
+  "@tachybase/database": "0.23.58"
 };

package/dist/node_modules/fs-extra/package.json

@@ -1 +1 @@
-{"name":"fs-extra","version":"11.2.0","description":"fs-extra contains methods that aren't included in the vanilla Node.js fs package. Such as recursive mkdir, copy, and remove.","engines":{"node":">=14.14"},"homepage":"https://github.com/jprichardson/node-fs-extra","repository":{"type":"git","url":"https://github.com/jprichardson/node-fs-extra"},"keywords":["fs","file","file system","copy","directory","extra","mkdirp","mkdir","mkdirs","recursive","json","read","write","extra","delete","remove","touch","create","text","output","move","promise"],"author":"JP Richardson <jprichardson@gmail.com>","license":"MIT","dependencies":{"graceful-fs":"^4.2.0","jsonfile":"^6.0.1","universalify":"^2.0.0"},"devDependencies":{"klaw":"^2.1.1","klaw-sync":"^3.0.2","minimist":"^1.1.1","mocha":"^10.1.0","nyc":"^15.0.0","proxyquire":"^2.0.1","read-dir-files":"^0.1.1","standard":"^17.0.0"},"main":"./lib/index.js","exports":{".":"./lib/index.js","./esm":"./lib/esm.mjs"},"files":["lib/","!lib/**/__tests__/"],"scripts":{"lint":"standard","test-find":"find ./lib/**/__tests__ -name *.test.js | xargs mocha","test":"npm run lint && npm run unit && npm run unit-esm","unit":"nyc node test.js","unit-esm":"node test.mjs"},"sideEffects":false,"_lastModified":"2025-02-21T11:04:13.396Z"}
+{"name":"fs-extra","version":"11.2.0","description":"fs-extra contains methods that aren't included in the vanilla Node.js fs package. Such as recursive mkdir, copy, and remove.","engines":{"node":">=14.14"},"homepage":"https://github.com/jprichardson/node-fs-extra","repository":{"type":"git","url":"https://github.com/jprichardson/node-fs-extra"},"keywords":["fs","file","file system","copy","directory","extra","mkdirp","mkdir","mkdirs","recursive","json","read","write","extra","delete","remove","touch","create","text","output","move","promise"],"author":"JP Richardson <jprichardson@gmail.com>","license":"MIT","dependencies":{"graceful-fs":"^4.2.0","jsonfile":"^6.0.1","universalify":"^2.0.0"},"devDependencies":{"klaw":"^2.1.1","klaw-sync":"^3.0.2","minimist":"^1.1.1","mocha":"^10.1.0","nyc":"^15.0.0","proxyquire":"^2.0.1","read-dir-files":"^0.1.1","standard":"^17.0.0"},"main":"./lib/index.js","exports":{".":"./lib/index.js","./esm":"./lib/esm.mjs"},"files":["lib/","!lib/**/__tests__/"],"scripts":{"lint":"standard","test-find":"find ./lib/**/__tests__ -name *.test.js | xargs mocha","test":"npm run lint && npm run unit && npm run unit-esm","unit":"nyc node test.js","unit-esm":"node test.mjs"},"sideEffects":false,"_lastModified":"2025-03-06T10:00:58.692Z"}

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":"2025-02-21T11:04:13.065Z"}
+{"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":"2025-03-06T10:00:58.356Z"}

package/dist/server/actions/query.js

@@ -201,23 +201,36 @@ const parseFieldAndAssociations = async (ctx, next) => {
     collection
   });
   const { where, include: filterInclude } = filterParser.toSequelizeParams();
-  const parsedFilterInclude = filterInclude == null ? void 0 : filterInclude.map((item) => {
-    var _a;
-    if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
-      item.through = { attributes: [] };
-    }
-    return item;
-  });
+  addBelongsToManyThrough(filterInclude, collectionName, ctx.db);
   ctx.action.params.values = {
     ...ctx.action.params.values,
     where,
     measures: parsedMeasures,
     dimensions: parsedDimensions,
     orders: parsedOrders,
-    include: [...include, ...parsedFilterInclude || []]
+    include: [...include, ...filterInclude || []]
   };
   await next();
 };
+function addBelongsToManyThrough(include, collectionName, db) {
+  var _a, _b;
+  if (!include) {
+    return;
+  }
+  const collection = db.getCollection(collectionName);
+  if (!collection) {
+    return;
+  }
+  const fields = collection.fields;
+  for (const item of include) {
+    if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
+      item.through = { attributes: [] };
+    }
+    if (item.include) {
+      addBelongsToManyThrough(item.include, (_b = fields.get(item.association)) == null ? void 0 : _b.target, db);
+    }
+  }
+}
 const parseVariables = async (ctx, next) => {
   const { filter } = ctx.action.params.values;
   if (!filter) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-block-charts",
   "displayName": "Block: charts",
-  "version": "0.23.48",
+  "version": "0.23.58",
   "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.",
   "keywords": [
     "Blocks"
@@ -23,17 +23,17 @@
     "react-error-boundary": "^4.1.2",
     "react-i18next": "^15.2.0",
     "sequelize": "^6.37.5",
-    "@tachybase/components": "0.23.48",
-    "@tachybase/schema": "0.23.48"
+    "@tachybase/components": "0.23.58",
+    "@tachybase/schema": "0.23.58"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.48",
-    "@tachybase/cache": "0.23.48",
-    "@tachybase/client": "0.23.48",
-    "@tachybase/database": "0.23.48",
-    "@tachybase/test": "0.23.48",
-    "@tachybase/utils": "0.23.48",
-    "@tachybase/server": "0.23.48"
+    "@tachybase/actions": "0.23.58",
+    "@tachybase/client": "0.23.58",
+    "@tachybase/server": "0.23.58",
+    "@tachybase/test": "0.23.58",
+    "@tachybase/utils": "0.23.58",
+    "@tachybase/database": "0.23.58",
+    "@tachybase/cache": "0.23.58"
   },
   "description.zh-CN": "提供数据可视化功能，包含图表卡片和图表筛选卡片，支持折线图、面积图、柱状图等十几种图表，你也可以扩展更多图表类型。",
   "displayName.zh-CN": "卡片：图表",