@nocobase/plugin-data-visualization 1.4.23 → 1.4.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -8,24 +8,24 @@
8
8
  */
9
9
 
10
10
  module.exports = {
11
- "@nocobase/client": "1.4.23",
11
+ "@nocobase/client": "1.4.25",
12
12
  "dayjs": "1.11.10",
13
13
  "@formily/react": "2.3.0",
14
14
  "@formily/shared": "2.3.2",
15
15
  "lodash": "4.17.21",
16
16
  "react": "18.2.0",
17
- "@nocobase/cache": "1.4.23",
18
- "@nocobase/server": "1.4.23",
19
- "@nocobase/test": "1.4.23",
17
+ "@nocobase/cache": "1.4.25",
18
+ "@nocobase/server": "1.4.25",
19
+ "@nocobase/test": "1.4.25",
20
20
  "@emotion/css": "11.13.0",
21
21
  "@ant-design/icons": "5.2.6",
22
22
  "ahooks": "3.7.8",
23
23
  "antd": "5.12.8",
24
24
  "@formily/antd-v5": "1.1.9",
25
25
  "@formily/core": "2.3.0",
26
- "@nocobase/utils": "1.4.23",
26
+ "@nocobase/utils": "1.4.25",
27
27
  "react-i18next": "11.18.6",
28
- "@nocobase/actions": "1.4.23",
29
- "@nocobase/database": "1.4.23",
28
+ "@nocobase/actions": "1.4.25",
29
+ "@nocobase/database": "1.4.25",
30
30
  "sequelize": "6.35.2"
31
31
  };
@@ -1 +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-01-13T09:41:33.029Z"}
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-01-15T21:52:43.770Z"}
@@ -1 +1 @@
1
- {"name":"moment-timezone","version":"0.5.43","description":"Parse and display moments in any timezone.","homepage":"http://momentjs.com/timezone/","author":"Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)","keywords":["moment","date","time","timezone","olson","iana","zone","tz"],"main":"./index.js","typings":"./index.d.ts","engines":{"node":"*"},"repository":{"type":"git","url":"https://github.com/moment/moment-timezone.git"},"bugs":{"url":"https://github.com/moment/moment-timezone/issues"},"license":"MIT","dependencies":{"moment":"^2.29.4"},"devDependencies":{"grunt":"^1.5.3","grunt-contrib-clean":"^2.0.1","grunt-contrib-jshint":"^3.2.0","grunt-contrib-nodeunit":"^4.0.0","grunt-contrib-uglify":"^5.2.2","grunt-exec":"^3.0.0","typescript":"^3.5.1"},"jspm":{"main":"builds/moment-timezone-with-data","shim":{"moment-timezone":{"deps":["moment"]}}},"scripts":{"test":"grunt"},"_lastModified":"2025-01-13T09:41:33.716Z"}
1
+ {"name":"moment-timezone","version":"0.5.43","description":"Parse and display moments in any timezone.","homepage":"http://momentjs.com/timezone/","author":"Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)","keywords":["moment","date","time","timezone","olson","iana","zone","tz"],"main":"./index.js","typings":"./index.d.ts","engines":{"node":"*"},"repository":{"type":"git","url":"https://github.com/moment/moment-timezone.git"},"bugs":{"url":"https://github.com/moment/moment-timezone/issues"},"license":"MIT","dependencies":{"moment":"^2.29.4"},"devDependencies":{"grunt":"^1.5.3","grunt-contrib-clean":"^2.0.1","grunt-contrib-jshint":"^3.2.0","grunt-contrib-nodeunit":"^4.0.0","grunt-contrib-uglify":"^5.2.2","grunt-exec":"^3.0.0","typescript":"^3.5.1"},"jspm":{"main":"builds/moment-timezone-with-data","shim":{"moment-timezone":{"deps":["moment"]}}},"scripts":{"test":"grunt"},"_lastModified":"2025-01-15T21:52:44.467Z"}
@@ -111,18 +111,21 @@ class QueryParser {
111
111
  fieldMap: dimensionFieldMap
112
112
  } = this.parseDimensions(ctx, dimensions, hasAgg, (_a = ctx.get) == null ? void 0 : _a.call(ctx, "x-timezone"));
113
113
  const order = this.parseOrders(ctx, orders, hasAgg);
114
+ const queryParams = {
115
+ where,
116
+ attributes: [...measureAttributes, ...dimensionAttributes],
117
+ include,
118
+ group,
119
+ order,
120
+ subQuery: false,
121
+ raw: true
122
+ };
123
+ if (!hasAgg || dimensions.length) {
124
+ queryParams["limit"] = limit || 2e3;
125
+ }
114
126
  ctx.action.params.values = {
115
127
  ...ctx.action.params.values,
116
- queryParams: {
117
- where,
118
- attributes: [...measureAttributes, ...dimensionAttributes],
119
- include,
120
- group,
121
- order,
122
- limit: limit || 2e3,
123
- subQuery: false,
124
- raw: true
125
- },
128
+ queryParams,
126
129
  fieldMap: { ...measureFieldMap, ...dimensionFieldMap }
127
130
  };
128
131
  await next();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/plugin-data-visualization",
3
- "version": "1.4.23",
3
+ "version": "1.4.25",
4
4
  "displayName": "Data visualization",
5
5
  "displayName.zh-CN": "数据可视化",
6
6
  "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.",
@@ -34,7 +34,7 @@
34
34
  "@nocobase/test": "1.x",
35
35
  "@nocobase/utils": "1.x"
36
36
  },
37
- "gitHead": "1e87e75a9c3b1efb0426b0690589f988a6d4aedc",
37
+ "gitHead": "1a03757687ce47568c604a4b9bd648c151bbd6e2",
38
38
  "keywords": [
39
39
  "Blocks"
40
40
  ]