@nocobase/plugin-data-visualization 1.3.0-alpha.20240814073548 → 1.3.0-beta

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,13 +8,13 @@
8
8
  */
9
9
 
10
10
  module.exports = {
11
- "@nocobase/client": "1.3.0-alpha.20240814073548",
11
+ "@nocobase/client": "1.3.0-beta",
12
12
  "dayjs": "1.11.10",
13
13
  "@formily/react": "2.3.0",
14
14
  "@formily/shared": "2.3.0",
15
15
  "lodash": "4.17.21",
16
- "@nocobase/cache": "1.3.0-alpha.20240814073548",
17
- "@nocobase/server": "1.3.0-alpha.20240814073548",
16
+ "@nocobase/cache": "1.3.0-beta",
17
+ "@nocobase/server": "1.3.0-beta",
18
18
  "react": "18.2.0",
19
19
  "@emotion/css": "11.11.2",
20
20
  "@ant-design/icons": "5.2.6",
@@ -22,9 +22,9 @@ module.exports = {
22
22
  "antd": "5.12.8",
23
23
  "@formily/antd-v5": "1.1.9",
24
24
  "@formily/core": "2.3.0",
25
- "@nocobase/utils": "1.3.0-alpha.20240814073548",
25
+ "@nocobase/utils": "1.3.0-beta",
26
26
  "react-i18next": "11.18.6",
27
27
  "sequelize": "6.35.2",
28
- "@nocobase/actions": "1.3.0-alpha.20240814073548",
29
- "@nocobase/database": "1.3.0-alpha.20240814073548"
28
+ "@nocobase/actions": "1.3.0-beta",
29
+ "@nocobase/database": "1.3.0-beta"
30
30
  };
@@ -94,5 +94,6 @@
94
94
  "Aspect ratio": "Aspect ratio",
95
95
  "Fixed height": "Fixed height",
96
96
  "Show background": "Show background",
97
- "Show padding": "Show padding"
97
+ "Show padding": "Show padding",
98
+ "Distinct": "Distinct"
98
99
  }
@@ -95,5 +95,6 @@
95
95
  "Aspect ratio": "宽高比",
96
96
  "Fixed height": "固定高度",
97
97
  "Show background": "显示背景",
98
- "Show padding": "显示内边距"
98
+ "Show padding": "显示内边距",
99
+ "Distinct": "去重"
99
100
  }
@@ -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":"2024-08-14T07:47:48.844Z"}
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-08-25T16:22:12.811Z"}
@@ -97,7 +97,7 @@ const parseBuilder = async (ctx, next) => {
97
97
  const fieldMap = {};
98
98
  let hasAgg = false;
99
99
  measures.forEach((measure) => {
100
- const { field, aggregation, alias } = measure;
100
+ const { field, aggregation, alias, distinct } = measure;
101
101
  const attribute = [];
102
102
  const col = sequelize.col(field);
103
103
  if (aggregation) {
@@ -105,7 +105,7 @@ const parseBuilder = async (ctx, next) => {
105
105
  throw new Error(`Invalid aggregation function: ${aggregation}`);
106
106
  }
107
107
  hasAgg = true;
108
- attribute.push(sequelize.fn(aggregation, col));
108
+ attribute.push(sequelize.fn(aggregation, distinct ? sequelize.fn("DISTINCT", col) : col));
109
109
  } else {
110
110
  attribute.push(col);
111
111
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/plugin-data-visualization",
3
- "version": "1.3.0-alpha.20240814073548",
3
+ "version": "1.3.0-beta",
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.",
@@ -28,13 +28,13 @@
28
28
  "@nocobase/actions": "1.x",
29
29
  "@nocobase/cache": "1.x",
30
30
  "@nocobase/client": "1.x",
31
- "@nocobase/data-source-main": "1.x",
32
31
  "@nocobase/database": "1.x",
32
+ "@nocobase/plugin-data-source-main": "1.x",
33
33
  "@nocobase/server": "1.x",
34
34
  "@nocobase/test": "1.x",
35
35
  "@nocobase/utils": "1.x"
36
36
  },
37
- "gitHead": "cb195a2da766088e2a368f60ee2e933579d0987c",
37
+ "gitHead": "175a86dcc41577bff4f94ae614ebe778fd532f3f",
38
38
  "keywords": [
39
39
  "Blocks"
40
40
  ]