mali-applet-ui 0.2.82 → 0.2.83

package/components/ml-drawer/ml-drawer.vue

@@ -13,8 +13,8 @@
       </view>
       <view v-if="showConfirmButton || showCancelButton || showFooter" class="ml-drawer-footer">
         <slot name="footer">
-          <ml-button v-if="showCancelButton" @click="cancelEvent">{{ cancelButtonText }}</ml-button>
-          <ml-button v-if="showConfirmButton" status="primary" @click="confirmEvent">{{ confirmButtonText }}</ml-button>
+          <ml-button v-if="showCancelButton" :status="cancelButtonStatus" @click="cancelEvent">{{ cancelButtonText }}</ml-button>
+          <ml-button v-if="showConfirmButton" :status="confirmButtonStatus" @click="confirmEvent">{{ confirmButtonText }}</ml-button>
         </slot>
       </view>
     </view>
@@ -40,12 +40,17 @@ export default {
       default: true
     },
     showConfirmButton: Boolean,
+    confirmButtonStatus: {
+      type: String,
+      default: 'primary'
+    },
     confirmButtonText: {
       type: String,
       default: '确认'
     },
     confirmClosable: Boolean,
     showCancelButton: Boolean,
+    cancelButtonStatus: String,
     cancelButtonText: {
       type: String,
       default: '取消'
@@ -173,7 +178,7 @@ export default {
     position: absolute;
     bottom: 0;
     left: 0;
-    padding-bottom: 20rpx;
+    padding-bottom: 30rpx;
     background: #fff;
     transition: transform 0.25s ease, transform 0.3s ease;
   }

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

@@ -37,6 +37,7 @@ export default {
     title: String,
     field: String,
 		align: String,
+    required: Boolean,
     titleAlign: String,
     vertical: Boolean,
     labelWidth: String,
@@ -59,36 +60,6 @@ export default {
       mId: XEUtils.uniqueId('mlFItem')
     }
   },
-  watch: {
-    title () {
-      this.updateProp('title')
-    },
-    field () {
-      this.updateProp('field')
-    },
-    itemValue () {
-      if (this.form) {
-        this.form.validateField(this.field)
-      }
-    }
-  },
-  mounted () {
-    this.$nextTick(() => {
-      if (this.form) {
-        this.form.itemList.push({
-          mId: this.mId,
-          title: this.title,
-          field: this.field,
-          errRule: null
-        })
-      }
-    })
-  },
-  beforeDestroy () {
-    if (this.form) {
-      XEUtils.remove(this.form.itemList, item => item.mId === this.mId)
-    }
-  },
   computed: {
     titleStyle () {
       return this.itemLabelWidth ? `width:${this.itemLabelWidth};` : ''
@@ -97,6 +68,9 @@ export default {
       return this.form ? this.form.border : false
     },
     isRequired () {
+      if (this.required) {
+        return true
+      }
       if (this.form && this.form.rules) {
         const currRules = this.form.rules[this.field]
         if (currRules && currRules.some(item => item.required)) {
@@ -151,6 +125,36 @@ export default {
       return labelWidth
     }
   },
+  watch: {
+    title () {
+      this.updateProp('title')
+    },
+    field () {
+      this.updateProp('field')
+    },
+    itemValue () {
+      if (this.form) {
+        this.form.validateField(this.field)
+      }
+    }
+  },
+  mounted () {
+    this.$nextTick(() => {
+      if (this.form) {
+        this.form.itemList.push({
+          mId: this.mId,
+          title: this.title,
+          field: this.field,
+          errRule: null
+        })
+      }
+    })
+  },
+  beforeDestroy () {
+    if (this.form) {
+      XEUtils.remove(this.form.itemList, item => item.mId === this.mId)
+    }
+  },
   methods: {
     updateProp (prop) {
       if (this.form) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "0.2.82",
+  "version": "0.2.83",
   "description": "码里云小程序组件库",
   "scripts": {
     "release": "node script/release.js && npm publish"