dfish-widget 1.0.128 → 1.0.130

package/lib/index.esm.js

@@ -1915,9 +1915,9 @@ const bindCache = {};
 				}
 			},
 			ajax(cmd) {
-        this.ajaxLock && this.ajaxLock();
+        this.setLoading && this.setLoading();
 				return $$1.ajax(cmd).then((res) => {
-          this.ajaxLock && this.ajaxLock(false);
+          this.setLoading && this.setLoading(false);
           return res
         })
 			},
@@ -1935,14 +1935,14 @@ const bindCache = {};
         return new Promise(async (resolve) => {
           await nextTick();
           const vm = $$1.vm(this);
-          this.ajaxLock && this.ajaxLock();
+          this.setLoading && this.setLoading();
           let isValid = await vm.valid(cmd.range, cmd.group);
           if (isValid) {
             let post = vm.getPostData(cmd.range);
             cmd.data = cmd.data && post ? $$1.extend({}, cmd.data, post) : (cmd.data || post);
           	resolve(this.ajax(cmd));
           } else {
-            this.ajaxLock && this.ajaxLock(false);
+            this.setLoading && this.setLoading(false);
           }
         })
 			},
@@ -4556,7 +4556,7 @@ var script$14 = {
       }
     },
     methods: {
-      ajaxLock(a) {
+      setLoading(a) {
         a = a == null ? true : a;
         this.x.loading = a;
       },
@@ -7232,8 +7232,12 @@ var script$C = {
           let hs = this.validHooks;
           for (let q of ques) {
             let rv = typeof q.rule !== 'object' ? q.rule : q.rule.value !== undefined ? q.rule.value : q.rule;
-            let e = hs[q.type](v, rv, q);
-            if (e) return e
+            if (!q.rule || q.rule.trigger == trigger) {
+              let e = hs[q.type](v, rv, q);
+              if (e && !(e instanceof Promise)) {
+                return e
+              }
+            }
           }
         }
       },
@@ -9858,27 +9862,40 @@ var script$o = {
           this.focus();
           this.$emit('clear', e);
         }
-      },
-      oninput(e) {
+      },
+      baseInput(e) {
         let v = e.target.value;
         this.val(v);
         this.baseValid('change');
         this.trigger(e, v);
+      },
+      oninput(e) {
         if (this.x.suggest) {
           clearTimeout(this.sug_timer);
-          if (v === '') {
+          if (e.target.value === '') {
+            this.baseInput(e);
             this.doSuggest(false);
+          } else if (e.type !== 'input') {
+            e.runType = 'input';
+            this.baseInput(e);
+            this.doSuggest(true);
           } else {
+            let v = e.target.value;
+            this.val(v);
             this.sug_timer = setTimeout(() => {
+              this.trigger(e, v);
+              this.baseValid('change');
               this.doSuggest(true);
             }, 500);
           }
+        } else {
+          this.baseInput(e);
         }
       },
       onfocus(e) {
         this.isFocus = true;
         if (this.x.suggest && !this.showSuggest && e.target.value && !this.sug_completed) {
-          this.doSuggest(e.target.value);
+          this.oninput(e);
         }
         if (this.sug_completed) {
           this.sug_completed = false;
@@ -9887,7 +9904,7 @@ var script$o = {
       },
       onclick(e) {
         if (this.x.suggest && !this.showSuggest && e.target.value && !this.sug_completed) {
-          this.doSuggest(e.target.value);
+          this.oninput(e);
         }
       },
       doSuggest(a) {