super-page-runtime 2.2.23 → 2.2.29

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

@@ -7,8 +7,8 @@ import { getComponentRef as g } from "../global-refs.js";
 import b from "../eventBus.js";
 import C from "axios";
 import { handleEvent as T, getTableUuid as y, doAfterClickEvent as h } from "./event-util.js";
-import { setStoreInfo as w } from "../store-util.js";
-import { getPermissionCodes as P, getDefaultValue as k, getModelFields as N } from "../page-init-util.js";
+import { setStoreInfo as P } from "../store-util.js";
+import { getPermissionCodes as w, getDefaultValue as k, getModelFields as N } from "../page-init-util.js";
 import { updateChartDatasources as M, caculateShowCondition as R, getVariableValue as v, setVariableValue as S } from "../page-helper-util.js";
 import I from "./print-label.js";
 import { getTableNameByTableUuid as x } from "../table-utils.js";
@@ -26,17 +26,17 @@ const _ = { save: function(e2) {
   const t2 = e2.pageContext.code + "_";
   b.$emit(t2 + "export-pdf-report", e2);
 }, submit: function(e2) {
-  return G(e2, false, "submit", "/dsc/commons/submits");
+  return J(e2, false, "submit", "/dsc/commons/submits");
 }, submitList: function(e2) {
-  return G(e2, true, "submit", "/dsc/commons/batch-submits");
+  return J(e2, true, "submit", "/dsc/commons/batch-submits");
 }, agree: function(e2) {
-  return G(e2, false, "agree", "/dsc/commons/approves");
+  return J(e2, false, "agree", "/dsc/commons/approves");
 }, agreeList: function(e2) {
-  return G(e2, true, "agree", "/dsc/commons/batch-approves");
+  return J(e2, true, "agree", "/dsc/commons/batch-approves");
 }, disagree: function(e2) {
-  return G(e2, false, "disagree", "/dsc/commons/refuses");
+  return J(e2, false, "disagree", "/dsc/commons/refuses");
 }, disagreeList: function(e2) {
-  return G(e2, true, "disagree", "/dsc/commons/batch-refuses");
+  return J(e2, true, "disagree", "/dsc/commons/batch-refuses");
 }, back: function(e2) {
   const t2 = e2.pageContext;
   H(t2, t2.entity ? t2.entity.data : {}, !(!e2.configureObj.props || !e2.configureObj.props.base) && e2.configureObj.props.base.isNeedValueMapping);
@@ -50,10 +50,10 @@ const _ = { save: function(e2) {
         const r2 = e3.pageContext, u2 = e3.configureObj, l2 = u2.props.base, p2 = r2.systemCode, d2 = r2.backendUrl, m2 = u2.props.base.tableUuid ? u2.props.base.tableUuid : e3.tableUuid, f2 = x(r2, m2);
         let b2 = n(d2, r2.isTest) + "/dsc/commons/" + f2;
         b2 = o(b2, p2, d2, r2.isTest);
-        const C2 = void 0 === l2.isPermission || "true" === l2.isPermission || l2.isPermission, T2 = t(r2), y2 = P(u2, r2), h2 = { ids: a2, functionCode: y2, isPermission: C2 + "", systemCode: p2, isWorkflowEntity: T2, listCodesMap: r2.listCodesMap, pageCode: r2.code, pageVersion: r2.version };
+        const C2 = void 0 === l2.isPermission || "true" === l2.isPermission || l2.isPermission, T2 = t(r2), y2 = w(u2, r2), h2 = { ids: a2, functionCode: y2, isPermission: C2 + "", systemCode: p2, isWorkflowEntity: T2, listCodesMap: r2.listCodesMap, pageCode: r2.code, pageVersion: r2.version };
         r2.beanName && (h2.beanName = r2.beanName);
-        const w2 = u2.props.deleteLogicSetting;
-        w2 && ("object" == typeof w2 ? h2.deleteLogicSetting = JSON.stringify(w2) : "string" == typeof w2 && (h2.deleteLogicSetting = w2));
+        const P2 = u2.props.deleteLogicSetting;
+        P2 && ("object" == typeof P2 ? h2.deleteLogicSetting = JSON.stringify(P2) : "string" == typeof P2 && (h2.deleteLogicSetting = P2));
         const k2 = (_a = u2.props.base) == null ? void 0 : _a.logSetting;
         k2 && (h2.logSettingText = k2.join(""));
         const N2 = u2.props.base.isSafeDelete;
@@ -83,7 +83,7 @@ const _ = { save: function(e2) {
     const b2 = e3.listCode;
     b2 && (f2 += "&listCode=" + b2);
     t2.beanName && (f2 += "&beanName=" + t2.beanName);
-    const C2 = P(s2, t2);
+    const C2 = w(s2, t2);
     C2 && (f2 += "&functionCode=" + C2);
     t2.tableName && (f2 += "&tableName=" + t2.tableName);
     t2.code && (f2 += "&pageCode=" + t2.code);
@@ -95,8 +95,8 @@ const _ = { save: function(e2) {
     if (o2) {
       f2 += "&isPermission=" + (void 0 === o2.isPermission || "true" === o2.isPermission || o2.isPermission);
     }
-    const w2 = n(l2, t2.isTest);
-    window.open(w2 + "/dsc/commons/download-files" + f2);
+    const P2 = n(l2, t2.isTest);
+    window.open(P2 + "/dsc/commons/download-files" + f2);
   }(e2);
 }, import: function(e2) {
   const t2 = e2.pageContext.code + "_";
@@ -110,7 +110,7 @@ const _ = { save: function(e2) {
       c2 || (c2 = n2.code);
       let u2 = false;
       u2 = void 0 !== o2.isAsync && null !== o2.isAsync && o2.isAsync;
-      const l2 = void 0 === o2.isPermission || "true" === o2.isPermission || o2.isPermission, p2 = P(e3.configureObj, n2), d2 = c2, m2 = { backendUrl: n2.backendUrl, pageContext: n2 };
+      const l2 = void 0 === o2.isPermission || "true" === o2.isPermission || o2.isPermission, p2 = w(e3.configureObj, n2), d2 = c2, m2 = { backendUrl: n2.backendUrl, pageContext: n2 };
       window.$vueApp.config.globalProperties.$exportDataNew(r2, d2, i2, p2, null, m2, u2, n2.code, l2);
     });
   }(e2);
@@ -283,11 +283,11 @@ function j(e2) {
 }
 function D(e2, s2, o2, i2) {
   var _a;
-  const a2 = o2.templateUuid, r2 = o2.templateName, c2 = e2.systemCode, u2 = (_a = s2.props.base) == null ? void 0 : _a.logSetting, l2 = t(e2), p2 = e2.beanName, m2 = s2.props.base, f2 = s2.tableName ? s2.tableName : e2.tableName, g2 = e2.backendUrl, b2 = O.getFormViewData(e2), T2 = void 0 === m2.isPermission || "true" === m2.isPermission || m2.isPermission, y2 = { entity: b2, fileName: a2, showName: r2, beanName: p2, isWorkflowForm: l2, functionCode: P(s2, e2), tableName: f2, isPermission: T2 + "", systemCode: c2, listCodesMap: e2.listCodesMap, pageCode: e2.code, pageVersion: e2.version };
+  const a2 = o2.templateUuid, r2 = o2.templateName, c2 = e2.systemCode, u2 = (_a = s2.props.base) == null ? void 0 : _a.logSetting, l2 = t(e2), p2 = e2.beanName, m2 = s2.props.base, f2 = s2.tableName ? s2.tableName : e2.tableName, g2 = e2.backendUrl, b2 = O.getFormViewData(e2), T2 = void 0 === m2.isPermission || "true" === m2.isPermission || m2.isPermission, y2 = { entity: b2, fileName: a2, showName: r2, beanName: p2, isWorkflowForm: l2, functionCode: w(s2, e2), tableName: f2, isPermission: T2 + "", systemCode: c2, listCodesMap: e2.listCodesMap, pageCode: e2.code, pageVersion: e2.version };
   u2 && (y2.logSettingText = u2.join(""));
-  const w2 = te(e2);
+  const P2 = te(e2);
   let k2;
-  y2.additionalParamMap = w2, k2 = i2 ? function(e3, t2, s3, o3) {
+  y2.additionalParamMap = P2, k2 = i2 ? function(e3, t2, s3, o3) {
     return new Promise((i3, a3) => {
       const r3 = n(t2, o3) + "/dsc/commons/export-pdf";
       C.defaults.headers.common.Authorization = d();
@@ -331,7 +331,7 @@ function L(e2, t2) {
 }
 function B(e2, n2, o2, i2, a2, r2, c2) {
   var _a;
-  const u2 = t(e2), l2 = e2.systemCode, p2 = void 0 === n2.props.base.isPermission || "true" === n2.props.base.isPermission || n2.props.base.isPermission, d2 = P(n2, e2);
+  const u2 = t(e2), l2 = e2.systemCode, p2 = void 0 === n2.props.base.isPermission || "true" === n2.props.base.isPermission || n2.props.base.isPermission, d2 = w(n2, e2);
   let m2 = c2;
   m2 || (m2 = e2.entity.data);
   const f2 = { entity: m2, tableName: e2.tableName, formNoRuleCode: e2.formNoRuleCode, isWorkflowEntity: u2, functionCode: d2, isPermission: p2 + "", listCodesMap: e2.listCodesMap, pageCode: e2.code, pageVersion: e2.version };
@@ -402,7 +402,7 @@ function H(e2, t2, s2) {
     b.$emit(a2 + "close-dialog", { isNeedValueMapping: i2, dataModel: t2, sourceTableName: o2, jumpMode: n2 });
   }
 }
-function $(e2, t2, s2, n2, o2) {
+function G(e2, t2, s2, n2, o2) {
   var _a;
   o2 || (o2 = t2.runtime && t2.runtime.linkPage && t2.runtime.linkPage.valueMappings ? t2.runtime.linkPage.valueMappings : null) || (o2 = (_a = t2.props.linkPage) == null ? void 0 : _a.valueMappings);
   const i2 = e2.tableName;
@@ -418,7 +418,7 @@ function $(e2, t2, s2, n2, o2) {
     }
   }(s2, o2, e2), T(null, e2, t2, "setValue", { sourceModel: s2, sourceTableName: n2, entity: e2.entity.data, targetTableName: i2 });
 }
-function J(e2, t2, s2, n2) {
+function $(e2, t2, s2, n2) {
   var _a;
   t2 && !t2.props.base && (t2.props.base = {});
   let o2 = n2;
@@ -436,7 +436,7 @@ function J(e2, t2, s2, n2) {
     }
   }
 }
-function G(e2, t2, s2, i2) {
+function J(e2, t2, s2, i2) {
   return new Promise((r2, l2) => {
     const d2 = e2.pageContext, m2 = e2.configureObj, f2 = e2.mainDefaultValueColumns, g2 = e2.dynamicColumnInfo, b2 = e2.ids, C2 = m2.props.base.successOperation;
     let T2 = false;
@@ -484,11 +484,11 @@ function z(e2, s2) {
   T2 && f2.append("formNoRuleCode", T2);
   const y2 = e2.listCode;
   y2 && f2.append("listCode", y2);
-  let w2 = false;
-  w2 = void 0 !== p2.isAsync && null !== p2.isAsync && p2.isAsync, f2.append("isAsync", w2 + ""), f2.append("pageCode", i2.code);
+  let P2 = false;
+  P2 = void 0 !== p2.isAsync && null !== p2.isAsync && p2.isAsync, f2.append("isAsync", P2 + ""), f2.append("pageCode", i2.code);
   const k2 = t(i2);
   null != k2 && f2.append("isWorkflowEntity", k2 + "");
-  const N2 = P(a2, i2);
+  const N2 = w(a2, i2);
   N2 && f2.append("functionCode", N2);
   const M2 = te(i2);
   f2.append("additionalParamMapStr", JSON.stringify(M2));
@@ -499,7 +499,7 @@ function z(e2, s2) {
   const S2 = i2.backendUrl;
   let I2 = n(S2, i2.isTest) + "/dsc/commons/import-data";
   I2 = o(I2, v2, S2, i2.isTest), c.post(I2, f2).then((e3) => {
-    if (w2) l({ showClose: true, type: "success", message: u().t("superPageRuntimeMessage.asyncImport") });
+    if (P2) l({ showClose: true, type: "success", message: u().t("superPageRuntimeMessage.asyncImport") });
     else {
       let t2 = false;
       e3 ? (t2 = false, l({ dangerouslyUseHTMLString: true, showClose: true, type: "warning", message: e3 })) : (l({ showClose: true, type: "success", message: u().t("superPageRuntimeMessage.successfulImport") }), t2 = true), F(i2, a2, e3, null, true), i2.result = t2, h(i2, a2);
@@ -519,8 +519,8 @@ function Y(e2, t2) {
 function K(e2) {
   var _a;
   const t2 = e2.pageContext, n2 = e2.configureObj, o2 = t2.entity.data, i2 = t2.systemCode, a2 = t2.code;
-  let r2 = P(n2, t2);
-  r2 || (r2 = a2 + ".xxx"), o2.id || o2.ID || (o2.page_code = t2.code, o2.page_version = t2.version);
+  let r2 = w(n2, t2);
+  r2 || (r2 = a2 + ".xxx"), o2.id || o2.ID || (o2.PAGE_CODE = t2.code, o2.PAGE_VERSION = t2.version);
   const c2 = { entity: o2, pageMoel: t2.entity.page, formNoRuleCode: t2.formNoRuleCode, tableName: t2.tableName, emailTemplateCode: t2.emailTemplateCode, definitionId: t2.definitionId, functionCode: r2, systemCode: i2, listCodesMap: t2.listCodesMap, pageCode: t2.code, pageVersion: t2.version };
   t2.completeTaskParam && (c2.completeTaskParam = { taskId: t2.completeTaskParam.taskId, opinion: t2.completeTaskParam.opinion }), t2.judgeHeavyList && (s(t2.judgeHeavyList) ? c2.judgeHeavyList = JSON.stringify(t2.judgeHeavyList) : c2.judgeHeavyList = t2.judgeHeavyList);
   const u2 = n2.props.base.conversionCodes;
@@ -552,9 +552,9 @@ function Q(e2, t2, s2, n2, o2) {
     }
     if (e2.completeTaskParam) {
       const t3 = e2.completeTaskParam;
-      r2 = t3.taskId, n2 && (n2.taskId = r2), w(i2, a2, "_completeTaskParam", t3), s2.fieldPermissions = t3.fieldPermissions, s2.actionPermissions = t3.actionPermissions, s2.workflowButtonComponent = t3.buttonComponent, s2.completeTaskParam = t3;
+      r2 = t3.taskId, n2 && (n2.taskId = r2), P(i2, a2, "_completeTaskParam", t3), s2.fieldPermissions = t3.fieldPermissions, s2.actionPermissions = t3.actionPermissions, s2.workflowButtonComponent = t3.buttonComponent, s2.completeTaskParam = t3;
     }
-    s2.entity || (s2.entity = {}), s2.entity.task = e2.taskParamMap, w(i2, a2, "_currentActivityName", e2.taskName);
+    s2.entity || (s2.entity = {}), s2.entity.task = e2.taskParamMap, P(i2, a2, "_currentActivityName", e2.taskName);
   }
   return n2 && (n2.operationResult = o2), t2 || F(s2, n2.configureObj, e2, null, false), true;
 }
@@ -824,11 +824,11 @@ function pe(e2, s2, o2) {
           }), y2.listCodesMap = t3;
         }
         e3.refercePropMap && (y2.refercePropMap = e3.refercePropMap);
-        const h2 = C2 + "/dsc/commons/gets", w2 = E();
-        w2.restorePageLoadState(), T(null, e3, e3, "beforeFormLoadData"), c.post(h2, y2).then((t3) => {
+        const h2 = C2 + "/dsc/commons/gets", P2 = E();
+        P2.restorePageLoadState(), T(null, e3, e3, "beforeFormLoadData"), c.post(h2, y2).then((t3) => {
           t3 && (e3.entity.data = t3.entity, e3.initFormNo = t3.formNo);
           const s4 = e3.customRules, n2 = e3.rules, i4 = U(s4, n2);
-          e3.rules = i4, e3.canClick = true, T(null, e3, e3, "afterFormLoadData"), w2.setFormPageDataLoadState(true), o3(t3);
+          e3.rules = i4, e3.canClick = true, T(null, e3, e3, "afterFormLoadData"), P2.setFormPageDataLoadState(true), o3(t3);
         }).catch((t3) => {
           e3.canClick = true, i3(t3);
         });
@@ -868,8 +868,8 @@ export {
   ie as getTaskInformitions,
   ue as isVisibleWorkflowButton,
   Y as judgeDataNumber,
-  J as refreshFormOrListPage,
+  $ as refreshFormOrListPage,
   le as refreshPage,
   _ as standardEvents,
-  $ as updateValuesWhenCloseDialog
+  G as updateValuesWhenCloseDialog
 };

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

@@ -36,16 +36,16 @@ function getTableQueryInfo(t, e) {
       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));
+      const r2 = getParamNames(o2.propValue);
+      for (const t3 of r2) 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);
-  return o.props.queryFields = a, o.props.pageSize = t.displayQuantity, o;
+  const r = [];
+  if (t.tableValueField && (o.props.valueField = t.tableValueField), t.tableLableField && -1 == r.indexOf(t.tableLableField) && (o.props.lableField = t.tableLableField), t.autoSets) for (const e2 of t.autoSets) e2.source && -1 == r.indexOf(e2.source) && r.push(e2.source);
+  return o.props.queryFields = r, o.props.pageSize = t.displayQuantity, o;
 }
 function getServiceQueryInfo(t, e) {
   const o = { type: "service" };
@@ -61,16 +61,16 @@ function getServiceQueryInfo(t, e) {
   return o.props.dataSetField = t.serviceDataSetField, o.props.valueField = t.serviceValueField, o.props.labelField = t.serviceLabelField, o;
 }
 function updateChartDatasources(t, e, o, n) {
-  return new Promise((a, r) => {
-    if (!e || 0 == e.length) return void r(new Error("无需查询的统计图配置!"));
+  return new Promise((r, a) => {
+    if (!e || 0 == e.length) return void a(new Error("无需查询的统计图配置!"));
     const s = deepCopy(e);
     s.forEach((e2) => {
       const o2 = e2.services;
       if (o2 && o2.length > 0) {
         const 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);
+          const n2 = e4.name, r2 = e4.value;
+          o2[0].serviceInParams[n2] = getValueFromVariable(t.entity, r2);
         }), delete o2[0].serviceInputs);
       }
     });
@@ -84,19 +84,19 @@ function updateChartDatasources(t, e, o, n) {
       t.chartDataSourceMap || (t.chartDataSourceMap = {});
       for (const o2 in e2) {
         t.chartDataSourceMap[o2] = e2[o2];
-        const a2 = getComponentRef(t, o2);
-        if (a2) {
-          const r2 = a2.getConfigure();
-          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 : {};
+        const r2 = getComponentRef(t, o2);
+        if (r2) {
+          const a2 = r2.getConfigure();
+          if ((!n || a2 && (void 0 === a2.initializationQuery || a2.initializationQuery)) && r2.updateChartDatas && (r2.updateChartDatas(e2[o2]), (_b = (_a = a2.runtime) == null ? void 0 : _a.dataConfig) == null ? void 0 : _b.resultSet)) {
+            const n2 = e2[o2] && e2[o2].length > 0 ? e2[o2][0] : {}, r3 = 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);
+            a2.serviceDataField ? s2 = r3[a2.serviceDataField] : r3 && (s2 = Array.isArray(r3) ? r3 : [r3]), s2 || (s2 = []), setValueForVariableName(t.entity, a2.runtime.dataConfig.resultSet, s2);
           }
         }
       }
-      a(e2);
+      r(e2);
     }).catch((t2) => {
-      r(t2);
+      a(t2);
     });
   });
 }
@@ -105,11 +105,11 @@ function updateChartDatasourcesByComponent(t, e) {
   o && updateChartDatasources(t, [o], null, false);
 }
 function updateOptionDatasources(t, e, o) {
-  return new Promise((n, a) => {
-    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";
+  return new Promise((n, r) => {
+    if (!e || 0 == e.length) return void r(new Error("无需查询的配置!"));
+    const a = t.entity ? t.entity : {}, s = {};
+    a.request && Object.assign(s, a.request), a.page && Object.assign(s, a.page), s.query = o;
+    const i = { entityMap: a.data, additionalParamMap: s, dataSourceList: e, systemCode: t.systemCode, query: o }, u = t.backendUrl, l = getBaseUrl(u, t.isTest) + "/common/common-data/find-datas";
     http.post(l, i).then((e2) => {
       t.optionSourceMap || (t.optionSourceMap = {});
       for (const o2 in e2) {
@@ -119,7 +119,7 @@ function updateOptionDatasources(t, e, o) {
       }
       n(e2);
     }).catch((t2) => {
-      a(t2);
+      r(t2);
     });
   });
 }
@@ -144,14 +144,14 @@ function queryOptionDatasources(t, e, o) {
 }
 function autoSetAfterSelect(t, e, o, n) {
   if (!o || 0 == o.length) return;
-  const a = e.entity ? e.entity : {};
+  const r = e.entity ? e.entity : {};
   for (const t2 of o) {
     if (!t2.source || !t2.target) continue;
     const e2 = getValuesByField(n, t2.source);
     let o2 = t2.target;
     if (!o2 || !o2.startsWith("${")) continue;
     o2 = o2.substring(2, o2.length - 1);
-    setVariableValue(a, o2.split("."), e2.join(","));
+    setVariableValue(r, o2.split("."), e2.join(","));
   }
 }
 function getValuesByField(t, e) {
@@ -182,8 +182,8 @@ function setVariableValue(t, e, o) {
   if (!t || !e || 0 == e.length) return;
   let n = t;
   for (let t2 = 0; t2 < e.length; t2++) {
-    const a = e[t2];
-    t2 + 1 === e.length ? n[a] = o : (void 0 === n[a] && (n[a] = {}), n = n[a]);
+    const r = e[t2];
+    t2 + 1 === e.length ? n[r] = o : (void 0 === n[r] && (n[r] = {}), n = n[r]);
   }
 }
 function setVariableValueWithProp(t, e, o) {
@@ -194,9 +194,10 @@ function formatVariableValue(t, 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);
-    if (r && "[object Date]" === Object.prototype.toString.call(r)) return dayjs(r).format("YYYY-MM-DD hh:mm:ss");
-    e = e.replace(a, null == r ? "" : r);
+    const r = n[t2], a = getValueFromVariable(o, r);
+    if (a && "[object Date]" === Object.prototype.toString.call(a)) return dayjs(a).format("YYYY-MM-DD hh:mm:ss");
+    if (a && "number" == typeof a) return a;
+    e = e.replace(r, null == a ? "" : a);
   }
   return e;
 }
@@ -229,18 +230,18 @@ function formatValueByType(t, e, o) {
 function getValueFromVariable(t, e, o) {
   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;
+    let n = e.substring(2, e.length - 1), r = null, a = null;
+    if (n.startsWith("data.")) n = n.substring(5), a = t.data, r = "data";
+    else if (n.startsWith("page.")) n = n.substring(5), r = "page", a = t.page;
+    else if (n.startsWith("task.")) n = n.substring(5), r = "task", a = t.task;
+    else if (n.startsWith("request.")) n = n.substring(8), r = "request", a = t.request;
+    else if (n.startsWith("context.")) n = n.substring(8), r = "context", a = t.context;
+    else if (n.startsWith("system.")) n = n.substring(7), r = "system", a = t.system;
     else {
       if (n.startsWith("fixed.")) return n.substring(6);
-      n.startsWith("row.") && (n = n.substring(4), r = o, a = "row");
+      n.startsWith("row.") && (n = n.substring(4), a = o, r = "row");
     }
-    return n ? getValueFromSource(r, n, a) : "";
+    return n ? getValueFromSource(a, n, r) : "";
   }
   return e;
 }
@@ -248,17 +249,17 @@ function getValueFromSource(t, e, o) {
   if ("context" != o && !t || !e) return;
   const n = e.indexOf(".");
   if (n > -1) {
-    const a = e.substring(0, n), r = e.substring(n + 1);
-    let s = t[a];
-    return s && Array.isArray(s) && s.length > 0 && (s = s[0]), getValueFromSource(s, r, o);
+    const r = e.substring(0, n), a = e.substring(n + 1);
+    let s = t[r];
+    return s && Array.isArray(s) && s.length > 0 && (s = s[0]), getValueFromSource(s, a, o);
   }
   if ("context" == o) {
     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;
+      const r = t2.substring(t2.length - 1), a = /* @__PURE__ */ new Date();
+      return n2 = "+" === o2 ? n2 : -n2, "d" === r || "w" === r ? (n2 = "w" === r ? 7 * n2 : n2, a.setDate(a.getDate() + n2)) : "m" === r ? a.setMonth(a.getMonth() + n2) : "y" === r && a.setFullYear(a.getFullYear() + n2), a;
     }
     if (!t) return;
   }
@@ -274,13 +275,13 @@ function caculateShowCondition(pageContext, showConditions, row) {
     let n = e.operator;
     if (!o || "" === o) continue;
     n || (n = "EQ");
-    const a = getValueFromVariable(entityData, o, row);
-    let r = getValueFromVariable(entityData, e.propValue, row);
+    const r = getValueFromVariable(entityData, o, row);
+    let a = getValueFromVariable(entityData, e.propValue, row);
     const s = e.dataType;
-    "CONTAIN" != n && "NOT_CONTAIN" != n || a && !a.includes && (n = "CONTAIN" == n ? "EQ" : "NET");
+    "CONTAIN" != n && "NOT_CONTAIN" != n || r && !r.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);
+    if (i || (i = "null"), void 0 !== a && "" !== a || (a = null, "null" === i ? n = "IS_NULL" : "notequal" === i ? n = "IS_NOT_NULL" : u = true), null == u) try {
+      u = executeExpression(r, n, a, s);
     } catch (t2) {
       u = false;
     }
@@ -295,17 +296,17 @@ function caculateShowCondition(pageContext, showConditions, row) {
 }
 function monitorFieldChange(t, e, o) {
   if (!o || !t || !e || 0 == e.length) return;
-  const n = [], a = [];
+  const n = [], r = [];
   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]));
+    "page" !== e2[0] && "task" !== e2[0] && "data" !== e2[0] || (n.push(e2), r.includes(e2[0]) || r.push(e2[0]));
   }
-  const r = t.entity;
-  let s = getMonitorFieldValues(n, r), i = false;
-  for (const t2 of a) watch(r[t2], () => {
+  const a = t.entity;
+  let s = getMonitorFieldValues(n, a), i = false;
+  for (const t2 of r) watch(a[t2], () => {
     i && clearTimeout(i), i = setTimeout(function() {
-      const t3 = getMonitorFieldValues(n, r);
+      const t3 = getMonitorFieldValues(n, a);
       s != t3 && (s = t3, o());
     }, 200);
   });