super-page-runtime 2.3.37-sit2 → 2.3.37-sit4

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

@@ -1,42 +1,42 @@
 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 i } from "agilebuilder-ui/src/utils/util";
+import { getComponentRefByCode as s, getComponentRef as r, getAllComponentRefs as n } from "../global-refs.js";
+import { getI18n as o } from "agilebuilder-ui/src/utils/util";
 import { getAdditionalParamMap as l } from "./standard-event.js";
-import { isPromise as o } from "agilebuilder-ui/src/utils/common-util";
+import { isPromise as i } 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 f } from "../common-util.js";
-import { scrollIntoComponentWithCode as c, scrollIntoComponentWithUuid as d } from "../anchor-util.js";
+import { isWorkflowPage as u, getListCode as c } from "../common-util.js";
+import { scrollIntoComponentWithCode as f, scrollIntoComponentWithUuid as d } from "../anchor-util.js";
 function m(e2, t2, s2) {
-  const n2 = {};
+  const r2 = {};
   t2 || (t2 = {});
-  let r2 = 0;
-  const i2 = e2.split(".");
-  return i2.forEach((e3) => {
+  let n2 = 0;
+  const o2 = e2.split(".");
+  return o2.forEach((e3) => {
     let l2;
-    if (r2 === i2.length - 1) l2 = 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;
+    if (n2 === o2.length - 1) l2 = function(e4, t3, s3) {
+      let r3;
+      for (let n3 = 0; n3 < t3.length; n3++) if (r3 = 0 === n3 ? e4[t3[n3]] : r3.fields[t3[n3]], n3 !== t3.length - 1) {
+        if (t3[n3 + 1] === s3) break;
       }
-      return n3;
-    }(n2, i2, e3), l2.fields[e3] = s2;
+      return r3;
+    }(r2, o2, e3), l2.fields[e3] = s2;
     else {
       let s3;
-      0 === r2 ? l2 = t2 : (s3 = function(e4, t3, s4) {
-        let n3;
-        for (let r3 = 0; r3 < t3.length; r3++) {
-          const i3 = t3[r3];
-          if (n3 = 0 === r3 ? e4[i3] : n3.fields[t3[r3]], i3 === s4) break;
+      0 === n2 ? l2 = t2 : (s3 = function(e4, t3, s4) {
+        let r3;
+        for (let n3 = 0; n3 < t3.length; n3++) {
+          const o3 = t3[n3];
+          if (r3 = 0 === n3 ? e4[o3] : r3.fields[t3[n3]], o3 === s4) break;
         }
-        return n3;
-      }(n2, i2, i2[r2 - 1]), l2 = s3.fields), l2[e3] || (l2[e3] = { type: "object", required: true, fields: {} }), 0 === r2 ? n2[e3] = l2[e3] : s3.fields[e3] = l2[e3];
+        return r3;
+      }(r2, o2, o2[n2 - 1]), l2 = s3.fields), l2[e3] || (l2[e3] = { type: "object", required: true, fields: {} }), 0 === n2 ? r2[e3] = l2[e3] : s3.fields[e3] = l2[e3];
     }
-    r2++;
-  }), n2;
+    n2++;
+  }), r2;
 }
