mali-applet-ui 1.0.107 → 1.0.109

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

@@ -54,6 +54,10 @@ export default {
       type: Number,
       default: 12
     },
+    digits: {
+      type: [Number, String],
+      default: 2
+    },
     negative: Boolean,
     placeholder: {
       type: String,
@@ -134,7 +138,7 @@ export default {
   },
   methods: {
     updateValue (value) {
-      this.inpVal = eqEmptyNull(value) ? '' : XEUtils.toFixed(XEUtils.toNumber(value), 2)
+      this.inpVal = eqEmptyNull(value) ? '' : XEUtils.toFixed(XEUtils.toNumber(value), this.digits)
     },
     checkValue  () {
       const numVal = XEUtils.toNumber(this.inpVal)
@@ -154,7 +158,7 @@ export default {
       if (eqEmptyNull(this.inpVal) && eqEmptyNull(this.value)) {
         return { status: false, value: this.inpVal }
       }
-      const val = XEUtils.floor(numVal, 2)
+      const val = XEUtils.floor(numVal, this.digits)
       if (`${val}` !== `${this.value}`) {
         this.updateModel = true
         this.updateValue(val)

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

@@ -29,6 +29,10 @@ export default {
       default: false
     },
     unit: Boolean,
+    digits: {
+      type: [Number, String],
+      default: 2
+    },
     underline: Boolean,
     className: String
   },
@@ -41,9 +45,9 @@ export default {
     },
     amountLabel () {
       if (this.simplify) {
-        return toWanAmountString(this.value)
+        return toWanAmountString(this.value, this.digits)
       }
-      return toAmountString(this.value)
+      return toAmountString(this.value, this.digits)
     }
   },
   methods: {

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

@@ -130,13 +130,37 @@ export default {
             }
           }
           if (rule.required) {
-            if (!itemValue) {
+            if (XEUtils.eqNull(itemValue) || itemValue === '') {
               errRule = rule
               break
             }
-            if (rule.type === 'array' && !itemValue.length) {
-              errRule = rule
-              break
+            if (rule.type === 'integer' || rule.type === 'number') {
+              if (rule.type === 'integer') {
+                if (!/^\d+$/.test(itemValue)) {
+                  errRule = rule
+                  break
+                }
+              } else if (rule.type === 'number') {
+                if (!/^[-+]?\d+(.\d+)?$/.test(itemValue)) {
+                  errRule = rule
+                  break
+                }
+              }
+              const numValue = XEUtils.toNumber(itemValue)
+              if (XEUtils.isNumber(rule.min) && numValue < rule.min) {
+                errRule = rule
+                break
+              }
+              if (XEUtils.isNumber(rule.max) && numValue > rule.max) {
+                errRule = rule
+                break
+              }
+            }
+            if (rule.type === 'array') {
+              if (!itemValue.length) {
+                errRule = rule
+                break
+              }
             }
             if (rule.pattern && !new RegExp(rule.pattern).test(itemValue)) {
               errRule = rule

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

@@ -20,9 +20,10 @@ export default {
     options: Array,
     className: String
   },
-  data () {
-    return {
-
+  inject: {
+    layout: {
+      from: '$pageLayout',
+      default: null
     }
   },
   computed: {
@@ -58,6 +59,11 @@ export default {
       this.updateTitle(option)
       this.$emit('input', value)
       this.$emit('change', { value, option })
+      setTimeout(() => {
+        if (this.layout && this.layout.clearPadding) {
+          this.layout.clearPadding()
+        }
+      }, 50)
     }
   }
 }
@@ -148,4 +154,4 @@ export default {
     line-height: 40rpx;
   }
 }
-</style>
+</style>

package/package.json

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