form-custom-test 3.0.160 → 3.0.162

package/dist/render.es.js

@@ -3100,7 +3100,7 @@ const getRegExp = function(validatorName2) {
     maxLen10Decimals2: "/^\\d{1,10}(\\.\\d{1,2})?$/",
     maxLen12Decimals2: "/^\\d{1,12}(\\.\\d{1,2})?$/",
     latitude: "/^-?(?:90(?:\\.0{1,6})?|[1-8]?\\d(?:\\.\\d{1,6})?|0(?:\\.\\d{1,6})?)$/",
-    sixFigures: "/^\\d{1,6}(\\.\\d{1,6})?$/",
+    sixFigures: "/^(0|[1-9]\\d{0,5})(\\.\\d{1,6})?$/",
     percentage: "/^(?:100(?:\\.0{0,4})?|[1-9]?\\d(?:\\.\\d{0,4})?|0(?:\\.\\d{0,4})?)$/",
     longitude: "/^-?(?:180(?:\\.0{1,6})?|1[0-7]\\d(?:\\.\\d{1,6})?|[1-9]?\\d(?:\\.\\d{1,6})?|0(?:\\.\\d{1,6})?)$/"
   };
@@ -8790,17 +8790,39 @@ var fieldMixin = {
         this.fieldModel = this.field.options.defaultValue;
       }
     },
