fix #29 #21 #26

Author: cunjinli

package.json

@@ -1,6 +1,6 @@
 {
   "name": "weui-miniprogram",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

src/form/form-validator.ts

@@ -8,7 +8,7 @@ const validateSingleRule = (rule: any, value:any, param:any = null, models = nul
         if (ruleKey === 'validator' || ruleKey === 'name' || ruleKey === 'message') continue
         const validateMethod = typeof rule.validator !== 'undefined' ? rule.validator : Validator[ruleKey]
         if (typeof validateMethod === 'function') {
-            message = validateMethod({name: rule.name, message: rule.message}, value, param, models)
+            message = validateMethod(rule, value, param, models)
             if (message) {
                 return message
             }

src/form/validator.ts

@@ -19,25 +19,31 @@ export default {
     required: (r, val, param, models) => {
         if (!val) return sprintf(r.message || defaultMessage.required, r.name)
     },
-    minlength: (r, val, minlen) => {
+    minlength: (r, val) => {
+        const minlen = r.minlength
         val = val || ''
         if (val.length < minlen) return sprintf(r.message || defaultMessage.minlength, minlen)
     },
-    maxlength: (r, val, maxlen) => {
+    maxlength: (r, val) => {
+        const maxlen = r.maxlength
         val = val || ''
         if (val.length > maxlen) return sprintf(r.message || defaultMessage.maxlength, maxlen)
     },
-    rangelength: (r, val, range) => {
+    rangelength: (r, val) => {
+        const range = r.range
         val = val || ''
         if (val.length > range[1] || val.length < range[0]) return sprintf(r.message || defaultMessage.rangelength, range[0], range[1])
     },
-    min: (r, val, min) => {
+    min: (r, val) => {
+        const min = r.min
         if (val < min) return sprintf(r.message || defaultMessage.min, min)
     },
-    max: (r, val, max) => {
+    max: (r, val) => {
+        const max = r.max
         if (val > max) return sprintf(r.message || defaultMessage.max, max)
     },
-    range: (r, val, range) => {
+    range: (r, val) => {
+        const range = r.range
         if (val < range[0] || val > range[1]) return sprintf(r.message || defaultMessage.range, range[0], range[1])
     },
     mobile: (r, val) => {
@@ -59,9 +65,11 @@ export default {
         }
     },
     equalTo: function(r, value, param, models) {
-        if (value !== models[param]) return sprintf(r.message || defaultMessage.equalTo, r.name)
+        const equalTo = r.equalTo
+        if (value !== models[equalTo]) return sprintf(r.message || defaultMessage.equalTo, r.name)
     },
     bytelength: function(r, value, param, models) {
+        param = r.param
         const len = value.replace(/[^\x00-\xff]/g, '**').length;
         if (len > param) return sprintf(r.message || defaultMessage.bytelength, param)
     }

src/slideview/slideview.ts

@@ -13,7 +13,10 @@ Component({
     },
     buttons: {
       type: Array,
-      value: [] // type, text, src
+      value: [], // type, text, src
+      observer: function(newVal) {
+        this.addClassNameForButton()
+      }
     },
     disable: {
       type: Boolean,
@@ -38,18 +41,7 @@ Component({
   ready() {
     //@ts-ignore
     this.updateRight()
-    this.data.buttons.forEach(btn => {
-      if (this.data.icon) {
-        btn.className = ''
-      } else if (btn.type === 'warn') {
-        btn.className = 'weui-slideview__btn-group_warn'
-      } else {
-        btn.className = 'weui-slideview__btn-group_default'
-      }
-    });
-    this.setData({
-      buttons: this.data.buttons
-    })
+    this.addClassNameForButton()
   },
   methods: {
     updateRight() {
@@ -70,7 +62,23 @@ Component({
         }).exec()
       }).exec()
     },
-      
+    addClassNameForButton() {
+      // @ts-ignore
+      const {buttons, icon} = this.data
+      buttons.forEach(btn => {
+        if (icon) {
+          btn.className = ''
+        } else if (btn.type === 'warn') {
+          btn.className = 'weui-slideview__btn-group_warn'
+        } else {
+          btn.className = 'weui-slideview__btn-group_default'
+        }
+      });
+      this.setData({
+        buttons: buttons
+      })
+
+    },
     buttonTapByWxs(data) {
       this.triggerEvent('buttontap', data, {})
     },

src/uploader/uploader.ts

@@ -47,7 +47,11 @@ Component({
         extClass: {
             type: String,
             value: '',
-        }
+        },
+        delete: { // 是否显示delete按钮
+            type: Boolean,
+            value: true
+        },
     },
     data: {
         currentFiles: [],

src/uploader/uploader.wxml

@@ -33,4 +33,4 @@
         </view>
     </view>
 </view>
-<mp-gallery hide-on-click="{{true}}" show="{{showPreview}}" binddelete="deletePic" img-urls="{{previewImageUrls}}" current="{{previewCurrent}}"></mp-gallery>
+<mp-gallery hide-on-click="{{true}}" delete="{{delete}}" show="{{showPreview}}" binddelete="deletePic" img-urls="{{previewImageUrls}}" current="{{previewCurrent}}"></mp-gallery>