super-page-runtime 2.3.13-sit4 → 2.3.14-sit1

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

@@ -4,8 +4,9 @@ import { getComponentRefByCode as n, getComponentRef as s, getAllComponentRefs a
 import { getI18n as i } from "agilebuilder-ui/src/utils/util";
 import { getAdditionalParamMap as o } from "./standard-event.js";
 import { isPromise as l } from "agilebuilder-ui/src/utils/common-util";
-import { getListCode as a, isWorkflowPage as u } from "../common-util.js";
-function f(e2, t2, n2) {
+import { parseSubTablePermissionCondition as a } from "agilebuilder-ui/src/utils/calculator/calculator-util";
+import { getListCode as u, isWorkflowPage as f } from "../common-util.js";
+function c(e2, t2, n2) {
   const s2 = {};
   t2 || (t2 = {});
   let r2 = 0;
@@ -33,10 +34,10 @@ function f(e2, t2, n2) {
     r2++;
   }), s2;
 }
-function c(e2, t2, n2, s2, r2, i2) {
-  return m(e2, t2, n2, s2, true, r2, i2);
+function d(e2, t2, n2, s2, r2, i2) {
+  return p(e2, t2, n2, s2, true, r2, i2);
 }
-function d(e2) {
+function m(e2) {
   if (e2) return Object.keys(e2).forEach((t2) => {
     if (t2.indexOf(".") >= 0) {
       let n2 = [];
@@ -44,8 +45,8 @@ function d(e2) {
     }
   }), e2;
 }
-function m(s2, r2, i2, o2, l2, a2, u2) {
-  let f2, c2 = d(r2);
+function p(s2, r2, i2, o2, l2, a2, u2) {
+  let f2, c2 = m(r2);
   if (r2 && null !== r2 || !i2 || (c2 = {}), !c2 || 0 === Object.keys(c2).length) return s2.validateErrorField = "", true;
   return new e(c2).validate(s2, { first: true }, (e2, c3) => {
     let d2;
@@ -57,59 +58,63 @@ function m(s2, r2, i2, o2, l2, a2, u2) {
     if (d2 && true === l2) {
       if (/[A-Z]+/.test(d2) && void 0 !== s2[d2.toLowerCase()]) {
         const e3 = JSON.parse(JSON.stringify(s2));
-        e3[d2.toUpperCase()] = s2[d2.toLowerCase()], delete e3[d2.toLowerCase()], f2 = m(e3, r2, i2, o2, false, a2, u2);
+        e3[d2.toUpperCase()] = s2[d2.toLowerCase()], delete e3[d2.toLowerCase()], f2 = p(e3, r2, i2, o2, false, a2, u2);
       }
     }
   }), f2;
 }
-function p(e2, s2, r2) {
-  const l2 = e2.entity.data, a2 = { ...e2.entity.page, ...l2 }, f2 = e2.rules, c2 = s2.props.base ? s2.props.base.isEnableRequired : null;
-  return null != c2 && (r2 = c2), null == r2 && (r2 = false), function(e3, s3, r3, l3) {
+function g(e2, s2, r2) {
+  const l2 = e2.entity.data, u2 = { ...e2.entity.page, ...l2 }, c2 = e2.rules, d2 = s2.props.base ? s2.props.base.isEnableRequired : null;
+  return null != d2 && (r2 = d2), null == r2 && (r2 = false), function(e3, s3, r3, l3) {
     if (e3) {
-      return u(l3) ? function(e4, s4, r4) {
-        return new Promise((l4, a3) => {
-          const u2 = o(s4), f3 = s4.entity.context, c3 = s4.entity.task, d2 = true, m2 = s4.subTablePageInfo;
-          b(e4, s4, r4).then((r5) => {
+      return f(l3) ? function(e4, s4, r4) {
+        return new Promise((l4, u3) => {
+          const f2 = o(s4), c3 = s4.entity.context, d3 = s4.entity.task, m2 = true, p2 = s4.subTablePageInfo;
+          h(e4, s4, r4).then((r5) => {
             if (r5) {
-              let o2, a4, p2, g2, b2 = r5;
-              const h2 = s4.workflowRules;
-              if (h2) {
+              let o2, u4, g2, b2, h2 = r5;
+              const y2 = s4.workflowRules;
+              if (y2) {
                 if (!function(e5, s5) {
+                  var _a, _b, _c;
                   if (!e5.actionPermissions) return true;
                   const r7 = Object.keys(e5.actionPermissions);
                   for (let o3 = 0; o3 < r7.length; o3++) {
-                    const l5 = r7[o3], a5 = e5.actionPermissions[l5];
-                    if (a5 && a5.notEmpty) {
+                    const l5 = r7[o3], u5 = e5.actionPermissions[l5];
+                    if (u5 && u5.notEmpty) {
                       let r8 = false;
                       if (s5[l5] ? Array.isArray(s5[l5]) && 0 === s5[l5].length && (r8 = true) : r8 = true, r8) {
-                        const s6 = n(e5, l5).getConfigure();
-                        return t({ showClose: true, message: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: s6.title ? s6.title : l5 }), type: "warning" }), false;
+                        const r9 = n(e5, l5).getConfigure();
+                        if ((_a = u5.notEmptyCondition) == null ? void 0 : _a.parentCondition) {
+                          if (false === a(u5.notEmptyCondition.parentCondition.replaceAll("${field[", "${parent["), e5.dataTypeMaps, s5, {}, (_b = e5.entity) == null ? void 0 : _b.request, (_c = e5.entity) == null ? void 0 : _c.task, e5.contextParam)) return true;
+                        }
+                        return t({ showClose: true, message: i().t("superPageRuntimeMessage.xxxNotEmpty", { label: r9.title ? r9.title : l5 }), type: "warning" }), false;
                       }
                     }
                   }
                   return true;
                 }(s4, e4)) return void l4(false);
-                const r6 = true, y2 = window.$vueApp.config.globalProperties.$formValidator(e4, h2, d2, u2, c3, f3, m2, r6);
-                b2 = y2.msg, o2 = y2.field, a4 = y2.listCode, p2 = y2.rowIndex, g2 = y2.pageNum;
-              } else b2 = true;
-              if (true !== b2) {
-                if (t({ showClose: true, message: b2 + "", type: "warning" }), a4) {
-                  const e5 = n(s4, a4);
-                  e5 && e5.addRequiredClass && e5.addRequiredClass(o2, p2, g2);
+                const r6 = true, w2 = window.$vueApp.config.globalProperties.$formValidator(e4, y2, m2, f2, d3, c3, p2, r6);
+                h2 = w2.msg, o2 = w2.field, u4 = w2.listCode, g2 = w2.rowIndex, b2 = w2.pageNum;
+              } else h2 = true;
+              if (true !== h2) {
+                if (t({ showClose: true, message: h2 + "", type: "warning" }), u4) {
+                  const e5 = n(s4, u4);
+                  e5 && e5.addRequiredClass && e5.addRequiredClass(o2, g2, b2);
                 } else {
                   const e5 = n(s4, o2);
                   e5 && e5.addRequiredClass && e5.addRequiredClass();
                 }
                 l4(false);
               } else Object.keys(e4).indexOf("validateErrorField") >= 0 && delete e4.validateErrorField, l4(e4);
-            } else a3(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
+            } else u3(new Error(i().t("superPageRuntimeMessage.formDataVerificationFailed")).message);
           }).catch((e5) => {
-            a3(e5);
+            u3(e5);
           });
         });
       }(s3, l3, r3) : function(e4, t2, n2) {
         return new Promise((s4, r4) => {
-          b(e4, t2, n2).then((t3) => {
+          h(e4, t2, n2).then((t3) => {
             if (t3) {
               const t4 = JSON.parse(JSON.stringify(e4));
               Object.keys(t4).indexOf("validateErrorField") >= 0 && delete t4.validateErrorField, s4(t4);
@@ -123,9 +128,9 @@ function p(e2, s2, r2) {
     return new Promise((e4, t2) => {
       e4(true);
     });
-  }(r2, a2, f2, e2);
+  }(r2, u2, c2, e2);
 }
-function g(e2) {
+function b(e2) {
   return new Promise((t2, n2) => {
     const r2 = [], i2 = e2.customValidatorUuids;
     i2 && i2.forEach((t3) => {
@@ -136,11 +141,11 @@ function g(e2) {
     }) : t2(true);
   });
 }
-function b(e2, n2, r2) {
+function h(e2, n2, r2) {
   return new Promise((o2, a2) => {
     const u2 = JSON.parse(JSON.stringify(e2));
     if (r2 && 0 !== Object.keys(r2).length) {
-      if (true === c(u2, r2, null, null, true, n2)) {
+      if (true === d(u2, r2, null, null, true, n2)) {
         const e3 = function(e4) {
           var _a;
           if (!e4) return true;
@@ -183,10 +188,10 @@ function b(e2, n2, r2) {
             return null;
           }(n2);
           e4 && l(e4) ? e4.then((e5) => {
-            e5 ? g(n2).then((e6) => {
+            e5 ? b(n2).then((e6) => {
               o2(e6);
             }) : o2(false);
-          }) : g(n2).then((e5) => {
+          }) : b(n2).then((e5) => {
             o2(e5);
           });
         } else a2(new Error(i().t("superPageRuntimeMessage.tableListSubTableDataVerificationFailed")).message);
@@ -194,7 +199,7 @@ function b(e2, n2, r2) {
     } else o2(true);
   });
 }
-function h(e2, t2) {
+function y(e2, t2) {
   if (!e2) return t2;
   t2 || (t2 = {});
   const n2 = Object.keys(e2), s2 = e2;
@@ -204,34 +209,34 @@ function h(e2, t2) {
       Object.keys(e4).forEach((n3) => {
         t2.subRules || (t2.subRules = {}), t2.subRules[n3] ? Object.assign(t2.subRules[n3], e4[n3]) : t2.subRules[n3] = e4[n3];
       });
-    } else C(s2[e3]), t2[e3] = s2[e3];
-  }), d(t2);
+    } else x(s2[e3]), t2[e3] = s2[e3];
+  }), m(t2);
 }
-function y(e2) {
+function w(e2) {
   if (!e2 || 0 === Object.keys(e2).length) return;
   const t2 = {}, n2 = Object.keys(e2);
   for (let s2 = 0; s2 < n2.length; s2++) {
     const r2 = n2[s2], i2 = e2[r2];
-    w(i2), r2.indexOf(".") > 0 ? f(r2, t2, i2) : i2 && i2.length > 0 && (t2[r2] = [...i2]);
+    R(i2), r2.indexOf(".") > 0 ? c(r2, t2, i2) : i2 && i2.length > 0 && (t2[r2] = [...i2]);
   }
   return t2;
 }
-function w(e2, t2) {
+function R(e2, t2) {
   e2.forEach((e3) => {
     e3.message;
     const t3 = e3.label, n2 = i().t(t3);
     e3.required && (e3.message = i().t("superPageRuntimeMessage.required", { label: n2 })), e3.myType && (e3.message = i().t("superPageRuntimeMessage.formatMismatch", { label: n2 })), e3.patternType && (e3.message = i().t("superPageRuntimeMessage.formatMismatch", { label: n2 })), void 0 !== e3.max && null !== e3.max && (e3.message = i().t("superPageRuntimeMessage.overMaxLength", { label: n2, value: e3.max })), void 0 !== e3.min && null !== e3.min && (e3.message = i().t("superPageRuntimeMessage.limitMinLength", { label: n2, value: e3.min }));
   });
 }
-function R(e2) {
+function v(e2) {
   const t2 = e2.entity.data, n2 = { ...e2.entity.page, ...t2 }, s2 = o(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 l2 = window.$vueApp.config.globalProperties.$getValidator(e2.completeTaskParam.fieldPermissions, n2, true, s2, i2, r2);
-  return l2 = h(e2.customRules, l2), l2;
+  return l2 = y(e2.customRules, l2), l2;
 }
-function v(e2, t2) {
+function P(e2, t2) {
   if (!t2) return;
   const s2 = {};
   t2.forEach((e3) => {
@@ -239,31 +244,31 @@ function v(e2, t2) {
     n2 ? s2[t3] = n2 : false === e3.required && (s2[t3] = []);
   });
   let r2 = e2.rules ? e2.rules : {};
-  r2 = h(s2, r2), e2.rules = r2;
+  r2 = y(s2, r2), e2.rules = r2;
   let i2 = e2.workflowRules ? e2.workflowRules : {};
-  i2 = h(s2, i2), e2.workflowRules = i2;
+  i2 = y(s2, i2), e2.workflowRules = i2;
   const o2 = t2.filter((e3) => "_all_fields" === e3.name);
-  o2 && o2.length > 0 && E(e2, o2[0]), t2.forEach((t3) => {
+  o2 && o2.length > 0 && k(e2, o2[0]), t2.forEach((t3) => {
     if ("_all_fields" !== t3.name) {
       O(n(e2, t3.name), t3);
     }
   });
 }
-function P(e2) {
-  E(e2, { disabled: true });
+function E(e2) {
+  k(e2, { disabled: true });
 }
-function E(e2, t2) {
+function k(e2, t2) {
   const n2 = r(e2);
   if (n2) for (const e3 in n2) {
     const s2 = n2[e3];
     O(s2 ? s2.value : s2, t2);
   }
 }
-function k(e2, t2, r2) {
+function C(e2, t2, r2) {
   var _a;
   let i2, o2;
   if (r2 ? (i2 = n(e2, r2), o2 = i2 ? i2.getTableUuid() : null) : (o2 = e2.tableUuids && e2.tableUuids.length > 0 ? e2.tableUuids[0] : null, i2 = o2 ? s(e2, o2) : null), !i2) return;
-  const l2 = e2.code, u2 = e2.version, f2 = a(l2, u2, o2);
+  const l2 = e2.code, a2 = e2.version, f2 = u(l2, a2, o2);
   if (((_a = e2.workflowRules) == null ? void 0 : _a.subRules) && e2.workflowRules.subRules[r2]) {
     const n2 = e2.workflowRules.subRules[r2];
     t2.forEach((e3) => {
@@ -279,31 +284,31 @@ function O(e2, t2) {
     void 0 !== t2.show && (t2.show ? e2.show() : e2.hide()), void 0 !== t2.required && ((_a = n2 == null ? void 0 : n2.runtime) == null ? void 0 : _a.props) && (n2.runtime.props.required = t2.required), void 0 !== t2.readonly && ((_b = n2 == null ? void 0 : n2.runtime) == null ? void 0 : _b.props) && (t2.readonly ? n2.runtime.props.state = "readonly" : n2.runtime.props.state = "enabled"), void 0 !== t2.disabled && n2 && (((_c = n2 == null ? void 0 : n2.runtime) == null ? void 0 : _c.props) && (t2.disabled ? n2.runtime.props.state = "disabled" : n2.runtime.props.state = "enabled"), "table" === n2.name && e2.changeOperationAddState(false));
   }
 }
-function C(e2) {
+function x(e2) {
   if (!(e2 == null ? void 0 : e2.type)) return;
   const t2 = j[e2.type];
   t2 && (e2.validator = t2.validator);
 }
 const j = { boolean: { validator: function(e2, t2, n2) {
-  return true === x(e2, t2) && ("number" == typeof t2 && (1 === t2 || 0 === t2) || "boolean" == typeof t2 && (true === t2 || false === t2));
+  return true === M(e2, t2) && ("number" == typeof t2 && (1 === t2 || 0 === t2) || "boolean" == typeof t2 && (true === t2 || false === t2));
 } }, date: { validator: function(e2, t2, n2) {
-  if (true !== x(e2, t2)) return false;
+  if (true !== M(e2, t2)) return false;
   const s2 = new Date(t2);
   return !isNaN(s2.getTime());
 } }, number: { validator: function(e2, t2, n2) {
-  return true === x(e2, t2) && (("string" != typeof t2 || "" !== t2.trim()) && ("number" == typeof t2 || !isNaN(Number(t2))));
-} } }, x = (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 {
-  P as disabledAllFields,
-  k as dynamicControlTableEdit,
-  R as getWorkflowRules,
-  w as i18nValidatePropRulesMessage,
-  y as i18nValidateRulesMessage,
-  h as packageCustomRules,
-  C as packageCustomValidator,
-  f as setObjectPropRule,
+  E as disabledAllFields,
+  C as dynamicControlTableEdit,
+  v as getWorkflowRules,
+  R as i18nValidatePropRulesMessage,
+  w as i18nValidateRulesMessage,
+  y as packageCustomRules,
+  x as packageCustomValidator,
+  c as setObjectPropRule,
   O as updateComponentDisplayState,
-  v as updateFormItemEditState,
-  p as validateDataModelFunc,
-  c as validator
+  P as updateFormItemEditState,
+  g as validateDataModelFunc,
+  d as validator
 };

package/dist/es/components/runtime/utils/page-init-util.js

@@ -1,26 +1,26 @@
 import e from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap as t } from "./events/standard-event.js";
-import { PageDimensions as s } from "./interfaces/page-design-types.js";
-import { getFormPropName as i, getVariableValue as n, setVariableValue as o, formatVariableValue as r } from "./page-helper-util.js";
+import { PageDimensions as i } from "./interfaces/page-design-types.js";
+import { getFormPropName as s, getVariableValue as o, setVariableValue as n, formatVariableValue as r } from "./page-helper-util.js";
 import { getSessionCache as l } from "agilebuilder-ui/src/utils/auth";
 import { functions as a } from "./api/page-expose-util.js";
 import { isWorkflowPage as p, deepCopy as u } from "./common-util.js";
 import { packageCustomValidator as d } from "./events/validator-util.js";
 import { isMobileBrowser as f } from "agilebuilder-ui/src/utils/common-util";
-function m(t2) {
+function c(t2) {
   return e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + t2);
 }
-function c(e2) {
+function m(e2) {
   var _a, _b, _c;
   if (null == e2) return null;
-  const t2 = { uuid: e2.uuid, name: e2.name, label: e2.label, code: e2.code, version: e2.version, dimensions: e2.dimensions, systemCode: e2.systemCode, systemVersion: e2.systemVersion, backendUrl: e2.backendUrl, rules: {}, tableUuids: e2.tableUuids, listCodesMap: e2.listCodesMap, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: g(e2), pageType: e2.pageType, beanName: e2.props ? e2.props.beanName : null, importBeanName: e2.props ? e2.props.importBeanName : null, subTablePageInfo: e2.subTablePageInfo, workflowCode: e2.workflowCode, workflowVersion: e2.workflowVersion, refercePropMap: (_a = e2.runtime) == null ? void 0 : _a.refercePropMap, subTableWatchProps: e2.subTableWatchProps, dataTypeMaps: e2.dataTypeMaps, isWorkflowEntity: void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, branchFieldAuth: e2.branchFieldAuth, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam } };
+  const t2 = { uuid: e2.uuid, name: e2.name, label: e2.label, code: e2.code, version: e2.version, dimensions: e2.dimensions, systemCode: e2.systemCode, systemVersion: e2.systemVersion, backendUrl: e2.backendUrl, rules: {}, tableUuids: e2.tableUuids, listCodesMap: e2.listCodesMap, listCodesInitSearchForm: e2.listCodesInitSearchForm, formNoRuleCode: e2.props ? e2.props.formNoRuleCode : null, judgeHeavyList: g(e2), pageType: e2.pageType, beanName: e2.props ? e2.props.beanName : null, importBeanName: e2.props ? e2.props.importBeanName : null, subTablePageInfo: e2.subTablePageInfo, workflowCode: e2.workflowCode, workflowVersion: e2.workflowVersion, refercePropMap: (_a = e2.runtime) == null ? void 0 : _a.refercePropMap, subTableWatchProps: e2.subTableWatchProps, dataTypeMaps: e2.dataTypeMaps, isWorkflowEntity: void 0 !== ((_b = e2.props) == null ? void 0 : _b.activeWorkflow) ? (_c = e2.props) == null ? void 0 : _c.activeWorkflow : e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, branchFieldAuth: e2.branchFieldAuth, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam }, propTitleMap: {} };
   if (e2.props && e2.props.notIdInitializationList) {
-    let s2 = e2.props.notIdInitializationList;
-    "string" == typeof s2 && (s2 = JSON.parse(s2)), s2.length > 0 && (t2.notIdInitializationList = s2);
+    let i2 = e2.props.notIdInitializationList;
+    "string" == typeof i2 && (i2 = JSON.parse(i2)), i2.length > 0 && (t2.notIdInitializationList = i2);
   }
   if (e2.variables) {
-    const s2 = t2.entity.page;
-    for (const t3 of e2.variables) t3.name && (t3.isArrayElement ? s2[t3.name] = [] : t3.defaultValue ? s2[t3.name] = t3.defaultValue : s2[t3.name] = void 0);
+    const i2 = t2.entity.page;
+    for (const t3 of e2.variables) t3.name && (t3.isArrayElement ? i2[t3.name] = [] : t3.defaultValue ? i2[t3.name] = t3.defaultValue : i2[t3.name] = void 0);
   }
   return function(e3) {
     if (f()) {
@@ -30,8 +30,8 @@ function c(e2) {
     } else e3.entity.page._isMobile = "false";
   }(t2), Object.assign(t2, e2), t2.dimensions = function() {
     const e3 = window.outerWidth;
-    if (!e3) return s.PC;
-    return e3 > 768 ? s.PC : e3 > 414 ? s.IPAD : s.PHONE;
+    if (!e3) return i.PC;
+    return e3 > 768 ? i.PC : e3 > 414 ? i.IPAD : i.PHONE;
   }(), t2.events = e2.runtime && e2.runtime.events ? e2.runtime.events : [], t2;
 }
 function g(e2) {
@@ -44,23 +44,31 @@ function g(e2) {
 }
 function b(e2) {
   let t2 = decodeURI(window.location.href);
+  try {
+    window.top && !Array.isArray(window.top) && (t2 = decodeURI(window.top.location.href));
+  } catch (e3) {
+  }
   if (t2 && t2.includes("?")) {
     t2 = t2.substring(t2.lastIndexOf("?") + 1);
-    const s2 = t2.split("&");
-    for (const t3 of s2) {
-      const s3 = t3.split("=");
-      e2[s3[0]] = s3.length > 1 ? s3[1] : "";
+    const i2 = t2.split("&");
+    for (const t3 of i2) {
+      const i3 = t3.split("=");
+      let s2 = i3[0];
+      if (s2) {
+        const t4 = i3.length > 1 ? i3[1] : "";
+        s2.indexOf("ai__") >= 0 && (s2 = s2.substring(s2.indexOf("ai__") + 4)), e2[s2] = t4;
+      }
     }
   }
   e2._t_;
 }
-function y(e2, t2) {
+function h(e2, t2) {
   if (e2) {
     Object.assign(t2, e2);
     w(e2.paramStoreId, t2), delete e2.paramStoreId, e2.jumpMode && (t2.jumpMode = e2.jumpMode);
   }
 }
-function h(e2, t2) {
+function y(e2, t2) {
   if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query)) {
     Object.assign(t2, e2.query);
     w(e2.query.paramStoreId, t2);
@@ -68,133 +76,145 @@ function h(e2, t2) {
 }
 function w(e2, t2) {
   if (e2) {
-    const s2 = l(e2);
-    if (s2) {
-      const e3 = JSON.parse(s2);
+    const i2 = l(e2);
+    if (i2) {
+      const e3 = JSON.parse(i2);
       Object.assign(t2, e3);
     }
   }
 }
 function E(e2, t2) {
-  let s2, i2 = t2;
-  t2 || (s2 = e2.props.base ? e2.props.base : {}, i2 = s2.prop);
-  let n2 = null;
-  return t2 && !t2.startsWith("${") ? n2 = ["data", t2] : !e2 || i2 && i2.startsWith("${") ? i2.startsWith("${") ? (i2 = i2.substring(2, i2.length - 1), n2 = i2.split("."), e2 && n2.length < 2 && (n2 = [e2.uuid])) : e2 && (n2 = ["page", e2.uuid]) : n2 = ["page", e2.uuid], n2 || e2 ? n2 : ["temp"];
+  let i2, s2 = t2;
+  t2 || (i2 = e2.props.base ? e2.props.base : {}, s2 = i2.prop);
+  let o2 = null;
+  return t2 && !t2.startsWith("${") ? o2 = ["data", t2] : !e2 || s2 && s2.startsWith("${") ? s2.startsWith("${") ? (s2 = s2.substring(2, s2.length - 1), o2 = s2.split("."), e2 && o2.length < 2 && (o2 = [e2.uuid])) : e2 && (o2 = ["page", e2.uuid]) : o2 = ["page", e2.uuid], o2 || e2 ? o2 : ["temp"];
 }
-function v(e2, t2, s2) {
-  const i2 = E(t2, s2), r2 = e2.entity;
+function v(e2, t2, i2) {
+  var _a;
+  const s2 = E(t2, i2), r2 = e2.entity;
   if (null == r2.data.ID && null == r2.data.id) {
-    let s3, l2, a2 = false;
-    t2 && (s3 = t2.props.base ? t2.props.base : {}, l2 = t2.name, a2 = s3.multiple);
-    const p2 = n(r2, i2);
+    let i3, l2, a2 = false;
+    t2 && (i3 = t2.props.base ? t2.props.base : {}, l2 = t2.name, a2 = i3.multiple);
+    const p2 = o(r2, s2);
     if (null == p2) {
-      const t3 = s3 ? s3.defaultValue : null;
-      if (t3) {
-        const s4 = P(e2, t3, l2, a2);
-        null != s4 && o(r2, i2, s4);
+      const t3 = i3 ? i3.defaultValue : null;
+      if (t3) try {
+        const o2 = P(e2, t3, l2, a2);
+        if (null != o2 && "" !== o2) n(r2, s2, o2);
+        else if (((_a = i3.moreDefaultValue) == null ? void 0 : _a.length) > 0) {
+          const t4 = i3.moreDefaultValue;
+          for (let i4 = 0; i4 < t4.length; i4++) {
+            const o3 = P(e2, t4[i4], l2, a2);
+            if (null != o3 && "" !== o3) {
+              n(r2, s2, o3);
+              break;
+            }
+          }
+        }
+      } catch (e3) {
       }
     }
   }
-  return i2;
+  return s2;
 }
-function P(e2, t2, s2, i2) {
-  let n2;
-  if (t2 && (n2 = r(e2, t2), null != n2 && null != n2 && s2)) {
+function P(e2, t2, i2, s2) {
+  let o2;
+  if (t2 && (o2 = r(e2, t2), null != o2 && null != o2 && i2)) {
     let e3 = false;
-    "checkbox" == s2 ? e3 = true : "select" == s2 && (e3 = i2), e3 && (n2 = (n2 + "").split(","));
+    "checkbox" == i2 ? e3 = true : "select" == i2 && (e3 = s2), e3 && (o2 = (o2 + "").split(","));
   }
-  return n2;
+  return o2;
 }
 function M(e2, t2) {
   var _a, _b;
   if (false === ((_b = (_a = e2.props) == null ? void 0 : _a.base) == null ? void 0 : _b.isPermission)) return "true";
-  const s2 = [];
-  if (e2.autoPermissions) for (const i2 of e2.autoPermissions) s2.push(t2.code + "." + i2.simpleCode);
+  const i2 = [];
+  if (e2.autoPermissions) for (const s2 of e2.autoPermissions) i2.push(t2.code + "." + s2.simpleCode);
   if (e2.functionCodes) {
-    const i2 = e2.sourceTypes ? e2.sourceTypes : [], n2 = e2.functionCodes;
-    for (let e3 = 0; e3 < n2.length; e3++) {
-      const o2 = n2[e3], r2 = e3 < i2.length ? i2[e3] : "";
+    const s2 = e2.sourceTypes ? e2.sourceTypes : [], o2 = e2.functionCodes;
+    for (let e3 = 0; e3 < o2.length; e3++) {
+      const n2 = o2[e3], r2 = e3 < s2.length ? s2[e3] : "";
       let l2 = "";
-      if ("service" == r2) l2 = o2;
-      else if ("standard" === r2) l2 = t2.code + "." + o2;
+      if ("service" == r2) l2 = n2;
+      else if ("standard" === r2) l2 = t2.code + "." + n2;
       else {
-        l2 = "custom" === k(o2, t2).type ? o2 : t2.code + "." + o2;
+        l2 = "custom" === k(n2, t2).type ? n2 : t2.code + "." + n2;
       }
-      s2.includes(l2) || s2.push(l2);
+      i2.includes(l2) || i2.push(l2);
     }
   }
-  return s2.join(",");
+  return i2.join(",");
 }
 function k(e2, t2) {
-  const s2 = t2.pagePermissions;
-  if (s2 && s2.length > 0) {
-    for (let t3 = 0; t3 < s2.length; t3++) if (s2[t3].simpleCode === e2) return s2[t3];
+  const i2 = t2.pagePermissions;
+  if (i2 && i2.length > 0) {
+    for (let t3 = 0; t3 < i2.length; t3++) if (i2[t3].simpleCode === e2) return i2[t3];
   }
   return null;
 }
-function j(s2, i2, n2) {
-  const o2 = s2.tableRuntimes, r2 = t(i2);
+function C(i2, s2, o2) {
+  const n2 = i2.tableRuntimes, r2 = t(s2);
   let l2;
-  const a2 = i2.code;
-  return r2 && Object.keys(r2) > 0 && (l2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: o2, additionalParamMapJson: l2, pageCode: a2, publishVersion: n2, pageType: s2.pageType });
+  const a2 = s2.code;
+  return r2 && Object.keys(r2) > 0 && (l2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: n2, additionalParamMapJson: l2, pageCode: a2, publishVersion: o2, pageType: i2.pageType });
 }
-const C = ["button-detail", "print-label"];
-function I(e2, t2, s2) {
+const I = ["button-detail", "print-label"];
+function j(e2, t2, i2) {
   var _a, _b;
-  const n2 = t2.props && t2.props.base ? t2.props.base.prop : null, o2 = p(e2);
+  const o2 = t2.props && t2.props.base ? t2.props.base.prop : null, n2 = p(e2);
   let r2 = false;
-  if (o2 && C.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
-    const s3 = e2.fieldPermissionMap.get("all_fields");
-    false === (s3 == null ? void 0 : s3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", r2 = true);
+  if (n2 && I.indexOf(t2.name) < 0 && e2.fieldPermissionMap) {
+    const i3 = e2.fieldPermissionMap.get("all_fields");
+    false === (i3 == null ? void 0 : i3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", r2 = true);
   }
-  if (n2) {
-    const l2 = i(n2);
+  if (o2) {
+    const l2 = s(o2);
     if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[l2] || (e2.rules[l2] = []), t2.props.rules.forEach((e3) => {
-      d(e3), !s2 && e3 && e3.required && (e3.required = false);
-    }), e2.rules[l2] = t2.props.rules), o2 && !r2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
-      const i2 = e2.fieldPermissionMap.get(l2);
-      if (!s2 && e2.workflowRules && (e2.workflowRules[l2] || e2.workflowRules.rules && e2.workflowRules.rules[l2])) {
+      d(e3), !i2 && e3 && e3.required && (e3.required = false);
+    }), e2.rules[l2] = t2.props.rules), n2 && !r2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
+      const s2 = e2.fieldPermissionMap.get(l2);
+      if (!i2 && e2.workflowRules && (e2.workflowRules[l2] || e2.workflowRules.rules && e2.workflowRules.rules[l2])) {
         let t3 = e2.workflowRules[l2];
         if (!t3 && e2.workflowRules.rules && (t3 = e2.workflowRules.rules[l2]), t3 && Array.isArray(t3) && t3.length > 0) for (let e3 = 0; e3 < t3.length; e3++) {
-          const s3 = t3[e3];
-          if (s3 && s3.required) {
-            s3.required = false;
+          const i3 = t3[e3];
+          if (i3 && i3.required) {
+            i3.required = false;
             break;
           }
         }
         else t3 && t3.required && (t3.required = false);
       }
-      t2.runtime.props || (t2.runtime.props = {}), i2 ? (!s2 && i2.canEdit && (i2.canEdit = false), false === i2.canEdit ? t2.runtime.props.state = "disabled" : i2.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true)) : t2.runtime.props.state = "";
+      t2.runtime.props || (t2.runtime.props = {}), s2 ? (!i2 && s2.canEdit && (s2.canEdit = false), false === s2.canEdit ? t2.runtime.props.state = "disabled" : s2.canEdit && (t2.runtime.props.state = "", t2.runtime.props.required = true)) : t2.runtime.props.state = "";
     }
     ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: l2, events: t2.props.customRuleEvents }));
   }
 }
 function O(e2, t2) {
   if (e2.initInfo) {
-    ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((s2) => {
-      const i2 = e2.initInfo[s2];
-      if (i2) if ("dynamicControlFormEdit" === s2) {
-        let s3 = i2.filter((e3) => "_all_fields" === e3.name || e3.name === t2);
-        if (s3 && s3.length > 0 && (s3 = s3.filter((e3) => "_all_fields" === e3.name), s3 && s3.length > 0)) {
-          const e3 = u(s3[0]);
-          e3.name = t2, s3 = [e3];
+    ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((i2) => {
+      const s2 = e2.initInfo[i2];
+      if (s2) if ("dynamicControlFormEdit" === i2) {
+        let i3 = s2.filter((e3) => "_all_fields" === e3.name || e3.name === t2);
+        if (i3 && i3.length > 0 && (i3 = i3.filter((e3) => "_all_fields" === e3.name), i3 && i3.length > 0)) {
+          const e3 = u(i3[0]);
+          e3.name = t2, i3 = [e3];
         }
-        a.dynamicControlFormEdit(e2, s3, false);
-      } else "disableElement" === s2 ? i2.indexOf(t2) >= 0 && a.disableElement(e2, [t2], false) : "enableElement" === s2 ? i2.indexOf(t2) >= 0 && a.enableElement(e2, [t2], false) : "hideElement" === s2 ? i2.indexOf(t2) >= 0 && a.hideElement(e2, [t2], false) : "showElement" === s2 && i2.indexOf(t2) >= 0 && a.showElement(e2, [t2], false);
+        a.dynamicControlFormEdit(e2, i3, false);
+      } else "disableElement" === i2 ? s2.indexOf(t2) >= 0 && a.disableElement(e2, [t2], false) : "enableElement" === i2 ? s2.indexOf(t2) >= 0 && a.enableElement(e2, [t2], false) : "hideElement" === i2 ? s2.indexOf(t2) >= 0 && a.hideElement(e2, [t2], false) : "showElement" === i2 && s2.indexOf(t2) >= 0 && a.showElement(e2, [t2], false);
     });
   }
 }
 export {
   O as controlObjectRenderState,
-  c as convertToPageContext,
+  m as convertToPageContext,
   P as getDefaultValue,
   v as getFormModelFields,
   E as getModelFields,
   M as getPermissionCodes,
   b as packageAdditionalMapWithLocationSearch,
-  y as packageAdditionalMapWithPageRequest,
-  h as packageAdditionalMapWithRoute,
-  I as packageFormRules,
-  m as queryPageDesignByCode,
-  j as queryPageSuperGrids
+  h as packageAdditionalMapWithPageRequest,
+  y as packageAdditionalMapWithRoute,
+  j as packageFormRules,
+  c as queryPageDesignByCode,
+  C as queryPageSuperGrids
 };