super-page-runtime 2.2.0 → 2.2.1

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

@@ -5,15 +5,11 @@ import { getComponentRef } from "./global-refs.js";
 import { watch } from "vue";
 import { deepCopy, getBaseUrl } from "./common-util.js";
 function getComponentOptionConfigs(t, e) {
-  if (!t.props || !t.props.dataOrigin)
-    return;
-  if (t.name && "table" === t.name)
-    return;
+  if (!t.props || !t.props.dataOrigin) return;
+  if (t.name && "table" === t.name) return;
   const o = t.props.dataOrigin, n = { uuid: t.uuid };
-  if ("optionGroup" == o.optionValueSetType)
-    n.type = "optionGroup", n.props = { code: o.optionGroup };
-  else if ("dynamicData" == o.optionValueSetType)
-    n.type = "dynamicData", n.filterType = o.filterType, n.props = { code: o.dynamicDataSourceCode };
+  if ("optionGroup" == o.optionValueSetType) n.type = "optionGroup", n.props = { code: o.optionGroup };
+  else if ("dynamicData" == o.optionValueSetType) n.type = "dynamicData", n.filterType = o.filterType, n.props = { code: o.dynamicDataSourceCode };
   else if ("dataTable" == o.optionValueSetType) {
     n.filterType = o.filterType;
     const t2 = getTableQueryInfo(o, e);
@@ -29,31 +25,26 @@ function getTableQueryInfo(t, e) {
   const o = { type: "dataTable" };
   if (o.props = { tableName: t.tableName, systemCode: t.tableSysCode ? t.tableSysCode : e.systemCode, systemVersion: t.tableSysCode ? t.tableSysVersion : e.systemVersion }, t.sortFields) {
     const e2 = [];
-    for (const o2 of t.sortFields)
-      o2.name && e2.push({ prop: o2.name, order: o2.type ? o2.type : "asc" });
+    for (const o2 of t.sortFields) o2.name && e2.push({ prop: o2.name, order: o2.type ? o2.type : "asc" });
     o.props.sorts = e2;
   }
   const n = [];
   if (t.filterList) {
     const e2 = [];
     for (const o2 of t.filterList) {
-      if (!o2.propName)
-        continue;
+      if (!o2.propName) continue;
       o2.propDbName || (o2.propDbName = o2.propName);
       const t2 = {};
       Object.assign(t2, o2);
       const a2 = getParamNames(o2.propValue);
-      for (const t3 of a2)
-        t3 && (t3.startsWith("${data.") || t3.startsWith("${task.") || t3.startsWith("${page.")) && (n.includes(t3) || n.push(t3));
+      for (const t3 of a2) t3 && (t3.startsWith("${data.") || t3.startsWith("${task.") || t3.startsWith("${page.")) && (n.includes(t3) || n.push(t3));
       o2.propValue, e2.push(t2);
     }
     o.props.searchForm = e2;
   }
   o.props.monitorFields = n;
   const a = [];
-  if (t.tableValueField && (o.props.valueField = t.tableValueField), t.tableLableField && -1 == a.indexOf(t.tableLableField) && (o.props.lableField = t.tableLableField), t.autoSets)
-    for (const e2 of t.autoSets)
-      e2.source && -1 == a.indexOf(e2.source) && a.push(e2.source);
+  if (t.tableValueField && (o.props.valueField = t.tableValueField), t.tableLableField && -1 == a.indexOf(t.tableLableField) && (o.props.lableField = t.tableLableField), t.autoSets) for (const e2 of t.autoSets) e2.source && -1 == a.indexOf(e2.source) && a.push(e2.source);
   return o.props.queryFields = a, o.props.pageSize = t.displayQuantity, o;
 }
 function getServiceQueryInfo(t, e) {
@@ -61,8 +52,7 @@ function getServiceQueryInfo(t, e) {
   if (o.props = { serivceCode: t.serviceCode, systemCode: t.tableSysCode ? t.tableSysCode : e.systemCode, systemVersion: t.tableSysCode ? t.tableSysCode : e.systemCode }, t.serviceInputs) {
     const e2 = [];
     for (const o2 of t.serviceInputs) {
-      if (!o2.name || o2.value)
-        continue;
+      if (!o2.name || o2.value) continue;
       const t2 = {};
       Object.assign(t2, o2), e2.push(t2);
     }
@@ -72,21 +62,16 @@ function getServiceQueryInfo(t, e) {
 }
 function updateChartDatasources(t, e, o, n) {
   return new Promise((a, r) => {
-    if (!e || 0 == e.length)
-      return void r(new Error("无需查询的统计图配置!"));
+    if (!e || 0 == e.length) return void r(new Error("无需查询的统计图配置!"));
     const s = deepCopy(e);
     s.forEach((e2) => {
-      var _a;
-      const o2 = e2.uuid, n2 = getComponentRef(t, o2);
-      if (n2) {
-        const o3 = n2.getConfigure(), a2 = (_a = o3 == null ? void 0 : o3.props.dataOrigin) == null ? void 0 : _a.serviceInputs;
-        if (a2) {
-          const o4 = e2.services;
-          o4 && o4.length > 0 && (o4[0].serviceInParams = {}, a2.forEach((e3) => {
-            const n3 = e3.name, a3 = e3.value;
-            o4[0].serviceInParams[n3] = getValueFromVariable(t.entity, a3);
-          }));
-        }
+      const o2 = e2.services;
+      if (o2 && o2.length > 0) {
+        let e3 = o2[0].serviceInputs;
+        e3 && (o2[0].serviceInParams = {}, e3.forEach((e4) => {
+          const n2 = e4.name, a2 = e4.value;
+          o2[0].serviceInParams[n2] = getValueFromVariable(t.entity, a2);
+        }), delete o2[0].serviceInputs);
       }
     });
     const i = t.entity ? t.entity : {}, u = {};
@@ -102,7 +87,7 @@ function updateChartDatasources(t, e, o, n) {
         const a2 = getComponentRef(t, o2);
         if (a2) {
           const r2 = a2.getConfigure();
-          if ((!n || r2 && r2.initializationQuery) && a2.updateChartDatas && (a2.updateChartDatas(e2[o2]), (_b = (_a = r2.runtime) == null ? void 0 : _a.dataConfig) == null ? void 0 : _b.resultSet)) {
+          if ((!n || r2 && (void 0 === r2.initializationQuery || r2.initializationQuery)) && a2.updateChartDatas && (a2.updateChartDatas(e2[o2]), (_b = (_a = r2.runtime) == null ? void 0 : _a.dataConfig) == null ? void 0 : _b.resultSet)) {
             const n2 = e2[o2] && e2[o2].length > 0 ? e2[o2][0] : {}, a3 = n2 && n2.result ? n2.result : {};
             let s2 = null;
             r2.serviceDataField ? s2 = a3[r2.serviceDataField] : a3 && (s2 = Array.isArray(a3) ? a3 : [a3]), s2 || (s2 = []), setValueForVariableName(t.entity, r2.runtime.dataConfig.resultSet, s2);
@@ -121,8 +106,7 @@ function updateChartDatasourcesByComponent(t, e) {
 }
 function updateOptionDatasources(t, e, o) {
   return new Promise((n, a) => {
-    if (!e || 0 == e.length)
-      return void a(new Error("无需查询的配置!"));
+    if (!e || 0 == e.length) return void a(new Error("无需查询的配置!"));
     const r = t.entity ? t.entity : {}, s = {};
     r.request && Object.assign(s, r.request), r.page && Object.assign(s, r.page), s.query = o;
     const i = { entityMap: r.data, additionalParamMap: s, dataSourceList: e, systemCode: t.systemCode, query: o }, u = t.backendUrl, l = getBaseUrl(u, t.isTest) + "/common/common-data/find-datas";
@@ -147,30 +131,25 @@ function getComponentOptionDatasFromPage(t, e) {
   return o || [];
 }
 function getOptionDatasSourceMap(t) {
-  if (!t || !t.optionSourceMap)
-    return {};
+  if (!t || !t.optionSourceMap) return {};
   const e = t.optionSourceMap;
   return e || {};
 }
 function getChartDatasFromPage(t, e) {
-  if (!t || !t.chartDataSourceMap || !e)
-    return null;
+  if (!t || !t.chartDataSourceMap || !e) return null;
   return t.chartDataSourceMap[e.uuid];
 }
 function queryOptionDatasources(t, e, o) {
   return updateOptionDatasources(t, e ? [e] : [], o);
 }
 function autoSetAfterSelect(t, e, o, n) {
-  if (!o || 0 == o.length)
-    return;
+  if (!o || 0 == o.length) return;
   const a = e.entity ? e.entity : {};
   for (const t2 of o) {
-    if (!t2.source || !t2.target)
-      continue;
+    if (!t2.source || !t2.target) continue;
     const e2 = getValuesByField(n, t2.source);
     let o2 = t2.target;
-    if (!o2 || !o2.startsWith("${"))
-      continue;
+    if (!o2 || !o2.startsWith("${")) continue;
     o2 = o2.substring(2, o2.length - 1);
     setVariableValue(a, o2.split("."), e2.join(","));
   }
@@ -187,24 +166,20 @@ function getValuesByField(t, e) {
   return [""];
 }
 function getVariableValue(t, e) {
-  if (!t || !e || 0 == e.length)
-    return;
+  if (!t || !e || 0 == e.length) return;
   let o = t;
   for (let t2 = 0; t2 < e.length; t2++) {
-    if (null == o)
-      return o;
+    if (null == o) return o;
     o = o[e[t2]];
   }
   return o;
 }
 function setValueForVariableName(t, e, o) {
-  if (!e || !e.startsWith("${"))
-    return;
+  if (!e || !e.startsWith("${")) return;
   setVariableValue(t, (e = e.substring(2, e.length - 1)).split("."), o);
 }
 function setVariableValue(t, e, o) {
-  if (!t || !e || 0 == e.length)
-    return;
+  if (!t || !e || 0 == e.length) return;
   let n = t;
   for (let t2 = 0; t2 < e.length; t2++) {
     const a = e[t2];
@@ -212,13 +187,11 @@ function setVariableValue(t, e, o) {
   }
 }
 function setVariableValueWithProp(t, e, o) {
-  if (!t || !e)
-    return;
+  if (!t || !e) return;
   setVariableValue(t, e.split("."), o);
 }
 function formatVariableValue(t, e) {
-  if (!t || "" == e || null == e || null == e)
-    return e;
+  if (!t || "" == e || null == e || null == e) return e;
   const o = t.entity ? t.entity : {}, n = getParamNames(e);
   for (const t2 in n) {
     const a = n[t2], r = getValueFromVariable(o, a);
@@ -227,20 +200,16 @@ function formatVariableValue(t, e) {
   return e;
 }
 function getParamNames(t) {
-  if (!t)
-    return [];
+  if (!t) return [];
   const e = t.match(/\$\{[^\{|\}]+\}/g);
   return e || [];
 }
 function formatValueByType(t, e, o) {
-  if (!e || "" == t || null == t || null == t)
-    return t;
+  if (!e || "" == t || null == t || null == t) return t;
   if (o = o || {}, "number" == e || "percent" == e) {
-    if (isNaN(t))
-      return t;
+    if (isNaN(t)) return t;
     let n = parseInt(o.decimalDigit);
-    if ((null == n || isNaN(n)) && (n = -1), t = parseFloat(t), "percent" == e && (t *= 100), n > -1 && (t = parseFloat(t.toFixed(n))), "percent" == e)
-      t += "%";
+    if ((null == n || isNaN(n)) && (n = -1), t = parseFloat(t), "percent" == e && (t *= 100), n > -1 && (t = parseFloat(t.toFixed(n))), "percent" == e) t += "%";
     else {
       if (o.thousandsSeparator) {
         const e2 = t.toString().split(".");
@@ -257,25 +226,17 @@ function formatValueByType(t, e, o) {
   return "custom" == e && o.formatEventUuid, t;
 }
 function getValueFromVariable(t, e, o) {
-  if (null == e || null == e)
-    return e;
+  if (null == e || null == e) return e;
   if (e.startsWith("${") && e.endsWith("}")) {
     let n = e.substring(2, e.length - 1), a = null, r = null;
-    if (n.startsWith("data."))
-      n = n.substring(5), r = t.data, a = "data";
-    else if (n.startsWith("page."))
-      n = n.substring(5), a = "page", r = t.page;
-    else if (n.startsWith("task."))
-      n = n.substring(5), a = "task", r = t.task;
-    else if (n.startsWith("request."))
-      n = n.substring(8), a = "request", r = t.request;
-    else if (n.startsWith("context."))
-      n = n.substring(8), a = "context", r = t.context;
-    else if (n.startsWith("system."))
-      n = n.substring(7), a = "system", r = t.system;
+    if (n.startsWith("data.")) n = n.substring(5), r = t.data, a = "data";
+    else if (n.startsWith("page.")) n = n.substring(5), a = "page", r = t.page;
+    else if (n.startsWith("task.")) n = n.substring(5), a = "task", r = t.task;
+    else if (n.startsWith("request.")) n = n.substring(8), a = "request", r = t.request;
+    else if (n.startsWith("context.")) n = n.substring(8), a = "context", r = t.context;
+    else if (n.startsWith("system.")) n = n.substring(7), a = "system", r = t.system;
     else {
-      if (n.startsWith("fixed."))
-        return n.substring(6);
+      if (n.startsWith("fixed.")) return n.substring(6);
       n.startsWith("row.") && (n = n.substring(4), r = o, a = "row");
     }
     return n ? getValueFromSource(r, n, a) : "";
@@ -283,8 +244,7 @@ function getValueFromVariable(t, e, o) {
   return e;
 }
 function getValueFromSource(t, e, o) {
-  if ("context" != o && !t || !e)
-    return;
+  if ("context" != o && !t || !e) return;
   const n = e.indexOf(".");
   if (n > -1) {
     const a = e.substring(0, n), r = e.substring(n + 1);
@@ -292,42 +252,37 @@ function getValueFromSource(t, e, o) {
     return s && Array.isArray(s) && s.length > 0 && (s = s[0]), getValueFromSource(s, r, o);
   }
   if ("context" == o) {
-    if ("currentDate" == e || "currentTime" == e)
-      return /* @__PURE__ */ new Date();
+    if ("currentDate" == e || "currentTime" == e) return /* @__PURE__ */ new Date();
     if (e.startsWith("currentDate") && e.length > 11) {
       const t2 = e.substring(11), o2 = t2.substring(0, 1);
       let n2 = parseInt(t2.substring(1, t2.length - 1), 10);
       const a = t2.substring(t2.length - 1), r = /* @__PURE__ */ new Date();
       return n2 = "+" === o2 ? n2 : -n2, "d" === a || "w" === a ? (n2 = "w" === a ? 7 * n2 : n2, r.setDate(r.getDate() + n2)) : "m" === a ? r.setMonth(r.getMonth() + n2) : "y" === a && r.setFullYear(r.getFullYear() + n2), r;
     }
-    if (!t)
-      return;
+    if (!t) return;
   }
   return t[e];
 }
 function caculateShowCondition(pageContext, showConditions, row) {
-  if (!showConditions || 0 == showConditions.length || !pageContext || !pageContext.entity)
-    return true;
+  if (!showConditions || 0 == showConditions.length || !pageContext || !pageContext.entity) return true;
   const entityData = pageContext.entity;
   let conditions = "";
   const maxLen = showConditions.length;
   for (let t = 0; t < maxLen; t++) {
     const e = showConditions[t], o = e.propName;
     let n = e.operator;
-    if (!o || "" === o)
-      continue;
+    if (!o || "" === o) continue;
     n || (n = "EQ");
     const a = getValueFromVariable(entityData, o, row);
     let r = getValueFromVariable(entityData, e.propValue, row);
     const s = e.dataType;
     "CONTAIN" != n && "NOT_CONTAIN" != n || a && !a.includes && (n = "CONTAIN" == n ? "EQ" : "NET");
     let i = e.variableIsNull, u;
-    if (i || (i = "null"), void 0 !== r && "" !== r || (r = null, "null" === i ? n = "IS_NULL" : "notequal" === i ? n = "IS_NOT_NULL" : u = true), null == u)
-      try {
-        u = executeExpression(a, n, r, s);
-      } catch (t2) {
-        u = false;
-      }
+    if (i || (i = "null"), void 0 !== r && "" !== r || (r = null, "null" === i ? n = "IS_NULL" : "notequal" === i ? n = "IS_NOT_NULL" : u = true), null == u) try {
+      u = executeExpression(a, n, r, s);
+    } catch (t2) {
+      u = false;
+    }
     const l = e.leftBracket, c = e.rightBracket;
     let p = e.joinSign;
     if (l && null !== l && "" !== l && (conditions += l, conditions += " "), conditions += u + " ", c && null !== c && "" !== c && (conditions += c, conditions += " "), t < maxLen - 1 && p && null !== p && "" !== p) {
@@ -338,29 +293,25 @@ function caculateShowCondition(pageContext, showConditions, row) {
   return !conditions || eval("(" + conditions + ")");
 }
 function monitorFieldChange(t, e, o) {
-  if (!o || !t || !e || 0 == e.length)
-    return;
+  if (!o || !t || !e || 0 == e.length) return;
   const n = [], a = [];
-  for (let t2 of e)
-    if (t2.startsWith("${")) {
-      t2 = t2.substring(2, t2.length - 1);
-      const e2 = t2.split(".");
-      "page" !== e2[0] && "task" !== e2[0] && "data" !== e2[0] || (n.push(e2), a.includes(e2[0]) || a.push(e2[0]));
-    }
+  for (let t2 of e) if (t2.startsWith("${")) {
+    t2 = t2.substring(2, t2.length - 1);
+    const e2 = t2.split(".");
+    "page" !== e2[0] && "task" !== e2[0] && "data" !== e2[0] || (n.push(e2), a.includes(e2[0]) || a.push(e2[0]));
+  }
   const r = t.entity;
   let s = getMonitorFieldValues(n, r), i = false;
-  for (const t2 of a)
-    watch(r[t2], () => {
-      i && clearTimeout(i), i = setTimeout(function() {
-        const t3 = getMonitorFieldValues(n, r);
-        s != t3 && (s = t3, o());
-      }, 200);
-    });
+  for (const t2 of a) watch(r[t2], () => {
+    i && clearTimeout(i), i = setTimeout(function() {
+      const t3 = getMonitorFieldValues(n, r);
+      s != t3 && (s = t3, o());
+    }, 200);
+  });
 }
 function getMonitorFieldValues(t, e) {
   let o = "";
-  for (const n of t)
-    o += "_" + getVariableValue(e, n);
+  for (const n of t) o += "_" + getVariableValue(e, n);
   return o;
 }
 function getFormPropName(t) {
@@ -379,8 +330,7 @@ function isPromise(t) {
   return t && "[object Promise]" === Object.prototype.toString.call(t);
 }
 function decomposeVariable(t) {
-  if (!t)
-    return [];
+  if (!t) return [];
   const e = t.match(/\${(.*?)}/);
   return e ? e[1].split(".") : [];
 }

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

@@ -16,7 +16,12 @@ export declare function queryPageDesignByCode(pageCode: string): Promise<any>;
  * 转换页面设计对象为运行时对象
  * @param pageDesign 页面设计对象
  */
-export declare function convertToPageContext(pageDesign: PageDesign, pageRequest: object): PageContext | null;
+export declare function convertToPageContext(pageDesign: PageDesign): PageContext | null;
+/**
+ * 获取请求对象的值
+ */
+export declare function packageAdditionalMapWithLocationSearch(requestObj: any): any;
+export declare function packageAdditionalMapWithPageRequest(pageRequest: object, requestObj: any): void;
 export declare function packageAdditionalMapWithRoute(route: any, requestObj: any): void;
 export declare function getModelFields(formItemConfigure: any, prop?: string): string[];
 /**

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

@@ -1,7 +1,7 @@
 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 { setVariableValue as n, formatVariableValue as i, getFormPropName as o } from "./page-helper-util.js";
+import { getFormPropName as n, setVariableValue as i, formatVariableValue as o } from "./page-helper-util.js";
 import { getSessionCache as r } from "agilebuilder-ui/src/utils/auth";
 import { functions as l } from "./api/page-expose-util.js";
 import { isWorkflowPage as a, deepCopy as p } from "./common-util.js";
@@ -9,26 +9,23 @@ import { packageCustomValidator as u } from "./events/validator-util.js";
 function d(t2) {
   return e.get(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + t2);
 }
-function m(e2, t2) {
+function m(e2) {
   var _a;
-  if (null == e2)
-    return null;
-  const n2 = { 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: c(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: e2.isWorkflowEntity, entity: { data: {}, task: {}, request: f(t2), page: {}, context: e2.contextParam, system: e2.systemParam } };
+  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: c(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: e2.isWorkflowEntity, allChartUuids: e2.allChartUuids, entity: { data: {}, task: {}, request: {}, page: {}, context: e2.contextParam, system: e2.systemParam } };
   if (e2.props && e2.props.notIdInitializationList) {
-    let t3 = e2.props.notIdInitializationList;
-    "string" == typeof t3 && (t3 = JSON.parse(t3)), t3.length > 0 && (n2.notIdInitializationList = t3);
+    let s2 = e2.props.notIdInitializationList;
+    "string" == typeof s2 && (s2 = JSON.parse(s2)), s2.length > 0 && (t2.notIdInitializationList = s2);
   }
   if (e2.variables) {
-    const t3 = n2.entity.page;
-    for (const s2 of e2.variables)
-      s2.name && (s2.isArrayElement ? t3[s2.name] = [] : s2.defaultValue ? t3[s2.name] = s2.defaultValue : t3[s2.name] = void 0);
+    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);
   }
-  return Object.assign(n2, e2), n2.dimensions = function() {
+  return Object.assign(t2, e2), t2.dimensions = function() {
     const e3 = window.outerWidth;
-    if (!e3)
-      return s.PC;
+    if (!e3) return s.PC;
     return e3 > 768 ? s.PC : e3 > 414 ? s.IPAD : s.PHONE;
-  }(), n2.events = e2.runtime && e2.runtime.events ? e2.runtime.events : [], n2;
+  }(), t2.events = e2.runtime && e2.runtime.events ? e2.runtime.events : [], t2;
 }
 function c(e2) {
   try {
@@ -39,28 +36,30 @@ function c(e2) {
   }
 }
 function f(e2) {
-  const t2 = {};
-  if (e2) {
-    b(e2.paramStoreId, t2), delete e2.paramStoreId, Object.assign(t2, e2);
-  }
-  let s2 = decodeURI(window.location.href);
-  if (s2 && s2.includes("?")) {
-    s2 = s2.substring(s2.lastIndexOf("?") + 1);
-    const e3 = s2.split("&");
-    for (const s3 of e3) {
-      const e4 = s3.split("=");
-      t2[e4[0]] = e4.length > 1 ? e4[1] : "";
+  let t2 = decodeURI(window.location.href);
+  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] : "";
     }
   }
-  return t2._t_, t2;
+  e2._t_;
 }
 function g(e2, t2) {
+  if (e2) {
+    Object.assign(t2, e2);
+    h(e2.paramStoreId, t2), delete e2.paramStoreId;
+  }
+}
+function b(e2, t2) {
   if (e2 && (e2.params && Object.assign(t2, e2.params), e2.query)) {
     Object.assign(t2, e2.query);
-    b(e2.query.paramStoreId, t2);
+    h(e2.query.paramStoreId, t2);
   }
 }
-function b(e2, t2) {
+function h(e2, t2) {
   if (e2) {
     const s2 = r(e2);
     if (s2) {
@@ -75,31 +74,28 @@ function y(e2, t2) {
   let i2 = null;
   return t2 && !t2.startsWith("${") ? i2 = ["data", t2] : !e2 || n2 && n2.startsWith("${") ? n2.startsWith("${") ? (n2 = n2.substring(2, n2.length - 1), i2 = n2.split("."), e2 && i2.length < 2 && (i2 = [e2.uuid])) : e2 && (i2 = ["page", e2.uuid]) : i2 = ["page", e2.uuid], i2 || e2 ? i2 : ["temp"];
 }
-function h(e2, t2, s2) {
-  const i2 = y(t2, s2), o2 = e2.entity;
+function E(e2, t2, s2) {
+  const n2 = y(t2, s2), o2 = e2.entity;
   if (null == o2.data.ID && null == o2.data.id) {
     let s3, r2, l2 = false;
     t2 && (s3 = t2.props.base ? t2.props.base : {}, r2 = t2.name, l2 = s3.multiple);
-    const a2 = E(e2, s3 ? s3.defaultValue : null, r2, l2);
-    null != a2 && n(o2, i2, a2);
+    const a2 = v(e2, s3 ? s3.defaultValue : null, r2, l2);
+    null != a2 && i(o2, n2, a2);
   }
-  return i2;
+  return n2;
 }
-function E(e2, t2, s2, n2) {
-  let o2;
-  if (t2 && (o2 = i(e2, t2), null != o2 && null != o2 && s2)) {
+function v(e2, t2, s2, n2) {
+  let i2;
+  if (t2 && (i2 = o(e2, t2), null != i2 && null != i2 && s2)) {
     let e3 = false;
-    "checkbox" == s2 ? e3 = true : "select" == s2 && (e3 = n2), e3 && (o2 = (o2 + "").split(","));
+    "checkbox" == s2 ? e3 = true : "select" == s2 && (e3 = n2), e3 && (i2 = (i2 + "").split(","));
   }
-  return o2;
+  return i2;
 }
-function v(e2, t2) {
-  if (!t2 || !e2 || t2.isTest)
-    return "true";
+function P(e2, t2) {
+  if (!t2 || !e2 || t2.isTest) return "true";
   const s2 = [];
-  if (e2.autoPermissions)
-    for (const n2 of e2.autoPermissions)
-      s2.push(t2.code + "." + n2.simpleCode);
+  if (e2.autoPermissions) for (const n2 of e2.autoPermissions) s2.push(t2.code + "." + n2.simpleCode);
   if (e2.functionCodes) {
     const n2 = e2.sourceTypes ? e2.sourceTypes : [], i2 = e2.functionCodes;
     for (let e3 = 0; e3 < i2.length; e3++) {
@@ -110,57 +106,57 @@ function v(e2, t2) {
   }
   return s2.join(",");
 }
-function P(s2, n2, i2) {
+function w(s2, n2, i2) {
   const o2 = s2.tableRuntimes, r2 = t(n2);
   let l2;
   const a2 = n2.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: i2, pageType: s2.pageType });
 }
-function w(e2, t2) {
+function C(e2, t2) {
   var _a, _b;
   const s2 = t2.props && t2.props.base ? t2.props.base.prop : null;
-  let n2 = false;
+  let i2 = false;
   if (a(e2) && "button-detail" !== t2.name && 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", n2 = true);
+    false === (s3 == null ? void 0 : s3.canEdit) && ((_a = t2.runtime) == null ? void 0 : _a.props) && (t2.runtime.props.state = "disabled", i2 = true);
   }
   if (s2) {
-    const i2 = o(s2);
-    if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[i2] || (e2.rules[i2] = []), t2.props.rules.forEach((e3) => {
+    const o2 = n(s2);
+    if (e2.rules || (e2.rules = {}), t2.props.rules && t2.props.rules.length > 0 && (e2.rules[o2] || (e2.rules[o2] = []), t2.props.rules.forEach((e3) => {
       u(e3);
-    }), e2.rules[i2] = t2.props.rules), !n2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
-      const s3 = e2.fieldPermissionMap.get(i2);
+    }), e2.rules[o2] = t2.props.rules), !i2 && "button-detail" !== t2.name && e2.fieldPermissionMap) {
+      const s3 = e2.fieldPermissionMap.get(o2);
       t2.runtime.props || (t2.runtime.props = {}), s3 ? false === s3.canEdit ? t2.runtime.props.state = "disabled" : s3.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: i2, events: t2.props.customRuleEvents }));
+    ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: o2, events: t2.props.customRuleEvents }));
   }
 }
 function I(e2, t2) {
   if (e2.initInfo) {
     ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((s2) => {
       const n2 = e2.initInfo[s2];
-      if (n2)
-        if ("dynamicControlFormEdit" === s2) {
-          let s3 = n2.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 = p(s3[0]);
-            e3.name = t2, s3 = [e3];
-          }
-          l.dynamicControlFormEdit(e2, s3, false);
-        } else
-          "disableElement" === s2 ? n2.indexOf(t2) >= 0 && l.disableElement(e2, [t2], false) : "enableElement" === s2 ? n2.indexOf(t2) >= 0 && l.enableElement(e2, [t2], false) : "hideElement" === s2 ? n2.indexOf(t2) >= 0 && l.hideElement(e2, [t2], false) : "showElement" === s2 && n2.indexOf(t2) >= 0 && l.showElement(e2, [t2], false);
+      if (n2) if ("dynamicControlFormEdit" === s2) {
+        let s3 = n2.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 = p(s3[0]);
+          e3.name = t2, s3 = [e3];
+        }
+        l.dynamicControlFormEdit(e2, s3, false);
+      } else "disableElement" === s2 ? n2.indexOf(t2) >= 0 && l.disableElement(e2, [t2], false) : "enableElement" === s2 ? n2.indexOf(t2) >= 0 && l.enableElement(e2, [t2], false) : "hideElement" === s2 ? n2.indexOf(t2) >= 0 && l.hideElement(e2, [t2], false) : "showElement" === s2 && n2.indexOf(t2) >= 0 && l.showElement(e2, [t2], false);
     });
   }
 }
 export {
   I as controlObjectRenderState,
   m as convertToPageContext,
-  E as getDefaultValue,
-  h as getFormModelFields,
+  v as getDefaultValue,
+  E as getFormModelFields,
   y as getModelFields,
-  v as getPermissionCodes,
-  g as packageAdditionalMapWithRoute,
-  w as packageFormRules,
+  P as getPermissionCodes,
+  f as packageAdditionalMapWithLocationSearch,
+  g as packageAdditionalMapWithPageRequest,
+  b as packageAdditionalMapWithRoute,
+  C as packageFormRules,
   d as queryPageDesignByCode,
-  P as queryPageSuperGrids
+  w as queryPageSuperGrids
 };

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

@@ -4,8 +4,7 @@ function t(o2) {
   return o2 ? e[o2] : void 0;
 }
 function a(o2) {
-  if (!o2)
-    return;
+  if (!o2) return;
   let t2 = n[o2];
   if (null == t2) {
     for (const n2 in e) {
@@ -17,8 +16,7 @@ function a(o2) {
             break;
           }
         }
-        if (t2)
-          break;
+        if (t2) break;
       }
     }
     n[o2] = t2 || "";

package/dist/es/components/runtime/utils/page-store.d.ts

@@ -1,7 +1,7 @@
-export declare const usePageContextStore: import('pinia').StoreDefinition<"pageContextUtil", import('pinia')._UnwrapAll<Pick<{
+export declare const usePageContextStore: import('pinia').StoreDefinition<"pageContextUtil", Pick<{
     pageContext: any;
     setPageContext: (newPageContext: any) => void;
-}, "pageContext">>, Pick<{
+}, "pageContext">, Pick<{
     pageContext: any;
     setPageContext: (newPageContext: any) => void;
 }, "pageContext">, Pick<{