@lark-apaas/fullstack-vite-preset 1.0.2-alpha.32 → 1.0.2-alpha.34
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.
- package/lib/module-alias/echarts-for-react.d.ts +1 -8
- package/lib/module-alias/echarts-for-react.d.ts.map +1 -1
- package/lib/module-alias/echarts-for-react.js +45 -11
- package/lib/module-alias/echarts-for-react.js.map +1 -1
- package/lib/module-alias/registry_echarts_theme.d.ts +2 -6
- package/lib/module-alias/registry_echarts_theme.d.ts.map +1 -1
- package/lib/module-alias/registry_echarts_theme.js +1 -1
- package/lib/module-alias/registry_echarts_theme.js.map +1 -1
- package/lib/preset.d.ts.map +1 -1
- package/lib/preset.js +24 -1
- package/lib/preset.js.map +1 -1
- package/lib/vite-plugins/static-assets-plugin.d.ts.map +1 -1
- package/lib/vite-plugins/static-assets-plugin.js +47 -2
- package/lib/vite-plugins/static-assets-plugin.js.map +1 -1
- package/package.json +3 -2
- package/src/module-alias/echarts-for-react.mjs +52 -9
- package/src/module-alias/registry_echarts_theme.mjs +1 -1
|
@@ -1,17 +1,10 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import OriginalReactECharts from 'echarts-for-react';
|
|
3
3
|
import type { EChartsReactProps } from 'echarts-for-react';
|
|
4
|
-
/**
|
|
5
|
-
* Convert HSL/HSLA color to hex or rgba
|
|
6
|
-
*/
|
|
7
|
-
export declare function convertColorToHex(color: string): string;
|
|
8
|
-
/**
|
|
9
|
-
* Deep traverse object to transform all HSL colors in 'color' property
|
|
10
|
-
*/
|
|
11
|
-
export declare function transformColors<T>(value: T, visited?: WeakSet<object>): T;
|
|
12
4
|
/**
|
|
13
5
|
* EChartsReact wrapper component
|
|
14
6
|
* - Automatically converts HSL colors to hex in option
|
|
7
|
+
* - Removes label.color from funnel series
|
|
15
8
|
*/
|
|
16
9
|
export declare class EChartsReact extends React.Component<EChartsReactProps> {
|
|
17
10
|
render(): React.CElement<EChartsReactProps, OriginalReactECharts>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echarts-for-react.d.ts","sourceRoot":"","sources":["../../src/module-alias/echarts-for-react.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,oBAAoB,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"echarts-for-react.d.ts","sourceRoot":"","sources":["../../src/module-alias/echarts-for-react.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,oBAAoB,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AA+G3D;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC;IAClE,MAAM;CAYP;AAED,cAAc,mBAAmB,CAAC;AAClC,eAAe,YAAY,CAAC"}
|
|
@@ -18,8 +18,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
20
|
exports.EChartsReact = void 0;
|
|
21
|
-
exports.convertColorToHex = convertColorToHex;
|
|
22
|
-
exports.transformColors = transformColors;
|
|
23
21
|
const react_1 = __importDefault(require("react"));
|
|
24
22
|
const echarts_for_react_1 = __importDefault(require("echarts-for-react"));
|
|
25
23
|
const colorjs_io_1 = __importDefault(require("colorjs.io"));
|
|
@@ -47,6 +45,15 @@ function convertColorToHex(color) {
|
|
|
47
45
|
return color;
|
|
48
46
|
}
|
|
49
47
|
}
|
|
48
|
+
function convertColorValue(propValue, visited) {
|
|
49
|
+
if (typeof propValue === 'string') {
|
|
50
|
+
return convertColorToHex(propValue);
|
|
51
|
+
}
|
|
52
|
+
if (Array.isArray(propValue)) {
|
|
53
|
+
return propValue.map((item) => typeof item === 'string' ? convertColorToHex(item) : transformColors(item, visited));
|
|
54
|
+
}
|
|
55
|
+
return transformColors(propValue, visited);
|
|
56
|
+
}
|
|
50
57
|
/**
|
|
51
58
|
* Deep traverse object to transform all HSL colors in 'color' property
|
|
52
59
|
*/
|
|
@@ -59,8 +66,6 @@ function transformColors(value, visited = new WeakSet()) {
|
|
|
59
66
|
return value;
|
|
60
67
|
if (value instanceof Date || value instanceof RegExp)
|
|
61
68
|
return value;
|
|
62
|
-
if (typeof value === 'function')
|
|
63
|
-
return value;
|
|
64
69
|
visited.add(value);
|
|
65
70
|
if (Array.isArray(value)) {
|
|
66
71
|
return value.map((item) => transformColors(item, visited));
|
|
@@ -72,14 +77,11 @@ function transformColors(value, visited = new WeakSet()) {
|
|
|
72
77
|
continue;
|
|
73
78
|
const propValue = obj[key];
|
|
74
79
|
if (key === 'color') {
|
|
75
|
-
if (typeof propValue === '
|
|
76
|
-
result[key] =
|
|
77
|
-
}
|
|
78
|
-
else if (Array.isArray(propValue)) {
|
|
79
|
-
result[key] = propValue.map((item) => typeof item === 'string' ? convertColorToHex(item) : transformColors(item, visited));
|
|
80
|
+
if (typeof propValue === 'function') {
|
|
81
|
+
result[key] = (...args) => convertColorValue(propValue(...args), visited);
|
|
80
82
|
}
|
|
81
83
|
else {
|
|
82
|
-
result[key] =
|
|
84
|
+
result[key] = convertColorValue(propValue, visited);
|
|
83
85
|
}
|
|
84
86
|
}
|
|
85
87
|
else {
|
|
@@ -88,14 +90,46 @@ function transformColors(value, visited = new WeakSet()) {
|
|
|
88
90
|
}
|
|
89
91
|
return result;
|
|
90
92
|
}
|
|
93
|
+
/**
|
|
94
|
+
* Remove label.color and emphasis.label.color from funnel series
|
|
95
|
+
* to let ECharts use default contrast colors
|
|
96
|
+
*/
|
|
97
|
+
function removeFunnelLabelColor(option) {
|
|
98
|
+
const opt = option;
|
|
99
|
+
if (!Array.isArray(opt.series))
|
|
100
|
+
return option;
|
|
101
|
+
const series = opt.series.map((item) => {
|
|
102
|
+
if (item?.type !== 'funnel')
|
|
103
|
+
return item;
|
|
104
|
+
let result = { ...item };
|
|
105
|
+
// remove label.color
|
|
106
|
+
if (result.label && typeof result.label === 'object') {
|
|
107
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
108
|
+
const { color: _, ...labelRest } = result.label;
|
|
109
|
+
result = { ...result, label: labelRest };
|
|
110
|
+
}
|
|
111
|
+
// remove emphasis.label.color
|
|
112
|
+
const emphasis = result.emphasis;
|
|
113
|
+
if (emphasis?.label && typeof emphasis.label === 'object') {
|
|
114
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
115
|
+
const { color: _, ...emphasisLabelRest } = emphasis.label;
|
|
116
|
+
result = { ...result, emphasis: { ...emphasis, label: emphasisLabelRest } };
|
|
117
|
+
}
|
|
118
|
+
return result;
|
|
119
|
+
});
|
|
120
|
+
return { ...opt, series };
|
|
121
|
+
}
|
|
91
122
|
/**
|
|
92
123
|
* EChartsReact wrapper component
|
|
93
124
|
* - Automatically converts HSL colors to hex in option
|
|
125
|
+
* - Removes label.color from funnel series
|
|
94
126
|
*/
|
|
95
127
|
class EChartsReact extends react_1.default.Component {
|
|
96
128
|
render() {
|
|
97
129
|
const { option, ...rest } = this.props;
|
|
98
|
-
const transformedOption = option
|
|
130
|
+
const transformedOption = option
|
|
131
|
+
? removeFunnelLabelColor(transformColors(option))
|
|
132
|
+
: option;
|
|
99
133
|
return react_1.default.createElement(echarts_for_react_1.default, {
|
|
100
134
|
option: transformedOption,
|
|
101
135
|
...rest,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"echarts-for-react.js","sourceRoot":"","sources":["../../src/module-alias/echarts-for-react.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"echarts-for-react.js","sourceRoot":"","sources":["../../src/module-alias/echarts-for-react.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,7 @@ export declare function getCssVariable(varName: string, element?: HTMLElement):
|
|
|
8
8
|
export declare function generateEChartsTheme(element?: HTMLElement): {
|
|
9
9
|
color: string[];
|
|
10
10
|
backgroundColor: string;
|
|
11
|
-
textStyle: {
|
|
12
|
-
color: string;
|
|
13
|
-
};
|
|
11
|
+
textStyle: {};
|
|
14
12
|
title: {
|
|
15
13
|
textStyle: {
|
|
16
14
|
color: string;
|
|
@@ -352,9 +350,7 @@ export declare function generateEChartsTheme(element?: HTMLElement): {
|
|
|
352
350
|
export declare function getShadcnEChartsTheme(): {
|
|
353
351
|
color: string[];
|
|
354
352
|
backgroundColor: string;
|
|
355
|
-
textStyle: {
|
|
356
|
-
color: string;
|
|
357
|
-
};
|
|
353
|
+
textStyle: {};
|
|
358
354
|
title: {
|
|
359
355
|
textStyle: {
|
|
360
356
|
color: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry_echarts_theme.d.ts","sourceRoot":"","sources":["../../src/module-alias/registry_echarts_theme.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,cAAgB,GAAG,MAAM,CAS/E;AAGD,wBAAgB,oBAAoB,CAAC,OAAO,cAAgB
|
|
1
|
+
{"version":3,"file":"registry_echarts_theme.d.ts","sourceRoot":"","sources":["../../src/module-alias/registry_echarts_theme.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,cAAgB,GAAG,MAAM,CAS/E;AAGD,wBAAgB,oBAAoB,CAAC,OAAO,cAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2W3D;AAGD,wBAAgB,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry_echarts_theme.js","sourceRoot":"","sources":["../../src/module-alias/registry_echarts_theme.ts"],"names":[],"mappings":";;;;;AAQA,wCASC;AAGD,oDA2WC;AAGD,sDAGC;AArYD,4DAA+B;AAE/B;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,OAAe,EAAE,OAAO,GAAG,QAAQ,CAAC,IAAI;IACrE,MAAM,KAAK,GAAG,MAAM;SACjB,gBAAgB,CAAC,OAAO,CAAC;SACzB,gBAAgB,CAAC,OAAO,CAAC;SACzB,IAAI,EAAE,CAAC;IACV,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,IAAI,oBAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,uCAAuC;AACvC,SAAgB,oBAAoB,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI;IAC1D,mBAAmB;IACnB,MAAM,WAAW,GAAG;QAClB,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;QACpC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;QACpC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;QACpC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;QACpC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;KACrC,CAAC;IAEF,4BAA4B;IAC5B,MAAM,UAAU,GAAG,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,eAAe,GAAG,cAAc,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE,WAAW;QAClB,eAAe,EAAE,aAAa;QAC9B,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"registry_echarts_theme.js","sourceRoot":"","sources":["../../src/module-alias/registry_echarts_theme.ts"],"names":[],"mappings":";;;;;AAQA,wCASC;AAGD,oDA2WC;AAGD,sDAGC;AArYD,4DAA+B;AAE/B;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,OAAe,EAAE,OAAO,GAAG,QAAQ,CAAC,IAAI;IACrE,MAAM,KAAK,GAAG,MAAM;SACjB,gBAAgB,CAAC,OAAO,CAAC;SACzB,gBAAgB,CAAC,OAAO,CAAC;SACzB,IAAI,EAAE,CAAC;IACV,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,IAAI,oBAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,uCAAuC;AACvC,SAAgB,oBAAoB,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI;IAC1D,mBAAmB;IACnB,MAAM,WAAW,GAAG;QAClB,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;QACpC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;QACpC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;QACpC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;QACpC,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC;KACrC,CAAC;IAEF,4BAA4B;IAC5B,MAAM,UAAU,GAAG,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,KAAK,GAAG,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,eAAe,GAAG,cAAc,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAErD,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE,WAAW;QAClB,eAAe,EAAE,aAAa;QAC9B,SAAS,EAAE;QACT,qBAAqB;SACtB;QACD,KAAK,EAAE;YACL,SAAS,EAAE;gBACT,KAAK,EAAE,UAAU;aAClB;YACD,YAAY,EAAE;gBACZ,KAAK,EAAE,eAAe;aACvB;SACF;QACD,IAAI,EAAE;YACJ,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;aACf;YACD,SAAS,EAAE;gBACT,KAAK,EAAE,CAAC;aACT;YACD,UAAU,EAAE,CAAC;YACb,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,KAAK;SACd;QACD,KAAK,EAAE;YACL,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;aACf;YACD,SAAS,EAAE;gBACT,KAAK,EAAE,CAAC;aACT;YACD,UAAU,EAAE,CAAC;YACb,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,KAAK;SACd;QACD,GAAG,EAAE;YACH,SAAS,EAAE;gBACT,cAAc,EAAE,CAAC;gBACjB,cAAc,EAAE,MAAM;aACvB;SACF;QACD,GAAG,EAAE;YACH,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,MAAM;aACpB;SACF;QACD,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,MAAM;aACpB;SACF;QACD,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,MAAM;aACpB;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,MAAM;aACpB;SACF;QACD,MAAM,EAAE;YACN,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,MAAM;aACpB;SACF;QACD,MAAM,EAAE;YACN,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,MAAM;aACpB;SACF;QACD,KAAK,EAAE;YACL,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,MAAM;aACpB;SACF;QACD,WAAW,EAAE;YACX,SAAS,EAAE;gBACT,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;gBACrB,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;gBACtB,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;gBAC3B,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;gBAC5B,WAAW,EAAE,CAAC;aACf;SACF;QACD,KAAK,EAAE;YACL,SAAS,EAAE;gBACT,WAAW,EAAE,CAAC;gBACd,WAAW,EAAE,MAAM;aACpB;YACD,SAAS,EAAE;gBACT,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,eAAe;aACvB;YACD,UAAU,EAAE,CAAC;YACb,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,WAAW;YAClB,KAAK,EAAE;gBACL,KAAK,EAAE,UAAU;aAClB;SACF;QACD,GAAG,EAAE;YACH,SAAS,EAAE;gBACT,SAAS,EAAE,KAAK;gBAChB,WAAW,EAAE,MAAM;gBACnB,WAAW,EAAE,GAAG;aACjB;YACD,KAAK,EAAE;gBACL,KAAK,EAAE,UAAU;aAClB;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE;oBACT,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;oBACzB,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;oBAC3B,WAAW,EAAE,CAAC;iBACf;gBACD,KAAK,EAAE;oBACL,KAAK,EAAE,UAAU;iBAClB;aACF;SACF;QACD,GAAG,EAAE;YACH,SAAS,EAAE;gBACT,SAAS,EAAE,KAAK;gBAChB,WAAW,EAAE,MAAM;gBACnB,WAAW,EAAE,GAAG;aACjB;YACD,KAAK,EAAE;gBACL,KAAK,EAAE,UAAU;aAClB;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE;oBACT,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;oBACzB,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;oBAC3B,WAAW,EAAE,CAAC;iBACf;gBACD,KAAK,EAAE;oBACL,KAAK,EAAE,UAAU;iBAClB;aACF;SACF;QACD,YAAY,EAAE;YACZ,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;iBACd;aACF;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;iBACd;aACF;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,eAAe;aACvB;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,KAAK;gBACX,SAAS,EAAE;oBACT,KAAK,EAAE,CAAC,MAAM,CAAC;iBAChB;aACF;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,KAAK;aACZ;SACF;QACD,SAAS,EAAE;YACT,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;iBACd;aACF;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;iBACd;aACF;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,eAAe;aACvB;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,CAAC,MAAM,CAAC;iBAChB;aACF;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,KAAK;aACZ;SACF;QACD,OAAO,EAAE;YACP,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;iBACd;aACF;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;iBACd;aACF;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,eAAe;aACvB;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,CAAC,MAAM,CAAC;iBAChB;aACF;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,KAAK;aACZ;SACF;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;iBACd;aACF;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;iBACd;aACF;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,eAAe;aACvB;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE;oBACT,KAAK,EAAE,CAAC,MAAM,CAAC;iBAChB;aACF;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,KAAK;aACZ;SACF;QACD,OAAO,EAAE;YACP,SAAS,EAAE;gBACT,WAAW,EAAE,eAAe;aAC7B;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE;oBACT,WAAW,EAAE,OAAO;iBACrB;aACF;SACF;QACD,MAAM,EAAE;YACN,SAAS,EAAE;gBACT,KAAK,EAAE,UAAU;aAClB;SACF;QACD,OAAO,EAAE;YACP,WAAW,EAAE;gBACX,SAAS,EAAE;oBACT,KAAK,EAAE,MAAM;oBACb,KAAK,EAAE,CAAC;iBACT;gBACD,UAAU,EAAE;oBACV,KAAK,EAAE,MAAM;oBACb,KAAK,EAAE,CAAC;iBACT;aACF;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE;gBACT,KAAK,EAAE,OAAO;gBACd,KAAK,EAAE,CAAC;aACT;YACD,SAAS,EAAE;gBACT,KAAK,EAAE,OAAO;gBACd,WAAW,EAAE,CAAC;aACf;YACD,YAAY,EAAE;gBACZ,KAAK,EAAE,OAAO;gBACd,WAAW,EAAE,OAAO;gBACpB,WAAW,EAAE,GAAG;aACjB;YACD,eAAe,EAAE;gBACf,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;gBACrB,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;aAC5B;YACD,KAAK,EAAE;gBACL,KAAK,EAAE,eAAe;aACvB;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE;oBACT,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;iBACtB;gBACD,YAAY,EAAE;oBACZ,KAAK,EAAE,OAAO;oBACd,WAAW,EAAE,OAAO;oBACpB,WAAW,EAAE,GAAG;iBACjB;gBACD,KAAK,EAAE;oBACL,KAAK,EAAE,eAAe;iBACvB;aACF;SACF;QACD,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;SACxC;QACD,QAAQ,EAAE;YACR,eAAe,EAAE,UAAU;YAC3B,mBAAmB,EAAE,MAAM;YAC3B,WAAW,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,cAAc;YAClD,WAAW,EAAE,OAAO;YACpB,UAAU,EAAE,MAAM;YAClB,SAAS,EAAE;gBACT,KAAK,EAAE,UAAU;aAClB;SACF;QACD,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,KAAK,EAAE,UAAU;aAClB;YACD,QAAQ,EAAE;gBACR,KAAK,EAAE;oBACL,KAAK,EAAE,UAAU;iBAClB;aACF;SACF;KACF,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,4CAA4C;AAC5C,SAAgB,qBAAqB;IACnC,OAAO;IACP,OAAO,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC7C,CAAC"}
|
package/lib/preset.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset.d.ts","sourceRoot":"","sources":["../src/preset.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preset.d.ts","sourceRoot":"","sources":["../src/preset.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAyB,MAAM,MAAM,CAAC;AA0C9D,MAAM,WAAW,gCAAgC;IAC/C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mCAAmC;IACnC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,2CAA2C;IAC3C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,uBAAuB;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oCAAoC;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAUD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,gCAAgC,GACxC,UAAU,CAiXZ"}
|
package/lib/preset.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createRecommendViteConfig = createRecommendViteConfig;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
7
8
|
const path_1 = __importDefault(require("path"));
|
|
8
9
|
const plugin_react_1 = __importDefault(require("@vitejs/plugin-react"));
|
|
9
10
|
const vite_tsconfig_paths_1 = __importDefault(require("vite-tsconfig-paths"));
|
|
@@ -32,12 +33,21 @@ function sendBackendUnavailable502(_err, _req, res) {
|
|
|
32
33
|
message: 'Backend service is not running',
|
|
33
34
|
}));
|
|
34
35
|
}
|
|
36
|
+
function readAppFlags(rootDir) {
|
|
37
|
+
try {
|
|
38
|
+
return JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(rootDir, 'package.json'), 'utf-8')).flags || {};
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
return {};
|
|
42
|
+
}
|
|
43
|
+
}
|
|
35
44
|
function createRecommendViteConfig(options) {
|
|
36
45
|
const { isDev = true, enableReactRefresh = isDev, needRoutes = true, clientBasePath = '', publicPath = '', codeSplitting = true, } = options;
|
|
37
46
|
// Inspector can be disabled via environment variable
|
|
38
47
|
const enableInspector = isDev && process.env.DISABLE_INSPECTOR !== 'true';
|
|
39
48
|
const rootDir = process.cwd();
|
|
40
49
|
const serverPort = process.env.SERVER_PORT || '3000';
|
|
50
|
+
const appFlags = readAppFlags(rootDir);
|
|
41
51
|
// Build the plugins array
|
|
42
52
|
const plugins = [
|
|
43
53
|
// Error overlay plugin - replaces Vite's native error overlay with custom one
|
|
@@ -58,6 +68,10 @@ function createRecommendViteConfig(options) {
|
|
|
58
68
|
// React plugin with Babel for styled-jsx support
|
|
59
69
|
(0, plugin_react_1.default)({
|
|
60
70
|
jsxRuntime: 'automatic',
|
|
71
|
+
// Only use inspector jsx-runtime in dev mode when inspector is enabled
|
|
72
|
+
jsxImportSource: enableInspector
|
|
73
|
+
? '@lark-apaas/miaoda-inspector-jsx-runtime'
|
|
74
|
+
: 'react',
|
|
61
75
|
babel: {
|
|
62
76
|
plugins: [['styled-jsx/babel']],
|
|
63
77
|
},
|
|
@@ -102,6 +116,10 @@ function createRecommendViteConfig(options) {
|
|
|
102
116
|
mainFields: ['module', 'browser', 'main'],
|
|
103
117
|
extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
|
|
104
118
|
alias: {
|
|
119
|
+
// 确保所有 echarts 子路径导入（如 echarts/core, echarts/lib/...）
|
|
120
|
+
// 都解析到 preset 自带的 echarts，避免第三方扩展（如 echarts-wordcloud）
|
|
121
|
+
// 安装了独立的 echarts 副本导致注册不到同一个实例上
|
|
122
|
+
echarts: path_1.default.dirname(require.resolve('echarts/package.json')),
|
|
105
123
|
// Intercept @/inspector.dev.css import from client-toolkit
|
|
106
124
|
// In dev mode, inspector injects styles at runtime, so we use empty CSS
|
|
107
125
|
// This avoids creating files in user's project directory
|
|
@@ -132,6 +150,8 @@ function createRecommendViteConfig(options) {
|
|
|
132
150
|
// Build tool identifier for source map handling
|
|
133
151
|
// Vite dev mode doesn't need source map mapping - stack traces are already source paths
|
|
134
152
|
'process.env.BUILD_TOOL': JSON.stringify('vite'),
|
|
153
|
+
// 模板 flags 配置
|
|
154
|
+
'process.env.APP_FLAGS': JSON.stringify(appFlags),
|
|
135
155
|
},
|
|
136
156
|
server: {
|
|
137
157
|
port: Number(process.env.CLIENT_DEV_PORT) || 8080,
|
|
@@ -221,7 +241,10 @@ function createRecommendViteConfig(options) {
|
|
|
221
241
|
// Include inspector so Vite pre-bundles it with its dependencies
|
|
222
242
|
...(enableInspector ? ['@lark-apaas/miaoda-inspector'] : []),
|
|
223
243
|
],
|
|
224
|
-
|
|
244
|
+
// Exclude jsx-runtime from pre-bundling (it's handled specially by React plugin)
|
|
245
|
+
exclude: enableInspector
|
|
246
|
+
? ['@lark-apaas/miaoda-inspector-jsx-runtime']
|
|
247
|
+
: [],
|
|
225
248
|
// Pass define replacements to esbuild for pre-bundling
|
|
226
249
|
// Without this, process.env.X in dependencies won't be replaced
|
|
227
250
|
esbuildOptions: {
|
package/lib/preset.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../src/preset.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../src/preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-assets-plugin.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/static-assets-plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EAAE,MAAM,EAAoD,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"static-assets-plugin.d.ts","sourceRoot":"","sources":["../../src/vite-plugins/static-assets-plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EAAE,MAAM,EAAoD,MAAM,MAAM,CAAC;AA4CrF,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAMD,wBAAgB,kBAAkB,CAChC,OAAO,GAAE,yBAA8B,GACtC,MAAM,CAqVR;AAED,eAAe,kBAAkB,CAAC"}
|
|
@@ -50,6 +50,40 @@ const path = __importStar(require("path"));
|
|
|
50
50
|
const glob_1 = require("glob");
|
|
51
51
|
const SHARED_STATIC_PREFIX = '@shared/static/';
|
|
52
52
|
const VIRTUAL_MODULE_PREFIX = '\0@shared/static/';
|
|
53
|
+
/** File extensions that should be resolved as normal modules instead of static asset URLs */
|
|
54
|
+
const SCRIPT_EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.mts', '.cts', '.mjs', '.cjs'];
|
|
55
|
+
/**
|
|
56
|
+
* Split a relative path into the clean path and optional query string.
|
|
57
|
+
* e.g. "file.md?raw" → ["file.md", "?raw"]
|
|
58
|
+
*/
|
|
59
|
+
function splitQuery(relativePath) {
|
|
60
|
+
const qIndex = relativePath.indexOf('?');
|
|
61
|
+
if (qIndex === -1)
|
|
62
|
+
return [relativePath, ''];
|
|
63
|
+
return [relativePath.slice(0, qIndex), relativePath.slice(qIndex)];
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Try to resolve a relative path to a real script file on disk.
|
|
67
|
+
* Handles both explicit extensions (utils.ts) and extensionless imports (utils).
|
|
68
|
+
* Returns the absolute path if found, null otherwise.
|
|
69
|
+
*/
|
|
70
|
+
function resolveScriptFile(staticDir, cleanPath) {
|
|
71
|
+
const ext = path.extname(cleanPath).toLowerCase();
|
|
72
|
+
// Has explicit script extension → resolve directly
|
|
73
|
+
if (ext && SCRIPT_EXTENSIONS.includes(ext)) {
|
|
74
|
+
return path.join(staticDir, cleanPath);
|
|
75
|
+
}
|
|
76
|
+
// No extension → probe for matching script file on disk
|
|
77
|
+
if (!ext) {
|
|
78
|
+
for (const scriptExt of SCRIPT_EXTENSIONS) {
|
|
79
|
+
const fullPath = path.join(staticDir, cleanPath + scriptExt);
|
|
80
|
+
if (fs.existsSync(fullPath)) {
|
|
81
|
+
return fullPath;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return null;
|
|
86
|
+
}
|
|
53
87
|
function staticAssetsPlugin(options = {}) {
|
|
54
88
|
const { clientBasePath = '', rootDir = process.cwd() } = options;
|
|
55
89
|
const staticDir = path.resolve(rootDir, 'shared/static');
|
|
@@ -120,9 +154,20 @@ function staticAssetsPlugin(options = {}) {
|
|
|
120
154
|
resolveId(id) {
|
|
121
155
|
if (id.startsWith(SHARED_STATIC_PREFIX)) {
|
|
122
156
|
const relativePath = id.slice(SHARED_STATIC_PREFIX.length);
|
|
123
|
-
const
|
|
157
|
+
const [cleanPath, query] = splitQuery(relativePath);
|
|
158
|
+
// Imports with query params (e.g. ?raw, ?url) should resolve to real
|
|
159
|
+
// paths and let Vite's native handling process them
|
|
160
|
+
if (query) {
|
|
161
|
+
return path.join(staticDir, cleanPath) + query;
|
|
162
|
+
}
|
|
163
|
+
// JS/TS files should be resolved to their real paths and bundled normally
|
|
164
|
+
const scriptPath = resolveScriptFile(staticDir, cleanPath);
|
|
165
|
+
if (scriptPath) {
|
|
166
|
+
return scriptPath;
|
|
167
|
+
}
|
|
168
|
+
const virtualId = VIRTUAL_MODULE_PREFIX + cleanPath;
|
|
124
169
|
// Prevent vite:json from processing JSON virtual modules
|
|
125
|
-
return
|
|
170
|
+
return cleanPath.endsWith('.json') ? virtualId + '.js' : virtualId;
|
|
126
171
|
}
|
|
127
172
|
return null;
|
|
128
173
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"static-assets-plugin.js","sourceRoot":"","sources":["../../src/vite-plugins/static-assets-plugin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"static-assets-plugin.js","sourceRoot":"","sources":["../../src/vite-plugins/static-assets-plugin.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lark-apaas/fullstack-vite-preset",
|
|
3
|
-
"version": "1.0.2-alpha.
|
|
3
|
+
"version": "1.0.2-alpha.34",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src/empty.css",
|
|
@@ -34,7 +34,8 @@
|
|
|
34
34
|
"@babel/traverse": "^7.28.0",
|
|
35
35
|
"@babel/types": "^7.28.2",
|
|
36
36
|
"@lark-apaas/devtool-kits": "^1.2.18",
|
|
37
|
-
"@lark-apaas/
|
|
37
|
+
"@lark-apaas/miaoda-inspector-jsx-runtime": "^1.0.1",
|
|
38
|
+
"@lark-apaas/vite-inspector-plugin": "^1.0.2",
|
|
38
39
|
"@vitejs/plugin-react": "^4.5.0",
|
|
39
40
|
"clsx": "^2.1.1",
|
|
40
41
|
"colorjs.io": "^0.5.2",
|
|
@@ -27,6 +27,18 @@ export function convertColorToHex(color) {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
+
function convertColorValue(propValue, visited) {
|
|
31
|
+
if (typeof propValue === 'string') {
|
|
32
|
+
return convertColorToHex(propValue);
|
|
33
|
+
}
|
|
34
|
+
if (Array.isArray(propValue)) {
|
|
35
|
+
return propValue.map((item) =>
|
|
36
|
+
typeof item === 'string' ? convertColorToHex(item) : transformColors(item, visited)
|
|
37
|
+
);
|
|
38
|
+
}
|
|
39
|
+
return transformColors(propValue, visited);
|
|
40
|
+
}
|
|
41
|
+
|
|
30
42
|
/**
|
|
31
43
|
* Deep traverse object to transform all HSL colors in 'color' property
|
|
32
44
|
*/
|
|
@@ -35,7 +47,6 @@ export function transformColors(value, visited = new WeakSet()) {
|
|
|
35
47
|
if (typeof value !== 'object') return value;
|
|
36
48
|
if (visited.has(value)) return value;
|
|
37
49
|
if (value instanceof Date || value instanceof RegExp) return value;
|
|
38
|
-
if (typeof value === 'function') return value;
|
|
39
50
|
|
|
40
51
|
visited.add(value);
|
|
41
52
|
|
|
@@ -50,14 +61,10 @@ export function transformColors(value, visited = new WeakSet()) {
|
|
|
50
61
|
const propValue = value[key];
|
|
51
62
|
|
|
52
63
|
if (key === 'color') {
|
|
53
|
-
if (typeof propValue === '
|
|
54
|
-
result[key] =
|
|
55
|
-
} else if (Array.isArray(propValue)) {
|
|
56
|
-
result[key] = propValue.map((item) =>
|
|
57
|
-
typeof item === 'string' ? convertColorToHex(item) : transformColors(item, visited)
|
|
58
|
-
);
|
|
64
|
+
if (typeof propValue === 'function') {
|
|
65
|
+
result[key] = (...args) => convertColorValue(propValue(...args), visited);
|
|
59
66
|
} else {
|
|
60
|
-
result[key] =
|
|
67
|
+
result[key] = convertColorValue(propValue, visited);
|
|
61
68
|
}
|
|
62
69
|
} else {
|
|
63
70
|
result[key] = transformColors(propValue, visited);
|
|
@@ -67,13 +74,49 @@ export function transformColors(value, visited = new WeakSet()) {
|
|
|
67
74
|
return result;
|
|
68
75
|
}
|
|
69
76
|
|
|
77
|
+
/**
|
|
78
|
+
* Remove label.color and emphasis.label.color from funnel series
|
|
79
|
+
* to let ECharts use default contrast colors
|
|
80
|
+
*/
|
|
81
|
+
function removeFunnelLabelColor(option) {
|
|
82
|
+
if (!Array.isArray(option.series)) return option;
|
|
83
|
+
|
|
84
|
+
const series = option.series.map((item) => {
|
|
85
|
+
if (item?.type !== 'funnel') return item;
|
|
86
|
+
|
|
87
|
+
let result = { ...item };
|
|
88
|
+
|
|
89
|
+
// remove label.color
|
|
90
|
+
if (result.label && typeof result.label === 'object') {
|
|
91
|
+
const { color: _, ...labelRest } = result.label;
|
|
92
|
+
result = { ...result, label: labelRest };
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
// remove emphasis.label.color
|
|
96
|
+
const emphasis = result.emphasis;
|
|
97
|
+
if (emphasis?.label && typeof emphasis.label === 'object') {
|
|
98
|
+
const { color: _, ...emphasisLabelRest } = emphasis.label;
|
|
99
|
+
result = { ...result, emphasis: { ...emphasis, label: emphasisLabelRest } };
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
return result;
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
return { ...option, series };
|
|
106
|
+
}
|
|
107
|
+
|
|
70
108
|
/**
|
|
71
109
|
* EChartsReact wrapper component
|
|
110
|
+
* - Automatically converts HSL colors to hex in option
|
|
111
|
+
* - Removes label.color from funnel series
|
|
72
112
|
*/
|
|
73
113
|
export class EChartsReact extends React.Component {
|
|
74
114
|
render() {
|
|
75
115
|
const { option, ...rest } = this.props;
|
|
76
|
-
|
|
116
|
+
|
|
117
|
+
const transformedOption = option
|
|
118
|
+
? removeFunnelLabelColor(transformColors(option))
|
|
119
|
+
: option;
|
|
77
120
|
|
|
78
121
|
return React.createElement(OriginalReactECharts, {
|
|
79
122
|
option: transformedOption,
|