mali-applet-ui 1.1.0 → 1.1.2

package/lib/components/ml-amount-input/ml-amount-input.vue

@@ -30,7 +30,7 @@
 
 <script>
 import XEUtils from 'xe-utils'
-import { getPlatformEnv, toAmountString, toWanAmountString, toNumMoneyToChinese } from '../../../utils'
+import MaliUtils from '../../../utils'
 
 function eqEmptyNull (value) {
   return value === '' || XEUtils.eqNull(value)
@@ -83,7 +83,7 @@ export default {
   },
   data () {
     return {
-      platformEnv: getPlatformEnv(),
+      platformEnv: MaliUtils.getPlatformEnv(),
       inpVal: ''
     }
   },
@@ -96,9 +96,9 @@ export default {
     },
     amountLabel () {
       if (this.simplify) {
-        return toWanAmountString(this.value)
+        return MaliUtils.toWanAmountString(this.value)
       }
-      return toAmountString(this.value)
+      return MaliUtils.toAmountString(this.value)
     },
     minNum () {
       if (XEUtils.isNumber(this.min) || this.min) {
@@ -116,7 +116,7 @@ export default {
       return null
     },
     currAmountLabel () {
-      return this.currAmountNum === '' ? '' : toNumMoneyToChinese(this.currAmountNum)
+      return this.currAmountNum === '' ? '' : MaliUtils.toNumMoneyToChinese(this.currAmountNum)
     }
   },
   watch: {

package/lib/components/ml-amount-text/ml-amount-text.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { toAmountString, toWanAmountString } from '../../../utils'
+import MaliUtils from '../../../utils'
 
 export default {
   name: 'MlAmountText',
@@ -45,9 +45,9 @@ export default {
     },
     amountLabel () {
       if (this.simplify) {
-        return toWanAmountString(this.value, this.digits)
+        return MaliUtils.toWanAmountString(this.value || 0, this.digits)
       }
-      return toAmountString(this.value, this.digits)
+      return MaliUtils.toAmountString(this.value || 0, this.digits)
     }
   },
   methods: {

package/lib/components/ml-echarts/echarts.js

@@ -1,13 +1,13 @@
 import * as echarts from './echarts.simple.min.js'
 // import * as echarts from './echarts.all.js'
-import { getAppDpr } from '../../../utils'
+import MaliUtils from '../../../utils'
 
 /* eslint-disable */
 
 // #ifdef MP-ALIPAY
 const eInit = echarts.init
 echarts.init = function (p1, p2, opts = {}) {
-  opts.devicePixelRatio = opts.devicePixelRatio || getAppDpr()
+  opts.devicePixelRatio = opts.devicePixelRatio || MaliUtils.getAppDpr()
   return eInit.call(this, p1, p2, opts)
 }
 // #endif

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

@@ -8,7 +8,7 @@
 import WxCanvas from './wx-canvas'
 import echarts from './echarts'
 import XEUtils from 'xe-utils'
-import { getPlatformEnv, getAppDpr } from '../../../utils'
+import MaliUtils from '../../../utils'
 
 function wrapTouch (event) {
   for (let i = 0; i < event.touches.length; ++i) {
@@ -37,7 +37,7 @@ export default {
   },
   data () {
     return {
-      platformEnv: getPlatformEnv(),
+      platformEnv: MaliUtils.getPlatformEnv(),
       canvasId: XEUtils.uniqueId('chart'),
       cvsWidth: '',
       cvsHeight: ''
@@ -130,7 +130,7 @@ export default {
         .exec(res => {
           if (res && res[0]) {
             const canvasNode = res[0].node
-            const ratio = getAppDpr()
+            const ratio = MaliUtils.getAppDpr()
             const canvasWidth = res[0].width
             const canvasHeight = res[0].height
             this.cvsWidth = canvasWidth
@@ -161,7 +161,7 @@ export default {
         return canvas
       })
       const query = uni.createSelectorQuery().in(this)
-      const ratio = getAppDpr()
+      const ratio = MaliUtils.getAppDpr()
       query
         .select(`#${this.canvasId}`)
         .boundingClientRect(res => {

package/lib/components/ml-input/ml-input.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { getPlatformEnv } from '../../../utils'
+import MaliUtils from '../../../utils'
 import XEUtils from 'xe-utils'
 
 export default {
@@ -93,7 +93,7 @@ export default {
   },
   data () {
     return {
-      platformEnv: getPlatformEnv(),
+      platformEnv: MaliUtils.getPlatformEnv(),
       inpVal: ''
     }
   },

package/lib/components/ml-number-input/ml-number-input.vue

@@ -34,7 +34,7 @@
 
 <script>
 import XEUtils from 'xe-utils'
-import { getPlatformEnv } from '../../../utils'
+import MaliUtils from '../../../utils'
 
 function eqEmptyNull (value) {
   return value === '' || XEUtils.eqNull(value)
@@ -74,7 +74,7 @@ export default {
   },
   data () {
     return {
-      platformEnv: getPlatformEnv(),
+      platformEnv: MaliUtils.getPlatformEnv(),
       inpVal: ''
     }
   },

package/lib/components/ml-search-bar/ml-search-bar.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { getPlatformEnv } from '../../../utils'
+import MaliUtils from '../../../utils'
 
 export default {
   name: 'MlSearchBar',
@@ -58,7 +58,7 @@ export default {
   },
   data () {
     return {
-      platformEnv: getPlatformEnv(),
+      platformEnv: MaliUtils.getPlatformEnv(),
       inpVal: ''
     }
   },

package/lib/components/ml-textarea/ml-textarea.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { getPlatformEnv } from '../../../utils'
+import MaliUtils from '../../../utils'
 import XEUtils from 'xe-utils'
 // import VoiceInput from './voice-input.vue'
 
@@ -90,7 +90,7 @@ export default {
   },
   data () {
     return {
-      platformEnv: getPlatformEnv(),
+      platformEnv: MaliUtils.getPlatformEnv(),
       inpVal: ''
     }
   },

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

@@ -67,7 +67,7 @@
 
 <script>
 import globalStore from '../../../config/store'
-import { getPlatformEnv, getFileSuffix, getFileName } from '../../../utils'
+import MaliUtils from '../../../utils'
 
 function normalizeChooseAndUploadFileRes (res, fileType) {
   res.tempFiles.forEach((item) => {
@@ -226,7 +226,7 @@ export default {
       fileList: [],
       docsTypes: ['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx'],
       imgTypes: ['png', 'jpg', 'gif'],
-      platformEnv: getPlatformEnv()
+      platformEnv: MaliUtils.getPlatformEnv()
     }
   },
   computed: {
@@ -295,17 +295,17 @@ export default {
     loadList () {
       if (this.simpleValue) {
         this.fileList = (this.urlList && this.urlList.length ? this.urlList : (this.value || [])).map(url => {
-          const name = getFileName(url)
+          const name = MaliUtils.getFileName(url)
           const obj = {
             id: null,
             [this.nameField]: name,
-            [this.typeField]: getFileSuffix(name),
+            [this.typeField]: MaliUtils.getFileSuffix(name),
             [this.urlField]: url
           }
           return {
             id: null,
             [this.nameField]: name,
-            [this.typeField]: getFileSuffix(name),
+            [this.typeField]: MaliUtils.getFileSuffix(name),
             [this.urlField]: url,
             tempPath: this.getUrl(obj)
           }
@@ -504,7 +504,7 @@ export default {
         this.loading = true
         Promise.all(
           tempFiles.map(file => {
-            const fileSuffix = getFileSuffix(file.name)
+            const fileSuffix = MaliUtils.getFileSuffix(file.name)
             if (uploadMethod) {
               return Promise.resolve(
                 uploadMethod.call(this.currVM, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "vue2 码里云小程序组件库",
   "files": [
     "lib",

package/utils/index.js

@@ -1,4 +1,12 @@
-import XEUtils from 'xe-utils'
+import objectMethods from 'xe-utils/object'
+import arrayMethods from 'xe-utils/array'
+import baseMethods from 'xe-utils/base'
+import numberMethods from 'xe-utils/number'
+import dateMethods from 'xe-utils/date'
+import stringMethods from 'xe-utils/string'
+import functionMethods from 'xe-utils/function'
+import urlMethods from 'xe-utils/url'
+import webMethods from 'xe-utils/web'
 
 import * as appletFns from './applet'
 import * as dateFns from './date'
@@ -6,7 +14,25 @@ import * as numberFns from './number'
 import * as fileFns from './file'
 
 const MaliUtils = {
-  ...XEUtils,
+  // Object
+  ...objectMethods,
+  // Array
+  ...arrayMethods,
+  // Base
+  ...baseMethods,
+  // Number
+  ...numberMethods,
+  // Date
+  ...dateMethods,
+  // String
+  ...stringMethods,
+  // Function
+  ...functionMethods,
+  // URL
+  ...urlMethods,
+  // Web
+  ...webMethods,
+
   ...appletFns,
   ...dateFns,
   ...numberFns,