mali-applet-ui 0.0.53 → 0.0.54

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

@@ -8,31 +8,7 @@
 import XEUtils from 'xe-utils'
 import WxCanvas from './wx-canvas';
 import * as echarts from './echarts';
-
-function compareVersion(v1, v2) {
-	v1 = v1.split('.')
-	v2 = v2.split('.')
-	const len = Math.max(v1.length, v2.length)
-
-	while (v1.length < len) {
-		v1.push('0')
-	}
-	while (v2.length < len) {
-		v2.push('0')
-	}
-
-	for (let i = 0; i < len; i++) {
-		const num1 = parseInt(v1[i])
-		const num2 = parseInt(v2[i])
-
-		if (num1 > num2) {
-			return 1
-		} else if (num1 < num2) {
-			return -1
-		}
-	}
-	return 0
-}
+import globalStore from '../../config/store'
 
 export default {
   name: 'MlEcharts',
@@ -44,7 +20,6 @@ export default {
 		height:String,
 		width: String,
 		lazyLoad:Boolean,
-		forceUseOldCanvas: Boolean,
 		className: String
 	},
 	data() {
@@ -87,7 +62,10 @@ export default {
           opts.legend.formatter = this.customFormat
         }
       }
-      return opts
+      return {
+				color: globalStore.echarts.color,
+				...opts
+			}
     },
     customFormat (name) {
       return this.formatLegend(name, this.options || {})
@@ -111,17 +89,6 @@ export default {
       this.loadChart()
     },
 		init: function() {
-			const version = uni.getSystemInfoSync().SDKVersion
-			const canUseNewCanvas = compareVersion(version, '2.9.0') >= 0;
-			const forceUseOldCanvas = this.forceUseOldCanvas;
-			const isUseNewCanvas = canUseNewCanvas && !forceUseOldCanvas;
-			this.isUseNewCanvas = isUseNewCanvas
-
-			if (forceUseOldCanvas && canUseNewCanvas) {
-				console.warn('开发者强制使用旧canvas,建议关闭');
-			}
-			
-			// version >= 2.9.0：使用新的方式初始化
 			const query = uni.createSelectorQuery().in(this)
 			query
 				.in(this)

package/config/store.js

@@ -27,6 +27,10 @@ const globalStore = {
     record: {
       optionMethod: null
     }
+  },
+  // 图表
+  echarts: {
+    color: ['#582D27', '#391085', '#13c2c2', '#04395E', '#5E503F', '#7C98B3', '#69C6DB', '#A98467', '#b37feb']
   }
 }
 

package/index.js

@@ -1,13 +1,19 @@
 import config from './config'
+import MaliToast from './toast'
+import MaliLoading from './loading'
 import * as MaliUtils from './utils'
 
 const MaliUI = {
   config,
-  MaliUtils
+  MaliUtils,
+  MaliToast,
+  MaliLoading
 }
 
 export {
-	MaliUtils
+	MaliUtils,
+  MaliToast,
+  MaliLoading
 }
 
 export default MaliUI

package/loading/index.js

@@ -0,0 +1,19 @@
+const MaliLoading = {
+  show (option = {}) {
+    return new Promise(resolve => {
+      uni.showLoading({
+        title: option.content || '加载中',
+        success: resolve
+      })
+    })
+  },
+  hide () {
+    return new Promise(resolve => {
+      uni.hideLoading({
+        success: resolve
+      })
+    })
+  }
+}
+
+export default MaliLoading

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "mali-applet-ui",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "description": "码里云小程序组件库",
   "files": [
     "components",
     "config",
     "utils",
+    "loading",
+    "toast",
     "iconfont.css",
     "index.js",
     "index.scss"

package/toast/index.js

@@ -0,0 +1,29 @@
+const MaliToast = {
+  success (option = {}) {
+    return new Promise(resolve => {
+      uni.showToast({
+        title: option.content || '操作成功',
+        icon: 'success',
+        success: resolve
+      })
+    })
+  },
+  error (option = {}) {
+    return new Promise(resolve => {
+      uni.showToast({
+        title: option.content || '操作失败',
+        icon: 'error',
+        success: resolve
+      })
+    })
+  },
+  hide () {
+    return new Promise(resolve => {
+      uni.hideToast({
+        success: resolve
+      })
+    })
+  }
+}
+
+export default MaliToast