mrxy-yk 1.2.2 → 1.2.4-alpha.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.
- package/dist/element-plus/components/date-picker/index.js +1 -1
- package/dist/utils/echarts/modules/coordinate/basic.d.ts +2 -2
- package/dist/utils/echarts/modules/coordinate/basic.js +2 -1
- package/dist/utils/echarts/modules/type.d.ts +3 -3
- package/dist/utils/echarts/utils/assignOption.js +2 -1
- package/package.json +3 -3
- package/web-types.json +1 -1
|
@@ -28,7 +28,7 @@ class DatePickerType {
|
|
|
28
28
|
}
|
|
29
29
|
defaultDateStandardHandle(unit) {
|
|
30
30
|
if (!this.props.defaultDate) return;
|
|
31
|
-
const value = dayjs().subtract(this.props.defaultDate - 1, unit).format("YYYY-MM-DD HH:mm:ss");
|
|
31
|
+
const value = dayjs().startOf(unit).subtract(this.props.defaultDate - 1, unit).format("YYYY-MM-DD HH:mm:ss");
|
|
32
32
|
this.setModelValue(value);
|
|
33
33
|
}
|
|
34
34
|
// endregion
|
|
@@ -18,7 +18,7 @@ export declare class EcBasicOption {
|
|
|
18
18
|
* 更新EChart配置项，不更新内部配置项
|
|
19
19
|
* @param option { EcOptionBasicOption }
|
|
20
20
|
*/
|
|
21
|
-
setOption(option: EcOptionBasicOption): void;
|
|
21
|
+
setOption(option: EcOptionBasicOption | EChartsOption): void;
|
|
22
22
|
/**
|
|
23
23
|
* 清空Echarts，同时清空内部系列信息
|
|
24
24
|
*/
|
|
@@ -31,7 +31,7 @@ export declare class EcBasicOption {
|
|
|
31
31
|
* 更新内部配置项
|
|
32
32
|
* @param option { EcOptionBasicOption }
|
|
33
33
|
*/
|
|
34
|
-
updateOption(option?: EcOptionBasicOption): this;
|
|
34
|
+
updateOption(option?: EcOptionBasicOption | EChartsOption): this;
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* ECharts系列对象
|
|
@@ -49,7 +49,8 @@ class EcBasicOption {
|
|
|
49
49
|
// 获取EChartOption配置
|
|
50
50
|
valueOf() {
|
|
51
51
|
const option = this.currentOption;
|
|
52
|
-
const
|
|
52
|
+
const optionSeries = option.series;
|
|
53
|
+
const series = optionSeries.map((item) => {
|
|
53
54
|
return item instanceof EcBasicSeries ? item.valueOf() : item;
|
|
54
55
|
});
|
|
55
56
|
const defaultGrid = ObjectUtil.copy(this.defaultGrid);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { BarSeriesOption, EChartsOption, LineSeriesOption } from 'echarts';
|
|
1
|
+
import { BarSeriesOption, EChartsOption, LineSeriesOption, SeriesOption } from 'echarts';
|
|
2
2
|
import { EcBasicSeries } from '.';
|
|
3
3
|
// region 根配置
|
|
4
|
-
export type EcOptionBasicOption = EChartsOption & {
|
|
5
|
-
series?: EcSeriesBasicOption[]
|
|
4
|
+
export type EcOptionBasicOption = Omit<EChartsOption, 'series'> & {
|
|
5
|
+
series?: EcSeriesBasicOption | EcSeriesBasicOption[]
|
|
6
6
|
}
|
|
7
7
|
export type EcSeriesBasicOption<T = SeriesOption> = EcBasicSeries | T
|
|
8
8
|
// endregion
|
|
@@ -18,7 +18,8 @@ function assignEcOptionBasicOption(target, source) {
|
|
|
18
18
|
source.series = [series];
|
|
19
19
|
}
|
|
20
20
|
if (target.series) {
|
|
21
|
-
|
|
21
|
+
const sourceSeries = source.series;
|
|
22
|
+
for (let i = 0, len = sourceSeries.length; i < len; i++) {
|
|
22
23
|
const targetItem = target.series[i];
|
|
23
24
|
const sourceItem = source.series[i];
|
|
24
25
|
if (!targetItem || sourceItem instanceof EcBasicSeries) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mrxy-yk",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.4-alpha.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"description": "A collection of Vue 3 components and utilities",
|
|
@@ -83,12 +83,12 @@
|
|
|
83
83
|
},
|
|
84
84
|
"peerDependencies": {
|
|
85
85
|
"element-plus": "^2.6.0",
|
|
86
|
-
"vue": "^3.5.0"
|
|
86
|
+
"vue": "^3.5.0",
|
|
87
|
+
"dayjs": "^1.11.0"
|
|
87
88
|
},
|
|
88
89
|
"dependencies": {
|
|
89
90
|
"@amap/amap-jsapi-loader": "1.0.1",
|
|
90
91
|
"@element-plus/icons-vue": "2.3.2",
|
|
91
|
-
"dayjs": "1.11.19",
|
|
92
92
|
"echarts": "6.0.0",
|
|
93
93
|
"ezuikit-js": "8.2.4",
|
|
94
94
|
"jszip": "3.10.1",
|