-function p(e2, t2, s2, n2, r2, i2) {
-  return b(e2, t2, s2, n2, true, r2, i2);
+function p(e2, t2, s2, r2, n2, o2) {
+  return b(e2, t2, s2, r2, true, n2, o2);
 }
 function g(e2) {
   if (e2) return Object.keys(e2).forEach((t2) => {
@@ -46,155 +46,159 @@ function g(e2) {
     }
   }), e2;
 }
-function b(n2, r2, i2, l2, o2, a2, u2) {
-  let f2, d2 = g(r2);
-  if (r2 && null !== r2 || !i2 || (d2 = {}), !d2 || 0 === Object.keys(d2).length) return n2.validateErrorField = "", true;
-  return new e(d2).validate(n2, { first: true }, (e2, d3) => {
+function b(r2, n2, o2, l2, i2, a2, u2) {
+  let c2, d2 = g(n2);
+  if (n2 && null !== n2 || !o2 || (d2 = {}), !d2 || 0 === Object.keys(d2).length) return r2.validateErrorField = "", true;
+  return new e(d2).validate(r2, { first: true }, (e2, d3) => {
     let m2;
     if (e2) {
-      f2 = e2[0].message, m2 = e2[0].field, t({ message: f2, showClose: true, type: "warning", duration: 3e3 });
-      const n3 = s(u2, m2);
-      if (n3 && n3.addRequiredClass) {
-        n3.addRequiredClass();
+      c2 = e2[0].message, m2 = e2[0].field, t({ message: c2, showClose: true, type: "warning", duration: 3e3 });
+      const r3 = s(u2, m2);
+      if (r3 && r3.addRequiredClass) {
+        r3.addRequiredClass();
         try {
-          c(u2, m2);
+          f(u2, m2);
         } catch (e3) {
+          console.error("滚动失败", e3);
         }
       }
-    } else f2 = true;
-    if (m2 && true === o2) {
-      if (/[A-Z]+/.test(m2) && void 0 !== n2[m2.toLowerCase()]) {
-        const e3 = JSON.parse(JSON.stringify(n2));
-        e3[m2.toUpperCase()] = n2[m2.toLowerCase()], delete e3[m2.toLowerCase()], f2 = b(e3, r2, i2, l2, false, a2, u2);
+      console.log("errors", e2, "fields", d3);
+    } else c2 = true;
+    if (m2 && true === i2) {
+      if (/[A-Z]+/.test(m2) && void 0 !== r2[m2.toLowerCase()]) {
+        const e3 = JSON.parse(JSON.stringify(r2));
+        e3[m2.toUpperCase()] = r2[m2.toLowerCase()], delete e3[m2.toLowerCase()], c2 = b(e3, n2, o2, l2, false, a2, u2);
       }
     }
-  }), f2;
+  }), c2;
 }
-function h(e2, n2, r2) {
-  const o2 = e2.entity.data, f2 = { ...e2.entity.page, ...o2 }, d2 = e2.rules, m2 = n2.props.base ? n2.props.base.isEnableRequired : null;
-  return null != m2 && (r2 = m2), null == r2 && (r2 = false), function(e3, n3, r3, o3) {
+function h(e2, r2, n2) {
+  const i2 = e2.entity.data, c2 = { ...e2.entity.page, ...i2 }, d2 = e2.rules, m2 = r2.props.base ? r2.props.base.isEnableRequired : null;
+  return null != m2 && (n2 = m2), null == n2 && (n2 = false), function(e3, r3, n3, i3) {
     if (e3) {
-      return u(o3) ? function(e4, n4, r4) {
-        return new Promise((o4, u2) => {
-          const f3 = l(n4), d3 = n4.entity.context, m3 = n4.entity.task, p2 = true, g2 = n4.subTablePageInfo;
-          w(e4, n4, r4).then((r5) => {
-            if (r5) {
-              let l2, u3, b2, h2, y2 = r5;
-              const w2 = n4.workflowRules;
+      return u(i3) ? function(e4, r4, n4) {
+        return new Promise((i4, u2) => {
+          const c3 = l(r4), d3 = r4.entity.context, m3 = r4.entity.task, p2 = true, g2 = r4.subTablePageInfo;
+          w(e4, r4, n4).then((n5) => {
+            if (n5) {
+              let l2, u3, b2, h2, y2 = n5;
+              const w2 = r4.workflowRules;
               if (w2) {
-                if (!function(e5, n5) {
+                if (!function(e5, r5) {
                   var _a, _b, _c, _d;
                   if (!e5.actionPermissions) return true;
-                  const r7 = Object.keys(e5.actionPermissions);
-                  for (let l3 = 0; l3 < r7.length; l3++) {
-                    const o5 = r7[l3], u4 = e5.actionPermissions[o5];
+                  const n7 = Object.keys(e5.actionPermissions);
+                  for (let l3 = 0; l3 < n7.length; l3++) {
+                    const i5 = n7[l3], u4 = e5.actionPermissions[i5];
                     if (u4 && u4.notEmpty) {
-                      if ((_a = e5.hiddenNotValidatorCodes) == null ? void 0 : _a.has(o5)) continue;
-                      let r8 = false;
-                      if (n5[o5] ? Array.isArray(n5[o5]) && 0 === n5[o5].length && (r8 = true) : r8 = true, r8) {
-                        const r9 = s(e5, o5);
-                        if (!r9) return true;
-                        const l4 = r9.getConfigure();
+                      if ((_a = e5.hiddenNotValidatorCodes) == null ? void 0 : _a.has(i5)) continue;
+                      let n8 = false;
+                      if (r5[i5] ? Array.isArray(r5[i5]) && 0 === r5[i5].length && (n8 = true) : n8 = true, n8) {
+                        const n9 = s(e5, i5);
+                        if (!n9) return true;
+                        const l4 = n9.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: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: l4.title ? l4.title : o5 }), type: "warning" }), false;
+                        return t({ showClose: true, message: o().t("superPageRuntimeMessage.xxxNotEmpty", { label: l4.title ? l4.title : i5 }), type: "warning" }), false;
                       }
                     }
                   }
                   return true;
-                }(n4, e4)) return void o4(false);
-                const r6 = true, c2 = Object.assign({}, w2), R2 = n4.hiddenNotValidatorCodes;
+                }(r4, e4)) return void i4(false);
+                const n6 = true, f2 = Object.assign({}, w2), R2 = r4.hiddenNotValidatorCodes;
                 R2 && R2.size > 0 && R2.forEach((e5) => {
-                  c2.subRules && delete c2.subRules[e5], c2.rules && delete c2.rules[e5];
-                }), c2.subRules && (Object.keys(c2.subRules).length > 0 ? c2.totalSubRules || (c2.totalSubRules = {}) : delete c2.subRules);
-                const v2 = window.$vueApp.config.globalProperties.$formValidator(e4, c2, p2, f3, m3, d3, g2, r6);
+                  f2.subRules && delete f2.subRules[e5], f2.rules && delete f2.rules[e5];
+                }), f2.subRules && (Object.keys(f2.subRules).length > 0 ? f2.totalSubRules || (f2.totalSubRules = {}) : delete f2.subRules);
+                const v2 = window.$vueApp.config.globalProperties.$formValidator(e4, f2, p2, c3, m3, d3, g2, n6);
                 y2 = v2.msg, l2 = v2.field, u3 = v2.listCode, b2 = v2.rowIndex, h2 = v2.pageNum;
               } else y2 = true;
               if (true !== y2) {
                 if (t({ showClose: true, message: y2 + "", type: "warning" }), u3) {
-                  const e5 = s(n4, u3);
+                  const e5 = s(r4, u3);
                   if (e5 && e5.addRequiredClass) {
                     e5.addRequiredClass(l2, b2, h2);
                     try {
-                      c(n4, u3), e5.scrollToCell({ fieldName: l2, rowIndex: b2, pageNum: h2 });
+                      f(r4, u3), e5.scrollToCell({ fieldName: l2, rowIndex: b2, pageNum: h2 });
                     } catch (e6) {
+                      console.error("滚动到验证失败的子表字段失败，可能是表格组件版本较低没有scrollToCell方法", e6);
                     }
                   }
                 } else {
-                  const e5 = s(n4, l2);
+                  const e5 = s(r4, l2);
                   if (e5 && e5.addRequiredClass) {
                     e5.addRequiredClass();
                     try {
-                      c(n4, l2);
+                      f(r4, l2);
                     } catch (e6) {
+                      console.error("滚动失败", e6);
                     }
                   }
                 }
-                o4(false);
-              } else Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, o4(e4);
-            } else u2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+                i4(false);
+              } else Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, i4(e4);
+            } else u2(new Error(o().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
           }).catch((e5) => {
             u2(e5);
           });
         });
-      }(n3, o3, r3) : function(e4, t2, s2) {
-        return new Promise((n4, r4) => {
+      }(r3, i3, n3) : function(e4, t2, s2) {
+        return new Promise((r4, n4) => {
           w(e4, t2, s2).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);
+            n4(e5);
           });
         });
-      }(n3, o3, r3);
+      }(r3, i3, n3);
     }
     return new Promise((e4, t2) => {
       e4(true);
     });
-  }(r2, f2, d2, e2);
+  }(n2, c2, d2, e2);
 }
 function y(e2) {
   return new Promise((t2, s2) => {
-    const r2 = [], i2 = e2.customValidatorUuids;
-    i2 && i2.forEach((t3) => {
-      const s3 = n(e2, t3);
-      s3 && s3.validator && r2.push(s3.validator());
-    }), r2 && r2.length > 0 ? Promise.all(r2).then((e3) => {
+    const n2 = [], o2 = e2.customValidatorUuids;
+    o2 && o2.forEach((t3) => {
+      const s3 = r(e2, t3);
+      s3 && s3.validator && n2.push(s3.validator());
+    }), n2 && n2.length > 0 ? Promise.all(n2).then((e3) => {
       e3.includes(false) ? t2(false) : t2(true);
     }) : t2(true);
   });
 }
-function w(e2, s2, r2) {
+function w(e2, s2, n2) {
   return new Promise((l2, a2) => {
-    const f2 = JSON.parse(JSON.stringify(e2)), c2 = { ...r2 }, m2 = s2.hiddenNotValidatorCodes;
-    if (c2 && m2 && m2.size > 0 && m2.forEach((e3) => {
-      delete c2[e3];
-    }), c2 && 0 !== Object.keys(c2).length) {
-      if (true === p(f2, c2, null, null, true, s2)) {
+    const c2 = JSON.parse(JSON.stringify(e2)), f2 = { ...n2 }, m2 = s2.hiddenNotValidatorCodes;
+    if (f2 && m2 && m2.size > 0 && m2.forEach((e3) => {
+      delete f2[e3];
+    }), f2 && 0 !== Object.keys(f2).length) {
+      if (true === p(c2, f2, null, null, true, s2)) {
         const e3 = function(e4) {
           var _a;
           if (!e4) return true;
           if (u(e4)) return true;
           const s3 = e4.tableUuids;
           if (!s3) return true;
-          for (let r3 = 0; r3 < s3.length; r3++) {
-            const l3 = s3[r3], o2 = e4.hiddenNotValidatorCodes;
-            if (o2 && o2.size > 0 && o2.has(l3)) continue;
-            const a3 = n(e4, l3);
+          for (let n3 = 0; n3 < s3.length; n3++) {
+            const l3 = s3[n3], i2 = e4.hiddenNotValidatorCodes;
+            if (i2 && i2.size > 0 && i2.has(l3)) continue;
+            const a3 = r(e4, l3);
             if (a3) {
               if (a3.getConfigure()) {
                 const s4 = a3.getConfigure();
                 if ((_a = s4 == null ? void 0 : s4.verification) == null ? void 0 : _a.notEmpty) {
-                  const n2 = a3.getTableData();
-                  if (!n2 || !Array.isArray(n2) || 0 === n2.length) {
+                  const r2 = a3.getTableData();
+                  if (!r2 || !Array.isArray(r2) || 0 === r2.length) {
                     try {
                       d(e4, l3);
                     } catch (e5) {
                     }
-                    return t({ showClose: true, message: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: s4.title ? s4.title : s4.code }), type: "warning" }), false;
+                    return t({ showClose: true, message: o().t("superPageRuntimeMessage.xxxNotEmpty", { label: s4.title ? s4.title : s4.code }), type: "warning" }), false;
                   }
                 }
               }
@@ -213,91 +217,91 @@ function w(e2, s2, r2) {
           const e4 = function(e5) {
             const t2 = [];
             e5.customRuleEvents && e5.customRuleEvents.length > 0 && e5.customRuleEvents.forEach((s3) => {
-              s3.events.forEach((n2) => {
-                const r3 = e5.customEvents[n2];
-                t2.push(r3.apply(r3, [{ prop: s3.prop, pageContext: e5 }]));
+              s3.events.forEach((r2) => {
+                const n3 = e5.customEvents[r2];
+                t2.push(n3.apply(n3, [{ prop: s3.prop, pageContext: e5 }]));
               });
             });
             if (t2 && t2.length > 0) return new Promise((e6, s3) => {
-              const n2 = [], r3 = [];
+              const r2 = [], n3 = [];
               t2.forEach((e7) => {
-                o(e7) ? n2.push(e7) : r3.push(e7);
-              }), r3.includes(false) && e6(false), n2.length > 0 ? Promise.all(n2).then((t3) => {
+                i(e7) ? r2.push(e7) : n3.push(e7);
+              }), n3.includes(false) && e6(false), r2.length > 0 ? Promise.all(r2).then((t3) => {
                 t3.includes(false) ? e6(false) : e6(true);
               }).catch((t3) => {
-                e6(false);
+                console.error(t3), e6(false);
               }) : e6(true);
             });
             return null;
           }(s2);
-          e4 && o(e4) ? e4.then((e5) => {
+          e4 && i(e4) ? e4.then((e5) => {
             e5 ? y(s2).then((e6) => {
               l2(e6);
             }) : l2(false);
           }) : y(s2).then((e5) => {
             l2(e5);
           });
-        } else a2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
-      } else a2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+        } else a2(new Error(o().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
+      } else a2(new Error(o().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
     } else l2(true);
   });
 }
 function R(e2, t2, s2) {
   if (!t2) return s2;
   s2 || (s2 = {});
-  const n2 = u(e2), r2 = Object.keys(t2), i2 = t2;
-  return r2.forEach((e3) => {
+  const r2 = u(e2), n2 = Object.keys(t2), o2 = t2;
+  return n2.forEach((e3) => {
     if ("__subRules" === e3) {
-      const e4 = i2.__subRules;
+      const e4 = o2.__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];
       });
-    } else T(i2[e3]), n2 ? (s2.rules[e3] = i2[e3], s2[e3] && (s2[e3] = i2[e3])) : s2[e3] = i2[e3];
+    } else x(o2[e3]), r2 ? (s2.rules[e3] = o2[e3], s2[e3] && (s2[e3] = o2[e3])) : s2[e3] = o2[e3];
   }), g(s2);
 }
 function v(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], i2 = e2[r2];
-    P(i2), r2.indexOf(".") > 0 ? m(r2, t2, i2) : i2 && i2.length > 0 && (t2[r2] = [...i2]);
+  for (let r2 = 0; r2 < s2.length; r2++) {
+    const n2 = s2[r2], o2 = e2[n2];
+    P(o2), n2.indexOf(".") > 0 ? m(n2, t2, o2) : o2 && o2.length > 0 && (t2[n2] = [...o2]);
   }
   return t2;
 }
 function P(e2, t2) {
   e2.forEach((e3) => {
     e3.message;
-    const t3 = e3.label, s2 = i().t(t3);
-    e3.required && (e3.message = i().t("superPageRuntimeMessage.required", { label: s2 })), e3.myType && (e3.message = i().t("superPageRuntimeMessage.formatMismatch", { label: s2 })), e3.patternType && (e3.message = i().t("superPageRuntimeMessage.formatMismatch", { label: s2 })), void 0 !== e3.max && null !== e3.max && (e3.message = i().t("superPageRuntimeMessage.overMaxLength", { label: s2, value: e3.max })), void 0 !== e3.min && null !== e3.min && (e3.message = i().t("superPageRuntimeMessage.limitMinLength", { label: s2, value: e3.min }));
+    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 }));
   });
 }
 function E(e2) {
-  const t2 = e2.entity.data, s2 = { ...e2.entity.page, ...t2 }, n2 = l(e2), r2 = e2.entity.context, i2 = e2.entity.task;
+  const t2 = e2.entity.data, s2 = { ...e2.entity.page, ...t2 }, r2 = l(e2), n2 = e2.entity.context, o2 = 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 o2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, s2, true, n2, i2, r2);
+  let i2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, s2, true, r2, o2, n2);
   const a2 = e2.customRules;
-  return o2 = R(e2, a2, o2), o2 && (o2.rules || (o2.rules = {}), o2.subRules || (o2.subRules = {})), o2;
+  return i2 = R(e2, a2, i2), i2 && (i2.rules || (i2.rules = {}), i2.subRules || (i2.subRules = {})), i2;
 }
 function k(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] = []);
+    s2 ? r2[t3] = s2 : false === e3.required && (r2[t3] = []);
   }), u(e2)) {
     let t3 = e2.workflowRules ? e2.workflowRules : { rules: {}, subRules: {} };
-    t3 = R(e2, n2, t3), e2.workflowRules = t3;
+    t3 = R(e2, r2, t3), e2.workflowRules = t3;
   } else {
     let t3 = e2.rules ? e2.rules : {};
-    t3 = R(e2, n2, t3), e2.rules = t3;
+    t3 = R(e2, r2, t3), e2.rules = t3;
   }
-  const r2 = t2.filter((e3) => "_all_fields" === e3.name);
-  r2 && r2.length > 0 && O(e2, r2[0]), t2.forEach((t3) => {
+  const n2 = t2.filter((e3) => "_all_fields" === e3.name);
+  n2 && n2.length > 0 && O(e2, n2[0]), t2.forEach((t3) => {
     if ("_all_fields" !== t3.name) {
-      const n3 = s(e2, t3.name);
-      x(e2, n3, t3);
+      const r3 = s(e2, t3.name);
+      T(e2, r3, t3);
     }
   });
 }
@@ -305,37 +309,37 @@ function C(e2) {
   O(e2, { disabled: true });
 }
 function O(e2, t2) {
-  const s2 = r(e2);
-  if (s2) for (const n2 in s2) {
-    const r2 = s2[n2];
-    x(e2, r2 ? r2.value : r2, t2);
+  const s2 = n(e2);
+  if (s2) for (const r2 in s2) {
+    const n2 = s2[r2];
+    T(e2, n2 ? n2.value : n2, t2);
   }
 }
-function j(e2, t2, r2) {
+function j(e2, t2, n2) {
   var _a;
-  let i2, l2;
-  if (r2 ? (i2 = s(e2, r2), l2 = i2 ? i2.getTableUuid() : null) : (l2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, i2 = l2 ? n(e2, l2) : null), !i2) return;
-  const o2 = e2.code, a2 = e2.version, u2 = f(o2, a2, l2);
-  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 o2, l2;
+  if (n2 ? (o2 = s(e2, n2), l2 = o2 ? o2.getTableUuid() : null) : (l2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, o2 = l2 ? r(e2, l2) : null), !o2) return;
+  const i2 = e2.code, a2 = e2.version, u2 = c(i2, a2, l2);
+  if (e2.workflowRules || (e2.workflowRules = { rules: {}, subRules: {} }), e2.workflowRules.subRules || (e2.workflowRules.subRules = {}), e2.workflowRules.subRules[n2] || (e2.workflowRules.subRules[n2] = {}), ((_a = e2.workflowRules) == null ? void 0 : _a.subRules) && e2.workflowRules.subRules[n2]) {
+    const s2 = e2.workflowRules.subRules[n2];
     t2.forEach((e3) => {
       s2[e3.name] = e3;
     });
   }
-  i2.dynamicControlTableEdit(e2, t2, u2);
+  o2.dynamicControlTableEdit(e2, t2, u2);
 }
-function x(e2, t2, s2) {
+function T(e2, t2, s2) {
   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 !== s2.show && (s2.show ? t2.show() : t2.hide()), void 0 !== s2.required && ((_a = r2 == null ? void 0 : r2.runtime) == null ? void 0 : _a.props) && (r2.runtime.props.required = s2.required), void 0 !== s2.readonly && ((_b = r2 == null ? void 0 : r2.runtime) == null ? void 0 : _b.props) && (s2.readonly ? r2.runtime.props.state = "readonly" : r2.runtime.props.state = "enabled"), void 0 !== s2.disabled && r2 && (((_c = r2 == null ? void 0 : r2.runtime) == null ? void 0 : _c.props) && (s2.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, i2 = f(n3, r2, s3), l2 = [{ name: "_all_fields", disabled: true }];
-      t2.dynamicControlTableEdit(e2, l2, i2);
+      const s3 = t2 ? t2.getTableUuid() : null, r3 = e2.code, n2 = e2.version, o2 = c(r3, n2, s3), l2 = [{ name: "_all_fields", disabled: true }];
+      t2.dynamicControlTableEdit(e2, l2, o2);
     }
   }
 }
-function T(e2) {
+function x(e2) {
   if (!(e2 == null ? void 0 : e2.type)) return;
   const t2 = N[e2.type];
   t2 && (e2.validator = t2.validator);
@@ -344,8 +348,8 @@ const N = { boolean: { validator: function(e2, t2, s2) {
   return true === M(e2, t2) && ("number" == typeof t2 && (1 === t2 || 0 === t2) || "boolean" == typeof t2 && (true === t2 || false === t2));
 } }, date: { validator: function(e2, t2, s2) {
   if (true !== M(e2, t2)) return false;
-  const n2 = new Date(t2);
-  return !isNaN(n2.getTime());
+  const r2 = new Date(t2);
+  return !isNaN(r2.getTime());
 } }, number: { validator: function(e2, t2, s2) {
   return true === M(e2, t2) && (("string" != typeof t2 || "" !== t2.trim()) && ("number" == typeof t2 || !isNaN(Number(t2))));
 } } }, M = (e2, t2) => null != t2 && "" !== t2 || !e2.required;
@@ -356,7 +360,7 @@ export {
   P as i18nValidatePropRulesMessage,
   v as i18nValidateRulesMessage,
   R as packageCustomRules,
-  T as packageCustomValidator,
+  x as packageCustomValidator,
   m as setObjectPropRule,
   k as updateFormItemEditState,
   h as validateDataModelFunc,

package/dist/es/components/runtime/utils/form/scan-util.js

@@ -44,8 +44,9 @@ function analysisScanValue(scanValue, scanRuleSets) {
     }
     let res = false;
     if (validStr) try {
-      res = eval("(" + validStr + ")");
+      console.log("validStr", validStr), res = eval("(" + validStr + ")"), console.log("res", res);
     } catch (e) {
+      console.log(e);
     }
     else res = true;
     if (res) return executeAnalysisForScan(scanValue, scanSet);
@@ -62,11 +63,11 @@ function executeAnalysisForScan(e, t) {
       let n = e;
       if (t2.splitChar && t2.splitNum) {
         const a3 = (t2.splitChar, t2.splitChar), s2 = e.split(a3), l = t2.splitNum < 1 ? 1 : t2.splitNum;
-        n = l <= s2.length ? s2[l - 1] : "";
+        console.log(n, a3, s2, l), n = l <= s2.length ? s2[l - 1] : "";
       }
       if (t2.splitChar2 && t2.splitNum2) {
         const e2 = (t2.splitChar2, t2.splitChar2), a3 = n.split(e2), s2 = t2.splitNum2 < 1 ? 1 : t2.splitNum2;
-        n = s2 <= a3.length ? a3[s2 - 1] : "";
+        console.log(n, e2, a3, s2), n = s2 <= a3.length ? a3[s2 - 1] : "";
       }
       if (n.length > 0) {
         const e2 = _getScanIndexs(n, t2.startIndex, t2.endIndex), a3 = e2[0], s2 = e2[1];