@nocobase/plugin-data-visualization 0.16.0-alpha.4 → 0.16.0-alpha.6

package/dist/externalVersion.js

@@ -1,10 +1,10 @@
 module.exports = {
-  "@nocobase/client": "0.16.0-alpha.4",
+  "@nocobase/client": "0.16.0-alpha.6",
   "react": "18.2.0",
   "@formily/react": "2.2.27",
   "@formily/shared": "2.2.27",
-  "@nocobase/cache": "0.16.0-alpha.4",
-  "@nocobase/server": "0.16.0-alpha.4",
+  "@nocobase/cache": "0.16.0-alpha.6",
+  "@nocobase/server": "0.16.0-alpha.6",
   "@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.16.0-alpha.4",
-  "@nocobase/database": "0.16.0-alpha.4",
-  "@nocobase/utils": "0.16.0-alpha.4"
+  "@nocobase/actions": "0.16.0-alpha.6",
+  "@nocobase/database": "0.16.0-alpha.6",
+  "@nocobase/utils": "0.16.0-alpha.6"
 };

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-24T15:22:41.139Z"}
+{"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-12-04T03:11:36.746Z"}

package/dist/server/actions/query.js

@@ -145,10 +145,9 @@ const parseFieldAndAssociations = async (ctx, next) => {
   const { collection: collectionName, measures, dimensions, orders, filter } = ctx.action.params.values;
   const collection = ctx.db.getCollection(collectionName);
   const fields = collection.fields;
-  const underscored = collection.options.underscored;
   const models = {};
   const parseField = (selected) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let target;
     let name;
     if (!Array.isArray(selected.field)) {
@@ -158,16 +157,17 @@ const parseFieldAndAssociations = async (ctx, next) => {
     } else if (selected.field.length > 1) {
       [target, name] = selected.field;
     }
-    let field = underscored ? (0, import_database.snakeCase)(name) : name;
-    let fieldType = (_a = fields.get(name)) == null ? void 0 : _a.type;
+    const rawAttributes = collection.model.getAttributes();
+    let field = ((_a = rawAttributes[name]) == null ? void 0 : _a.field) || name;
+    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 targetFields = targetCollection.fields;
-      fieldType = (_b = targetFields.get(name)) == null ? void 0 : _b.type;
+      fieldType = (_c = targetFields.get(name)) == null ? void 0 : _c.type;
       field = `${target}.${field}`;
       name = `${target}.${name}`;
-      const targetType = (_c = fields.get(target)) == null ? void 0 : _c.type;
+      const targetType = (_d = fields.get(target)) == null ? void 0 : _d.type;
       if (!models[target]) {
         models[target] = { type: targetType };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "0.16.0-alpha.4",
+  "version": "0.16.0-alpha.6",
   "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": "98d65186a22281e59209d11a6756712a62667c07"
+  "gitHead": "e8ad2328a8f85289cb19a7994d3fd726c7ae1720"
 }