fix: bar line and pie add tooltip formatter

components/HorizontalBar/HorizontalBar.vue

@@ -6,7 +6,9 @@
 <script>
 	import uniEcCanvas from '@/uni-ec-canvas/uni-ec-canvas'
 	import echartElementData from '@/mixins/echartElementData.js'
-	import { DATAZOOM_DEFAULT } from '@/mixins/zoomConfig.js'
+	import {
+		DATAZOOM_DEFAULT
+	} from '@/mixins/zoomConfig.js'
 	let chart = null
 	let lastCount = 0 // 记录datazoom最后一次滑动的数值数量
 
@@ -47,26 +49,31 @@
 					}
 				} = this.elementData
 				const that = this
-				that.ec.option= {
+				that.ec.option = {
 					...that.elementInfo.option,
 					yAxis: {
 						...that.elementInfo.option.yAxis,
 						data: categories
 					},
-					tooltip: {
-						...that.elementInfo.option.tooltip,
-						trigger: "axis"
-					},
-					dataZoom: that.elementInfo.dataZoom && that.elementInfo.dataZoom.show ? [{...that.elementInfo.dataZoom,...DATAZOOM_DEFAULT}] : [{show: false}],
+					tooltip: that.dealTooltip(that.elementInfo.option.tooltip),
+					dataZoom: that.elementInfo.dataZoom && that.elementInfo.dataZoom.show ? [{
+						...that.elementInfo.dataZoom,
+						...DATAZOOM_DEFAULT
+					}] : [{
+						show: false
+					}],
 					series: that.dealSeriesData(series)
 				}
 				chart.setOption(that.ec.option)
 				chart.on('click', event => {
-					const { preview, images } = that.elementData.dataList
+					const {
+						preview,
+						images
+					} = that.elementData.dataList
 					var urls = []
 					var caches = uni.getStorageSync('cacheImages')
 					images.forEach(url => {
-						if(caches.hasOwnProperty(url)) {
+						if (caches.hasOwnProperty(url)) {
 							urls.push(caches[url])
 						} else {
 							urls.push(url)
@@ -93,14 +100,19 @@
 			initChart() {
 				// 等待子组件完全挂载完成---chart初始化完成
 				this.$nextTick().then(() => {
-					const { categories, series, preview, images } = this.elementData.dataList
-					if(this.labelShow) {
+					const {
+						categories,
+						series,
+						preview,
+						images
+					} = this.elementData.dataList
+					if (this.labelShow) {
 						// 处理初始状态时，数值显示的数量是否超过了配置的最大值
 						let count = categories.length
-						if(this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) {
+						if (this.elementInfo.dataZoom && this.elementInfo.dataZoom.show) {
 							count = count * (this.elementInfo.dataZoom.end - this.elementInfo.dataZoom.start) / 100
 						}
-						if(count > this.elementInfo.option.dataset.maxCount) {
+						if (count > this.elementInfo.option.dataset.maxCount) {
 							this.elementInfo.option.dataset.show = false
 						}
 						lastCount = count
@@ -109,23 +121,54 @@
 					const dealSeries = this.dealSeriesData(series)
 					this.$set(this.ec.option, 'yAxis.data', categories)
 					this.$set(this.ec.option, 'series', dealSeries)
-					this.$set(this.ec.option, 'dataZoom', this.elementInfo.dataZoom && this.elementInfo.dataZoom.show ? [{...this.elementInfo.dataZoom,...DATAZOOM_DEFAULT}] : [{show: false}])
-					if(chart) {
+					this.$set(this.ec.option, 'dataZoom', this.elementInfo.dataZoom && this.elementInfo.dataZoom
+						.show ? [{
+							...this.elementInfo.dataZoom,
+							...DATAZOOM_DEFAULT
+						}] : [{
+							show: false
+						}])
+					if (chart) {
 						const option = chart.getOption()
 						option.series = dealSeries
 						// 重新setOption，使得设置的formatter生效
 						chart.setOption(option)
-						if(Number(dealSeries[0].barWidth)) {
+						if (Number(dealSeries[0].barWidth)) {
 							const height = categories.length * (Number(dealSeries[0].barWidth) + 5) + 25
 							uni.$emit('handleUpdateHeight', height)
-							chart.resize({ width: chart.getWidth(), height })
+							chart.resize({
+								width: chart.getWidth(),
+								height
+							})
 						}
 					}
-					if(preview) {
+					if (preview) {
 						this.cacheImages(images)
 					}
 				})
 			},
+			/**
+			 * 
+			 * @param tooltip 表单的tooltip设置 
+			 */
+			dealTooltip(tooltip) {
+				if (!tooltip) {
+					return
+				}
+				if (tooltip.formatter && tooltip.formatter.length) {
+					return {
+						...tooltip,
+						formatter: (val) => {
+							return this.$u.common.converFunction(tooltip.formatter, val)
+						},
+						trigger: "axis"
+					}
+				}
+				return {
+					...tooltip,
+					trigger: "axis"
+				}
+			},
 			/**
 			 * 处理数据
 			 */
@@ -156,16 +199,16 @@
 			 */
 			cacheImages(images) {
 				var caches = uni.getStorageSync('cacheImages')
-				if(!caches) {
+				if (!caches) {
 					caches = {}
 				}
 				images.forEach(url => {
 					// 如果包含当前url，就不再下载
-					if(!caches.hasOwnProperty(url)) {
+					if (!caches.hasOwnProperty(url)) {
 						uni.downloadFile({
 							url: url,
 							success: (res) => {
-								if(res.statusCode === 200) {
+								if (res.statusCode === 200) {
 									caches[url] = res.tempFilePath
 									uni.setStorageSync('cacheImages', caches)
 								}
@@ -181,12 +224,12 @@
 			handleDataZoomEvent(event) {
 				var count = this.elementData.dataList.categories.length * (event.end - event.start) / 100
 				// 给小程序里面赋值datas，如果存在且不为空，代表可以左右滑动切换
-				if(this.elementData.dataList.datas && this.elementData.dataList.datas.length) {
+				if (this.elementData.dataList.datas && this.elementData.dataList.datas.length) {
 					count = this.elementData.dataList.datas[this.index].categories.length * (event.end - event.start) / 100
 					this.switchData(event, count)
 				}
 				// 当前图表初始设置了labelShow=true时，才判断超过最大个数隐藏
-				if(this.labelShow) {
+				if (this.labelShow) {
 					this.dealLabelShowStatus(event, count)
 				}
 				lastCount = count
@@ -200,15 +243,15 @@
 			dealLabelShowStatus(event, count) {
 				var flag = false
 				const maxCount = this.elementInfo.option.dataset.maxCount
-				if(lastCount < count && lastCount <= maxCount  && count > maxCount ) {
+				if (lastCount < count && lastCount <= maxCount && count > maxCount) {
 					// 放大的情况
 					flag = true
 				}
-				if(lastCount > count && lastCount >= maxCount && count < maxCount) {
+				if (lastCount > count && lastCount >= maxCount && count < maxCount) {
 					// 缩小的情况
 					flag = true
 				}
-				if(flag) {
+				if (flag) {
 					const series = this.ec.option.series
 					series.map(item => {
 						item.label.show = count <= this.elementInfo.option.dataset.maxCount
@@ -224,15 +267,15 @@
 			 * event： 包含dataZoom的start和end
 			 * count: 当前图表显示的数量
 			 */
-			switchData(event,count) {
+			switchData(event, count) {
 				const categories = this.elementData.dataList.datas[this.index].categories
 				// 容错在一个百分点内，认为是滑块滚动
 				const flag = Math.abs(lastCount - count) <= categories.length / 100 ? true : false
-				if(flag && event.end === 100 && this.index != this.elementData.dataList.datas.length - 1) {
+				if (flag && event.end === 100 && this.index != this.elementData.dataList.datas.length - 1) {
 					this.index += 1
 					this.setChartDatas(event)
 				}
-				if(flag && event.start === 0 && this.index != 0) {
+				if (flag && event.start === 0 && this.index != 0) {
 					this.index -= 1
 					this.setChartDatas(event)
 				}

components/LineMixBar/LineMixBar.vue

@@ -63,10 +63,7 @@
 							type: 'value'
 						}
 					],
-					tooltip: {
-						...that.elementInfo.option.tooltip,
-						trigger: "axis"
-					},
+					tooltip: that.dealTooltip(that.elementInfo.option.tooltip),
 					toolbox: {
 						...that.elementInfo.option.toolbox,
 						feature: {
@@ -125,6 +122,28 @@
 					}
 				})
 			},
+			/**
+			 * 
+			 * @param tooltip 表单的tooltip设置 
+			 */
+			dealTooltip(tooltip) {
+				if (!tooltip) {
+					return
+				}
+				if (tooltip.formatter && tooltip.formatter.length) {
+					return {
+						...tooltip,
+						formatter: (val) => {
+							return this.$u.common.converFunction(tooltip.formatter, val)
+						},
+						trigger: "axis"
+					}
+				}
+				return {
+					...tooltip,
+					trigger: "axis"
+				}
+			},
 			/**
 			 * 处理数据
 			 */

components/NormalBar/NormalBar.vue

@@ -49,10 +49,7 @@
 						...that.elementInfo.option.xAxis,
 						data: categories
 					},
-					tooltip: {
-						...that.elementInfo.option.tooltip,
-						trigger: "axis"
-					},
+					tooltip: that.dealTooltip(that.elementInfo.option.tooltip),
 					toolbox: {
 						...that.elementInfo.option.toolbox,
 						feature: {
@@ -111,6 +108,28 @@
 					}
 				})
 			},
+			/**
+			 * 
+			 * @param tooltip 表单的tooltip设置 
+			 */
+			dealTooltip(tooltip) {
+				if (!tooltip) {
+					return
+				}
+				if (tooltip.formatter && tooltip.formatter.length) {
+					return {
+						...tooltip,
+						formatter: (val) => {
+							return this.$u.common.converFunction(tooltip.formatter, val)
+						},
+						trigger: "axis"
+					}
+				}
+				return {
+					...tooltip,
+					trigger: "axis"
+				}
+			},
 			/**
 			 * 处理数据
 			 */

components/NormalLine/NormalLine.vue

@@ -51,10 +51,7 @@
 						...that.elementInfo.option.xAxis,
 						data: categories
 					},
-					tooltip: {
-						...that.elementInfo.option.tooltip,
-						trigger: "axis"
-					},
+					tooltip: that.dealTooltip(that.elementInfo.option.tooltip),
 					toolbox: {
 						...that.elementInfo.option.toolbox,
 						feature: {
@@ -113,6 +110,28 @@
 					}
 				})
 			},
+			/**
+			 * 
+			 * @param tooltip 表单的tooltip设置 
+			 */
+			dealTooltip(tooltip) {
+				if (!tooltip) {
+					return
+				}
+				if (tooltip.formatter && tooltip.formatter.length) {
+					return {
+						...tooltip,
+						formatter: (val) => {
+							return this.$u.common.converFunction(tooltip.formatter, val)
+						},
+						trigger: "axis"
+					}
+				}
+				return {
+					...tooltip,
+					trigger: "axis"
+				}
+			},
 			/**
 			 * 处理数据
 			 */

components/NormalPie/NormalPie.vue

@@ -41,18 +41,16 @@ export default {
 			})
 			canvas.setChart(chart)
 			const { series } = this.elementData.dataList
+			const that = this
 			this.ec.option = {
-				...this.elementInfo.option,
+				...that.elementInfo.option,
 				color: ['#1089E7', '#F57474', '#56D0E3', '#F8B448', '#8B78F6'],
-				tooltip: {
-					...this.elementInfo.option.tooltip,
-				    trigger: 'item'
-				},
-				series: this.dealSeriesData(series)
+				tooltip: that.dealTooltip(that.elementInfo.option.tooltip),
+				series: that.dealSeriesData(series)
 			}
-			chart.setOption(this.ec.option)
+			chart.setOption(that.ec.option)
 			chart.on('click', event => {
-				this.handleEchartsClick(event)
+				that.handleEchartsClick(event)
 			})
 			return chart
 		},
@@ -65,6 +63,29 @@ export default {
 			}
 		},
 		
+		/**
+		* 
+		* @param tooltip 表单的tooltip设置 
+		*/
+		dealTooltip (tooltip) {
+			if(!tooltip) {
+				return 
+			}
+			if(tooltip.formatter && tooltip.formatter.length) {
+				return {
+					...tooltip,
+					formatter: (val) => {
+						return this.$u.common.converFunction(tooltip.formatter, val)
+					},
+					trigger: "item"
+				}
+			}
+			return {
+				...tooltip,
+				trigger: "item"
+			}
+		},
+		
 		dealSeriesData (data) {
 			if(!data) return
 			const series = [{