dfish-widget 1.0.66 → 1.0.67

package/lib/index.esm.js

@@ -1920,13 +1920,10 @@ const bindCache = {};
         return new Promise(async (resolve) => {
           await nextTick();
           const vm = $$1.vm(this);
-          let d = cmd.validate || false;
-          let f = vm.getFormList(d.range || cmd.range);
-          let g = d.range && d.range != cmd.range ? vm.getFormList(cmd.range) : f;
           this.ajaxLock && this.ajaxLock();
-          let isValid = await vm.valid(f, d.group);
+          let isValid = await vm.valid(cmd.range, cmd.group);
           if (isValid) {
-            let post = vm.getPostData(g);
+            let post = vm.getPostData(cmd.range);
             cmd.data = cmd.data && post ? $$1.extend({}, cmd.data, post) : (cmd.data || post);
           	resolve(this.ajax(cmd));
           } else {
@@ -2187,7 +2184,6 @@ var script$1l = {
       },
       // 获取所有表单，返回一个dom集合 /@ a -> range(widgetID, 可选，如果 range 以 !开头，表示排除), b -> 是否包含disabled的表单
       getFormList(a, b) {
-        if (Array.isArray(a)) return a
         let r, f = ':input:not(button)' + (b ? '' : ':not(:disabled)');
         if (a && typeof a === 'string') {
           let d = a.charAt(0) === '!';
@@ -2195,7 +2191,7 @@ var script$1l = {
           if (e = e.join())
             r = $$1.q(d ? `${f}:not(${e})` : e, this.el());
         } else {
-          r = $$1.q(f, a ? $$1.el(a) : this.el());
+          r = $$1.q(f, Array.isArray(a) ? $$1.q(a.map(n => $$1.el(n))) : a ? $$1.el(a) : this.el());
         }
         return r ? $$1.lodash.map(r.not('[w-form-ignore] :input')) : []
       },
@@ -7167,7 +7163,7 @@ var script$A = {
             if (rule && !v) return this.formErr(que)
           },
           pattern: (v, rule, que) => {
-            if (v && (typeof rule === 'string' ? !$$1.eval(`${rule}.test(v)`, {rule, v}) : !rule.test(v)))
+            if (v && rule && (typeof rule === 'string' ? !$$1.eval(`${rule}.test(v)`, {rule, v}) : (rule.test && !rule.test(v))))
               return this.formErr(que)
           },
           validateHandler: async(v, rule, que) => {
@@ -11719,7 +11715,10 @@ var script$5 = {
         this.warn(false);
       },
       clear() {
-        this.$refs.input.value = this.sensor_text = '';
+        this.sensor_text = '';
+        if (this.isNormal) {
+          this.$refs.input.value = '';
+        }
       },
       focus(toEnd) {
 				if (this.isNormal) {