form-custom-test 3.0.246 → 3.0.247

package/dist/render.es.js

@@ -9084,16 +9084,30 @@ var fieldMixin = {
           if (!w)
             return;
           if (w.formItemFlag && w.options && w.options.name) {
-            w.options.hidden = hiddenVal;
-            const fieldRef = this.getWidgetRef(w.options.name, false);
-            if (fieldRef && typeof fieldRef.setHidden === "function") {
-              fieldRef.setHidden(hiddenVal);
-            } else if (fieldRef) {
-              if (hiddenVal && typeof fieldRef.clearFieldRules === "function") {
+            const opts = w.options;
+            const fieldRef = this.getWidgetRef(opts.name, false);
+            if (hiddenVal) {
+              if (!opts.hidden) {
+                opts._hiddenByCol = true;
+                opts.hidden = true;
+                if (fieldRef && typeof fieldRef.setHidden === "function") {
+                  fieldRef.setHidden(true);
+                } else if (fieldRef && typeof fieldRef.clearFieldRules === "function") {
+                  fieldRef.clearFieldRules();
+                }
+              } else if (fieldRef && typeof fieldRef.clearFieldRules === "function") {
                 fieldRef.clearFieldRules();
-              } else if (!hiddenVal && typeof fieldRef.buildFieldRules === "function") {
+              }
+            } else if (opts._hiddenByCol) {
+              opts._hiddenByCol = false;
+              opts.hidden = false;
+              if (fieldRef && typeof fieldRef.setHidden === "function") {
+                fieldRef.setHidden(false);
+              } else if (fieldRef && typeof fieldRef.buildFieldRules === "function") {
                 fieldRef.buildFieldRules();
               }
+            } else if (!opts.hidden && fieldRef && typeof fieldRef.buildFieldRules === "function") {
+              fieldRef.buildFieldRules();
             }
           }
           if (Array.isArray(w.widgetList))
@@ -24783,18 +24797,34 @@ const _sfc_main$P = {
         if (!fieldWidget.formItemFlag || !fieldWidget.options || !fieldWidget.options.name) {
           return;
         }
-        fieldWidget.options.hidden = hiddenFlag;
-        const fieldRef = this.getWidgetRef(fieldWidget.options.name);
-        if (!fieldRef)
-          return;
-        if (typeof fieldRef.setHidden === "function") {
-          fieldRef.setHidden(hiddenFlag);
-        } else if (hiddenFlag) {
-          if (typeof fieldRef.clearFieldRules === "function") {
+        const opts = fieldWidget.options;
+        const fieldRef = this.getWidgetRef(opts.name);
+        if (hiddenFlag) {
+          if (!opts.hidden) {
+            opts._hiddenByCol = true;
+            opts.hidden = true;
+          }
+          if (fieldRef && typeof fieldRef.setHidden === "function") {
+            if (opts._hiddenByCol) {
+              fieldRef.setHidden(true);
+            } else if (typeof fieldRef.clearFieldRules === "function") {
+              fieldRef.clearFieldRules();
+            }
+          } else if (fieldRef && typeof fieldRef.clearFieldRules === "function") {
             fieldRef.clearFieldRules();
           }
-        } else if (typeof fieldRef.buildFieldRules === "function") {
-          fieldRef.buildFieldRules();
+        } else {
+          if (opts._hiddenByCol) {
+            opts._hiddenByCol = false;
+            opts.hidden = false;
+            if (fieldRef && typeof fieldRef.setHidden === "function") {
+              fieldRef.setHidden(false);
+            } else if (fieldRef && typeof fieldRef.buildFieldRules === "function") {
+              fieldRef.buildFieldRules();
+            }
+          } else if (!opts.hidden && fieldRef && typeof fieldRef.buildFieldRules === "function") {
+            fieldRef.buildFieldRules();
+          }
         }
       });
     },
@@ -24903,7 +24933,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-315cc820"]]);
+var GridColItem = /* @__PURE__ */ _export_sfc$1(_sfc_main$P, [["render", _sfc_render$P], ["__scopeId", "data-v-67883cb4"]]);
 var __glob_0_1$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": GridColItem
@@ -26709,7 +26739,27 @@ const _sfc_main$J = {
         if (!fieldWidget.formItemFlag || !fieldWidget.options || !fieldWidget.options.name) {
           return;
         }
-        this.findWidgetAndSetHidden(fieldWidget.options.name, hiddenFlag);
+        const opts = fieldWidget.options;
+        const fieldName = opts.name;
+        if (hiddenFlag) {
+          if (!opts.hidden) {
+            opts._hiddenByCol = true;
+            this.findWidgetAndSetHidden(fieldName, true);
+          } else {
+            const fieldRef = this.getWidgetRef(fieldName);
+            if (fieldRef && typeof fieldRef.clearFieldRules === "function") {
+              fieldRef.clearFieldRules();
+            }
+          }
+        } else if (opts._hiddenByCol) {
+          opts._hiddenByCol = false;
+          this.findWidgetAndSetHidden(fieldName, false);
+        } else if (!opts.hidden) {
+          const fieldRef = this.getWidgetRef(fieldName);
+          if (fieldRef && typeof fieldRef.buildFieldRules === "function") {
+            fieldRef.buildFieldRules();
+          }
+        }
       });
     },
     setColHidden(colName, hidden) {
@@ -26789,7 +26839,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-cd88fba4"]]);
+var VFormRender = /* @__PURE__ */ _export_sfc$1(_sfc_main$J, [["render", _sfc_render$J], ["__scopeId", "data-v-379b4a24"]]);
 function registerIcon(app) {
   app.component("el-icon-edit", edit);
   app.component("el-icon-minus", minus);
@@ -26804,13 +26854,13 @@ function registerIcon(app) {
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1789607311752__");
+    var svgDom = document.getElementById("__svg__icons__dom__1789608008327__");
     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__1789607311752__";
+      svgDom.id = "__svg__icons__dom__1789608008327__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }