super-page-runtime 2.3.46 → 2.3.47-sit2

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -1,12 +1,12 @@
 import e from "async-validator";
 import { ElMessage as t } from "element-plus";
-import { getComponentRefByCode as s, getComponentRef as n, getAllComponentRefs as r } from "../global-refs.js";
-import { getI18n as o } from "agilebuilder-ui/src/utils/util";
-import { getAdditionalParamMap as i } from "./standard-event.js";
+import { getComponentRefByCode as n, getComponentRef as r, getAllComponentRefs as s } from "../global-refs.js";
+import { getI18n as i } from "agilebuilder-ui/src/utils/util";
+import { getAdditionalParamMap as o } from "./standard-event.js";
 import { isPromise as l } from "agilebuilder-ui/src/utils/common-util";
 import { parseSubTablePermissionCondition as a } from "agilebuilder-ui/src/utils/calculator/calculator-util";
-import { isWorkflowPage as u, getListCode as c } from "../common-util.js";
-import { scrollIntoComponentWithCode as f, scrollIntoComponentWithUuid as d } from "../anchor-util.js";
+import { isWorkflowPage as u, getListCode as f } from "../common-util.js";
+import { scrollIntoComponentWithCode as c, scrollIntoComponentWithUuid as d } from "../anchor-util.js";
 const m = ["downloadTemplate", "back", "exportForm", "exportPDF", "lineEditCreate", "workflowSave"];
 function p(e2, t2 = /* @__PURE__ */ new WeakMap()) {
   if ("function" == typeof structuredClone) try {
@@ -14,316 +14,313 @@ function p(e2, t2 = /* @__PURE__ */ new WeakMap()) {
   } catch (e3) {
   }
   if (null === e2 || "object" != typeof e2) return e2;
-  const s2 = e2;
-  if (t2.has(s2)) return t2.get(s2);
+  const n2 = e2;
+  if (t2.has(n2)) return t2.get(n2);
   if (Array.isArray(e2)) {
-    const n3 = [];
-    return t2.set(s2, n3), e2.forEach((e3, s3) => {
-      n3[s3] = p(e3, t2);
-    }), n3;
+    const r3 = [];
+    return t2.set(n2, r3), e2.forEach((e3, n3) => {
+      r3[n3] = p(e3, t2);
+    }), r3;
   }
   if (e2 instanceof Date) return new Date(e2.getTime());
   if (e2 instanceof RegExp) return new RegExp(e2.source, e2.flags);
   if (e2 instanceof Map) {
-    const n3 = /* @__PURE__ */ new Map();
-    return t2.set(s2, n3), e2.forEach((e3, s3) => {
-      n3.set(p(s3, t2), p(e3, t2));
-    }), n3;
+    const r3 = /* @__PURE__ */ new Map();
+    return t2.set(n2, r3), e2.forEach((e3, n3) => {
+      r3.set(p(n3, t2), p(e3, t2));
+    }), r3;
   }
   if (e2 instanceof Set) {
-    const n3 = /* @__PURE__ */ new Set();
-    return t2.set(s2, n3), e2.forEach((e3) => {
-      n3.add(p(e3, t2));
-    }), n3;
+    const r3 = /* @__PURE__ */ new Set();
+    return t2.set(n2, r3), e2.forEach((e3) => {
+      r3.add(p(e3, t2));
+    }), r3;
   }
-  const n2 = {};
-  return t2.set(s2, n2), Object.keys(e2).forEach((s3) => {
-    n2[s3] = p(e2[s3], t2);
-  }), n2;
+  const r2 = {};
+  return t2.set(n2, r2), Object.keys(e2).forEach((n3) => {
+    r2[n3] = p(e2[n3], t2);
+  }), r2;
 }
-function g(e2, t2, s2) {
-  const n2 = {};
+function g(e2, t2, n2) {
+  const r2 = {};
   t2 || (t2 = {});
-  let r2 = 0;
-  const o2 = e2.split(".");
-  return o2.forEach((e3) => {
-    let i2;
-    if (r2 === o2.length - 1) i2 = function(e4, t3, s3) {
-      let n3;
-      for (let r3 = 0; r3 < t3.length; r3++) if (n3 = 0 === r3 ? e4[t3[r3]] : n3.fields[t3[r3]], r3 !== t3.length - 1) {
-        if (t3[r3 + 1] === s3) break;
+  let s2 = 0;
+  const i2 = e2.split(".");
+  return i2.forEach((e3) => {
+    let o2;
+    if (s2 === i2.length - 1) o2 = function(e4, t3, n3) {
+      let r3;
+      for (let s3 = 0; s3 < t3.length; s3++) if (r3 = 0 === s3 ? e4[t3[s3]] : r3.fields[t3[s3]], s3 !== t3.length - 1) {
+        if (t3[s3 + 1] === n3) break;
       }
-      return n3;
-    }(n2, o2, e3), i2.fields[e3] = s2;
+      return r3;
+    }(r2, i2, e3), o2.fields[e3] = n2;
     else {
-      let s3;
-      0 === r2 ? i2 = t2 : (s3 = function(e4, t3, s4) {
-        let n3;
-        for (let r3 = 0; r3 < t3.length; r3++) {
-          const o3 = t3[r3];
-          if (n3 = 0 === r3 ? e4[o3] : n3.fields[t3[r3]], o3 === s4) break;
+      let n3;
+      0 === s2 ? o2 = t2 : (n3 = function(e4, t3, n4) {
+        let r3;
+        for (let s3 = 0; s3 < t3.length; s3++) {
+          const i3 = t3[s3];
+          if (r3 = 0 === s3 ? e4[i3] : r3.fields[t3[s3]], i3 === n4) break;
         }
-        return n3;
-      }(n2, o2, o2[r2 - 1]), i2 = s3.fields), i2[e3] || (i2[e3] = { type: "object", required: true, fields: {} }), 0 === r2 ? n2[e3] = i2[e3] : s3.fields[e3] = i2[e3];
+        return r3;
+      }(r2, i2, i2[s2 - 1]), o2 = n3.fields), o2[e3] || (o2[e3] = { type: "object", required: true, fields: {} }), 0 === s2 ? r2[e3] = o2[e3] : n3.fields[e3] = o2[e3];
     }
-    r2++;
-  }), n2;
+    s2++;
+  }), r2;
 }
-function h(e2, t2, s2, n2, r2, o2) {
-  return y(e2, t2, s2, n2, true, r2, o2);
+function b(e2, t2, n2, r2, s2, i2) {
+  return y(e2, t2, n2, r2, true, s2, i2);
 }
-function b(e2) {
+function h(e2) {
   if (e2) return Object.keys(e2).forEach((t2) => {
     if (t2.indexOf(".") >= 0) {
-      let s2 = [];
-      s2 = t2.split("."), e2[s2[0]] ? e2[s2[0]].fields[s2[1]] = e2[t2][0] : (e2[s2[0]] = new Object(), e2[s2[0]].fields = new Object(), e2[s2[0]].fields[s2[1]] = e2[t2][0], e2[s2[0]].type = "object"), delete e2[t2];
+      let n2 = [];
+      n2 = t2.split("."), e2[n2[0]] ? e2[n2[0]].fields[n2[1]] = e2[t2][0] : (e2[n2[0]] = new Object(), e2[n2[0]].fields = new Object(), e2[n2[0]].fields[n2[1]] = e2[t2][0], e2[n2[0]].type = "object"), delete e2[t2];
     }
   }), e2;
 }
-function y(n2, r2, i2, l2, a2, u2, c2) {
+function y(r2, s2, o2, l2, a2, u2, f2) {
   var _a;
-  let d2 = b(r2);
-  if (r2 && null !== r2 || !i2 || (d2 = {}), !d2 || 0 === Object.keys(d2).length) return n2.validateErrorField = "", true;
-  const m2 = ((_a = c2.props) == null ? void 0 : _a.highlightAllRequiredField) || false;
+  let d2 = h(s2);
+  if (s2 && null !== s2 || !o2 || (d2 = {}), !d2 || 0 === Object.keys(d2).length) return r2.validateErrorField = "", true;
+  const m2 = ((_a = f2.props) == null ? void 0 : _a.highlightAllRequiredField) || false;
   let p2;
-  return new e(d2).validate(n2, { first: !m2 }, (e2, g2) => {
+  return new e(d2).validate(r2, { first: !m2 }, (e2, g2) => {
     if (m2) {
       if (p2 = e2 || true, true === p2 && true === a2 && d2) {
         const e3 = /[A-Z]+/, t2 = Object.keys(d2);
-        if (t2.some((t3) => e3.test(t3) && void 0 !== n2[t3.toLowerCase()])) {
-          const s2 = JSON.parse(JSON.stringify(n2));
+        if (t2.some((t3) => e3.test(t3) && void 0 !== r2[t3.toLowerCase()])) {
+          const n2 = JSON.parse(JSON.stringify(r2));
           t2.forEach((t3) => {
-            e3.test(t3) && void 0 !== n2[t3.toLowerCase()] && (s2[t3.toUpperCase()] = n2[t3.toLowerCase()], delete s2[t3.toLowerCase()]);
-          }), p2 = y(s2, r2, i2, l2, false, u2, c2);
+            e3.test(t3) && void 0 !== r2[t3.toLowerCase()] && (n2[t3.toUpperCase()] = r2[t3.toLowerCase()], delete n2[t3.toLowerCase()]);
+          }), p2 = y(n2, s2, o2, l2, false, u2, f2);
         }
       }
-      true !== p2 && t({ showClose: true, message: o().t("superPageRuntimeMessage.pleaseInputRequiredInfo"), type: "warning" });
+      true !== p2 && t({ showClose: true, message: i().t("superPageRuntimeMessage.pleaseInputRequiredInfo"), type: "warning" });
     } else {
-      let o2;
+      let i2;
       if (e2) {
-        p2 = e2[0].message, o2 = e2[0].field, t({ message: p2, showClose: true, type: "warning", duration: 3e3 });
-        const n3 = s(c2, o2);
-        if (n3 && n3.addRequiredClass) {
-          n3.addRequiredClass();
+        p2 = e2[0].message, i2 = e2[0].field, t({ message: p2, showClose: true, type: "warning", duration: 3e3 });
+        const r3 = n(f2, i2);
+        if (r3 && r3.addRequiredClass) {
+          r3.addRequiredClass();
           try {
-            f(c2, o2);
+            c(f2, i2);
           } catch (e3) {
-            console.error("滚动失败", e3);
           }
         }
       } else p2 = true;
-      if (o2 && true === a2) {
-        if (/[A-Z]+/.test(o2) && void 0 !== n2[o2.toLowerCase()]) {
-          const e3 = JSON.parse(JSON.stringify(n2));
-          e3[o2.toUpperCase()] = n2[o2.toLowerCase()], delete e3[o2.toLowerCase()], p2 = y(e3, r2, i2, l2, false, u2, c2);
+      if (i2 && true === a2) {
+        if (/[A-Z]+/.test(i2) && void 0 !== r2[i2.toLowerCase()]) {
+          const e3 = JSON.parse(JSON.stringify(r2));
+          e3[i2.toUpperCase()] = r2[i2.toLowerCase()], delete e3[i2.toLowerCase()], p2 = y(e3, s2, o2, l2, false, u2, f2);
         }
       }
     }
   }), p2;
 }
-function w(e2, n2, r2, l2) {
-  if (r2) {
-    if (J(r2.isStandard, r2.event)) return new Promise((e3, t2) => {
+function w(e2, r2, s2, l2) {
+  if (s2) {
+    if (J(s2.isStandard, s2.event)) return new Promise((e3, t2) => {
       e3(true);
     });
   }
-  const c2 = e2.entity.data, f2 = { ...e2.entity.page, ...c2 }, d2 = e2.rules, m2 = n2.props.base ? n2.props.base.isEnableRequired : null;
-  return null != m2 && (l2 = m2), null == l2 && (l2 = false), function(e3, n3, r3, l3) {
+  const f2 = e2.entity.data, c2 = { ...e2.entity.page, ...f2 }, d2 = e2.rules, m2 = r2.props.base ? r2.props.base.isEnableRequired : null;
+  return null != m2 && (l2 = m2), null == l2 && (l2 = false), function(e3, r3, s3, l3) {
     if (e3) {
-      return u(l3) ? function(e4, n4, r4) {
+      return u(l3) ? function(e4, r4, s4) {
         return new Promise((l4, u2) => {
           var _a;
-          const c3 = i(n4), f3 = n4.entity.context, d3 = n4.entity.task, m3 = true, g2 = n4.subTablePageInfo, h2 = ((_a = n4.props) == null ? void 0 : _a.highlightAllRequiredField) || false;
-          x(e4, n4, r4).then((r5) => {
-            if (r5) {
-              let i2 = r5;
-              const u3 = n4.workflowRules;
-              let b2 = null, y2 = null;
+          const f3 = o(r4), c3 = r4.entity.context, d3 = r4.entity.task, m3 = true, g2 = r4.subTablePageInfo, b2 = ((_a = r4.props) == null ? void 0 : _a.highlightAllRequiredField) || false;
+          N(e4, r4, s4).then((s5) => {
+            if (s5) {
+              let o2 = s5;
+              const u3 = r4.workflowRules;
+              let h2 = null, y2 = null;
               if (u3) {
-                if (!function(e5, n5) {
+                if (!function(e5, r5) {
                   var _a2, _b, _c, _d;
                   if (!e5.actionPermissions) return true;
-                  const r7 = Object.keys(e5.actionPermissions);
-                  for (let i3 = 0; i3 < r7.length; i3++) {
-                    const l5 = r7[i3], u4 = e5.actionPermissions[l5];
+                  const s7 = Object.keys(e5.actionPermissions);
+                  for (let o3 = 0; o3 < s7.length; o3++) {
+                    const l5 = s7[o3], u4 = e5.actionPermissions[l5];
                     if (u4 && u4.notEmpty) {
                       if ((_a2 = e5.hiddenNotValidatorCodes) == null ? void 0 : _a2.has(l5)) continue;
-                      let r8 = false;
-                      if (n5[l5] ? Array.isArray(n5[l5]) && 0 === n5[l5].length && (r8 = true) : r8 = true, r8) {
-                        const r9 = s(e5, l5);
-                        if (!r9) return true;
-                        const i4 = r9.getConfigure();
+                      let s8 = false;
+                      if (r5[l5] ? Array.isArray(r5[l5]) && 0 === r5[l5].length && (s8 = true) : s8 = true, s8) {
+                        const s9 = n(e5, l5);
+                        if (!s9) return true;
+                        const o4 = s9.getConfigure();
                         if ((_b = u4.notEmptyCondition) == null ? void 0 : _b.parentCondition) {
-                          if (false === a(u4.notEmptyCondition.parentCondition.replaceAll("${field[", "${parent["), e5.dataTypeMaps, n5, {}, (_c = e5.entity) == null ? void 0 : _c.request, (_d = e5.entity) == null ? void 0 : _d.task, e5.contextParam)) return true;
+                          if (false === a(u4.notEmptyCondition.parentCondition.replaceAll("${field[", "${parent["), e5.dataTypeMaps, r5, {}, (_c = e5.entity) == null ? void 0 : _c.request, (_d = e5.entity) == null ? void 0 : _d.task, e5.contextParam)) return true;
                         }
-                        return t({ showClose: true, message: o().t("superPageRuntimeMessage.xxxNotEmpty", { label: i4.title ? i4.title : l5 }), type: "warning" }), false;
+                        return t({ showClose: true, message: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: o4.title ? o4.title : l5 }), type: "warning" }), false;
                       }
                     }
                   }
                   return true;
-                }(n4, e4)) return void l4(false);
-                const r6 = true;
-                b2 = function(e5, t2) {
-                  const s2 = p(e5);
+                }(r4, e4)) return void l4(false);
+                const s6 = true;
+                h2 = function(e5, t2) {
+                  const n2 = p(e5);
                   t2 && t2.size > 0 && t2.forEach((e6) => {
-                    delete s2[e6], s2.subRules && delete s2.subRules[e6], s2.rules && delete s2.rules[e6];
+                    delete n2[e6], n2.subRules && delete n2.subRules[e6], n2.rules && delete n2.rules[e6];
                   });
-                  s2.subRules && (Object.keys(s2.subRules).length > 0 ? s2.totalSubRules || (s2.totalSubRules = {}) : delete s2.subRules);
-                  return s2;
-                }(u3, n4.hiddenNotValidatorCodes), y2 = window.$vueApp.config.globalProperties.$formValidator(e4, b2, m3, c3, d3, f3, g2, r6, { returnAllErrors: h2 }), i2 = y2 && Array.isArray(y2) ? 1 === y2.length && y2[0].message ? y2[0].message : 0 === y2.length || o().t("superPageRuntimeMessage.pleaseInputRequiredInfo") : !y2 || y2.msg;
-              } else i2 = true;
-              true !== i2 ? (console.error("流程表单验证失败", b2, e4), t({ showClose: true, message: i2 + "", type: "warning" }), y2 && Array.isArray(y2) && y2.length > 0 ? (C(n4, y2), k(n4, P(n4, y2))) : y2.listCode ? (R(n4, y2), E(n4, y2)) : (R(n4, y2), v(n4, y2.field)), l4(false)) : (Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, l4(e4));
-            } else u2(new Error(o().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+                  n2.subRules && (Object.keys(n2.subRules).length > 0 ? n2.totalSubRules || (n2.totalSubRules = {}) : delete n2.subRules);
+                  return n2;
+                }(u3, r4.hiddenNotValidatorCodes), y2 = window.$vueApp.config.globalProperties.$formValidator(e4, h2, m3, f3, d3, c3, g2, s6, { returnAllErrors: b2 }), o2 = y2 && Array.isArray(y2) ? 1 === y2.length && y2[0].message ? y2[0].message : 0 === y2.length || i().t("superPageRuntimeMessage.pleaseInputRequiredInfo") : !y2 || y2.msg;
+              } else o2 = true;
+              true !== o2 ? (t({ showClose: true, message: o2 + "", type: "warning" }), y2 && Array.isArray(y2) && y2.length > 0 ? (v(r4, y2), k(r4, P(r4, y2))) : y2.listCode ? (R(r4, y2), C(r4, y2)) : (R(r4, y2), E(r4, y2.field)), l4(false)) : (Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, l4(e4));
+            } else u2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
           }).catch((e5) => {
             u2(e5);
           });
         });
-      }(n3, l3, r3) : function(e4, t2, s2) {
-        return new Promise((n4, r4) => {
-          x(e4, t2, s2).then((t3) => {
+      }(r3, l3, s3) : function(e4, t2, n2) {
+        return new Promise((r4, s4) => {
+          N(e4, t2, n2).then((t3) => {
             if (t3) {
               const t4 = JSON.parse(JSON.stringify(e4));
-              Object.keys(t4).indexOf("validateErrorField") >= 0 && delete t4.validateErrorField, n4(t4);
-            } else n4(false);
+              Object.keys(t4).indexOf("validateErrorField") >= 0 && delete t4.validateErrorField, r4(t4);
+            } else r4(false);
           }).catch((e5) => {
-            r4(e5);
+            s4(e5);
           });
         });
-      }(n3, l3, r3);
+      }(r3, l3, s3);
     }
     return new Promise((e4, t2) => {
       e4(true);
     });
-  }(l2, f2, d2, e2);
+  }(l2, c2, d2, e2);
 }
 function R(e2, t2) {
   if (t2.listCode) {
-    const n2 = s(e2, t2.listCode);
-    (n2 == null ? void 0 : n2.addRequiredClass) && n2.addRequiredClass(t2.field, t2.rowIndex, t2.pageNum);
+    const r2 = n(e2, t2.listCode);
+    (r2 == null ? void 0 : r2.addRequiredClass) && r2.addRequiredClass(t2.field, t2.rowIndex, t2.pageNum);
   } else if (t2.field) {
-    const n2 = s(e2, t2.field);
-    (n2 == null ? void 0 : n2.addRequiredClass) && n2.addRequiredClass();
+    const r2 = n(e2, t2.field);
+    (r2 == null ? void 0 : r2.addRequiredClass) && r2.addRequiredClass();
   }
 }
-function C(e2, t2) {
+function v(e2, t2) {
   t2.forEach((t3) => R(e2, t3));
 }
-function E(e2, t2) {
+function C(e2, t2) {
   try {
-    f(e2, t2.listCode);
-    const n2 = s(e2, t2.listCode);
-    (n2 == null ? void 0 : n2.scrollToCell) && n2.scrollToCell({ fieldName: t2.field, rowIndex: t2.rowIndex, pageNum: t2.pageNum });
+    c(e2, t2.listCode);
+    const r2 = n(e2, t2.listCode);
+    (r2 == null ? void 0 : r2.scrollToCell) && r2.scrollToCell({ fieldName: t2.field, rowIndex: t2.rowIndex, pageNum: t2.pageNum });
   } catch (e3) {
-    console.error("滚动到验证失败的子表字段失败，可能是表格组件版本较低没有scrollToCell方法", e3);
   }
 }
-function v(e2, t2) {
+function E(e2, t2) {
   try {
-    f(e2, t2);
+    c(e2, t2);
   } catch (e3) {
-    console.error("滚动失败", e3);
   }
 }
 function P(e2, t2) {
-  let n2 = null, r2 = 1 / 0;
+  let r2 = null, s2 = 1 / 0;
   return t2.forEach((t3) => {
-    const o2 = t3.listCode || t3.field;
-    if (!o2) return;
-    const i2 = s(e2, o2), l2 = (i2 == null ? void 0 : i2.$el) || i2;
+    const i2 = t3.listCode || t3.field;
+    if (!i2) return;
+    const o2 = n(e2, i2), l2 = (o2 == null ? void 0 : o2.$el) || o2;
     if (l2 == null ? void 0 : l2.getBoundingClientRect) {
       const e3 = l2.getBoundingClientRect();
-      e3.top < r2 && (r2 = e3.top, n2 = t3);
+      e3.top < s2 && (s2 = e3.top, r2 = t3);
     }
-  }), n2;
+  }), r2;
 }
 function k(e2, t2) {
-  t2 && (t2.listCode ? E(e2, t2) : t2.field && v(e2, t2.field));
+  t2 && (t2.listCode ? C(e2, t2) : t2.field && E(e2, t2.field));
 }
 function O(e2) {
-  return new Promise((t2, s2) => {
-    const r2 = [], o2 = e2.customValidatorUuids;
-    o2 && o2.forEach((t3) => {
-      const s3 = n(e2, t3);
-      s3 && s3.validator && r2.push(s3.validator());
-    }), r2 && r2.length > 0 ? Promise.all(r2).then((e3) => {
+  return new Promise((t2, n2) => {
+    const s2 = [], i2 = e2.customValidatorUuids;
+    i2 && i2.forEach((t3) => {
+      const n3 = r(e2, t3);
+      n3 && n3.validator && s2.push(n3.validator());
+    }), s2 && s2.length > 0 ? Promise.all(s2).then((e3) => {
       e3.includes(false) ? t2(false) : t2(true);
     }) : t2(true);
   });
 }
-function x(e2, t2, s2) {
-  return new Promise((n2, r2) => {
+function N(e2, t2, n2) {
+  return new Promise((r2, s2) => {
     var _a;
-    const i2 = JSON.parse(JSON.stringify(e2)), a2 = p(s2), u2 = t2.hiddenNotValidatorCodes;
+    const o2 = JSON.parse(JSON.stringify(e2)), a2 = p(n2), u2 = t2.hiddenNotValidatorCodes;
     if (a2 && u2 && u2.size > 0 && u2.forEach((e3) => {
       delete a2[e3];
     }), a2 && 0 !== Object.keys(a2).length) {
-      const e3 = h(i2, a2, null, null, true, t2);
-      if (((_a = t2.props) == null ? void 0 : _a.highlightAllRequiredField) && e3 && Array.isArray(e3) && e3.length > 0 && (C(t2, e3), k(t2, P(t2, e3)), n2(false)), true === e3) {
-        if (true === M(t2)) {
+      const e3 = b(o2, a2, null, null, true, t2);
+      if (((_a = t2.props) == null ? void 0 : _a.highlightAllRequiredField) && e3 && Array.isArray(e3) && e3.length > 0 && (v(t2, e3), k(t2, P(t2, e3)), r2(false)), true === e3) {
+        if (true === x(t2)) {
           const e4 = q(t2);
           e4 && l(e4) ? e4.then((e5) => {
             e5 ? O(t2).then((e6) => {
-              n2(e6);
-            }) : n2(false);
+              r2(e6);
+            }) : r2(false);
           }) : O(t2).then((e5) => {
-            n2(e5);
+            r2(e5);
           });
-        } else r2(new Error(o().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
-      } else r2(new Error(o().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+        } else s2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
+      } else s2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
     } else {
-      if (true === M(t2)) {
+      if (true === x(t2)) {
         const e3 = q(t2);
         e3 && l(e3) ? e3.then((e4) => {
           e4 ? O(t2).then((e5) => {
-            n2(e5);
-          }) : n2(false);
+            r2(e5);
+          }) : r2(false);
         }) : O(t2).then((e4) => {
-          n2(e4);
+          r2(e4);
         });
-      } else r2(new Error(o().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
+      } else s2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
     }
   });
 }
-function T(e2, t2, s2) {
-  if (!t2) return s2;
-  s2 || (s2 = {});
-  const n2 = u(e2), r2 = Object.keys(t2), o2 = t2;
-  return r2.forEach((e3) => {
+function j(e2, t2, n2) {
+  if (!t2) return n2;
+  n2 || (n2 = {});
+  const r2 = u(e2), s2 = Object.keys(t2), i2 = t2;
+  return s2.forEach((e3) => {
     if ("__subRules" === e3) {
-      const e4 = o2.__subRules;
+      const e4 = i2.__subRules;
       Object.keys(e4).forEach((t3) => {
-        s2.subRules || (s2.subRules = {}), s2.subRules[t3] ? Object.assign(s2.subRules[t3], e4[t3]) : s2.subRules[t3] = e4[t3];
+        n2.subRules || (n2.subRules = {}), n2.subRules[t3] ? Object.assign(n2.subRules[t3], e4[t3]) : n2.subRules[t3] = e4[t3];
       });
-    } else _(o2[e3]), n2 ? (s2.rules[e3] = o2[e3], s2[e3] && (s2[e3] = o2[e3])) : s2[e3] = o2[e3];
-  }), b(s2);
+    } else _(i2[e3]), r2 ? (n2.rules[e3] = i2[e3], n2[e3] && (n2[e3] = i2[e3])) : n2[e3] = i2[e3];
+  }), h(n2);
 }
-function M(e2) {
+function x(e2) {
   var _a;
   if (!e2) return true;
   if (u(e2)) return true;
-  const s2 = e2.tableUuids;
-  if (!s2) return true;
-  for (let r2 = 0; r2 < s2.length; r2++) {
-    const i2 = s2[r2], l2 = e2.hiddenNotValidatorCodes;
-    if (l2 && l2.size > 0 && l2.has(i2)) continue;
-    const a2 = n(e2, i2);
+  const n2 = e2.tableUuids;
+  if (!n2) return true;
+  for (let s2 = 0; s2 < n2.length; s2++) {
+    const o2 = n2[s2], l2 = e2.hiddenNotValidatorCodes;
+    if (l2 && l2.size > 0 && l2.has(o2)) continue;
+    const a2 = r(e2, o2);
     if (a2) {
       if (a2.getConfigure()) {
-        const s3 = a2.getConfigure();
-        if ((_a = s3 == null ? void 0 : s3.verification) == null ? void 0 : _a.notEmpty) {
-          const n2 = a2.getTableData();
-          if (!n2 || !Array.isArray(n2) || 0 === n2.length) {
+        const n3 = a2.getConfigure();
+        if ((_a = n3 == null ? void 0 : n3.verification) == null ? void 0 : _a.notEmpty) {
+          const r2 = a2.getTableData();
+          if (!r2 || !Array.isArray(r2) || 0 === r2.length) {
             try {
-              d(e2, i2);
+              d(e2, o2);
             } catch (e3) {
             }
-            return t({ showClose: true, message: o().t("superPageRuntimeMessage.xxxNotEmpty", { label: s3.title ? s3.title : s3.code }), type: "warning" }), false;
+            return t({ showClose: true, message: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: n3.title ? n3.title : n3.code }), type: "warning" }), false;
           }
         }
       }
       if (false === a2.validatorSunTableListData()) {
         try {
-          d(e2, i2);
+          d(e2, o2);
         } catch (e3) {
         }
         return false;
@@ -332,67 +329,67 @@ function M(e2) {
   }
   return true;
 }
-function j(e2) {
+function M(e2) {
   if (!e2 || 0 === Object.keys(e2).length) return;
-  const t2 = {}, s2 = Object.keys(e2);
-  for (let n2 = 0; n2 < s2.length; n2++) {
-    const r2 = s2[n2], o2 = e2[r2];
-    N(o2), r2.indexOf(".") > 0 ? g(r2, t2, o2) : o2 && o2.length > 0 && (t2[r2] = [...o2]);
+  const t2 = {}, n2 = Object.keys(e2);
+  for (let r2 = 0; r2 < n2.length; r2++) {
+    const s2 = n2[r2], i2 = e2[s2];
+    T(i2), s2.indexOf(".") > 0 ? g(s2, t2, i2) : i2 && i2.length > 0 && (t2[s2] = [...i2]);
   }
   return t2;
 }
-function N(e2, t2) {
+function T(e2, t2) {
   e2.forEach((e3) => {
     e3.message;
-    const t3 = e3.label, s2 = o().t(t3);
-    e3.required && (e3.message = o().t("superPageRuntimeMessage.required", { label: s2 })), e3.myType && (e3.message = o().t("superPageRuntimeMessage.formatMismatch", { label: s2 })), e3.patternType && (e3.message = o().t("superPageRuntimeMessage.formatMismatch", { label: s2 })), void 0 !== e3.max && null !== e3.max && (e3.message = o().t("superPageRuntimeMessage.overMaxLength", { label: s2, value: e3.max })), void 0 !== e3.min && null !== e3.min && (e3.message = o().t("superPageRuntimeMessage.limitMinLength", { label: s2, value: e3.min }));
+    const t3 = e3.label, n2 = i().t(t3);
+    e3.required && (e3.message = i().t("superPageRuntimeMessage.required", { label: n2 })), e3.myType && (e3.message = i().t("superPageRuntimeMessage.formatMismatch", { label: n2 })), e3.patternType && (e3.message = i().t("superPageRuntimeMessage.formatMismatch", { label: n2 })), void 0 !== e3.max && null !== e3.max && (e3.message = i().t("superPageRuntimeMessage.overMaxLength", { label: n2, value: e3.max })), void 0 !== e3.min && null !== e3.min && (e3.message = i().t("superPageRuntimeMessage.limitMinLength", { label: n2, value: e3.min }));
   });
 }
 function A(e2) {
-  const t2 = e2.entity.data, s2 = { ...e2.entity.page, ...t2 }, n2 = i(e2), r2 = e2.entity.context, o2 = e2.entity.task;
+  const t2 = e2.entity.data, n2 = { ...e2.entity.page, ...t2 }, r2 = o(e2), s2 = e2.entity.context, i2 = e2.entity.task;
   e2.formPropTiltleMap && Object.keys(e2.formPropTiltleMap).length > 0 && e2.completeTaskParam.fieldPermissions && e2.completeTaskParam.fieldPermissions.length > 0 && e2.completeTaskParam.fieldPermissions.forEach((t3) => {
     t3.name && e2.formPropTiltleMap[t3.name] && (t3.label = e2.formPropTiltleMap[t3.name]);
   });
-  let l2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, s2, true, n2, o2, r2);
+  let l2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, n2, true, r2, i2, s2);
   const a2 = e2.customRules;
-  return l2 = T(e2, a2, l2), l2 && (l2.rules || (l2.rules = {}), l2.subRules || (l2.subRules = {})), l2;
+  return l2 = j(e2, a2, l2), l2 && (l2.rules || (l2.rules = {}), l2.subRules || (l2.subRules = {})), l2;
 }
 function q(e2) {
   const t2 = [];
-  return e2.customRuleEvents && e2.customRuleEvents.length > 0 && e2.customRuleEvents.forEach((s2) => {
-    s2.events.forEach((n2) => {
-      const r2 = e2.customEvents[n2];
-      t2.push(r2.apply(r2, [{ prop: s2.prop, pageContext: e2 }]));
+  return e2.customRuleEvents && e2.customRuleEvents.length > 0 && e2.customRuleEvents.forEach((n2) => {
+    n2.events.forEach((r2) => {
+      const s2 = e2.customEvents[r2];
+      t2.push(s2.apply(s2, [{ prop: n2.prop, pageContext: e2 }]));
     });
-  }), t2 && t2.length > 0 ? new Promise((e3, s2) => {
-    const n2 = [], r2 = [];
+  }), t2 && t2.length > 0 ? new Promise((e3, n2) => {
+    const r2 = [], s2 = [];
     t2.forEach((e4) => {
-      l(e4) ? n2.push(e4) : r2.push(e4);
-    }), r2.includes(false) && e3(false), n2.length > 0 ? Promise.all(n2).then((t3) => {
+      l(e4) ? r2.push(e4) : s2.push(e4);
+    }), s2.includes(false) && e3(false), r2.length > 0 ? Promise.all(r2).then((t3) => {
       t3.includes(false) ? e3(false) : e3(true);
     }).catch((t3) => {
-      console.error(t3), e3(false);
+      e3(false);
     }) : e3(true);
   }) : null;
 }
 function S(e2, t2) {
   if (!t2) return;
-  const n2 = {};
+  const r2 = {};
   if (t2.forEach((e3) => {
-    const { name: t3, rules: s2 } = e3;
-    s2 ? n2[t3] = s2 : false === e3.required && (n2[t3] = []);
+    const { name: t3, rules: n2 } = e3;
+    n2 ? r2[t3] = n2 : false === e3.required && (r2[t3] = []);
   }), u(e2)) {
     let t3 = e2.workflowRules ? e2.workflowRules : { rules: {}, subRules: {} };
-    t3 = T(e2, n2, t3), e2.workflowRules = t3;
+    t3 = j(e2, r2, t3), e2.workflowRules = t3;
   } else {
     let t3 = e2.rules ? e2.rules : {};
-    t3 = T(e2, n2, t3), e2.rules = t3;
+    t3 = j(e2, r2, t3), e2.rules = t3;
   }
-  const r2 = t2.filter((e3) => "_all_fields" === e3.name);
-  r2 && r2.length > 0 && L(e2, r2[0]), t2.forEach((t3) => {
+  const s2 = t2.filter((e3) => "_all_fields" === e3.name);
+  s2 && s2.length > 0 && L(e2, s2[0]), t2.forEach((t3) => {
     if ("_all_fields" !== t3.name) {
-      const n3 = s(e2, t3.name);
-      D(e2, n3, t3);
+      const r3 = n(e2, t3.name);
+      D(e2, r3, t3);
     }
   });
 }
@@ -400,50 +397,72 @@ function F(e2) {
   L(e2, { disabled: true });
 }
 function L(e2, t2) {
-  const s2 = r(e2);
-  if (s2) for (const n2 in s2) {
-    const r2 = s2[n2];
-    D(e2, r2 ? r2.value : r2, t2);
+  const n2 = s(e2);
+  if (n2) for (const r2 in n2) {
+    const s2 = n2[r2];
+    D(e2, s2 ? s2.value : s2, t2);
   }
 }
-function V(e2, t2, r2) {
+function V(e2, t2, s2) {
   var _a;
-  let o2, i2;
-  if (r2 ? (o2 = s(e2, r2), i2 = o2 ? o2.getTableUuid() : null) : (i2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, o2 = i2 ? n(e2, i2) : null), !o2) return;
-  const l2 = e2.code, a2 = e2.version, u2 = c(l2, a2, i2);
-  if (e2.workflowRules || (e2.workflowRules = { rules: {}, subRules: {} }), e2.workflowRules.subRules || (e2.workflowRules.subRules = {}), e2.workflowRules.subRules[r2] || (e2.workflowRules.subRules[r2] = {}), ((_a = e2.workflowRules) == null ? void 0 : _a.subRules) && e2.workflowRules.subRules[r2]) {
-    const s2 = e2.workflowRules.subRules[r2];
+  let i2, o2;
+  if (s2 ? (i2 = n(e2, s2), o2 = i2 ? i2.getTableUuid() : null) : (o2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, i2 = o2 ? r(e2, o2) : null), !i2) return;
+  const l2 = e2.code, a2 = e2.version, u2 = f(l2, a2, o2);
+  if (e2.workflowRules || (e2.workflowRules = { rules: {}, subRules: {} }), e2.workflowRules.subRules || (e2.workflowRules.subRules = {}), e2.workflowRules.subRules[s2] || (e2.workflowRules.subRules[s2] = {}), ((_a = e2.workflowRules) == null ? void 0 : _a.subRules) && e2.workflowRules.subRules[s2]) {
+    const n2 = e2.workflowRules.subRules[s2];
     t2.forEach((e3) => {
-      s2[e3.name] = e3;
+      n2[e3.name] = e3;
     });
   }
-  o2.dynamicControlTableEdit(e2, t2, u2);
+  i2.dynamicControlTableEdit(e2, t2, u2);
 }
-function D(e2, t2, s2) {
+function D(e2, t2, n2) {
   var _a, _b, _c;
   if (t2) {
-    const n2 = t2.getConfigure();
-    if (void 0 !== s2.show && (s2.show ? t2.show() : t2.hide()), void 0 !== s2.required && ((_a = n2 == null ? void 0 : n2.runtime) == null ? void 0 : _a.props) && (n2.runtime.props.required = s2.required), void 0 !== s2.readonly && ((_b = n2 == null ? void 0 : n2.runtime) == null ? void 0 : _b.props) && (s2.readonly ? n2.runtime.props.state = "readonly" : n2.runtime.props.state = "enabled"), void 0 !== s2.disabled && n2 && (((_c = n2 == null ? void 0 : n2.runtime) == null ? void 0 : _c.props) && (s2.disabled ? n2.runtime.props.state = "disabled" : n2.runtime.props.state = "enabled"), "table" === n2.name)) {
+    const r2 = t2.getConfigure();
+    if (void 0 !== n2.show && (n2.show ? t2.show() : t2.hide()), void 0 !== n2.required && ((_a = r2 == null ? void 0 : r2.runtime) == null ? void 0 : _a.props) && (r2.runtime.props.required = n2.required), void 0 !== n2.readonly && ((_b = r2 == null ? void 0 : r2.runtime) == null ? void 0 : _b.props) && (n2.readonly ? r2.runtime.props.state = "readonly" : r2.runtime.props.state = "enabled"), void 0 !== n2.disabled && r2 && (((_c = r2 == null ? void 0 : r2.runtime) == null ? void 0 : _c.props) && (n2.disabled ? r2.runtime.props.state = "disabled" : r2.runtime.props.state = "enabled"), "table" === r2.name)) {
       t2.changeOperationAddState(false);
-      const s3 = t2 ? t2.getTableUuid() : null, n3 = e2.code, r2 = e2.version, o2 = c(n3, r2, s3), i2 = [{ name: "_all_fields", disabled: true }];
-      t2.dynamicControlTableEdit(e2, i2, o2);
+      const n3 = t2 ? t2.getTableUuid() : null, r3 = e2.code, s2 = e2.version, i2 = f(r3, s2, n3), o2 = [{ name: "_all_fields", disabled: true }];
+      t2.dynamicControlTableEdit(e2, o2, i2);
     }
   }
 }
-function _(e2) {
-  if (!(e2 == null ? void 0 : e2.type)) return;
-  const t2 = U[e2.type];
-  t2 && (e2.validator = t2.validator);
+function _(t2) {
+  if ((t2 == null ? void 0 : t2.pattern) && "object" == typeof t2.pattern && 0 === Object.keys(t2.pattern).length && delete t2.pattern, !t2) return;
+  if (!t2.type) return void function(t3) {
+    var _a;
+    const n3 = (_a = e.validators) == null ? void 0 : _a.string;
+    if ("function" != typeof n3) return;
+    t3.validator = function(e2, t4, r2, s2, i2) {
+      if (null == t4 || "string" == typeof t4) return n3(e2, t4, r2, s2, i2);
+      if (Array.isArray(t4) && 0 === t4.length) return !e2.required;
+      const o2 = e2.type;
+      e2.type = void 0;
+      const l2 = n3(e2, t4, r2, s2, i2);
+      return e2.type = o2, l2;
+    };
+  }(t2);
+  const n2 = I[t2.type];
+  n2 && (t2.validator = n2.validator);
 }
-const U = { boolean: { validator: function(e2, t2, s2) {
-  return true === I(e2, t2) && ("number" == typeof t2 && (1 === t2 || 0 === t2) || "boolean" == typeof t2 && (true === t2 || false === t2));
-} }, date: { validator: function(e2, t2, s2) {
-  if (true !== I(e2, t2)) return false;
-  const n2 = new Date(t2);
-  return !isNaN(n2.getTime());
-} }, number: { validator: function(e2, t2, s2) {
-  return true === I(e2, t2) && (("string" != typeof t2 || "" !== t2.trim()) && ("number" == typeof t2 || !isNaN(Number(t2))));
-} } }, I = (e2, t2) => null != t2 && "" !== t2 || !e2.required;
+const I = { boolean: { validator: function(e2, t2, n2) {
+  return true === U(e2, t2) && ("number" == typeof t2 && (1 === t2 || 0 === t2) || "boolean" == typeof t2 && (true === t2 || false === t2));
+} }, date: { validator: function(e2, t2, n2) {
+  if (true !== U(e2, t2)) return false;
+  const r2 = new Date(t2);
+  return !isNaN(r2.getTime());
+} }, number: { validator: function(e2, t2, n2) {
+  return true === U(e2, t2) && (("string" != typeof t2 || "" !== t2.trim()) && ("number" == typeof t2 || !isNaN(Number(t2))));
+} }, float: { validator: function(e2, t2, n2) {
+  return true === U(e2, t2) && function(e3) {
+    if ("number" == typeof e3) return !isNaN(e3);
+    if ("string" == typeof e3 && "" !== e3.trim()) return !isNaN(Number(e3));
+    return false;
+  }(t2);
+} }, integer: { validator: function(e2, t2, n2) {
+  return true === U(e2, t2) && ("number" == typeof t2 ? Number.isInteger(t2) : "string" == typeof t2 && "" !== t2.trim() && /^-?\d+$/.test(t2.trim()));
+} } };
+const U = (e2, t2) => null != t2 && "" !== t2 || !e2.required;
 function J(e2, t2) {
   return e2 && m.includes(t2.eventName);
 }
@@ -451,13 +470,13 @@ export {
   F as disabledAllFields,
   V as dynamicControlTableEdit,
   A as getWorkflowRules,
-  N as i18nValidatePropRulesMessage,
-  j as i18nValidateRulesMessage,
+  T as i18nValidatePropRulesMessage,
+  M as i18nValidateRulesMessage,
   J as isNotNeedValidateRequired,
-  T as packageCustomRules,
+  j as packageCustomRules,
   _ as packageCustomValidator,
   g as setObjectPropRule,
   S as updateFormItemEditState,
   w as validateDataModelFunc,
-  h as validator
+  b as validator
 };