mali-applet-ui 0.1.55 → 0.1.56

package/components/ml-echarts/ml-echarts.vue

@@ -9,6 +9,15 @@ import XEUtils from 'xe-utils'
 import WxCanvas from './wx-canvas';
 import * as echarts from './echarts';
 
+function wrapTouch(event) {
+	for (let i = 0; i < event.touches.length; ++i) {
+		const touch = event.touches[i];
+		touch.offsetX = touch.x;
+		touch.offsetY = touch.y;
+	}
+	return event;
+}
+
 export default {
   name: 'MlEcharts',
 	props: {
@@ -18,6 +27,12 @@ export default {
 		lazyLoad:Boolean,
 		className: String
 	},
+  inject: {
+    currVM: {
+      from: '$pageVM',
+      default: null
+    }
+  },
 	data() {
 		return {
       canvasId: XEUtils.uniqueId('chart')
@@ -61,7 +76,7 @@ export default {
       return opts
     },
     customFormat (name) {
-      return this.formatLegend(name, this.options || {})
+      return this.formatLegend.call(this.currVM, name, this.options || {})
     },
     loadChart () {
       if (this.chart) {
@@ -81,7 +96,7 @@ export default {
       this.chart = chart
       this.loadChart()
     },
-		init: function() {
+		init() {
 			const query = uni.createSelectorQuery().in(this)
 			query
 				.in(this)
@@ -139,7 +154,6 @@ export default {
 				});
 			}
 		},
-
 		touchStart(e) {
 			if (this.chart && e.touches.length > 0) {
 				var touch = e.touches[0];
@@ -155,7 +169,6 @@ export default {
 				handler.processGesture(wrapTouch(e), 'start');
 			}
 		},
-
 		touchMove(e) {
 			if (this.chart && e.touches.length > 0) {
 				var touch = e.touches[0];
@@ -167,7 +180,6 @@ export default {
 				handler.processGesture(wrapTouch(e), 'change');
 			}
 		},
-
 		touchEnd(e) {
 			if (this.chart) {
 				const touch = e.changedTouches ? e.changedTouches[0] : {};
@@ -185,14 +197,6 @@ export default {
 		}
 	}
 }
-function wrapTouch(event) {
-	for (let i = 0; i < event.touches.length; ++i) {
-		const touch = event.touches[i];
-		touch.offsetX = touch.x;
-		touch.offsetY = touch.y;
-	}
-	return event;
-}
 </script>
 
 <style lang="scss">

package/components/ml-table/ml-table.vue

@@ -45,7 +45,7 @@
                 :titleUnderline="column.cellRender.props ? column.cellRender.props.titleUnderline : false"
                 :showNum="column.cellRender.props ? column.cellRender.props.showNum : false"
                 :max="column.cellRender.props && column.cellRender.props.max ? column.cellRender.props.max : 100"
-                :activeColor="barActiveColor ? barActiveColor({ type: 'body', row, rowIndex, column, columnIndex }) : column.cellRender.props ? column.cellRender.props.activeColor : ''"
+                :activeColor="getBarActiveColor({ type: 'body', row, rowIndex, column, columnIndex })"
                 :backgroundColor="column.cellRender.props ? column.cellRender.props.backgroundColor : ''">
               </ml-progress-bar>
               <ml-progress-bar
@@ -55,7 +55,7 @@
                 :max="row[column.cellRender.maxField] || ''"
                 :titleUnderline="column.cellRender.props ? column.cellRender.props.titleUnderline : false"
                 :showNum="column.cellRender.props ? column.cellRender.props.showNum : false"
-                :activeColor="(barActiveColor ? barActiveColor({ type: 'body', row, rowIndex, column, columnIndex }) : (column.cellRender.props ? column.cellRender.props.activeColor : '')) || '#FA8C16'"
+                :activeColor="getBarActiveColor({ type: 'body', row, rowIndex, column, columnIndex }) || '#FA8C16'"
                 :backgroundColor="(column.cellRender.props ? column.cellRender.props.backgroundColor : '') || '#1890FF'">
               </ml-progress-bar>
               <text v-else>{{ getCellValue({ type: 'body', row, rowIndex, column, columnIndex }) }}</text>
@@ -98,6 +98,12 @@ export default {
     // 仅用于MlProgressBar参数
     barActiveColor: Function
   },
+  inject: {
+    currVM: {
+      from: '$pageVM',
+      default: null
+    }
+  },
   data () {
     return {
       tableColumn: [],
@@ -140,10 +146,20 @@ export default {
         return { ...column, order, colid: XEUtils.uniqueId('col_') }
       })
     },
+    getBarActiveColor (params) {
+      const { column } = params
+      if (this.barActiveColor) {
+        if (XEUtils.isFunction(this.barActiveColor)) {
+          return this.barActiveColor.call(this.currVM, params)
+        }
+        return `${this.barActiveColor}`
+      }
+      return column.cellRender.props ? column.cellRender.props.activeColor : ''
+    },
     getHeaderCellClass(params) {
       if (this.headerCellClass) {
         if (XEUtils.isFunction(this.headerCellClass)) {
-          return this.headerCellClass(params)
+          return this.headerCellClass.call(this.currVM, params)
         }
         return `${this.headerCellClass}`
       }
@@ -152,8 +168,8 @@ export default {
     getHeaderCellValue (params) {
       const { row, column } = params
       const cellValue = row[column.field]
-      if (this.headerCellFormat) {
-        return this.headerCellFormat({ ...params, cellValue })
+      if (XEUtils.isFunction(this.headerCellFormat)) {
+        return this.headerCellFormat.call(this.currVM, { ...params, cellValue })
       }
       return XEUtils.eqNull(cellValue) ? '' : cellValue
     },
@@ -162,7 +178,7 @@ export default {
       const cellValue = row[column.field]
       if (this.cellClass) {
         if (XEUtils.isFunction(this.cellClass)) {
-          return this.cellClass({ ...params, cellValue })
+          return this.cellClass.call(this.currVM, { ...params, cellValue })
         }
         return `${this.cellClass}`
       }
@@ -172,7 +188,7 @@ export default {
       const { row, column } = params
       const cellValue = row[column.field]
       if (this.cellFormat) {
-        return this.cellFormat({ ...params, cellValue })
+        return this.cellFormat.call(this.currVM, { ...params, cellValue })
       }
       return XEUtils.eqNull(cellValue) ? '' : cellValue
     },

package/components/ml-upload/ml-upload.vue

@@ -70,6 +70,10 @@ export default {
 		removeFile: Function
 	},
   inject: {
+    currVM: {
+      from: '$pageVM',
+      default: null
+    },
     form: {
       from: 'mlForm',
       default: null
@@ -190,7 +194,7 @@ export default {
       		const fileSuffix = this.getSuffix(file.name)
 					if (uploadMethod) {
 						return Promise.resolve(
-							uploadMethod({
+							uploadMethod.call(this.currVM, {
 								file,
 								params: this.params
 							})
@@ -237,7 +241,7 @@ export default {
 			const removeMethod = this.removeFile ? this.removeFile : (globalStore.upload ? globalStore.upload.removeFile : null)
 			if (item && !item.id) {
 				if (removeMethod) {
-					removeMethod({
+					removeMethod.call(this.currVM, {
 						item,
 						params: this.params
 					})
@@ -249,7 +253,7 @@ export default {
     getUrl (item) {
       const getFileMethod = this.getFileUrl ? this.getFileUrl : (globalStore.upload ? globalStore.upload.getFileUrl : null)
       if (getFileMethod) {
-        return getFileMethod({
+        return getFileMethod.call(this.currVM, {
           item,
           params: this.params
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "description": "码里云小程序组件库",
   "files": [
     "components",