fix #27 #33

Author: cunjinli6

package.json

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

src/form/form-validator.ts

@@ -99,16 +99,18 @@ class FormValidator {
             rules.forEach(rule => {
                 rule.name = name // 字段名称
                 const resMessage = validateSingleRule(rule, value || models[name], rule.param, models)
-                if (resMessage) {
+                // 失败了直接中止
+                if (resMessage && !isFail) {
                     isFail = true
                     // errors[name] = {message: resMessage}
                     const error = resMessage ? {message: resMessage, rule} : undefined
                     cb(false, error)
-                    return false
                 }
-                return true
             })
-            cb(!isFail)
+            // 成功的回调
+            if (!isFail) {
+                cb(!isFail)
+            }
         } else {
             const rule = rules
             rule.name = name

src/gallery/gallery.wxml

@@ -1,7 +1,7 @@
 <view class="weui-gallery {{show ? 'weui-gallery_show' : ''}} {{extClass}}">
-  <view class="weui-gallery__info">{{current+1}}/{{imgUrls.length}}</view>
+  <view class="weui-gallery__info">{{current+1}}/{{currentImgs.length}}</view>
   <swiper class="weui-gallery__img__wrp" bindtap="hideGallery" indicator-dots="{{false}}" bindchange="change" current="{{current}}" autoplay="{{false}}" duration="{{500}}">
-    <block wx:for="{{imgUrls}}" wx:key="{{item + '-' +index}}">
+    <block wx:for="{{currentImgs}}" wx:key="{{item + '-' +index}}">
       <swiper-item>
         <image mode="aspectFit" class="weui-gallery__img" src="{{item}}"></image>
       </swiper-item>

tools/demo/example/form/form.js

@@ -152,6 +152,9 @@ Component({
                     })
                 }
             })
+            // this.selectComponent('#form').validateField('mobile', (valid, errors) => {
+            //     console.log('valid', valid, errors)
+            // })
         }
 
     }

tools/demo/example/searchbar/searchbar.js

@@ -1,7 +1,8 @@
 Page({
     data: {
         inputShowed: false,
-        inputVal: ""
+        inputVal: "",
+        i: 0
     },
     onLoad() {
         this.setData({
@@ -10,9 +11,19 @@ Page({
     },
     search: function (value) {
         return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve([{text: '搜索结果', value: 1}, {text: '搜索结果2', value: 2}])
-            }, 200)
+            if (this.data.i % 2 === 0) {
+                setTimeout(() => {
+                    resolve([{text: '搜索结果', value: 1}, {text: '搜索结果2', value: 2}])
+                }, 200)
+            } else {
+                setTimeout(() => {
+                    resolve([])
+                }, 200)
+
+            }
+            this.setData({
+                i: this.data.i + 1
+            })
         })
     },
     selectResult: function (e) {