form-custom-test 3.0.244 → 3.0.246

package/dist/render.es.js

@@ -8863,6 +8863,10 @@ var fieldMixin = {
         return;
       }
       this.rules.splice(0, this.rules.length);
+      const formRef = this.getFormRef && this.getFormRef();
+      if (formRef && typeof formRef.clearValidate === "function") {
+        formRef.clearValidate(this.getPropName());
+      }
     },
     getFieldRules() {
       return FormValidators;
@@ -8875,6 +8879,9 @@ var fieldMixin = {
       if (!!this.field.options.hidden && !this.designState) {
         return;
       }
+      if (!this.designState && this.isInsideHiddenCol()) {
+        return;
+      }
       if (!!this.field.options.required) {
         this.rules.push({
           required: true,
@@ -9162,6 +9169,68 @@ var fieldMixin = {
     setAppendButtonDisabled(flag) {
       this.field.options.appendButtonDisabled = flag;
     },
+    isInsideHiddenCol() {
+      var _a, _b, _c;
+      const formRef = this.getFormRef && this.getFormRef();
+      const widgetList = ((_a = formRef == null ? void 0 : formRef.formJsonObj) == null ? void 0 : _a.widgetList) || (formRef == null ? void 0 : formRef.widgetList);
+      if (!widgetList || !((_c = (_b = this.field) == null ? void 0 : _b.options) == null ? void 0 : _c.name)) {
+        return false;
+      }
+      const fieldName = this.field.options.name;
+      const findHiddenCol = (list) => {
+        var _a2, _b2;
+        if (!Array.isArray(list))
+          return false;
+        for (const w of list) {
+          if (!w)
+            continue;
+          if (w.type === "grid" && Array.isArray(w.cols)) {
+            for (const col of w.cols) {
+              if (((_a2 = col == null ? void 0 : col.options) == null ? void 0 : _a2.hidden) && this.fieldExistsInList(col.widgetList, fieldName)) {
+                return true;
+              }
+              if (findHiddenCol(col == null ? void 0 : col.widgetList))
+                return true;
+            }
+          }
+          if (w.type === "grid-col" && ((_b2 = w.options) == null ? void 0 : _b2.hidden) && this.fieldExistsInList(w.widgetList, fieldName)) {
+            return true;
+          }
+          if (Array.isArray(w.widgetList) && findHiddenCol(w.widgetList))
+            return true;
+          if (Array.isArray(w.cols) && findHiddenCol(w.cols))
+            return true;
+          if (Array.isArray(w.tabs)) {
+            for (const t of w.tabs) {
+              if (findHiddenCol(t == null ? void 0 : t.widgetList))
+                return true;
+            }
+          }
+        }
+        return false;
+      };
+      return findHiddenCol(widgetList);
+    },
+    fieldExistsInList(list, fieldName) {
+      var _a;
+      if (!Array.isArray(list) || !fieldName)
+        return false;
+      for (const w of list) {
+        if (!w)
+          continue;
+        if (((_a = w.options) == null ? void 0 : _a.name) === fieldName)
+          return true;
+        if (this.fieldExistsInList(w.widgetList, fieldName))
+          return true;
+        if (Array.isArray(w.cols)) {
+          for (const c of w.cols) {
+            if (this.fieldExistsInList(c == null ? void 0 : c.widgetList, fieldName))
+              return true;
+          }
+        }
+      }
+      return false;
+    },
     setHidden(flag) {
       this.field.options.hidden = flag;
       if (!!flag) {
@@ -24701,7 +24770,8 @@ const _sfc_main$P = {
         if (this.designState)
           return;
         this.syncColFieldValidation(!!val);
-      }
+      },
+      immediate: true
     }
   },
   methods: {
@@ -24803,7 +24873,7 @@ function _sfc_render$P(_ctx, _cache, $props, $setup, $data, $options) {
             key: $props.fieldSchemaData && $props.fieldSchemaData[swIdx] ? $props.fieldSchemaData[swIdx].id : swIdx,
             "parent-list": $props.widget.widgetList,
             "index-of-parent-list": swIdx,
-            "parent-widget": $props.parentWidget,
+            "parent-widget": $props.widget,
             "sub-form-row-index": $props.subFormRowIndex,
             "sub-form-row-id": $props.subFormRowId,
             "sub-form-disabled": $props.subFormDisabled,
@@ -24833,7 +24903,7 @@ function _sfc_render$P(_ctx, _cache, $props, $setup, $data, $options) {
     [vShow, $options.colVisible]
   ]) : createCommentVNode("", true);
 }
-var GridColItem = /* @__PURE__ */ _export_sfc$1(_sfc_main$P, [["render", _sfc_render$P], ["__scopeId", "data-v-535c3a84"]]);
+var GridColItem = /* @__PURE__ */ _export_sfc$1(_sfc_main$P, [["render", _sfc_render$P], ["__scopeId", "data-v-315cc820"]]);
 var __glob_0_1$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": GridColItem
@@ -26352,6 +26422,7 @@ const _sfc_main$J = {
       if (!needValidation) {
         return this.formDataModel;
       }
+      this.syncAllHiddenColFieldRules();
       let callback2 = function nullFunc() {
       };
       let promise = new window.Promise(function(resolve, reject) {
@@ -26376,6 +26447,43 @@ const _sfc_main$J = {
       });
       return promise;
     },
+    syncAllHiddenColFieldRules() {
+      const walk = (list) => {
+        if (!Array.isArray(list))
+          return;
+        list.forEach((w) => {
+          var _a;
+          if (!w)
+            return;
+          if (w.type === "grid" && Array.isArray(w.cols)) {
+            w.cols.forEach((col) => {
+              var _a2;
+              if ((_a2 = col == null ? void 0 : col.options) == null ? void 0 : _a2.hidden) {
+                this.syncFieldRulesByCol(col, true);
+              }
+              walk(col == null ? void 0 : col.widgetList);
+            });
+          } else if (w.type === "grid-col") {
+            if ((_a = w == null ? void 0 : w.options) == null ? void 0 : _a.hidden) {
+              this.syncFieldRulesByCol(w, true);
+            }
+            walk(w.widgetList);
+          } else {
+            if (Array.isArray(w.widgetList))
+              walk(w.widgetList);
+            if (Array.isArray(w.cols))
+              walk(w.cols);
+            if (Array.isArray(w.tabs)) {
+              w.tabs.forEach((t) => walk(t == null ? void 0 : t.widgetList));
+            }
+            if (Array.isArray(w.rows)) {
+              w.rows.forEach((r) => Array.isArray(r == null ? void 0 : r.cols) && r.cols.forEach((c) => walk(c == null ? void 0 : c.widgetList)));
+            }
+          }
+        });
+      };
+      walk(this.widgetList);
+    },
     setFormData(formData) {
       Object.keys(this.formDataModel).forEach((propName) => {
         if (!!formData && formData.hasOwnProperty(propName)) {
@@ -26474,6 +26582,7 @@ const _sfc_main$J = {
       this.$refs.renderForm.clearValidate(props);
     },
     validateForm(callback2) {
+      this.syncAllHiddenColFieldRules();
       this.$refs["renderForm"].validate((valid) => {
         if (valid && !!this.formConfig && !!this.formConfig.onFormValidateSuccess) {
           this.emitFormValidateSuccess(this.formDataModel);
@@ -26680,7 +26789,7 @@ function _sfc_render$J(_ctx, _cache, $props, $setup, $data, $options) {
     _: 3
   }, 8, ["label-position", "size", "class", "label-width", "model"]);
 }
-var VFormRender = /* @__PURE__ */ _export_sfc$1(_sfc_main$J, [["render", _sfc_render$J], ["__scopeId", "data-v-289ea27b"]]);
+var VFormRender = /* @__PURE__ */ _export_sfc$1(_sfc_main$J, [["render", _sfc_render$J], ["__scopeId", "data-v-cd88fba4"]]);
 function registerIcon(app) {
   app.component("el-icon-edit", edit);
   app.component("el-icon-minus", minus);
@@ -26695,13 +26804,13 @@ function registerIcon(app) {
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1789605624806__");
+    var svgDom = document.getElementById("__svg__icons__dom__1789607311752__");
     if (!svgDom) {
       svgDom = document.createElementNS("http://www.w3.org/2000/svg", "svg");
       svgDom.style.position = "absolute";
       svgDom.style.width = "0";
       svgDom.style.height = "0";
-      svgDom.id = "__svg__icons__dom__1789605624806__";
+      svgDom.id = "__svg__icons__dom__1789607311752__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }