super-page-runtime 2.3.36 → 2.3.37-sit1

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

@@ -8,8 +8,8 @@ import T from "../eventBus.js";
 import k from "axios";
 import { handleEvent as h, getTableUuid as y, doAfterClickEvent as P } from "./event-util.js";
 import { setStoreInfo as I } from "../store-util.js";
-import { getPermissionCodes as v, getDefaultValue as R, getModelFields as x } from "../page-init-util.js";
-import { caculateShowCondition as S, updateChartDatasources as M, getVariableValue as N, setVariableValue as O } from "../page-helper-util.js";
+import { getPermissionCodes as v, getDefaultValue as R, getModelFields as S } from "../page-init-util.js";
+import { caculateShowCondition as M, updateChartDatasources as x, getVariableValue as N, setVariableValue as O } from "../page-helper-util.js";
 import U from "./print-label.js";
 import { getTableNameByTableUuid as A, getCurrentUserFileTasks as E, setFileTaskRead as _ } from "../table-utils.js";
 import { getWorkflowRules as j, packageCustomRules as D } from "./validator-util.js";
@@ -155,7 +155,7 @@ const Y = { save: function(e2) {
       if (a2.fileuploadInfo && a2.fileuploadInfo.length > 0) {
         const e4 = a2.fileuploadInfo[0];
         let t2;
-        e4.isTable && e4.tableTitle && void 0 !== e4.rowIndex ? (e4.rowIndex, e4.rowIndex, t2 = l().t("superPageRuntimeMessage.fileUploadUnCompleteTable", { label: e4.label, tableTitle: e4.tableTitle, rowIndex: e4.rowIndex + 1 })) : t2 = l().t("superPageRuntimeMessage.fileUploadUnComplete", { label: e4.label }), u({ message: t2, type: "warning", showClose: true }), o2(false);
+        t2 = e4.isTable && e4.tableTitle && void 0 !== e4.rowIndex ? l().t("superPageRuntimeMessage.fileUploadUnCompleteTable", { label: e4.label, tableTitle: e4.tableTitle, rowIndex: e4.rowIndex + 1 }) : l().t("superPageRuntimeMessage.fileUploadUnComplete", { label: e4.label }), u({ message: t2, type: "warning", showClose: true }), o2(false);
       } else {
         let d2 = t(p2, a2.isTest) + "/dsc/workflow-commons/start";
         if (d2 = n(d2, r2, p2, a2.isTest), !d2) return void u({ showClose: true, type: "warning", message: l().t("superPageRuntimeMessage.requestPathEmpty") });
@@ -177,7 +177,7 @@ const Y = { save: function(e2) {
       if (a2.fileuploadInfo && a2.fileuploadInfo.length > 0) {
         const e4 = a2.fileuploadInfo[0];
         let t2;
-        e4.isTable && e4.tableTitle && void 0 !== e4.rowIndex ? (e4.rowIndex, e4.rowIndex, t2 = l().t("superPageRuntimeMessage.fileUploadUnCompleteTable", { label: e4.label, tableTitle: e4.tableTitle, rowIndex: e4.rowIndex + 1 })) : t2 = l().t("superPageRuntimeMessage.fileUploadUnComplete", { label: e4.label }), u({ message: t2, type: "warning", showClose: true }), o2(false);
+        t2 = e4.isTable && e4.tableTitle && void 0 !== e4.rowIndex ? l().t("superPageRuntimeMessage.fileUploadUnCompleteTable", { label: e4.label, tableTitle: e4.tableTitle, rowIndex: e4.rowIndex + 1 }) : l().t("superPageRuntimeMessage.fileUploadUnComplete", { label: e4.label }), u({ message: t2, type: "warning", showClose: true }), o2(false);
       } else {
         const i2 = a2.systemCode, r2 = a2.backendUrl;
         let p2 = t(r2, a2.isTest) + "/dsc/workflow-commons/submit";
@@ -291,8 +291,7 @@ 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 (t3) {
-      console.error("打印标签失败，未在配置中找到找到模板", t3, e3);
+    } catch (e4) {
     }
     U.printLabel(e3, t2);
   }(e2);
@@ -361,7 +360,7 @@ function z(e2) {
   let s2 = null;
   o2 && o2.runtime && (s2 = o2.runtime.props);
   const a2 = s2 ? s2.state : void 0;
-  s2 && (s2.state = "disabled"), M(t2, n2, void 0, e2.isInitChart).then(() => {
+  s2 && (s2.state = "disabled"), x(t2, n2, void 0, e2.isInitChart).then(() => {
     s2 && (s2.state = a2);
   }).catch(() => {
     s2 && (s2.state = a2);
@@ -462,7 +461,7 @@ function ee(e2, o2, s2, a2, i2, r2, l2, u2) {
     let u3, p3 = l3 + a3;
     p3 = n(p3, e3, o3, r3), u3 = i3 && (i3.id || i3.ID) ? c.put(p3, s3) : c.post(p3, s3);
     return u3;
-  }(p2, d2, m2, s2, e2.entity.data, e2.isTest);
+  }(p2, d2, m2, s2, l2, e2.isTest);
 }
 function te(e2, t2, n2, o2, s2, a2) {
   return ee(e2, t2, n2, o2, s2, a2, null, null);
@@ -473,10 +472,11 @@ function ne(t2, n2, o2, s2, a2) {
     let a3 = n3.props.base.successOperation;
     const i3 = n3.props.base.isNeedValueMapping, r2 = y(t3, n3);
     a3 || re.includes(n3.name) || (a3 = "refresh");
-    if ("refresh" === a3) if (r2) {
-      w(t3, r2).refresh();
-    } else console.error("tableUuid is empty");
-    else if ("closeWindow" === a3 || "closeWindowAndRefresh" === a3) {
+    if ("refresh" === a3) {
+      if (r2) {
+        w(t3, r2).refresh();
+      }
+    } else if ("closeWindow" === a3 || "closeWindowAndRefresh" === a3) {
       const s4 = e(t3.entity.page);
       let a4 = o3;
       a4 || (a4 = {}), Object.assign(s4, a4), ae(t3, n3, s4, i3);
@@ -530,7 +530,7 @@ function ie(e2, t2, n2, o2, s2) {
       Array.isArray(e3) && e3.length > 0 && (o3 = e3[0]), t3.forEach((e4) => {
         const t4 = e4.source;
         if (!t4) return;
-        const s3 = t4.split("."), a3 = N(o3, s3), i2 = e4.target, r2 = x(null, i2);
+        const s3 = t4.split("."), a3 = N(o3, s3), i2 = e4.target, r2 = S(null, i2);
         O(n3.entity, r2, a3);
       });
     }
@@ -548,7 +548,7 @@ function ce(e2, t2, n2, o2) {
       const n3 = y(e2, t2);
       if (n3) {
         w(e2, n3).refresh();
-      } else console.error("tableUuid is empty");
+      }
     } else if (a2 && "form" === a2) {
       const t3 = e2.entity.data;
       Ae(e2, t3.ID ? t3.ID : t3.id);
@@ -561,7 +561,7 @@ function le(e2, o2, s2, a2) {
     if (m2.fileuploadInfo && m2.fileuploadInfo.length > 0) {
       const e3 = m2.fileuploadInfo[0];
       let t2;
-      e3.isTable && e3.tableTitle && void 0 !== e3.rowIndex ? (e3.rowIndex, e3.rowIndex, t2 = l().t("superPageRuntimeMessage.fileUploadUnCompleteTable", { label: e3.label, tableTitle: e3.tableTitle, rowIndex: e3.rowIndex + 1 })) : t2 = l().t("superPageRuntimeMessage.fileUploadUnComplete", { label: e3.label }), u({ message: t2, type: "warning", showClose: true }), r2(false);
+      t2 = e3.isTable && e3.tableTitle && void 0 !== e3.rowIndex ? l().t("superPageRuntimeMessage.fileUploadUnCompleteTable", { label: e3.label, tableTitle: e3.tableTitle, rowIndex: e3.rowIndex + 1 }) : l().t("superPageRuntimeMessage.fileUploadUnComplete", { label: e3.label }), u({ message: t2, type: "warning", showClose: true }), r2(false);
     } else {
       const u2 = e2.mainDefaultValueColumns, g2 = e2.dynamicColumnInfo, b2 = e2.ids, C2 = f2.props.base.successOperation;
       let w2 = false;
@@ -620,13 +620,13 @@ function ue(e2, s2) {
   I2 && f2.append("functionCode", I2);
   const R2 = Te(a2);
   f2.append("additionalParamMapStr", JSON.stringify(R2));
-  const x2 = void 0 === p2.isPermission || "true" === p2.isPermission || p2.isPermission;
-  f2.append("isPermission", x2 + "");
-  const S2 = a2.systemCode;
-  S2 && f2.append("systemCode", S2);
-  const M2 = a2.backendUrl;
-  let N2 = t(M2, a2.isTest) + "/dsc/commons/import-data";
-  N2 = n(N2, S2, M2, a2.isTest), c.post(N2, f2).then((e3) => {
+  const S2 = void 0 === p2.isPermission || "true" === p2.isPermission || p2.isPermission;
+  f2.append("isPermission", S2 + "");
+  const M2 = a2.systemCode;
+  M2 && f2.append("systemCode", M2);
+  const x2 = a2.backendUrl;
+  let N2 = t(x2, a2.isTest) + "/dsc/commons/import-data";
+  N2 = n(N2, M2, x2, a2.isTest), c.post(N2, f2).then((e3) => {
     if (h2) u({ showClose: true, type: "success", message: l().t("superPageRuntimeMessage.asyncImport") }), Fe(a2);
     else {
       let t2 = false;
@@ -658,7 +658,7 @@ function de(e2) {
   const p2 = (_a = n2.props.base) == null ? void 0 : _a.logSetting;
   p2 && (c2.logSettingText = p2.join("")), c2.systemCode || (c2.systemCode = a2);
   const d2 = Te(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] : console.error("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]));
   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;
@@ -696,7 +696,7 @@ async function fe(e2, o2) {
     if (r2.fileuploadInfo && r2.fileuploadInfo.length > 0) {
       const e3 = r2.fileuploadInfo[0];
       let t2;
-      e3.isTable && e3.tableTitle && void 0 !== e3.rowIndex ? (e3.rowIndex, e3.rowIndex, t2 = l().t("superPageRuntimeMessage.fileUploadUnCompleteTable", { label: e3.label, tableTitle: e3.tableTitle, rowIndex: e3.rowIndex + 1 })) : t2 = l().t("superPageRuntimeMessage.fileUploadUnComplete", { label: e3.label }), u({ message: t2, type: "warning", showClose: true }), a2(false);
+      t2 = e3.isTable && e3.tableTitle && void 0 !== e3.rowIndex ? l().t("superPageRuntimeMessage.fileUploadUnCompleteTable", { label: e3.label, tableTitle: e3.tableTitle, rowIndex: e3.rowIndex + 1 }) : l().t("superPageRuntimeMessage.fileUploadUnComplete", { label: e3.label }), u({ message: t2, type: "warning", showClose: true }), a2(false);
     } else if (s2) {
       const p2 = r2.systemCode, d2 = r2.backendUrl, m2 = true === s2 ? (_a = r2.completeTaskParam) == null ? void 0 : _a.opinion : s2;
       let f2 = t(d2, r2.isTest) + "/dsc/workflow-commons/complete-tasks";
@@ -722,7 +722,7 @@ function ge(e2) {
       let n3 = false;
       if (((_c = (_b = o2.props) == null ? void 0 : _b.base) == null ? void 0 : _c.isMustOpinion) && (n3 = true), true === n3) {
         const t3 = e2.pageContext, s2 = (_e2 = (_d = o2.props) == null ? void 0 : _d.base) == null ? void 0 : _e2.mustOpinionConditions;
-        n3 = S(t3, s2);
+        n3 = M(t3, s2);
       }
       true === n3 ? (u({ showClose: true, type: "warning", message: l().t("superPageRuntimeMessage.pleaseInputOpinion") }), e2.pageContext.workflowOpinion.focusOpinionInput = true, t2(false)) : t2(true);
     } else t2(true);
@@ -753,7 +753,7 @@ function we(e2) {
         t2 = o2.config;
         break;
       }
-      if (S(e2.pageContext, o2.conditions)) {
+      if (M(e2.pageContext, o2.conditions)) {
         t2 = o2.config;
         break;
       }
@@ -806,7 +806,7 @@ async function ye(e2, o2) {
           if (void 0 === n3 || true === n3) {
             n3 = true;
             const t3 = e3.pageContext, s3 = (_d = (_c = o3.props) == null ? void 0 : _c.base) == null ? void 0 : _d.mustRemarkConditions;
-            n3 = S(t3, s3);
+            n3 = M(t3, s3);
           }
           true === n3 ? p.prompt(l().t("superPageRuntimeMessage.pleaseInputRemark"), l().t("superPageRuntimeMessage.remark"), { confirmButtonText: l().t("superPageRuntimeMessage.sure"), cancelButtonText: l().t("superPageRuntimeMessage.cancel"), inputType: "textarea", inputValue: null, closeOnClickModal: false, inputValidator: (e4) => !(!e4 || !e4.trim()) || l().t("superPageRuntimeMessage.pleaseInputRemark") }).then(({ value: e4 }) => {
             t2(e4);
@@ -871,7 +871,7 @@ function Re(e2) {
   if (i2 = n(i2, s2, a2, o2.isTest), i2) return c.post(i2, r2);
   u({ showClose: true, type: "warning", message: l().t("superPageRuntimeMessage.requestPathEmpty") });
 }
-function xe(e2, o2) {
+function Se(e2, o2) {
   if (o2) {
     const s2 = e2.pageContext, a2 = e2.configureObj, i2 = s2.systemCode, r2 = s2.backendUrl;
     let p2 = t(r2, s2.isTest) + "/dsc/workflow-commons/remove-signers";
@@ -884,14 +884,14 @@ function xe(e2, o2) {
     });
   }
 }
-function Se(e2) {
+function Me(e2) {
   const o2 = e2.pageContext, s2 = o2.systemCode, a2 = o2.backendUrl;
   let i2 = t(a2, o2.isTest) + "/dsc/workflow-commons/get-remove-transactors";
   const r2 = de(e2);
   if (i2 = n(i2, s2, a2, o2.isTest), i2) return c.post(i2, r2);
   u({ showClose: true, type: "warning", message: l().t("superPageRuntimeMessage.requestPathEmpty") });
 }
-function Me(e2, o2) {
+function xe(e2, o2) {
   if (o2) {
     const s2 = e2.pageContext, a2 = e2.configureObj, i2 = s2.systemCode, r2 = s2.backendUrl;
     let p2 = t(r2, s2.isTest) + "/dsc/workflow-commons/remove-transactors";
@@ -1011,18 +1011,18 @@ function Oe(e2, t2, n2, o2, s2, a2) {
     if (e2.workflowOpinion || (e2.workflowOpinion = { showOpinionBox: false }), (_b = (_a = s2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.showOpinionBox) {
       e2.workflowOpinion.showOpinionBox = true;
       const t4 = (_d = (_c = s2.props) == null ? void 0 : _c.base) == null ? void 0 : _d.showOpinionBoxConditions;
-      t4 && t4.length > 0 && (e2.workflowOpinion.showOpinionBox = S(e2, t4));
+      t4 && t4.length > 0 && (e2.workflowOpinion.showOpinionBox = M(e2, t4));
     }
     let t3 = false;
     if ((_f = (_e2 = s2.props) == null ? void 0 : _e2.base) == null ? void 0 : _f.isMustOpinion) {
       if (t3 = true, true === t3) {
         const n3 = (_h = (_g = s2.props) == null ? void 0 : _g.base) == null ? void 0 : _h.mustOpinionConditions;
-        n3 && n3.length > 0 && (t3 = S(e2, n3));
+        n3 && n3.length > 0 && (t3 = M(e2, n3));
       }
       e2.workflowOpinion.isRequired = t3, t3 && (e2.workflowOpinion.showOpinionBox = true);
     }
   }
-  return e2.workflowOpinion, i2;
+  return i2;
 }
 function Ue(e2, t2, n2) {
   return !(!e2.processState || "EXTRACT" !== e2.processState || "WAIT_TRANSACT" !== e2.active);
@@ -1042,7 +1042,7 @@ function Ee(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, b2 = l2, C2 = { pageCode: l2, pageVersion: u2, tableName: e3.tableName, formNoRuleCode: e3.formNoRuleCode, isWorkflowEntity: true, systemCode: i2, functionCode: b2 + ".workflowGets", listCodesMap: e3.listCodesMap, listCodesInitSearchForm: e3.listCodesInitSearchForm };
-        if (e3.listCodesMap, (!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
+        if ((!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
           const t2 = {};
           e3.tableUuids.forEach((e4) => {
             const n4 = r(l2, u2, e4);
@@ -1098,7 +1098,7 @@ function Ee(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, b2 = l2, C2 = t(e3.backendUrl, e3.isTest), w2 = { pageCode: l2, pageVersion: u2, tableName: e3.tableName, formNoRuleCode: e3.formNoRuleCode, id: d2, systemCode: i2, functionCode: b2 + ".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 = je(m2)), e3.notIdInitializationList && (w2.noIdAndTaskIdInitSetting = JSON.stringify(e3.notIdInitializationList)), p2 && (w2.additionalParamMap = p2), e3.beanName && (w2.beanName = e3.beanName), f2 && (w2.taskId = f2), e3.listCodesMap, (!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 = je(m2)), e3.notIdInitializationList && (w2.noIdAndTaskIdInitSetting = JSON.stringify(e3.notIdInitializationList)), p2 && (w2.additionalParamMap = p2), e3.beanName && (w2.beanName = e3.beanName), f2 && (w2.taskId = f2), (!e3.listCodesMap || 0 === Object.keys(e3.listCodesMap).length) && e3.tableUuids) {
           const t2 = {};
           e3.tableUuids.forEach((e4) => {
             const n4 = r(l2, u2, e4);
@@ -1198,15 +1198,15 @@ export {
   ye as doCreateCopyTask,
   Fe as doFileTaskFunc,
   ue as doImportFinally,
-  xe as doRemoveSigners,
-  Me as doRemoveTransactors,
+  Se as doRemoveSigners,
+  xe as doRemoveTransactors,
   ve as doReturnTaskTo,
   K as exportFormReport,
   Ne as extractWorkflowFunc,
   Te as getAdditionalParamMap,
   Ee as getFormData,
   Re as getRemoveSigner,
-  Se as getRemoveTransactor,
+  Me as getRemoveTransactor,
   te as getSaveFormRequest,
   ee as getSaveFormRequestWithRow,
   Ie as getTaskInformitions,

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

@@ -6,7 +6,8 @@ import { getAdditionalParamMap as l } from "./standard-event.js";
 import { isPromise as o } 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";
-function c(e2, t2, s2) {
+import { scrollIntoComponentWithCode as c, scrollIntoComponentWithUuid as d } from "../anchor-util.js";
+function m(e2, t2, s2) {
   const n2 = {};
   t2 || (t2 = {});
   let r2 = 0;
@@ -34,10 +35,10 @@ function c(e2, t2, s2) {
     r2++;
   }), n2;
 }
-function d(e2, t2, s2, n2, r2, i2) {
-  return p(e2, t2, s2, n2, true, r2, i2);
+function p(e2, t2, s2, n2, r2, i2) {
+  return b(e2, t2, s2, n2, true, r2, i2);
 }
-function m(e2) {
+function g(e2) {
   if (e2) return Object.keys(e2).forEach((t2) => {
     if (t2.indexOf(".") >= 0) {
       let s2 = [];
@@ -45,50 +46,57 @@ function m(e2) {
     }
   }), e2;
 }
-function p(n2, r2, i2, l2, o2, a2, u2) {
-  let f2, c2 = m(r2);
-  if (r2 && null !== r2 || !i2 || (c2 = {}), !c2 || 0 === Object.keys(c2).length) return n2.validateErrorField = "", true;
-  return new e(c2).validate(n2, { first: true }, (e2, c3) => {
-    let d2;
+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) => {
+    let m2;
     if (e2) {
-      f2 = e2[0].message, d2 = e2[0].field, t({ message: f2, showClose: true, type: "warning", duration: 3e3 });
-      const n3 = s(u2, d2);
-      n3 && n3.addRequiredClass && n3.addRequiredClass();
+      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();
+        try {
+          c(u2, m2);
+        } catch (e3) {
+        }
+      }
     } else f2 = true;
-    if (d2 && true === o2) {
-      if (/[A-Z]+/.test(d2) && void 0 !== n2[d2.toLowerCase()]) {
+    if (m2 && true === o2) {
+      if (/[A-Z]+/.test(m2) && void 0 !== n2[m2.toLowerCase()]) {
         const e3 = JSON.parse(JSON.stringify(n2));
-        e3[d2.toUpperCase()] = n2[d2.toLowerCase()], delete e3[d2.toLowerCase()], f2 = p(e3, r2, i2, l2, false, a2, u2);
+        e3[m2.toUpperCase()] = n2[m2.toLowerCase()], delete e3[m2.toLowerCase()], f2 = b(e3, r2, i2, l2, false, a2, u2);
       }
     }
   }), f2;
 }
-function g(e2, n2, r2) {
-  const o2 = e2.entity.data, f2 = { ...e2.entity.page, ...o2 }, c2 = e2.rules, d2 = n2.props.base ? n2.props.base.isEnableRequired : null;
-  return null != d2 && (r2 = d2), null == r2 && (r2 = false), function(e3, n3, r3, o3) {
+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) {
     if (e3) {
       return u(o3) ? function(e4, n4, r4) {
         return new Promise((o4, u2) => {
-          const f3 = l(n4), c3 = n4.entity.context, d3 = n4.entity.task, m2 = true, p2 = n4.subTablePageInfo;
-          h(e4, n4, r4).then((r5) => {
+          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, g2, b2, h2 = r5;
+              let l2, u3, b2, h2, y2 = r5;
               const w2 = n4.workflowRules;
               if (w2) {
                 if (!function(e5, n5) {
-                  var _a, _b, _c;
+                  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];
                     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 = u4.notEmptyCondition) == null ? void 0 : _a.parentCondition) {
-                          if (false === a(u4.notEmptyCondition.parentCondition.replaceAll("${field[", "${parent["), e5.dataTypeMaps, n5, {}, (_b = e5.entity) == null ? void 0 : _b.request, (_c = e5.entity) == null ? void 0 : _c.task, e5.contextParam)) return true;
+                        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: l4.title ? l4.title : o5 }), type: "warning" }), false;
                       }
@@ -96,18 +104,32 @@ function g(e2, n2, r2) {
                   }
                   return true;
                 }(n4, e4)) return void o4(false);
-                const r6 = true, y2 = Object.assign({}, w2);
-                y2.subRules && (Object.keys(y2.subRules).length > 0 ? y2.totalSubRules || (y2.totalSubRules = {}) : delete y2.subRules);
-                const R2 = window.$vueApp.config.globalProperties.$formValidator(e4, y2, m2, f3, d3, c3, p2, r6);
-                h2 = R2.msg, l2 = R2.field, u3 = R2.listCode, g2 = R2.rowIndex, b2 = R2.pageNum;
-              } else h2 = true;
-              if (true !== h2) {
-                if (t({ showClose: true, message: h2 + "", type: "warning" }), u3) {
+                const r6 = true, c2 = Object.assign({}, w2), R2 = n4.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);
+                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);
-                  e5 && e5.addRequiredClass && e5.addRequiredClass(l2, g2, b2);
+                  if (e5 && e5.addRequiredClass) {
+                    e5.addRequiredClass(l2, b2, h2);
+                    try {
+                      c(n4, u3), e5.scrollToCell({ fieldName: l2, rowIndex: b2, pageNum: h2 });
+                    } catch (e6) {
+                    }
+                  }
                 } else {
                   const e5 = s(n4, l2);
-                  e5 && e5.addRequiredClass && e5.addRequiredClass();
+                  if (e5 && e5.addRequiredClass) {
+                    e5.addRequiredClass();
+                    try {
+                      c(n4, l2);
+                    } catch (e6) {
+                    }
+                  }
                 }
                 o4(false);
               } else Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, o4(e4);
@@ -118,7 +140,7 @@ function g(e2, n2, r2) {
         });
       }(n3, o3, r3) : function(e4, t2, s2) {
         return new Promise((n4, r4) => {
-          h(e4, t2, s2).then((t3) => {
+          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);
@@ -132,9 +154,9 @@ function g(e2, n2, r2) {
     return new Promise((e4, t2) => {
       e4(true);
     });
-  }(r2, f2, c2, e2);
+  }(r2, f2, d2, e2);
 }
-function b(e2) {
+function y(e2) {
   return new Promise((t2, s2) => {
     const r2 = [], i2 = e2.customValidatorUuids;
     i2 && i2.forEach((t3) => {
@@ -145,11 +167,13 @@ function b(e2) {
     }) : t2(true);
   });
 }
-function h(e2, s2, r2) {
+function w(e2, s2, r2) {
   return new Promise((l2, a2) => {
-    const f2 = JSON.parse(JSON.stringify(e2));
-    if (r2 && 0 !== Object.keys(r2).length) {
-      if (true === d(f2, r2, null, null, true, s2)) {
+    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 e3 = function(e4) {
           var _a;
           if (!e4) return true;
@@ -157,16 +181,30 @@ function h(e2, s2, r2) {
           const s3 = e4.tableUuids;
           if (!s3) return true;
           for (let r3 = 0; r3 < s3.length; r3++) {
-            const l3 = s3[r3], o2 = n(e4, l3);
-            if (o2) {
-              if (o2.getConfigure()) {
-                const e5 = o2.getConfigure();
-                if ((_a = e5 == null ? void 0 : e5.verification) == null ? void 0 : _a.notEmpty) {
-                  const s4 = o2.getTableData();
-                  if (!s4 || !Array.isArray(s4) || 0 === s4.length) return t({ showClose: true, message: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: e5.title ? e5.title : e5.code }), type: "warning" }), false;
+            const l3 = s3[r3], o2 = e4.hiddenNotValidatorCodes;
+            if (o2 && o2.size > 0 && o2.has(l3)) continue;
+            const a3 = n(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) {
+                    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;
+                  }
+                }
+              }
+              if (!a3.validatorSunTableListData()) {
+                try {
+                  d(e4, l3);
+                } catch (e5) {
                 }
+                return false;
               }
-              if (!o2.validatorSunTableListData()) return false;
             }
           }
           return true;
@@ -187,16 +225,16 @@ function h(e2, s2, r2) {
               }), r3.includes(false) && e6(false), n2.length > 0 ? Promise.all(n2).then((t3) => {
                 t3.includes(false) ? e6(false) : e6(true);
               }).catch((t3) => {
-                console.error(t3), e6(false);
+                e6(false);
               }) : e6(true);
             });
             return null;
           }(s2);
           e4 && o(e4) ? e4.then((e5) => {
-            e5 ? b(s2).then((e6) => {
+            e5 ? y(s2).then((e6) => {
               l2(e6);
             }) : l2(false);
-          }) : b(s2).then((e5) => {
+          }) : y(s2).then((e5) => {
             l2(e5);
           });
         } else a2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
@@ -204,7 +242,7 @@ function h(e2, s2, r2) {
     } else l2(true);
   });
 }
-function w(e2, t2, s2) {
+function R(e2, t2, s2) {
   if (!t2) return s2;
   s2 || (s2 = {});
   const n2 = u(e2), r2 = Object.keys(t2), i2 = t2;
@@ -214,35 +252,35 @@ function w(e2, t2, s2) {
       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 j(i2[e3]), n2 ? (s2.rules[e3] = i2[e3], s2[e3] && (s2[e3] = i2[e3])) : s2[e3] = i2[e3];
-  }), m(s2);
+    } else T(i2[e3]), n2 ? (s2.rules[e3] = i2[e3], s2[e3] && (s2[e3] = i2[e3])) : s2[e3] = i2[e3];
+  }), g(s2);
 }
-function y(e2) {
+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];
-    R(i2), r2.indexOf(".") > 0 ? c(r2, t2, i2) : i2 && i2.length > 0 && (t2[r2] = [...i2]);
+    P(i2), r2.indexOf(".") > 0 ? m(r2, t2, i2) : i2 && i2.length > 0 && (t2[r2] = [...i2]);
   }
   return t2;
 }
-function R(e2, 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 }));
   });
 }
-function v(e2) {
+function E(e2) {
   const t2 = e2.entity.data, s2 = { ...e2.entity.page, ...t2 }, n2 = l(e2), r2 = 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 o2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, s2, true, n2, i2, r2);
   const a2 = e2.customRules;
-  return o2 = w(e2, a2, o2), o2 && (o2.rules || (o2.rules = {}), o2.subRules || (o2.subRules = {})), o2;
+  return o2 = R(e2, a2, o2), o2 && (o2.rules || (o2.rules = {}), o2.subRules || (o2.subRules = {})), o2;
 }
-function P(e2, t2) {
+function k(e2, t2) {
   if (!t2) return;
   const n2 = {};
   if (t2.forEach((e3) => {
@@ -250,30 +288,30 @@ function P(e2, t2) {
     s2 ? n2[t3] = s2 : false === e3.required && (n2[t3] = []);
   }), u(e2)) {
     let t3 = e2.workflowRules ? e2.workflowRules : { rules: {}, subRules: {} };
-    t3 = w(e2, n2, t3), e2.workflowRules = t3;
+    t3 = R(e2, n2, t3), e2.workflowRules = t3;
   } else {
     let t3 = e2.rules ? e2.rules : {};
-    t3 = w(e2, n2, t3), e2.rules = t3;
+    t3 = R(e2, n2, t3), e2.rules = t3;
   }
   const r2 = t2.filter((e3) => "_all_fields" === e3.name);
-  r2 && r2.length > 0 && E(e2, r2[0]), t2.forEach((t3) => {
+  r2 && r2.length > 0 && O(e2, r2[0]), t2.forEach((t3) => {
     if ("_all_fields" !== t3.name) {
       const n3 = s(e2, t3.name);
-      C(e2, n3, t3);
+      x(e2, n3, t3);
     }
   });
 }
-function k(e2) {
-  E(e2, { disabled: true });
+function C(e2) {
+  O(e2, { disabled: true });
 }
-function E(e2, t2) {
+function O(e2, t2) {
   const s2 = r(e2);
   if (s2) for (const n2 in s2) {
     const r2 = s2[n2];
-    C(e2, r2 ? r2.value : r2, t2);
+    x(e2, r2 ? r2.value : r2, t2);
   }
 }
-function O(e2, t2, r2) {
+function j(e2, t2, r2) {
   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;
@@ -286,7 +324,7 @@ function O(e2, t2, r2) {
   }
   i2.dynamicControlTableEdit(e2, t2, u2);
 }
-function C(e2, t2, s2) {
+function x(e2, t2, s2) {
   var _a, _b, _c;
   if (t2) {
     const n2 = t2.getConfigure();
@@ -297,30 +335,30 @@ function C(e2, t2, s2) {
     }
   }
 }
-function j(e2) {
+function T(e2) {
   if (!(e2 == null ? void 0 : e2.type)) return;
-  const t2 = x[e2.type];
+  const t2 = N[e2.type];
   t2 && (e2.validator = t2.validator);
 }
-const x = { boolean: { validator: function(e2, t2, s2) {
-  return true === T(e2, t2) && ("number" == typeof t2 && (1 === t2 || 0 === t2) || "boolean" == typeof t2 && (true === t2 || false === t2));
+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 !== T(e2, t2)) return false;
+  if (true !== M(e2, t2)) return false;
   const n2 = new Date(t2);
   return !isNaN(n2.getTime());
 } }, number: { validator: function(e2, t2, s2) {
-  return true === T(e2, t2) && (("string" != typeof t2 || "" !== t2.trim()) && ("number" == typeof t2 || !isNaN(Number(t2))));
-} } }, T = (e2, t2) => null != t2 && "" !== t2 || !e2.required;
+  return true === M(e2, t2) && (("string" != typeof t2 || "" !== t2.trim()) && ("number" == typeof t2 || !isNaN(Number(t2))));
+} } }, M = (e2, t2) => null != t2 && "" !== t2 || !e2.required;
 export {
-  k as disabledAllFields,
-  O as dynamicControlTableEdit,
-  v as getWorkflowRules,
-  R as i18nValidatePropRulesMessage,
-  y as i18nValidateRulesMessage,
-  w as packageCustomRules,
-  j as packageCustomValidator,
-  c as setObjectPropRule,
-  P as updateFormItemEditState,
-  g as validateDataModelFunc,
-  d as validator
+  C as disabledAllFields,
+  j as dynamicControlTableEdit,
+  E as getWorkflowRules,
+  P as i18nValidatePropRulesMessage,
+  v as i18nValidateRulesMessage,
+  R as packageCustomRules,
+  T as packageCustomValidator,
+  m as setObjectPropRule,
+  k as updateFormItemEditState,
+  h as validateDataModelFunc,
+  p as validator
 };