super-page-runtime 2.2.77 → 2.2.80

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

@@ -2,8 +2,8 @@ import e from "async-validator";
 import { ElMessage as t } from "element-plus";
 import { getComponentRefByCode as n, getComponentRef as r, getAllComponentRefs as s } from "../global-refs.js";
 import { getI18n as i } from "agilebuilder-ui/src/utils/util";
-import { getAdditionalParamMap as l } from "./standard-event.js";
-import { isPromise as o } from "agilebuilder-ui/src/utils/common-util";
+import { getAdditionalParamMap as o } from "./standard-event.js";
+import { isPromise as l } from "agilebuilder-ui/src/utils/common-util";
 import { getListCode as a, isWorkflowPage as u } from "../common-util.js";
 function f(e2, t2, n2) {
   const r2 = {};
@@ -11,24 +11,24 @@ function f(e2, t2, n2) {
   let s2 = 0;
   const i2 = e2.split(".");
   return i2.forEach((e3) => {
-    let l2;
-    if (s2 === i2.length - 1) l2 = function(e4, t3, n3) {
+    let o2;
+    if (s2 === i2.length - 1) o2 = function(e4, t3, n3) {
       let r3;
       for (let s3 = 0; s3 < t3.length; s3++) if (r3 = 0 === s3 ? e4[t3[s3]] : r3.fields[t3[s3]], s3 !== t3.length - 1) {
         if (t3[s3 + 1] === n3) break;
       }
       return r3;
-    }(r2, i2, e3), l2.fields[e3] = n2;
+    }(r2, i2, e3), o2.fields[e3] = n2;
     else {
       let n3;
-      0 === s2 ? l2 = t2 : (n3 = function(e4, t3, n4) {
+      0 === s2 ? o2 = t2 : (n3 = function(e4, t3, n4) {
         let r3;
         for (let s3 = 0; s3 < t3.length; s3++) {
           const i3 = t3[s3];
           if (r3 = 0 === s3 ? e4[i3] : r3.fields[t3[s3]], i3 === n4) break;
         }
         return r3;
-      }(r2, i2, i2[s2 - 1]), l2 = n3.fields), l2[e3] || (l2[e3] = { type: "object", required: true, fields: {} }), 0 === s2 ? r2[e3] = l2[e3] : n3.fields[e3] = l2[e3];
+      }(r2, i2, i2[s2 - 1]), o2 = n3.fields), o2[e3] || (o2[e3] = { type: "object", required: true, fields: {} }), 0 === s2 ? r2[e3] = o2[e3] : n3.fields[e3] = o2[e3];
     }
     s2++;
   }), r2;
@@ -44,12 +44,12 @@ function d(e2) {
     }
   }), e2;
 }