+    clearFieldValidate() {
+      var _a;
+      if (this.designState || !((_a = this.field) == null ? void 0 : _a.formItemFlag)) {
+        return;
+      }
+      const formRef = this.getFormRef();
+      if (!formRef || typeof formRef.clearValidate !== "function") {
+        return;
+      }
+      const prop = this.getPropName();
+      if (!prop) {
+        return;
+      }
+      this.$nextTick(() => {
+        formRef.clearValidate(prop);
+      });
+    },
     clearFieldRules() {
       if (!this.field.formItemFlag) {
         return;
       }
       this.rules.splice(0, this.rules.length);
+      this.clearFieldValidate();
     },
     buildFieldRules() {
-      if (!this.field.formItemFlag && this.field.options.hidden) {
+      if (!this.field.formItemFlag) {
         return;
       }
       this.rules.splice(0, this.rules.length);
+      if (!!this.field.options.hidden && !this.designState) {
+        this.clearFieldValidate();
+        return;
+      }
       if (!!this.field.options.required) {
         this.rules.push({
           required: true,
@@ -8838,6 +8860,7 @@ var fieldMixin = {
           label: this.field.options.label
         });
       }
+      this.clearFieldValidate();
     },
     disableChangeValidate() {
       if (!this.rules) {
@@ -8972,6 +8995,10 @@ var fieldMixin = {
       return formRef && typeof formRef.findColByName === "function" ? formRef.findColByName(null, colName) : null;
     },
     setColHidden(colName, hidden) {
+      const formRef = this.getFormRef();
+      if (formRef && typeof formRef.setColHidden === "function") {
+        return formRef.setColHidden(colName, hidden);
+      }
       const hiddenVal = !!hidden;
       if (Array.isArray(colName)) {
         let anySet = false;
@@ -24460,6 +24487,12 @@ const _sfc_main$B = {
     this.initLayoutProps();
     this.initRefList();
   },
+  mounted() {
+    var _a, _b;
+    if (!this.designState && ((_b = (_a = this.widget) == null ? void 0 : _a.options) == null ? void 0 : _b.hidden)) {
+      this.$nextTick(() => this.syncColFieldValidation(true));
+    }
+  },
   beforeUnmount() {
     var _a, _b;
     if (this.refList != null && ((_b = (_a = this.widget) == null ? void 0 : _a.options) == null ? void 0 : _b.name)) {
@@ -24472,12 +24505,50 @@ const _sfc_main$B = {
         this.layoutProps.span = val;
       },
       immediate: true
+    },
+    "widget.options.hidden": {
+      handler(val) {
+        if (this.designState)
+          return;
+        this.syncColFieldValidation(!!val);
+      }
     }
   },
   methods: {
+    syncColFieldValidation(hidden) {
+      if (!this.widget)
+        return;
+      const hiddenFlag = !!hidden;
+      const propsToClear = [];
+      const formRef = this.getFormRef();
+      traverseFieldWidgetsOfContainer(this.widget, (fieldWidget) => {
+        if (!fieldWidget.formItemFlag || !fieldWidget.options || !fieldWidget.options.name) {
+          return;
+        }
+        const fieldRef = this.getWidgetRef(fieldWidget.options.name);
+        if (!fieldRef)
+          return;
+        if (hiddenFlag) {
+          if (typeof fieldRef.clearFieldRules === "function") {
+            fieldRef.clearFieldRules();
+          }
+        } else if (typeof fieldRef.buildFieldRules === "function") {
+          fieldRef.buildFieldRules();
+        }
+        if (typeof fieldRef.getPropName === "function") {
+          propsToClear.push(fieldRef.getPropName());
+        }
+      });
+      if (propsToClear.length > 0 && formRef && typeof formRef.clearValidate === "function") {
+        this.$nextTick(() => {
+          formRef.clearValidate(propsToClear);
+        });
+      }
+    },
     setHidden(flag) {
       if (this.widget && this.widget.options) {
         this.widget.options.hidden = !!flag;
+        this.syncColFieldValidation(flag);
         this.$nextTick(() => this.$forceUpdate());
       }
     },
@@ -24579,7 +24650,7 @@ function _sfc_render$B(_ctx, _cache, $props, $setup, $data, $options) {
     [vShow, $options.colVisible]
   ]) : createCommentVNode("", true);
 }
-var GridColItem = /* @__PURE__ */ _export_sfc$1(_sfc_main$B, [["render", _sfc_render$B], ["__scopeId", "data-v-746165e2"]]);
+var GridColItem = /* @__PURE__ */ _export_sfc$1(_sfc_main$B, [["render", _sfc_render$B], ["__scopeId", "data-v-54aa37b2"]]);
 var __glob_0_1$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": GridColItem
@@ -25851,7 +25922,18 @@ const _sfc_main$v = {
       const fieldSchema = this.findFieldByName(widgetName);
       if (fieldSchema && fieldSchema.options) {
         fieldSchema.options.hidden = !!hiddenFlag;
-        this.$nextTick(() => this.$forceUpdate());
+        this.$nextTick(() => {
+          const ref2 = this.getWidgetRef(widgetName);
+          if (ref2) {
+            if (hiddenFlag) {
+              if (typeof ref2.clearFieldRules === "function")
+                ref2.clearFieldRules();
+            } else if (typeof ref2.buildFieldRules === "function") {
+              ref2.buildFieldRules();
+            }
+          }
+          this.$forceUpdate();
+        });
         return;
       }
       this.findWidgetOfSubFormAndSetHidden(widgetName, hiddenFlag);
@@ -25861,9 +25943,6 @@ const _sfc_main$v = {
       const fieldRef = this.getWidgetRef(fieldName);
       if (fieldRef && typeof fieldRef.setRequired === "function") {
         fieldRef.setRequired(flag);
-        if (typeof fieldRef.buildFieldRules === "function") {
-          fieldRef.buildFieldRules();
-        }
         return true;
       }
       const fieldSchema = this.findFieldByName(fieldName);
@@ -25872,6 +25951,8 @@ const _sfc_main$v = {
         const refAfter = this.getWidgetRef(fieldName);
         if (refAfter && typeof refAfter.buildFieldRules === "function") {
           refAfter.buildFieldRules();
+        } else {
+          this.$nextTick(() => this.clearValidate(fieldName));
         }
         return true;
       }
@@ -26158,7 +26239,11 @@ const _sfc_main$v = {
       });
     },
     clearValidate(props) {
-      this.$refs.renderForm.clearValidate(props);
+      const form = this.$refs.renderForm;
+      if (!form || typeof form.clearValidate !== "function") {
+        return;
+      }
+      form.clearValidate(props);
     },
     validateForm(callback2) {
       this.$refs["renderForm"].validate((valid) => {
@@ -26279,11 +26364,50 @@ const _sfc_main$v = {
       }
       return null;
     },
+    syncFieldRulesByCol(col, hidden) {
+      if (!col)
+        return;
+      const hiddenFlag = !!hidden;
+      const propsToClear = [];
+      traverseFieldWidgetsOfContainer(col, (fieldWidget) => {
+        if (!fieldWidget.formItemFlag || !fieldWidget.options || !fieldWidget.options.name) {
+          return;
+        }
+        const fieldRef = this.getWidgetRef(fieldWidget.options.name);
+        if (!fieldRef)
+          return;
+        if (hiddenFlag) {
+          if (typeof fieldRef.clearFieldRules === "function") {
+            fieldRef.clearFieldRules();
+          }
+        } else if (typeof fieldRef.buildFieldRules === "function") {
+          fieldRef.buildFieldRules();
+        }
+        if (typeof fieldRef.getPropName === "function") {
+          propsToClear.push(fieldRef.getPropName());
+        }
+      });
+      if (propsToClear.length > 0) {
+        this.$nextTick(() => {
+          this.clearValidate(propsToClear);
+        });
+      }
+    },
     setColHidden(colName, hidden) {
+      if (Array.isArray(colName)) {
+        let anySet = false;
+        colName.forEach((name) => {
+          if (this.setColHidden(name, hidden)) {
+            anySet = true;
+          }
+        });
+        return anySet;
+      }
       const col = this.findColByName(null, colName);
       if (!col || !col.options)
         return false;
       col.options.hidden = !!hidden;
+      this.syncFieldRulesByCol(col, hidden);
       this.$nextTick(() => this.$forceUpdate());
       return true;
     }
@@ -26344,7 +26468,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
     _: 3
   }, 8, ["label-position", "size", "class", "label-width", "model"]);
 }
-var VFormRender = /* @__PURE__ */ _export_sfc$1(_sfc_main$v, [["render", _sfc_render$v], ["__scopeId", "data-v-2bb5a9c0"]]);
+var VFormRender = /* @__PURE__ */ _export_sfc$1(_sfc_main$v, [["render", _sfc_render$v], ["__scopeId", "data-v-6ba86904"]]);
 function registerIcon(app) {
   app.component("el-icon-edit", edit);
   app.component("el-icon-minus", minus);
@@ -26359,13 +26483,13 @@ function registerIcon(app) {
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1779271953311__");
+    var svgDom = document.getElementById("__svg__icons__dom__1779273901379__");
     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__1779271953311__";
+      svgDom.id = "__svg__icons__dom__1779273901379__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }
@@ -62126,6 +62250,7 @@ const _sfc_main$6 = {
       const tableRef = this.$refs.tableRef;
       const selection = tableRef && typeof tableRef.getSelectionRows === "function" ? tableRef.getSelectionRows() : [];
       if (!selection || selection.length === 0) {
+        this.$message.error(`\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u8D44\u4EA7`);
         return;
       }
       const arr = [...this.selectedRows, ...selection].reduce((acc, item) => {
@@ -62510,7 +62635,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["modelValue", "onClose"]);
 }
-var AssetDialog = /* @__PURE__ */ _export_sfc$1(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-0c6d23e8"]]);
+var AssetDialog = /* @__PURE__ */ _export_sfc$1(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-4c34c6a0"]]);
 var index_vue_vue_type_style_index_0_lang$1 = "";
 const _sfc_main$5 = {
   name: "asset-select-widget",