feat: 公用文件调整

components/ChinaMap/ChinaMap.vue

@@ -3,7 +3,7 @@
 		<uni-ec-canvas
 			class="uni-ec-canvas"
 			id="china-map"
-			ref="canvas"
+			ref="chinaMapCanvas"
 			canvas-id="china-map-chart"
 			:ec="ec"
 		></uni-ec-canvas>

components/HorizontalBar/HorizontalBar.vue

@@ -3,7 +3,7 @@
 		<uni-ec-canvas
 			class="uni-ec-canvas"
 			id="horizontal-bar"
-			ref="canvas"
+			ref="horizontalBarCanvas"
 			canvas-id="horizontal-bar-chart"
 			:ec="ec"
 		></uni-ec-canvas>
@@ -35,7 +35,7 @@ export default {
 	methods: {
 		initChart() {
 			this.$nextTick(() => {
-				this.$refs['canvas'].init((canvas, width, height, canvasDpr) => {
+				this.$refs['horizontalBarCanvas'].init((canvas, width, height, canvasDpr) => {
 					chart = echarts.init(canvas, null, {
 						width: width,
 						height: height,
@@ -69,7 +69,7 @@ export default {
 					label: {
 						...this.elementInfo.option.dataset,
 						formatter: val => {
-							return converFunction(this.elementInfo.option.dataset.formatter, val)
+							return this.$u.common.converFunction(this.elementInfo.option.dataset.formatter, val)
 						}
 					}
 				}
@@ -81,9 +81,4 @@ export default {
 }
 </script>
 <style scoped>
-.uni-ec-canvas{
-	width: 750rpx;
-	height: 750rpx;
-	display:block;
-}
 </style>

components/LineMixBar/LineMixBar.vue

@@ -3,7 +3,7 @@
 		<uni-ec-canvas
 			class="uni-ec-canvas"
 			id="line-mix-bar"
-			ref="canvas"
+			ref="lineMixBarCanvas"
 			canvas-id="line-mix-bar-chart"
 			:ec="ec"
 		></uni-ec-canvas>
@@ -35,7 +35,7 @@
 		methods: {
 			initChart() {
 				this.$nextTick(() => {
-					this.$refs['canvas'].init((canvas, width, height, canvasDpr) => {
+					this.$refs['lineMixBarCanvas'].init((canvas, width, height, canvasDpr) => {
 						chart = echarts.init(canvas, null, {
 							width: width,
 							height: height,
@@ -81,7 +81,7 @@
 						label: {
 							...this.elementInfo.option.dataset,
 							formatter: val => {
-								return converFunction(this.elementInfo.option.dataset.formatter, val)
+								return this.$u.common.converFunction(this.elementInfo.option.dataset.formatter, val)
 							}
 						}
 					}
@@ -108,9 +108,4 @@
 	}
 </script>
 <style scoped>
-	.uni-ec-canvas {
-		width: 750rpx;
-		height: 750rpx;
-		display: block;
-	}
 </style>

components/NormalBar/NormalBar.vue

@@ -3,7 +3,7 @@
 		<uni-ec-canvas
 			class="uni-ec-canvas"
 			id="normal-bar"
-			ref="canvas"
+			ref="normalbarCanvas"
 			canvas-id="normal-bar-chart"
 			:ec="ec"
 		></uni-ec-canvas>
@@ -35,7 +35,7 @@ export default {
 	methods: {
 		initChart() {
 			this.$nextTick(() => {
-				this.$refs['canvas'].init((canvas, width, height, canvasDpr) => {
+				this.$refs['normalbarCanvas'].init((canvas, width, height, canvasDpr) => {
 					chart = echarts.init(canvas, null, {
 						width: width,
 						height: height,
@@ -69,7 +69,7 @@ export default {
 					label: {
 						...this.elementInfo.option.dataset,
 						formatter: val => {
-							return converFunction(this.elementInfo.option.dataset.formatter, val)
+							return this.$u.common.converFunction(this.elementInfo.option.dataset.formatter, val)
 						}
 					}
 				}
@@ -81,9 +81,4 @@ export default {
 }
 </script>
 <style scoped>
-.uni-ec-canvas{
-	width: 750rpx;
-	height: 750rpx;
-	display:block;
-}
 </style>

components/NormalGauge/NormalGauge.vue

@@ -2,9 +2,9 @@
 	<view>
 		<uni-ec-canvas
 			class="uni-ec-canvas"
-			id="NormalGauge"
-			ref="canvas"
-			canvas-id="lazy-load-chart"
+			id="normal-gauge"
+			ref="normalGaugeCanvas"
+			canvas-id="normal-gauge-chart"
 			:ec="ec"
 		></uni-ec-canvas>
 	</view>
@@ -26,7 +26,7 @@ export default {
 			  lazyLoad:true
 			}
 		};
-	}
+	},
 	
 	onReady () {
 	  
@@ -39,14 +39,14 @@ export default {
 	methods: {
 		initChart() {
 			this.$nextTick(() => {
-				this.$refs['canvas'].init((canvas, width, height, canvasDpr) => {
+				this.$refs['normalGaugeCanvas'].init((canvas, width, height, canvasDpr) => {
 					chart = echarts.init(canvas, null, {
 						width: width,
 						height: height,
 						devicePixelRatio: canvasDpr
 					})
 					canvas.setChart(chart)
-					const { dataList: { categories, series } } = this.elementData
+					const { dataList: { guageChart } } = this.elementData
 					const options = {
 						...this.elementInfo.option,
 						tooltip: {
@@ -62,10 +62,6 @@ export default {
 					return chart
 				})
 			})
-		},
-		
-		dealSeriesData (data) {
-			return data
 		}
 	}
 }

components/NormalLine/NormalLine.vue

@@ -3,7 +3,7 @@
 		<uni-ec-canvas
 			class="uni-ec-canvas"
 			id="normal-line"
-			ref="canvas"
+			ref="normalLineCanvas"
 			canvas-id="normal-line-chart"
 			:ec="ec"
 		></uni-ec-canvas>
@@ -34,7 +34,7 @@ export default {
 	methods: {
 		initChart() {
 			this.$nextTick(() => {
-				this.$refs['canvas'].init((canvas, width, height, canvasDpr) => {
+				this.$refs['normalLineCanvas'].init((canvas, width, height, canvasDpr) => {
 					chart = echarts.init(canvas, null, {
 						width: width,
 						height: height,
@@ -69,7 +69,7 @@ export default {
 					label: {
 						...this.elementInfo.option.dataset,
 						formatter: val => {
-							return converFunction(this.elementInfo.option.dataset.formatter, val)
+							return this.$u.common.converFunction(this.elementInfo.option.dataset.formatter, val)
 						}
 					}
 				}
@@ -81,9 +81,4 @@ export default {
 }
 </script>
 <style scoped>
-.uni-ec-canvas{
-	width: 750rpx;
-	height: 750rpx;
-	display:block;
-}
 </style>

main.js

@@ -27,4 +27,8 @@ Vue.use(HTTPInterceptor, app)
 import HTTPApi from '@/common/http.api.js'
 Vue.use(HTTPApi, app)
 
+// 自定义方法
+import common from './utils/common.js'
+Vue.use(common, app)
+
 app.$mount()

mixins/echartElementData.js

-import { converFunction } from '@/utils/common.js'
 export default {
   data() {
     return {
@@ -29,7 +28,7 @@ export default {
 			if (value.queryFormatter) dataFormatter = {...dataFormatter, ...value.queryFormatter}
 			let res = await this.$u[dataMethod.toLowerCase()](dataUrl, dataFormatter)
 			if (dataProcessing) {
-				this.elementData.dataList = converFunction(dataProcessing, res.data)
+				this.elementData.dataList = this.$u.common.converFunction(dataProcessing, res.data)
 			} else {
 				this.elementData.dataList = JSON.parse(JSON.stringify(res.data.Result))
 			}
@@ -50,7 +49,7 @@ export default {
 			const { Status, Msg } = res.data;
 			if (Status == "true") {
 				if(dataSetInfo.script) {
-					this.elementData.dataList = converFunction(dataSetInfo.script, res.data.Result)
+					this.elementData.dataList = this.$u.common.converFunction(dataSetInfo.script, res.data.Result)
 				} else {
 					this.elementData.dataList = res.data.Result
 				}

static/style/common.scss

@@ -21,3 +21,9 @@
 .my-u-block {
 	display: block;
 }
+
+.uni-ec-canvas{
+	width: 100%;
+	height: 750rpx;
+	display:block;
+}
\ No newline at end of file

utils/common.js

 import { Function } from '../static/plugin/eval5/eval5.js'
-/**
+
+const install = (Vue, vm) => {
+	/**
 	 * 数据转换
 	 */
-export const converFunction = (func, data) => {
+	const converFunction = (func, data) => {
 	  if(!func) return
 	  return new Function('"use strict";return (' + func + ')')()(data);
+	}
+	
+	vm.$u.common = {
+		converFunction
+	}
+}
+
+export default {
+	install
 }
\ No newline at end of file