super-page-runtime 2.3.43-sit2 → 2.3.43

package/dist/es/components/runtime/utils/events/standard-event.js

@@ -11,7 +11,7 @@ import { setStoreInfo as v } from "../store-util.js";
 import { getPermissionCodes as I, getDefaultValue as S, getModelFields as R } from "../page-init-util.js";
 import { caculateShowCondition as M, updateChartDatasources as x, getVariableValue as N, setVariableValue as O } from "../page-helper-util.js";
 import A from "./print-label.js";
-import { getTableNameByTableUuid as E, getCurrentUserFileTasks as U, setFileTaskRead as _ } from "../table-utils.js";
+import { getTableNameByTableUuid as U, getCurrentUserFileTasks as E, setFileTaskRead as _ } from "../table-utils.js";
 import { getWorkflowRules as j, packageCustomRules as D } from "./validator-util.js";
 import { functions as W } from "../api/page-expose-util.js";
 import { usePageContextStore as L } from "../page-store.js";
@@ -51,7 +51,7 @@ const Y = { save: function(e2) {
       if (!a2 || 0 === a2.length) return u({ showClose: true, type: "warning", message: l().t("superPageRuntimeMessage.pleaseSelectRecord") }), void s2(true);
       p.confirm(l().t("superPageRuntimeMessage.whetherToConfirmDeletion"), l().t("superPageRuntimeMessage.tips"), { confirmButtonText: l().t("superPageRuntimeMessage.sure"), cancelButtonText: l().t("superPageRuntimeMessage.cancel"), type: "warning" }).then(() => {
         var _a, _b, _c;
-        const r2 = e3.pageContext, l2 = e3.configureObj, u2 = l2.props.base, p2 = r2.systemCode, d2 = r2.backendUrl, m2 = l2.props.base.tableUuid ? l2.props.base.tableUuid : e3.tableUuid, f2 = E(r2, m2);
+        const r2 = e3.pageContext, l2 = e3.configureObj, u2 = l2.props.base, p2 = r2.systemCode, d2 = r2.backendUrl, m2 = l2.props.base.tableUuid ? l2.props.base.tableUuid : e3.tableUuid, f2 = U(r2, m2);
         let g2 = t(d2, r2.isTest) + "/dsc/commons/" + f2;
         g2 = n(g2, p2, d2, r2.isTest);
         const C2 = void 0 === u2.isPermission || "true" === u2.isPermission || u2.isPermission, b2 = o(r2), T2 = I(l2, r2), k2 = { ids: a2, functionCode: T2, isPermission: C2 + "", systemCode: p2, isWorkflowEntity: b2, listCodesMap: r2.listCodesMap, pageCode: r2.code, pageVersion: r2.version };
@@ -286,7 +286,8 @@ const Y = { save: function(e2) {
     let t2 = null;
     try {
       if (t2 = e3.menuItem ? e3.menuItem.templateUuid : e3.configureObj.props.base.template[0].templateUuid, !t2) throw new Error("未找到模板");
-    } catch (e4) {
+    } catch (t3) {
+      console.error("打印标签失败，未在配置中找到找到模板", t3, e3);
     }
     A.printLabel(e3, t2);
   }(e2);
@@ -480,11 +481,10 @@ function oe(t2, n2, o2, s2, i2) {
     let i3 = n3.props.base.successOperation;
     const a3 = n3.props.base.isNeedValueMapping, r2 = y(t3, n3);
     i3 || ce.includes(n3.name) || (i3 = "refresh");
-    if ("refresh" === i3) {
-      if (r2) {
-        w(t3, r2).refresh();
-      }
-    } else if ("closeWindow" === i3 || "closeWindowAndRefresh" === i3) {
+    if ("refresh" === i3) if (r2) {
+      w(t3, r2).refresh();
+    } else console.error("tableUuid is empty");
+    else if ("closeWindow" === i3 || "closeWindowAndRefresh" === i3) {
       const s4 = e(t3.entity.page);
       let i4 = o3;
       i4 || (i4 = {}), Object.assign(s4, i4), ae(t3, n3, s4, a3);
@@ -518,7 +518,7 @@ function ie(e2, t2, n2) {
   const o2 = t2.props.base.successOperation;
   if (!o2 || null === o2) return;
   const s2 = t2.props.base.isNeedValueMapping;
-  "noOperation" === o2 ? e2.canClick = true : "refresh" === o2 ? n2 && (n2.id || n2.ID) ? Ue(e2, n2.ID ? n2.ID : n2.id) : e2.canClick = true : "closeWindow" !== o2 && "closeWindowAndRefresh" !== o2 || (ae(e2, t2, n2, s2), e2.canClick = true);
+  "noOperation" === o2 ? e2.canClick = true : "refresh" === o2 ? n2 && (n2.id || n2.ID) ? Ee(e2, n2.ID ? n2.ID : n2.id) : e2.canClick = true : "closeWindow" !== o2 && "closeWindowAndRefresh" !== o2 || (ae(e2, t2, n2, s2), e2.canClick = true);
 }
 function ae(e2, t2, n2, o2) {
   const s2 = e2.entity && e2.entity.request ? e2.entity.request.jumpMode : null;
@@ -556,10 +556,10 @@ function le(e2, t2, n2, o2) {
       const n3 = y(e2, t2);
       if (n3) {
         w(e2, n3).refresh();
-      }
+      } else console.error("tableUuid is empty");
     } else if (i2 && "form" === i2) {
       const t3 = e2.entity.data;
-      Ue(e2, t3.ID ? t3.ID : t3.id);
+      Ee(e2, t3.ID ? t3.ID : t3.id);
     }
   }
 }
@@ -573,7 +573,7 @@ function ue(e2, o2, s2, i2) {
     let T2 = d2.tableName;
     if (o2) {
       const t2 = m2.props.base.tableUuid ? m2.props.base.tableUuid : e2.tableUuid;
-      T2 = E(d2, t2);
+      T2 = U(d2, t2);
     } else $(d2.code, d2.entity.data);
     const k2 = function(e3, o3, s3, i3, r3, u3, d3, m3, f3) {
       return new Promise((g3, C3) => {
@@ -601,7 +601,7 @@ function ue(e2, o2, s2, i2) {
 }
 function pe(e2, s2) {
   var _a, _b, _c;
-  const i2 = e2.pageContext, a2 = e2.configureObj, r2 = e2.tableConfigure, p2 = a2.props.base, d2 = a2.props.base.tableUuid ? a2.props.base.tableUuid : e2.tableUuid, m2 = E(i2, d2), f2 = new FormData();
+  const i2 = e2.pageContext, a2 = e2.configureObj, r2 = e2.tableConfigure, p2 = a2.props.base, d2 = a2.props.base.tableUuid ? a2.props.base.tableUuid : e2.tableUuid, m2 = U(i2, d2), f2 = new FormData();
   f2.append("multipartFile", s2), m2 && f2.append("tableName", m2);
   const g2 = (_b = (_a = a2.runtime) == null ? void 0 : _a.props) == null ? void 0 : _b.title;
   g2 && f2.append("currentOperation", g2), f2.append("isMobile", B()), i2.importBeanName && f2.append("importBeanName", i2.importBeanName), i2.beanName && f2.append("beanName", i2.beanName);
@@ -661,7 +661,7 @@ function me(e2) {
   const p2 = (_a = n2.props.base) == null ? void 0 : _a.logSetting;
   p2 && (c2.logSettingText = p2.join("")), c2.systemCode || (c2.systemCode = i2);
   const d2 = ke(t2);
-  c2.additionalParamMap = d2, d2.ids && d2.ids.length > 0 && ("string" == typeof d2.ids ? c2.ids = d2.ids.split(",") : Array.isArray(d2.ids) ? c2.ids = d2.ids : "number" == typeof ids && (c2.ids = [d2.ids]));
+  c2.additionalParamMap = d2, d2.ids && d2.ids.length > 0 && ("string" == typeof d2.ids ? c2.ids = d2.ids.split(",") : Array.isArray(d2.ids) ? c2.ids = d2.ids : "number" == typeof ids ? c2.ids = [d2.ids] : console.error("ids参数类型错误"));
   const m2 = n2.props.base.successOperation;
   m2 && "noOperation" === m2 && (c2.unControlVersion = true), c2.isWorkflowEntity = true;
   const f2 = (_c = (_b = n2.runtime) == null ? void 0 : _b.props) == null ? void 0 : _c.title;
@@ -993,7 +993,7 @@ function Ae(e2, t2, n2, o2, s2, i2) {
     const o3 = m(), s3 = o3 ? o3.loginName : null;
     if ("EXTRACT" === (e3 == null ? void 0 : e3.processState) && n3 && (n3.creator === s3 || n3.CREATOR === s3)) return true;
     return false;
-  }(n2, 0, i2) : "approveExtractWorkflow" === t2 || "refuseExtractWorkflow" === t2 ? a2 = Ee(n2) : "addTransactor" === t2 || "removeTransactor" === t2 ? a2 = function(e3) {
+  }(n2, 0, i2) : "approveExtractWorkflow" === t2 || "refuseExtractWorkflow" === t2 ? a2 = Ue(n2) : "addTransactor" === t2 || "removeTransactor" === t2 ? a2 = function(e3) {
     if (e3.processState && "SUBMIT" === e3.processState && ("WAIT_TRANSACT" === e3.active || "DRAW_WAIT" === e3.active) && "COUNTERSIGN" !== e3.processingMode) return true;
     return false;
   }(n2) : function(e3, t3) {
@@ -1022,12 +1022,12 @@ function Ae(e2, t2, n2, o2, s2, i2) {
       e2.workflowOpinion.isRequired = t3, t3 && (e2.workflowOpinion.showOpinionBox = true);
     }
   }
-  return a2;
+  return e2.workflowOpinion, a2;
 }
-function Ee(e2, t2, n2) {
+function Ue(e2, t2, n2) {
   return !(!e2.processState || "EXTRACT" !== e2.processState || "WAIT_TRANSACT" !== e2.active);
 }
-function Ue(e2, t2) {
+function Ee(e2, t2) {
   e2.entity.page || (e2.entity.page = {}), e2.entity.page._isRefresh = true, _e(e2, t2).then((t3) => {
     e2.isRefresh = true;
   });
@@ -1043,7 +1043,7 @@ function _e(e2, n2, s2) {
         let d2 = n3 || null, m2 = n3 ? [n3] : null;
         void 0 === o2 || o2 ? (d2 || (d2 = p2 && p2.id ? p2.id : null), m2 || (m2 = p2 ? p2.ids : null)) : (d2 = null, m2 = null, p2._id = p2.id, p2.id = null);
         const f2 = p2 ? p2.taskId : null, C2 = l2, b2 = { pageCode: l2, pageVersion: u2, tableName: e3.tableName, formNoRuleCode: e3.formNoRuleCode, isWorkflowEntity: true, systemCode: a2, functionCode: C2 + ".workflowGets", listCodesMap: e3.listCodesMap, listCodesInitSearchForm: e3.listCodesInitSearchForm };
-        if ((!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
+        if (e3.listCodesMap, (!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
           const t2 = {};
           e3.tableUuids.forEach((e4) => {
             const n4 = r(l2, u2, e4);
@@ -1100,7 +1100,7 @@ function _e(e2, n2, s2) {
         let d2 = n3 || null, m2 = n3 ? [n3] : null;
         void 0 === o2 || o2 ? (d2 || (d2 = p2 && p2.id ? p2.id : null), m2 || (m2 = p2 ? p2.ids : null)) : (d2 = null, m2 = null, p2._id = p2.id, p2.id = null);
         const f2 = p2 ? p2.taskId : null, C2 = l2, b2 = t(e3.backendUrl, e3.isTest), w2 = { pageCode: l2, pageVersion: u2, tableName: e3.tableName, formNoRuleCode: e3.formNoRuleCode, id: d2, systemCode: a2, functionCode: C2 + ".gets", listCodesMap: e3.listCodesMap, listCodesInitSearchForm: e3.listCodesInitSearchForm };
-        if (!w2.id && p2 && p2._t_ && g(p2._t_ + "_id") && (w2.id = g(p2._t_ + "_id")), m2 && (w2.ids = De(m2)), e3.notIdInitializationList && (w2.noIdAndTaskIdInitSetting = JSON.stringify(e3.notIdInitializationList)), p2 && (w2.additionalParamMap = p2), e3.beanName && (w2.beanName = e3.beanName), f2 && (w2.taskId = f2), ((_a = e3.props) == null ? void 0 : _a.enableFormDataPermission) && (w2.withDataPermission = true), (!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
+        if (!w2.id && p2 && p2._t_ && g(p2._t_ + "_id") && (w2.id = g(p2._t_ + "_id")), m2 && (w2.ids = De(m2)), e3.notIdInitializationList && (w2.noIdAndTaskIdInitSetting = JSON.stringify(e3.notIdInitializationList)), p2 && (w2.additionalParamMap = p2), e3.beanName && (w2.beanName = e3.beanName), f2 && (w2.taskId = f2), ((_a = e3.props) == null ? void 0 : _a.enableFormDataPermission) && (w2.withDataPermission = true), e3.listCodesMap, (!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
           const t2 = {};
           e3.tableUuids.forEach((e4) => {
             const n4 = r(l2, u2, e4);
@@ -1179,7 +1179,7 @@ function qe(e2, t2, n2) {
   }, 3e3));
 }
 function He(e2, t2) {
-  return U(e2, t2);
+  return E(e2, t2);
 }
 function Ge(e2, t2, n2, o2) {
   _(e2, n2).then(() => {
@@ -1217,7 +1217,7 @@ export {
   de as judgeDataNumber,
   Be as listChartConditions,
   le as refreshFormOrListPage,
-  Ue as refreshPage,
+  Ee as refreshPage,
   Le as saveChartConditionBase,
   Y as standardEvents,
   re as updateValuesWhenCloseDialog

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 i } from "agilebuilder-ui/src/utils/util";
-import { getAdditionalParamMap as o } from "./standard-event.js";
+import { getI18n as o } from "agilebuilder-ui/src/utils/util";
+import { getAdditionalParamMap as i } 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 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";
 const m = ["downloadTemplate", "back", "exportForm", "exportPDF", "lineEditCreate", "workflowSave"];
 function p(e2, t2 = /* @__PURE__ */ new WeakMap()) {
   if ("function" == typeof structuredClone) try {
@@ -45,32 +45,32 @@ function g(e2, t2, s2) {
   const n2 = {};
   t2 || (t2 = {});
   let r2 = 0;
-  const i2 = e2.split(".");
-  return i2.forEach((e3) => {
-    let o2;
-    if (r2 === i2.length - 1) o2 = function(e4, t3, s3) {
+  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;
       }
       return n3;
-    }(n2, i2, e3), o2.fields[e3] = s2;
+    }(n2, o2, e3), i2.fields[e3] = s2;
     else {
       let s3;
-      0 === r2 ? o2 = t2 : (s3 = function(e4, t3, s4) {
+      0 === r2 ? i2 = 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;
+          const o3 = t3[r3];
+          if (n3 = 0 === r3 ? e4[o3] : n3.fields[t3[r3]], o3 === s4) break;
         }
         return n3;
-      }(n2, i2, i2[r2 - 1]), o2 = s3.fields), o2[e3] || (o2[e3] = { type: "object", required: true, fields: {} }), 0 === r2 ? n2[e3] = o2[e3] : s3.fields[e3] = o2[e3];
+      }(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];
     }
     r2++;
   }), n2;
 }
-function h(e2, t2, s2, n2, r2, i2) {
-  return y(e2, t2, s2, n2, true, r2, i2);
+function h(e2, t2, s2, n2, r2, o2) {
+  return y(e2, t2, s2, n2, true, r2, o2);
 }
 function b(e2) {
   if (e2) return Object.keys(e2).forEach((t2) => {
@@ -80,11 +80,11 @@ function b(e2) {
     }
   }), e2;
 }
-function y(n2, r2, o2, l2, a2, u2, f2) {
+function y(n2, r2, i2, l2, a2, u2, c2) {
   var _a;
   let d2 = b(r2);
-  if (r2 && null !== r2 || !o2 || (d2 = {}), !d2 || 0 === Object.keys(d2).length) return n2.validateErrorField = "", true;
-  const m2 = ((_a = f2.props) == null ? void 0 : _a.highlightAllRequiredField) || false;
+  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 p2;
   return new e(d2).validate(n2, { first: !m2 }, (e2, g2) => {
     if (m2) {
@@ -94,27 +94,28 @@ function y(n2, r2, o2, l2, a2, u2, f2) {
           const s2 = JSON.parse(JSON.stringify(n2));
           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, o2, l2, false, u2, f2);
+          }), p2 = y(s2, r2, i2, l2, false, u2, c2);
         }
       }
-      true !== p2 && t({ showClose: true, message: i().t("superPageRuntimeMessage.pleaseInputRequiredInfo"), type: "warning" });
+      true !== p2 && t({ showClose: true, message: o().t("superPageRuntimeMessage.pleaseInputRequiredInfo"), type: "warning" });
     } else {
-      let i2;
+      let o2;
       if (e2) {
-        p2 = e2[0].message, i2 = e2[0].field, t({ message: p2, showClose: true, type: "warning", duration: 3e3 });
-        const n3 = s(f2, i2);
+        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();
           try {
-            c(f2, i2);
+            f(c2, o2);
           } catch (e3) {
+            console.error("滚动失败", e3);
           }
         }
       } else p2 = true;
-      if (i2 && true === a2) {
-        if (/[A-Z]+/.test(i2) && void 0 !== n2[i2.toLowerCase()]) {
+      if (o2 && true === a2) {
+        if (/[A-Z]+/.test(o2) && void 0 !== n2[o2.toLowerCase()]) {
           const e3 = JSON.parse(JSON.stringify(n2));
-          e3[i2.toUpperCase()] = n2[i2.toLowerCase()], delete e3[i2.toLowerCase()], p2 = y(e3, r2, o2, l2, false, u2, f2);
+          e3[o2.toUpperCase()] = n2[o2.toLowerCase()], delete e3[o2.toLowerCase()], p2 = y(e3, r2, i2, l2, false, u2, c2);
         }
       }
     }
@@ -126,16 +127,16 @@ function w(e2, n2, r2, l2) {
       e3(true);
     });
   }
-  const f2 = e2.entity.data, c2 = { ...e2.entity.page, ...f2 }, d2 = e2.rules, m2 = n2.props.base ? n2.props.base.isEnableRequired : null;
+  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) {
     if (e3) {
       return u(l3) ? function(e4, n4, r4) {
         return new Promise((l4, u2) => {
           var _a;
-          const f3 = o(n4), c3 = n4.entity.context, d3 = n4.entity.task, m3 = true, g2 = n4.subTablePageInfo, h2 = ((_a = n4.props) == null ? void 0 : _a.highlightAllRequiredField) || false;
+          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 o2 = r5;
+              let i2 = r5;
               const u3 = n4.workflowRules;
               let b2 = null, y2 = null;
               if (u3) {
@@ -143,19 +144,19 @@ function w(e2, n2, r2, l2) {
                   var _a2, _b, _c, _d;
                   if (!e5.actionPermissions) return true;
                   const r7 = Object.keys(e5.actionPermissions);
-                  for (let o3 = 0; o3 < r7.length; o3++) {
-                    const l5 = r7[o3], u4 = e5.actionPermissions[l5];
+                  for (let i3 = 0; i3 < r7.length; i3++) {
+                    const l5 = r7[i3], 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 o4 = r9.getConfigure();
+                        const i4 = r9.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;
                         }
-                        return t({ showClose: true, message: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: o4.title ? o4.title : l5 }), type: "warning" }), false;
+                        return t({ showClose: true, message: o().t("superPageRuntimeMessage.xxxNotEmpty", { label: i4.title ? i4.title : l5 }), type: "warning" }), false;
                       }
                     }
                   }
@@ -169,10 +170,10 @@ function w(e2, n2, r2, l2) {
                   });
                   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, f3, d3, c3, g2, r6, { returnAllErrors: h2 }), o2 = y2 && Array.isArray(y2) ? 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 ? (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(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+                }(u3, n4.hiddenNotValidatorCodes), y2 = window.$vueApp.config.globalProperties.$formValidator(e4, b2, m3, c3, d3, f3, g2, r6, { returnAllErrors: h2 }), i2 = y2 && Array.isArray(y2) ? 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);
           }).catch((e5) => {
             u2(e5);
           });
@@ -193,7 +194,7 @@ function w(e2, n2, r2, l2) {
     return new Promise((e4, t2) => {
       e4(true);
     });
-  }(l2, c2, d2, e2);
+  }(l2, f2, d2, e2);
 }
 function R(e2, t2) {
   if (t2.listCode) {
@@ -209,24 +210,26 @@ function C(e2, t2) {
 }
 function E(e2, t2) {
   try {
-    c(e2, t2.listCode);
+    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 });
   } catch (e3) {
+    console.error("滚动到验证失败的子表字段失败，可能是表格组件版本较低没有scrollToCell方法", e3);
   }
 }
 function v(e2, t2) {
   try {
-    c(e2, t2);
+    f(e2, t2);
   } catch (e3) {
+    console.error("滚动失败", e3);
   }
 }
 function P(e2, t2) {
   let n2 = null, r2 = 1 / 0;
   return t2.forEach((t3) => {
-    const i2 = t3.listCode || t3.field;
-    if (!i2) return;
-    const o2 = s(e2, i2), l2 = (o2 == null ? void 0 : o2.$el) || o2;
+    const o2 = t3.listCode || t3.field;
+    if (!o2) return;
+    const i2 = s(e2, o2), l2 = (i2 == null ? void 0 : i2.$el) || i2;
     if (l2 == null ? void 0 : l2.getBoundingClientRect) {
       const e3 = l2.getBoundingClientRect();
       e3.top < r2 && (r2 = e3.top, n2 = t3);
@@ -238,8 +241,8 @@ function k(e2, t2) {
 }
 function O(e2) {
   return new Promise((t2, s2) => {
-    const r2 = [], i2 = e2.customValidatorUuids;
-    i2 && i2.forEach((t3) => {
+    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) => {
@@ -250,13 +253,13 @@ function O(e2) {
 function x(e2, t2, s2) {
   return new Promise((n2, r2) => {
     var _a;
-    const o2 = JSON.parse(JSON.stringify(e2)), a2 = p(s2), u2 = t2.hiddenNotValidatorCodes;
+    const i2 = JSON.parse(JSON.stringify(e2)), a2 = p(s2), u2 = t2.hiddenNotValidatorCodes;
     if (a2 && u2 && u2.size > 0 && u2.forEach((e3) => {
       delete a2[e3];
     }), a2 && 0 !== Object.keys(a2).length) {
-      const e3 = h(o2, a2, null, null, true, t2);
+      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 === T(t2)) {
+        if (true === M(t2)) {
           const e4 = q(t2);
           e4 && l(e4) ? e4.then((e5) => {
             e5 ? O(t2).then((e6) => {
@@ -265,10 +268,10 @@ function x(e2, t2, s2) {
           }) : O(t2).then((e5) => {
             n2(e5);
           });
-        } else r2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
-      } else r2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+        } else r2(new Error(o().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
+      } else r2(new Error(o().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
     } else {
-      if (true === T(t2)) {
+      if (true === M(t2)) {
         const e3 = q(t2);
         e3 && l(e3) ? e3.then((e4) => {
           e4 ? O(t2).then((e5) => {
@@ -277,33 +280,33 @@ function x(e2, t2, s2) {
         }) : O(t2).then((e4) => {
           n2(e4);
         });
-      } else r2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
+      } else r2(new Error(o().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
     }
   });
 }
-function M(e2, t2, s2) {
+function T(e2, t2, s2) {
   if (!t2) return s2;
   s2 || (s2 = {});
-  const n2 = u(e2), r2 = Object.keys(t2), i2 = t2;
+  const n2 = u(e2), r2 = Object.keys(t2), o2 = t2;
   return r2.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 _(i2[e3]), n2 ? (s2.rules[e3] = i2[e3], s2[e3] && (s2[e3] = i2[e3])) : s2[e3] = i2[e3];
+    } else _(o2[e3]), n2 ? (s2.rules[e3] = o2[e3], s2[e3] && (s2[e3] = o2[e3])) : s2[e3] = o2[e3];
   }), b(s2);
 }
-function T(e2) {
+function M(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 o2 = s2[r2], l2 = e2.hiddenNotValidatorCodes;
-    if (l2 && l2.size > 0 && l2.has(o2)) continue;
-    const a2 = n(e2, o2);
+    const i2 = s2[r2], l2 = e2.hiddenNotValidatorCodes;
+    if (l2 && l2.size > 0 && l2.has(i2)) continue;
+    const a2 = n(e2, i2);
     if (a2) {
       if (a2.getConfigure()) {
         const s3 = a2.getConfigure();
@@ -311,16 +314,16 @@ function T(e2) {
           const n2 = a2.getTableData();
           if (!n2 || !Array.isArray(n2) || 0 === n2.length) {
             try {
-              d(e2, o2);
+              d(e2, i2);
             } catch (e3) {
             }
-            return t({ showClose: true, message: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: s3.title ? s3.title : s3.code }), type: "warning" }), false;
+            return t({ showClose: true, message: o().t("superPageRuntimeMessage.xxxNotEmpty", { label: s3.title ? s3.title : s3.code }), type: "warning" }), false;
           }
         }
       }
       if (false === a2.validatorSunTableListData()) {
         try {
-          d(e2, o2);
+          d(e2, i2);
         } catch (e3) {
         }
         return false;
@@ -333,26 +336,26 @@ function j(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];
-    N(i2), r2.indexOf(".") > 0 ? g(r2, t2, i2) : i2 && i2.length > 0 && (t2[r2] = [...i2]);
+    const r2 = s2[n2], o2 = e2[r2];
+    N(o2), r2.indexOf(".") > 0 ? g(r2, t2, o2) : o2 && o2.length > 0 && (t2[r2] = [...o2]);
   }
   return t2;
 }
 function N(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 A(e2) {
-  const t2 = e2.entity.data, s2 = { ...e2.entity.page, ...t2 }, n2 = o(e2), r2 = e2.entity.context, i2 = e2.entity.task;
+  const t2 = e2.entity.data, s2 = { ...e2.entity.page, ...t2 }, n2 = i(e2), r2 = 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 l2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, s2, true, n2, i2, r2);
+  let l2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, s2, true, n2, o2, r2);
   const a2 = e2.customRules;
-  return l2 = M(e2, a2, l2), l2 && (l2.rules || (l2.rules = {}), l2.subRules || (l2.subRules = {})), l2;
+  return l2 = T(e2, a2, l2), l2 && (l2.rules || (l2.rules = {}), l2.subRules || (l2.subRules = {})), l2;
 }
 function q(e2) {
   const t2 = [];
@@ -368,7 +371,7 @@ function q(e2) {
     }), r2.includes(false) && e3(false), n2.length > 0 ? Promise.all(n2).then((t3) => {
       t3.includes(false) ? e3(false) : e3(true);
     }).catch((t3) => {
-      e3(false);
+      console.error(t3), e3(false);
     }) : e3(true);
   }) : null;
 }
@@ -380,10 +383,10 @@ function S(e2, t2) {
     s2 ? n2[t3] = s2 : false === e3.required && (n2[t3] = []);
   }), u(e2)) {
     let t3 = e2.workflowRules ? e2.workflowRules : { rules: {}, subRules: {} };
-    t3 = M(e2, n2, t3), e2.workflowRules = t3;
+    t3 = T(e2, n2, t3), e2.workflowRules = t3;
   } else {
     let t3 = e2.rules ? e2.rules : {};
-    t3 = M(e2, n2, t3), e2.rules = t3;
+    t3 = T(e2, n2, t3), e2.rules = t3;
   }
   const r2 = t2.filter((e3) => "_all_fields" === e3.name);
   r2 && r2.length > 0 && L(e2, r2[0]), t2.forEach((t3) => {
@@ -405,16 +408,16 @@ function L(e2, t2) {
 }
 function V(e2, t2, r2) {
   var _a;
-  let i2, o2;
-  if (r2 ? (i2 = s(e2, r2), o2 = i2 ? i2.getTableUuid() : null) : (o2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, i2 = o2 ? n(e2, o2) : null), !i2) return;
-  const l2 = e2.code, a2 = e2.version, u2 = f(l2, a2, o2);
+  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];
     t2.forEach((e3) => {
       s2[e3.name] = e3;
     });
   }
-  i2.dynamicControlTableEdit(e2, t2, u2);
+  o2.dynamicControlTableEdit(e2, t2, u2);
 }
 function D(e2, t2, s2) {
   var _a, _b, _c;
@@ -422,8 +425,8 @@ function D(e2, t2, s2) {
     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)) {
       t2.changeOperationAddState(false);
-      const s3 = t2 ? t2.getTableUuid() : null, n3 = e2.code, r2 = e2.version, i2 = f(n3, r2, s3), o2 = [{ name: "_all_fields", disabled: true }];
-      t2.dynamicControlTableEdit(e2, o2, i2);
+      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);
     }
   }
 }
@@ -451,7 +454,7 @@ export {
   N as i18nValidatePropRulesMessage,
   j as i18nValidateRulesMessage,
   J as isNotNeedValidateRequired,
-  M as packageCustomRules,
+  T as packageCustomRules,
   _ as packageCustomValidator,
   g as setObjectPropRule,
   S as updateFormItemEditState,