Merge branch 'develop' of http://106.15.103.105/lihuizhen/ec-report-refactor into develop

components/HorizontalBar/HorizontalBar.vue

@@ -86,6 +86,10 @@
 				this.$set(this.ec.option, 'yAxis.data', categories)
 				this.$set(this.ec.option, 'series', this.dealSeriesData(series))
 				this.$set(this.ec.option, 'dataZoom', this.elementInfo.dataZoom && this.elementInfo.dataZoom.show ? [{...this.elementInfo.dataZoom,...DATAZOOM_DEFAULT}] : [{show: false}])
+				if(chart) {
+					// 重新setOption，使得设置的formatter生效
+					chart.setOption(this.ec.option)
+				}
 				if(preview) {
 					this.cacheImages(images)
 				}

components/LineMixBar/LineMixBar.vue

@@ -90,7 +90,11 @@
 				const {categories, series } = this.elementData.dataList
 				this.$set(this.ec.option, 'xAxis.data', categories)
 				this.$set(this.ec.option, 'series', this.dealSeriesData(series))
-				this.$set(this.ec.option, 'dataZoom', this.elementInfo.dataZoom && this.elementInfo.dataZoom.show ? [{...this.elementInfo.dataZoom,...DATAZOOM_DEFAULT}] : [{show: false}])
+				this.$set(this.ec.option, 'dataZoom', this.elementInfo.dataZoom && this.elementInfo.dataZoom.show ? [{...this.elementInfo.dataZoom,...DATAZOOM_DEFAULT}] : [{show: false}])
+				if(chart) {
+					// 重新setOption，使得设置的formatter生效
+					chart.setOption(this.ec.option)
+				}
 			},
 			/**
 			 * 处理数据

components/NormalBar/NormalBar.vue

@@ -77,6 +77,10 @@
 				this.$set(this.ec.option, 'xAxis.data', categories)
 				this.$set(this.ec.option, 'series', this.dealSeriesData(series))
 				this.$set(this.ec.option, 'dataZoom', this.elementInfo.dataZoom && this.elementInfo.dataZoom.show ? [{...this.elementInfo.dataZoom,...DATAZOOM_DEFAULT}] : [{show: false}])
+				if(chart) {
+					// 重新setOption，使得设置的formatter生效
+					chart.setOption(this.ec.option)
+				}
 			},
 			/**
 			 * 处理数据

components/NormalLine/NormalLine.vue

@@ -79,6 +79,10 @@
 				this.$set(this.ec.option, 'xAxis.data', categories)
 				this.$set(this.ec.option, 'series', this.dealSeriesData(series))
 				this.$set(this.ec.option, 'dataZoom', this.elementInfo.dataZoom && this.elementInfo.dataZoom.show ? [{...this.elementInfo.dataZoom,...DATAZOOM_DEFAULT}] : [{show: false}])
+				if(chart) {
+					// 重新setOption，使得设置的formatter生效
+					chart.setOption(this.ec.option)
+				}
 			},
 			/**
 			 * 处理数据

components/NormalPie/NormalPie.vue

@@ -59,6 +59,10 @@ export default {
 		initChart() {
 			const { series } = this.elementData.dataList
 			this.$set(this.ec.option, 'series', this.dealSeriesData(series))
+			if(chart) {
+				// 重新setOption，使得设置的formatter生效
+				chart.setOption(this.ec.option)
+			}
 		},
 		
 		dealSeriesData (data) {