@tsingroc/tsingroc-components 4.6.0 → 4.7.1

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.
@@ -29,6 +29,10 @@ export interface GridOption {
29
29
  /** 要绘制在该坐标系上的系列。*/
30
30
  series?: EChartsSeries<LineSeriesOption | BarSeriesOption | BoxplotSeriesOption | FlowGLSeriesOption>[];
31
31
  }
32
+ /**
33
+ * 添加一个直角坐标系。X 轴和 Y 轴的数据类型默认值与 ECharts 原版一致。
34
+ */
35
+ export declare function grid(option: GridOption): EChartsComponent;
32
36
  /**
33
37
  * 添加一个直角坐标系。X 轴和 Y 轴的数据类型默认值与 ECharts 原版一致。
34
38
  *
@@ -1,12 +1,9 @@
1
1
  import { useId } from "react";
2
2
  /**
3
3
  * 添加一个直角坐标系。X 轴和 Y 轴的数据类型默认值与 ECharts 原版一致。
4
- *
5
- * **注意**:该组件是一个 React hook,需要遵守正常使用 hook 的准则。
6
4
  */
7
- export function useGrid(option) {
5
+ export function grid(option) {
8
6
  const grid = {
9
- id: useId(),
10
7
  left: 0,
11
8
  right: 0,
12
9
  top: 24,
@@ -14,10 +11,9 @@ export function useGrid(option) {
14
11
  containLabel: true,
15
12
  ...option.option,
16
13
  };
17
- const gridId = grid.id;
18
14
  const xAxis = {
19
- id: gridId + "x",
20
- gridId,
15
+ id: grid.id === undefined ? undefined : String(grid.id) + "x",
16
+ gridId: grid.id === undefined ? undefined : String(grid.id),
21
17
  nameGap: 6,
22
18
  ...option.xAxis,
23
19
  nameTextStyle: { fontWeight: "bold", ...option.xAxis?.nameTextStyle },
@@ -29,9 +25,9 @@ export function useGrid(option) {
29
25
  };
30
26
  const xAxisId = xAxis.id;
31
27
  const yAxis = {
32
- id: gridId + "y",
28
+ id: grid.id === undefined ? undefined : String(grid.id) + "y",
33
29
  type: "value",
34
- gridId,
30
+ gridId: grid.id === undefined ? undefined : String(grid.id),
35
31
  nameGap: 10,
36
32
  ...option.yAxis,
37
33
  nameTextStyle: {
@@ -56,6 +52,20 @@ export function useGrid(option) {
56
52
  })),
57
53
  };
58
54
  }
55
+ /**
56
+ * 添加一个直角坐标系。X 轴和 Y 轴的数据类型默认值与 ECharts 原版一致。
57
+ *
58
+ * **注意**:该组件是一个 React hook,需要遵守正常使用 hook 的准则。
59
+ */
60
+ export function useGrid(option) {
61
+ return grid({
62
+ ...option,
63
+ option: {
64
+ id: useId(),
65
+ ...option.option,
66
+ },
67
+ });
68
+ }
59
69
  const MINIMAL_GRID = (grid, xAxis, yAxis) => {
60
70
  grid.top = 0;
61
71
  xAxis.show = false;
@@ -1 +1 @@
1
- {"version":3,"file":"grid.js","sourceRoot":"","sources":["../../../src/echarts/coordinateSystems/grid.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AA4C9B;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,MAAkB;IACxC,MAAM,IAAI,GAAwB;QAChC,EAAE,EAAE,KAAK,EAAE;QACX,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;QACR,GAAG,EAAE,EAAE;QACP,MAAM,EAAE,CAAC;QACT,YAAY,EAAE,IAAI;QAClB,GAAG,MAAM,CAAC,MAAM;KACjB,CAAC;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,EAAY,CAAC;IACjC,MAAM,KAAK,GAAyB;QAClC,EAAE,EAAE,MAAM,GAAG,GAAG;QAChB,MAAM;QACN,OAAO,EAAE,CAAC;QACV,GAAG,MAAM,CAAC,KAAK;QACf,aAAa,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE;QACrE,QAAQ,EAAE;YACR,cAAc,EAAE,IAAI;YACpB,GAAG,MAAM,CAAC,KAAK,EAAE,QAAQ;YACzB,8DAA8D;SAC3B;KACtC,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,EAAY,CAAC;IACnC,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,MAAM,GAAG,GAAG;QAChB,IAAI,EAAE,OAAO;QACb,MAAM;QACN,OAAO,EAAE,EAAE;QACX,GAAG,MAAM,CAAC,KAAK;QACf,aAAa,EAAE;YACb,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,MAAM;YAClB,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa;SAC/B;KACsB,CAAC;IAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,EAAY,CAAC;IACnC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAChE,OAAO;QACL,IAAI,EAAE,CAAC,IAAI,CAAC;QACZ,KAAK,EAAE,CAAC,KAAK,CAAC;QACd,KAAK,EAAE,CAAC,KAAK,CAAC;QACd,MAAM,EAAE,MAAM,CAAC,MAAM;YACnB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;aAC/B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,GAAG,MAAM;YACT,gBAAgB,EAAE,aAAa;YAC/B,OAAO;YACP,OAAO;SACR,CAAC,CAAC;KACN,CAAC;AACJ,CAAC;AAED,MAAM,YAAY,GAAe,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;IACtD,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IACb,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;IACnB,IACE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAK,KAAuB,CAAC,IAAI,KAAK,SAAS,CAAC;QACzE,KAAK,CAAC,IAAI,KAAK,UAAU,EACzB,CAAC;QACA,KAAkC,CAAC,WAAW,GAAG,KAAK,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC;QACtB,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACnC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC;IACnB,KAAK,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,gDAAgD;AAChD,MAAM,UAAU,WAAW;IACzB,OAAO,YAAY,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"grid.js","sourceRoot":"","sources":["../../../src/echarts/coordinateSystems/grid.ts"],"names":[],"mappings":"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"}
@@ -29,6 +29,10 @@ export interface PolarOption {
29
29
  /** 要绘制在该坐标系上的系列。*/
30
30
  series?: EChartsSeries<LineSeriesOption | BarSeriesOption>[];
31
31
  }
32
+ /**
33
+ * 添加一个极坐标系。角度轴和半径轴的数据类型默认值与 ECharts 原版一致。
34
+ */
35
+ export declare function polar(option: PolarOption): EChartsComponent;
32
36
  /**
33
37
  * 添加一个极坐标系。角度轴和半径轴的数据类型默认值与 ECharts 原版一致。
34
38
  *
@@ -1,18 +1,12 @@
1
1
  import { useId } from "react";
2
2
  /**
3
3
  * 添加一个极坐标系。角度轴和半径轴的数据类型默认值与 ECharts 原版一致。
4
- *
5
- * **注意**:该组件是一个 React hook,需要遵守正常使用 hook 的准则。
6
4
  */
7
- export function usePolar(option) {
8
- const polar = {
9
- id: useId(),
10
- ...option.option,
11
- };
12
- const polarId = polar.id;
5
+ export function polar(option) {
6
+ const polar = option.option ?? {};
13
7
  const angleAxis = {
14
- id: polarId + "angle",
15
- polarId,
8
+ id: polar.id === undefined ? undefined : String(polar.id) + "angle",
9
+ polarId: polar.id === undefined ? undefined : String(polar.id),
16
10
  ...option.angleAxis,
17
11
  axisLabel: {
18
12
  margin: 3,
@@ -30,9 +24,9 @@ export function usePolar(option) {
30
24
  };
31
25
  const angleAxisId = angleAxis.id;
32
26
  const radiusAxis = {
33
- id: polarId + "radius",
27
+ id: polar.id === undefined ? undefined : String(polar.id) + "radius",
34
28
  type: "value",
35
- polarId,
29
+ polarId: polar.id === undefined ? undefined : String(polar.id),
36
30
  ...option.radiusAxis,
37
31
  axisLine: {
38
32
  show: false,
@@ -55,6 +49,20 @@ export function usePolar(option) {
55
49
  })),
56
50
  };
57
51
  }
52
+ /**
53
+ * 添加一个极坐标系。角度轴和半径轴的数据类型默认值与 ECharts 原版一致。
54
+ *
55
+ * **注意**:该组件是一个 React hook,需要遵守正常使用 hook 的准则。
56
+ */
57
+ export function usePolar(option) {
58
+ return polar({
59
+ ...option,
60
+ option: {
61
+ id: useId(),
62
+ ...option.option,
63
+ },
64
+ });
65
+ }
58
66
  const WIND_POLAR = (_, angleAxis, radiusAxis) => {
59
67
  angleAxis.type = "category";
60
68
  angleAxis.data =
@@ -1 +1 @@
1
- {"version":3,"file":"polar.js","sourceRoot":"","sources":["../../../src/echarts/coordinateSystems/polar.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAuC9B;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,MAAmB;IAC1C,MAAM,KAAK,GAAyB;QAClC,EAAE,EAAE,KAAK,EAAE;QACX,GAAG,MAAM,CAAC,MAAM;KACjB,CAAC;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,EAAY,CAAC;IACnC,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,OAAO,GAAG,OAAO;QACrB,OAAO;QACP,GAAG,MAAM,CAAC,SAAS;QACnB,SAAS,EAAE;YACT,MAAM,EAAE,CAAC;YACT,QAAQ,EAAE,EAAE;YACZ,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS;SAC/B;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,KAAK;YACX,GAAG,MAAM,CAAC,SAAS,EAAE,QAAQ;SAC9B;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAI;YACV,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS;SAC/B;KAC0B,CAAC;IAC9B,MAAM,WAAW,GAAG,SAAS,CAAC,EAAY,CAAC;IAC3C,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,OAAO,GAAG,QAAQ;QACtB,IAAI,EAAE,OAAO;QACb,OAAO;QACP,GAAG,MAAM,CAAC,UAAU;QACpB,QAAQ,EAAE;YACR,IAAI,EAAE,KAAK;YACX,GAAG,MAAM,CAAC,UAAU,EAAE,QAAQ;SAC/B;KAC2B,CAAC;IAC/B,MAAM,YAAY,GAAG,UAAU,CAAC,EAAY,CAAC;IAC7C,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IAC1E,OAAO;QACL,KAAK,EAAE,CAAC,KAAK,CAAC;QACd,SAAS,EAAE,CAAC,SAAS,CAAC;QACtB,UAAU,EAAE,CAAC,UAAU,CAAC;QACxB,MAAM,EAAE,MAAM,CAAC,MAAM;YACnB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;aAC/B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,GAAG,MAAM;YACT,gBAAgB,EAAE,OAAO;YACzB,WAAW;YACX,YAAY;SACb,CAAC,CAAC;KACN,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,GAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE;IAC3D,SAAS,CAAC,IAAI,GAAG,UAAU,CAAC;IAC3B,SAAoE,CAAC,IAAI;QACxE,oBAAoB,CAAC;IACvB,SAAS,CAAC,UAAU,GAAG,MAAM,CAAC;IAC9B,UAAU,CAAC,SAAS,GAAG;QACrB,GAAG,UAAU,CAAC,SAAS;QACvB,aAAa,EAAE,KAAK;KACrB,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,SAAS;IACvB,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,oBAAoB,GAAG;IAC3B,GAAG;IACH,KAAK;IACL,IAAI;IACJ,KAAK;IACL,GAAG;IACH,KAAK;IACL,IAAI;IACJ,KAAK;IACL,GAAG;IACH,KAAK;IACL,IAAI;IACJ,KAAK;IACL,GAAG;IACH,KAAK;IACL,IAAI;IACJ,KAAK;CACG,CAAC"}
1
+ {"version":3,"file":"polar.js","sourceRoot":"","sources":["../../../src/echarts/coordinateSystems/polar.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tsingroc/tsingroc-components",
3
- "version": "4.6.0",
3
+ "version": "4.7.1",
4
4
  "author": "",
5
5
  "license": "ISC",
6
6
  "description": "",
@@ -53,12 +53,9 @@ export interface GridOption {
53
53
 
54
54
  /**
55
55
  * 添加一个直角坐标系。X 轴和 Y 轴的数据类型默认值与 ECharts 原版一致。
56
- *
57
- * **注意**:该组件是一个 React hook,需要遵守正常使用 hook 的准则。
58
56
  */
59
- export function useGrid(option: GridOption): EChartsComponent {
57
+ export function grid(option: GridOption): EChartsComponent {
60
58
  const grid: GridComponentOption = {
61
- id: useId(),
62
59
  left: 0,
63
60
  right: 0,
64
61
  top: 24,
@@ -66,10 +63,9 @@ export function useGrid(option: GridOption): EChartsComponent {
66
63
  containLabel: true,
67
64
  ...option.option,
68
65
  };
69
- const gridId = grid.id as string;
70
66
  const xAxis: XAXisComponentOption = {
71
- id: gridId + "x",
72
- gridId,
67
+ id: grid.id === undefined ? undefined : String(grid.id) + "x",
68
+ gridId: grid.id === undefined ? undefined : String(grid.id),
73
69
  nameGap: 6,
74
70
  ...option.xAxis,
75
71
  nameTextStyle: { fontWeight: "bold", ...option.xAxis?.nameTextStyle },
@@ -81,9 +77,9 @@ export function useGrid(option: GridOption): EChartsComponent {
81
77
  };
82
78
  const xAxisId = xAxis.id as string;
83
79
  const yAxis = {
84
- id: gridId + "y",
80
+ id: grid.id === undefined ? undefined : String(grid.id) + "y",
85
81
  type: "value",
86
- gridId,
82
+ gridId: grid.id === undefined ? undefined : String(grid.id),
87
83
  nameGap: 10,
88
84
  ...option.yAxis,
89
85
  nameTextStyle: {
@@ -109,6 +105,21 @@ export function useGrid(option: GridOption): EChartsComponent {
109
105
  };
110
106
  }
111
107
 
108
+ /**
109
+ * 添加一个直角坐标系。X 轴和 Y 轴的数据类型默认值与 ECharts 原版一致。
110
+ *
111
+ * **注意**:该组件是一个 React hook,需要遵守正常使用 hook 的准则。
112
+ */
113
+ export function useGrid(option: GridOption): EChartsComponent {
114
+ return grid({
115
+ ...option,
116
+ option: {
117
+ id: useId(),
118
+ ...option.option,
119
+ },
120
+ });
121
+ }
122
+
112
123
  const MINIMAL_GRID: GridPreset = (grid, xAxis, yAxis) => {
113
124
  grid.top = 0;
114
125
  xAxis.show = false;
@@ -46,18 +46,12 @@ export interface PolarOption {
46
46
 
47
47
  /**
48
48
  * 添加一个极坐标系。角度轴和半径轴的数据类型默认值与 ECharts 原版一致。
49
- *
50
- * **注意**:该组件是一个 React hook,需要遵守正常使用 hook 的准则。
51
49
  */
52
- export function usePolar(option: PolarOption): EChartsComponent {
53
- const polar: PolarComponentOption = {
54
- id: useId(),
55
- ...option.option,
56
- };
57
- const polarId = polar.id as string;
50
+ export function polar(option: PolarOption): EChartsComponent {
51
+ const polar: PolarComponentOption = option.option ?? {};
58
52
  const angleAxis = {
59
- id: polarId + "angle",
60
- polarId,
53
+ id: polar.id === undefined ? undefined : String(polar.id) + "angle",
54
+ polarId: polar.id === undefined ? undefined : String(polar.id),
61
55
  ...option.angleAxis,
62
56
  axisLabel: {
63
57
  margin: 3,
@@ -75,9 +69,9 @@ export function usePolar(option: PolarOption): EChartsComponent {
75
69
  } as AngleAxisComponentOption;
76
70
  const angleAxisId = angleAxis.id as string;
77
71
  const radiusAxis = {
78
- id: polarId + "radius",
72
+ id: polar.id === undefined ? undefined : String(polar.id) + "radius",
79
73
  type: "value",
80
- polarId,
74
+ polarId: polar.id === undefined ? undefined : String(polar.id),
81
75
  ...option.radiusAxis,
82
76
  axisLine: {
83
77
  show: false,
@@ -101,6 +95,21 @@ export function usePolar(option: PolarOption): EChartsComponent {
101
95
  };
102
96
  }
103
97
 
98
+ /**
99
+ * 添加一个极坐标系。角度轴和半径轴的数据类型默认值与 ECharts 原版一致。
100
+ *
101
+ * **注意**:该组件是一个 React hook,需要遵守正常使用 hook 的准则。
102
+ */
103
+ export function usePolar(option: PolarOption): EChartsComponent {
104
+ return polar({
105
+ ...option,
106
+ option: {
107
+ id: useId(),
108
+ ...option.option,
109
+ },
110
+ });
111
+ }
112
+
104
113
  const WIND_POLAR: PolarPreset = (_, angleAxis, radiusAxis) => {
105
114
  angleAxis.type = "category";
106
115
  (angleAxis as AngleAxisComponentOption & { data: readonly string[] }).data =