diff --git a/src/assets/images/chart/charts/PieCommon.png b/src/assets/images/chart/charts/PieCommon.png
new file mode 100644
index 00000000..550361ca
Binary files /dev/null and b/src/assets/images/chart/charts/PieCommon.png differ
diff --git a/src/assets/images/chart/charts/pie.png b/src/assets/images/chart/charts/PieCommon1.png
similarity index 100%
rename from src/assets/images/chart/charts/pie.png
rename to src/assets/images/chart/charts/PieCommon1.png
diff --git a/src/assets/images/chart/charts/PieCommon2.png b/src/assets/images/chart/charts/PieCommon2.png
new file mode 100644
index 00000000..e7fa9f1b
Binary files /dev/null and b/src/assets/images/chart/charts/PieCommon2.png differ
diff --git a/src/components/Pages/ChartItemSetting/SizeSetting.vue b/src/components/Pages/ChartItemSetting/SizeSetting.vue
index 5aa8c87f..2389dd96 100644
--- a/src/components/Pages/ChartItemSetting/SizeSetting.vue
+++ b/src/components/Pages/ChartItemSetting/SizeSetting.vue
@@ -8,7 +8,7 @@
placeholder="px"
>
- 宽度
+ 宽
- 高度
+ 高
diff --git a/src/hooks/useChartCommonData.hook.ts b/src/hooks/useChartCommonData.hook.ts
index 0965d561..8fc28c9f 100644
--- a/src/hooks/useChartCommonData.hook.ts
+++ b/src/hooks/useChartCommonData.hook.ts
@@ -57,7 +57,11 @@ export const useChartCommonData = (
series = [seriesItem]
}
if (vChartRef.value) {
- setOption(vChartRef.value, { series, dataset: dataset })
+ Object.assign(targetComponent.option, {
+ series,
+ dataset,
+ })
+ setOption(vChartRef.value, { series, dataset })
}
}
else if(SingleDataArr.some(_ => _ === currentSource)) { // 单个值的处理
diff --git a/src/packages/components/Charts/Pies/PieCommon/index.ts b/src/packages/components/Charts/Pies/PieCommon/index.ts
index 85d9bda3..7545df07 100644
--- a/src/packages/components/Charts/Pies/PieCommon/index.ts
+++ b/src/packages/components/Charts/Pies/PieCommon/index.ts
@@ -10,5 +10,5 @@ export const PieCommonConfig: ConfigType = {
categoryName: ChatCategoryEnumName.PIE,
package: PackagesCategoryEnum.CHARTS,
chartFrame: ChartFrameEnum.ECHARTS,
- image: 'pie.png'
+ image: 'PieCommon.png'
}
diff --git a/src/packages/components/Charts/Pies/PieCommon1/index.ts b/src/packages/components/Charts/Pies/PieCommon1/index.ts
index 6cb9b69a..0615c655 100644
--- a/src/packages/components/Charts/Pies/PieCommon1/index.ts
+++ b/src/packages/components/Charts/Pies/PieCommon1/index.ts
@@ -10,5 +10,5 @@ export const PieCommon1Config: ConfigType = {
categoryName: ChatCategoryEnumName.PIE,
package: PackagesCategoryEnum.CHARTS,
chartFrame: ChartFrameEnum.ECHARTS,
- image: 'pie.png'
+ image: 'PieCommon1.png'
}
diff --git a/src/packages/components/Charts/Pies/PieCommon2/index.ts b/src/packages/components/Charts/Pies/PieCommon2/index.ts
index 689191e1..b0bcc3ac 100644
--- a/src/packages/components/Charts/Pies/PieCommon2/index.ts
+++ b/src/packages/components/Charts/Pies/PieCommon2/index.ts
@@ -10,5 +10,5 @@ export const PieCommon2Config: ConfigType = {
categoryName: ChatCategoryEnumName.PIE,
package: PackagesCategoryEnum.CHARTS,
chartFrame: ChartFrameEnum.ECHARTS,
- image: 'pie.png'
+ image: 'PieCommon2.png'
}
diff --git a/src/packages/public/chart.ts b/src/packages/public/chart.ts
index 18d1de4b..5ed7785e 100644
--- a/src/packages/public/chart.ts
+++ b/src/packages/public/chart.ts
@@ -44,7 +44,5 @@ export const setOption = (instance: T, d
if (!instance) return
const option = instance.getOption()
option.dataset = null
- instance.setOption(data, {
- replaceMerge: ['series'],
- })
+ instance.setOption(data)
}
diff --git a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointRealTime.vue b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointRealTime.vue
index 897116a0..d21c7d1d 100644
--- a/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointRealTime.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartDataV2/components/PointRealTime.vue
@@ -38,7 +38,7 @@
-
+