-function m(n2, r2, s2, i2, l2, o2) {
+function m(n2, r2, s2, i2, o2, l2) {
   let a2, u2 = d(r2);
   if (r2 && null !== r2 || !s2 || (u2 = {}), !u2 || 0 === Object.keys(u2).length) return n2.validateErrorField = "", true;
-  return new e(u2).validate(n2, { first: true }, (e2, o3) => {
+  return new e(u2).validate(n2, { first: true }, (e2, l3) => {
     let u3;
-    if (e2 ? (a2 = e2[0].message, u3 = e2[0].field, t({ message: a2, showClose: true, type: "warning", duration: 3e3 })) : a2 = true, u3 && true === l2) {
+    if (e2 ? (a2 = e2[0].message, u3 = e2[0].field, t({ message: a2, showClose: true, type: "warning", duration: 3e3 }), console.log("errors", e2, "fields", l3)) : a2 = true, u3 && true === o2) {
       if (/[A-Z]+/.test(u3) && void 0 !== n2[u3.toLowerCase()]) {
         const e3 = JSON.parse(JSON.stringify(n2));
         e3[u3.toUpperCase()] = n2[u3.toLowerCase()], delete e3[u3.toLowerCase()], a2 = m(e3, r2, s2, i2, false);
@@ -58,20 +58,20 @@ function m(n2, r2, s2, i2, l2, o2) {
   }), a2;
 }
 function p(e2, n2, r2) {
-  const s2 = e2.entity.data, o2 = { ...e2.entity.page, ...s2 }, a2 = e2.rules, f2 = n2.props.base ? n2.props.base.isEnableRequired : null;
+  const s2 = e2.entity.data, l2 = { ...e2.entity.page, ...s2 }, a2 = e2.rules, f2 = n2.props.base ? n2.props.base.isEnableRequired : null;
   return null != f2 && (r2 = f2), null == r2 && (r2 = false), function(e3, n3, r3, s3) {
     if (e3) {
       return u(s3) ? function(e4, n4, r4) {
-        return new Promise((s4, o3) => {
-          const a3 = l(n4), u2 = n4.entity.context, f3 = n4.entity.task, c2 = true, d2 = n4.subTablePageInfo;
+        return new Promise((s4, l3) => {
+          const a3 = o(n4), u2 = n4.entity.context, f3 = n4.entity.task, c2 = true, d2 = n4.subTablePageInfo;
           b(e4, n4, r4).then((r5) => {
             if (r5) {
               let i2 = r5;
-              const l2 = n4.workflowRules;
-              i2 = !l2 || window.$vueApp.config.globalProperties.$formValidator(e4, l2, c2, a3, f3, u2, d2), true !== i2 ? (t({ showClose: true, message: i2 + "", type: "warning" }), s4(false)) : (Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, s4(e4));
-            } else o3(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+              const o2 = n4.workflowRules;
+              i2 = !o2 || window.$vueApp.config.globalProperties.$formValidator(e4, o2, c2, a3, f3, u2, d2), true !== i2 ? (t({ showClose: true, message: i2 + "", type: "warning" }), s4(false)) : (Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, s4(e4));
+            } else l3(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
           }).catch((e5) => {
-            o3(e5);
+            l3(e5);
           });
         });
       }(n3, s3, r3) : function(e4, t2, n4) {
@@ -90,7 +90,7 @@ function p(e2, n2, r2) {
     return new Promise((e4, t2) => {
       e4(true);
     });
-  }(r2, o2, a2, e2);
+  }(r2, l2, a2, e2);
 }
 function g(e2) {
   return new Promise((t2, n2) => {
@@ -104,7 +104,7 @@ function g(e2) {
   });
 }
 function b(e2, t2, n2) {
-  return new Promise((s2, l2) => {
+  return new Promise((s2, o2) => {
     const a2 = JSON.parse(JSON.stringify(e2));
     if (n2 && 0 !== Object.keys(n2).length) {
       if (true === c(a2, n2, null, null)) {
@@ -132,24 +132,24 @@ function b(e2, t2, n2) {
             if (t3 && t3.length > 0) return new Promise((e6, n3) => {
               const r2 = [], s3 = [];
               t3.forEach((e7) => {
-                o(e7) ? r2.push(e7) : s3.push(e7);
+                l(e7) ? r2.push(e7) : s3.push(e7);
               }), s3.includes(false) && e6(false), r2.length > 0 ? Promise.all(r2).then((t4) => {
                 t4.includes(false) ? e6(false) : e6(true);
               }).catch((t4) => {
-                e6(false);
+                console.error(t4), e6(false);
               }) : e6(true);
             });
             return null;
           }(t2);
-          e4 && o(e4) ? e4.then((e5) => {
+          e4 && l(e4) ? e4.then((e5) => {
             e5 ? g(t2).then((e6) => {
               s2(e6);
             }) : s2(false);
           }) : g(t2).then((e5) => {
             s2(e5);
           });
-        } else l2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
-      } else l2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+        } else o2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
+      } else o2(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
     } else s2(true);
   });
 }
@@ -183,12 +183,12 @@ function w(e2, t2) {
   });
 }
 function v(e2) {
-  const t2 = e2.entity.data, n2 = { ...e2.entity.page, ...t2 }, r2 = l(e2), s2 = e2.entity.context, i2 = e2.entity.task;
+  const t2 = e2.entity.data, n2 = { ...e2.entity.page, ...t2 }, r2 = o(e2), s2 = e2.entity.context, i2 = e2.entity.task;
   e2.formPropTiltleMap && Object.keys(e2.formPropTiltleMap).length > 0 && e2.completeTaskParam.fieldPermissions && e2.completeTaskParam.fieldPermissions.length > 0 && e2.completeTaskParam.fieldPermissions.forEach((t3) => {
     t3.name && e2.formPropTiltleMap[t3.name] && (t3.label = e2.formPropTiltleMap[t3.name]);
   });
-  let o2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, n2, true, r2, i2, s2);
-  return o2 = h(e2.customRules, o2), o2;
+  let l2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, n2, true, r2, i2, s2);
+  return l2 = h(e2.customRules, l2), l2;
 }
 function P(e2, t2) {
   if (!t2) return;
@@ -210,9 +210,9 @@ function E(e2) {
   });
 }
 function R(e2, t2, s2) {
-  let i2, l2;
-  if (s2 ? (i2 = n(e2, s2), l2 = i2 ? i2.getTableUuid() : null) : (l2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, i2 = l2 ? r(e2, l2) : null), !i2) return;
-  const o2 = e2.code, u2 = e2.version, f2 = a(o2, u2, l2);
+  let i2, o2;
+  if (s2 ? (i2 = n(e2, s2), o2 = i2 ? i2.getTableUuid() : null) : (o2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, i2 = o2 ? r(e2, o2) : null), !i2) return;
+  const l2 = e2.code, u2 = e2.version, f2 = a(l2, u2, o2);
   i2.dynamicControlTableEdit(e2, t2, f2);
 }
 function O(e2, t2) {

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];