dfish-widget 1.0.35 → 1.0.37

package/lib/index.esm.js

@@ -2220,12 +2220,6 @@ var script$1g = {
       },
       // 表单验证。验证通过返回true /@ range -> validaterange
       async valid(range) {
-        if (this._err_ns) {
-          this._err_ns.forEach(v => {
-            let n = $$1.vueMap.get(v.wid);
-             n && n.warn(false);
-          });
-        }
         let e = await this.getValidError(range);
         if (e) {
           e.forEach(v => $$1.vueMap.get(v.wid).warn());
@@ -2241,6 +2235,12 @@ var script$1g = {
       saveModified(range, original) {
         this.getFormList(range).forEach(o => (o = $$1(o)).saveModified && o.saveModified(original));
       },
+      resetFormStyle(range) {
+         this.getFormList(range).forEach(f => {
+          const c = $$1(f);
+          c.warn && c.warn(false);
+        });
+      },
       resetForm(range, empty) {
         this.getFormList(range).forEach(f => {
           const c = $$1(f);
@@ -5997,6 +5997,12 @@ var script$A = {
           return this.x.modelValue
         let ov = this.x.modelValue;
         this.x.modelValue = v;
+        if (ov == null) {
+          ov = '';
+        }
+        if (v == null) {
+          v = '';
+        }
         let changed = ov !== v;
         if (typeof ov === 'object') {
           changed = JSON.stringify(ov) != JSON.stringify(v);
@@ -6048,6 +6054,21 @@ var script$A = {
           }
         }
       },
+      getValidErrorSync(trigger, val) {
+        let ques = trigger ? this.validTriggers[trigger] : this.validQueues;
+        if (ques && (this.isNormal || (this.isReadonly && this.x.readonlyValidate))) {
+          let v = val !== undefined ? val : this.isPlural ? this.groupFormVal() : this.formVal();
+          if (typeof v !== 'string')
+            v = Array.isArray(v) ? v.join(',') : v == null ? '' : ('' + v);
+          v = v.trim();
+          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
+          }
+        }
+      },
       formErr(que, arg) {
         let label = this.getLabelText();
         let type = que.type;
@@ -6152,6 +6173,7 @@ var script$A = {
       },
       // @empty -> 是否强制清空
       reset(empty) {
+        this.warn(false);
         this.val(empty || this.defaultValue == null ? '' : this.defaultValue);
       },
       html_label() {
@@ -9871,8 +9893,9 @@ var script$b = {
         }
         this.x.format && this.doFormat();
       },
+      // #fixme: 暂时用getValidErrorSync
       isUsableVal(v) {
-        return !this.getValidError(null, v)
+        return !this.getValidErrorSync(null, v)
       },
       isFocusTarget(el) { // implement
         return (this.$refs.buttonMinus && this.$refs.buttonMinus.contains(el)) || (this.$refs.buttonPlus && this.$refs.buttonPlus.contains(el))
@@ -11395,6 +11418,7 @@ const init_text = $$1.loc.form.jigsaw_drag_right;
         this.isSuccess = false;
         this.text = init_text;
         this.setThumbLeft(0);
+        this.warn(false);
       },
       refresh(e) {
         e.runType = 'click:refresh';