super-page-runtime 2.3.33-sit1 → 2.3.33

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

@@ -53,7 +53,7 @@ function p(n2, r2, i2, l2, o2, a2, u2) {
     if (e2) {
       f2 = e2[0].message, d2 = e2[0].field, t({ message: f2, showClose: true, type: "warning", duration: 3e3 });
       const n3 = s(u2, d2);
-      n3 && n3.addRequiredClass && n3.addRequiredClass();
+      n3 && n3.addRequiredClass && n3.addRequiredClass(), console.log("errors", e2, "fields", c3);
     } else f2 = true;
     if (d2 && true === o2) {
       if (/[A-Z]+/.test(d2) && void 0 !== n2[d2.toLowerCase()]) {
@@ -187,7 +187,7 @@ function h(e2, s2, r2) {
               }), r3.includes(false) && e6(false), n2.length > 0 ? Promise.all(n2).then((t3) => {
                 t3.includes(false) ? e6(false) : e6(true);
               }).catch((t3) => {
-                e6(false);
+                console.error(t3), e6(false);
               }) : e6(true);
             });
             return null;

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

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

@@ -4,355 +4,355 @@ import { executeExpression } from "agilebuilder-ui/src/utils/calculator/calculat
 import { getComponentRef } from "./global-refs.js";
 import { watch } from "vue";
 import { deepCopy, getBaseUrl } from "./common-util.js";
-function getComponentOptionConfigs(t, e, o, n) {
-  return getComponentOptionConfigsBase(t, (e == null ? void 0 : e.systemCode) ? e.systemCode : o, (e == null ? void 0 : e.systemVersion) ? e == null ? void 0 : e.systemVersion : n);
+function getComponentOptionConfigs(e, t, o, n) {
+  return getComponentOptionConfigsBase(e, (t == null ? void 0 : t.systemCode) ? t.systemCode : o, (t == null ? void 0 : t.systemVersion) ? t == null ? void 0 : t.systemVersion : n);
 }
-function getComponentOptionConfigsBase(t, e, o) {
-  if (!t.props || !t.props.dataOrigin) return;
-  if (t.name && "table" === t.name) return;
-  const n = t.props.dataOrigin, a = { uuid: t.uuid };
+function getComponentOptionConfigsBase(e, t, o) {
+  if (!e.props || !e.props.dataOrigin) return;
+  if (e.name && "table" === e.name) return;
+  const n = e.props.dataOrigin, a = { uuid: e.uuid };
   if ("optionGroup" == n.optionValueSetType) a.type = "optionGroup", a.props = { code: n.optionGroup };
   else if ("dynamicData" == n.optionValueSetType) a.type = "dynamicData", a.filterType = n.filterType, a.props = { code: n.dynamicDataSourceCode };
   else if ("dataTable" == n.optionValueSetType) {
     a.filterType = n.filterType;
-    const t2 = getTableQueryInfo(n, e, o);
-    Object.assign(a, t2);
+    const e2 = getTableQueryInfo(n, t, o);
+    Object.assign(a, e2);
   } else if ("service" == n.optionValueSetType) {
     a.filterType = n.filterType;
-    const t2 = getServiceQueryInfo(n, e, o);
-    Object.assign(a, t2);
+    const e2 = getServiceQueryInfo(n, t, o);
+    Object.assign(a, e2);
   }
   return a.type ? a : void 0;
 }
-function getTableQueryInfo(t, e, o) {
+function getTableQueryInfo(e, t, o) {
   const n = { type: "dataTable" };
-  if (n.valueLabelSwitch = !!t.valueLabelSwitch, n.importValidateSwitch = !!t.importValidateSwitch, n.props = { tableName: t.tableName, systemCode: t.tableSysCode ? t.tableSysCode : e, systemVersion: t.tableSysVersion ? t.tableSysVersion : o }, t.sortFields) {
-    const e2 = [];
-    for (const o2 of t.sortFields) o2.name && e2.push({ prop: o2.name, order: o2.type ? o2.type : "asc" });
-    n.props.sorts = e2;
+  if (n.valueLabelSwitch = !!e.valueLabelSwitch, n.importValidateSwitch = !!e.importValidateSwitch, n.props = { tableName: e.tableName, systemCode: e.tableSysCode ? e.tableSysCode : t, systemVersion: e.tableSysVersion ? e.tableSysVersion : o }, e.sortFields) {
+    const t2 = [];
+    for (const o2 of e.sortFields) o2.name && t2.push({ prop: o2.name, order: o2.type ? o2.type : "asc" });
+    n.props.sorts = t2;
   }
   const a = [];
-  if (t.filterList) {
-    const e2 = [];
-    for (const o2 of t.filterList) {
+  if (e.filterList) {
+    const t2 = [];
+    for (const o2 of e.filterList) {
       if (!o2.propName) continue;
       o2.propDbName || (o2.propDbName = o2.propName);
-      const t2 = {};
-      Object.assign(t2, o2);
+      const e2 = {};
+      Object.assign(e2, o2);
       const n2 = getParamNames(o2.propValue);
-      for (const t3 of n2) t3 && (t3.startsWith("${data.") || t3.startsWith("${task.") || t3.startsWith("${page.")) && (a.includes(t3) || a.push(t3));
-      o2.propValue, e2.push(t2);
+      for (const e3 of n2) e3 && (e3.startsWith("${data.") || e3.startsWith("${task.") || e3.startsWith("${page.")) && (a.includes(e3) || a.push(e3));
+      o2.propValue, t2.push(e2);
     }
-    n.props.searchForm = e2;
+    n.props.searchForm = t2;
   }
   n.props.monitorFields = a;
   const r = [];
-  if (t.tableValueField && (n.props.valueField = t.tableValueField), t.tableLableField && -1 == r.indexOf(t.tableLableField) && (n.props.lableField = t.tableLableField), t.autoSets) for (const e2 of t.autoSets) e2.source && -1 == r.indexOf(e2.source) && r.push(e2.source);
-  return n.props.queryFields = r, n.props.pageSize = t.displayQuantity, n;
+  if (e.tableValueField && (n.props.valueField = e.tableValueField), e.tableLableField && -1 == r.indexOf(e.tableLableField) && (n.props.lableField = e.tableLableField), e.autoSets) for (const t2 of e.autoSets) t2.source && -1 == r.indexOf(t2.source) && r.push(t2.source);
+  return n.props.queryFields = r, n.props.pageSize = e.displayQuantity, n;
 }
-function getServiceQueryInfo(t, e, o) {
+function getServiceQueryInfo(e, t, o) {
   const n = { type: "service" };
-  if (n.valueLabelSwitch = !!t.valueLabelSwitch, n.importValidateSwitch = !!t.importValidateSwitch, n.props = { serivceCode: t.serviceCode, systemCode: t.tableSysCode ? t.tableSysCode : e, systemVersion: t.tableSysVersion ? t.tableSysVersion : o }, t.serviceInputs) {
-    const e2 = [];
-    for (const o2 of t.serviceInputs) {
+  if (n.valueLabelSwitch = !!e.valueLabelSwitch, n.importValidateSwitch = !!e.importValidateSwitch, n.props = { serivceCode: e.serviceCode, systemCode: e.tableSysCode ? e.tableSysCode : t, systemVersion: e.tableSysVersion ? e.tableSysVersion : o }, e.serviceInputs) {
+    const t2 = [];
+    for (const o2 of e.serviceInputs) {
       if (!o2.name || o2.value) continue;
-      const t2 = {};
-      Object.assign(t2, o2), e2.push(t2);
+      const e2 = {};
+      Object.assign(e2, o2), t2.push(e2);
     }
-    n.props.inputs = e2;
+    n.props.inputs = t2;
   }
-  return n.props.dataSetField = t.serviceDataSetField, n.props.valueField = t.serviceValueField, n.props.labelField = t.serviceLabelField, n;
+  return n.props.dataSetField = e.serviceDataSetField, n.props.valueField = e.serviceValueField, n.props.labelField = e.serviceLabelField, n;
 }
-function updateChartDatasources(t, e, o, n) {
+function updateChartDatasources(e, t, o, n) {
   return new Promise((a, r) => {
-    if (!e || 0 == e.length) return void r(new Error("无需查询的统计图配置!"));
-    const i = deepCopy(e);
-    i.forEach((e2) => {
-      const o2 = e2.services;
+    if (!t || 0 == t.length) return void r(new Error("无需查询的统计图配置!"));
+    const s = deepCopy(t);
+    s.forEach((t2) => {
+      const o2 = t2.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 t3 = o2[0].serviceInputs;
+        t3 && (o2[0].serviceInParams = {}, t3.forEach((t4) => {
+          const n2 = t4.name, a2 = t4.value;
+          o2[0].serviceInParams[n2] = getValueFromVariable(e.entity, a2);
         }), delete o2[0].serviceInputs);
       }
     });
-    const s = t.entity ? t.entity : {}, u = {};
-    s.request && Object.assign(u, s.request), s.page && Object.assign(u, s.page), o && Object.assign(u, o);
-    const l = {};
-    s.task && Object.assign(l, s.task);
-    const c = { entityMap: s.data, additionalParamMap: u, taskMap: l, dataSourceList: i, systemCode: t.systemCode, pageCode: t.code }, p = t.backendUrl, f = getBaseUrl(p, t.isTest) + "/common/common-data/find-chart-datas";
-    http.post(f, c, { headers: { customSystem: t.systemCode } }).then((e2) => {
+    const i = e.entity ? e.entity : {}, l = {};
+    i.request && Object.assign(l, i.request), i.page && Object.assign(l, i.page), o && Object.assign(l, o);
+    const u = {};
+    i.task && Object.assign(u, i.task);
+    const c = { entityMap: i.data, additionalParamMap: l, taskMap: u, dataSourceList: s, systemCode: e.systemCode, pageCode: e.code }, p = e.backendUrl, f = getBaseUrl(p, e.isTest) + "/common/common-data/find-chart-datas";
+    http.post(f, c, { headers: { customSystem: e.systemCode } }).then((t2) => {
       var _a, _b;
-      t.chartDataSourceMap || (t.chartDataSourceMap = {});
-      for (const o2 in e2) {
-        t.chartDataSourceMap[o2] = e2[o2];
-        const a2 = getComponentRef(t, o2);
+      e.chartDataSourceMap || (e.chartDataSourceMap = {});
+      for (const o2 in t2) {
+        e.chartDataSourceMap[o2] = t2[o2];
+        const a2 = getComponentRef(e, 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 : {};
-            let i2 = null;
-            r2.serviceDataField ? i2 = a3[r2.serviceDataField] : a3 && (i2 = Array.isArray(a3) ? a3 : [a3]), i2 || (i2 = []), setValueForVariableName(t.entity, r2.runtime.dataConfig.resultSet, i2);
+          if ((!n || r2 && (void 0 === r2.initializationQuery || r2.initializationQuery)) && a2.updateChartDatas && (a2.updateChartDatas(t2[o2]), (_b = (_a = r2.runtime) == null ? void 0 : _a.dataConfig) == null ? void 0 : _b.resultSet)) {
+            const n2 = t2[o2] && t2[o2].length > 0 ? t2[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(e.entity, r2.runtime.dataConfig.resultSet, s2);
           }
         }
       }
-      a(e2);
-    }).catch((t2) => {
-      r(t2);
+      console.log("查询统计图数据完成", t2), a(t2);
+    }).catch((e2) => {
+      console.log("查询统计图数据失败", e2), r(e2);
     });
   });
 }
-function updateChartDatasourcesByComponent(t, e) {
-  const o = t.initChartServiceConfigs.find((t2) => t2.uuid === e);
-  o && updateChartDatasources(t, [o], null, false);
+function updateChartDatasourcesByComponent(e, t) {
+  const o = e.initChartServiceConfigs.find((e2) => e2.uuid === t);
+  o && updateChartDatasources(e, [o], null, false);
 }
-function updateOptionDatasources(t, e, o) {
+function updateOptionDatasources(e, t, o) {
   return new Promise((n, a) => {
-    if (!e || 0 == e.length) return void a(new Error("无需查询的配置!"));
-    const r = t.entity ? t.entity : {}, i = {};
-    r.request && Object.assign(i, r.request), r.page && Object.assign(i, r.page), i.query = o;
-    const s = { entityMap: r.data, additionalParamMap: i, dataSourceList: e, systemCode: t.systemCode, query: o }, u = t.backendUrl, l = getBaseUrl(u, t.isTest) + "/common/common-data/find-datas";
-    http.post(l, s).then((e2) => {
-      t.optionSourceMap || (t.optionSourceMap = {});
-      for (const o2 in e2) {
-        t.optionSourceMap[o2] = e2[o2];
-        const n2 = getComponentRef(t, o2);
-        n2 && n2.updateOptions && n2.updateOptions(e2[o2]);
+    if (!t || 0 == t.length) return void a(new Error("无需查询的配置!"));
+    const r = e.entity ? e.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: t, systemCode: e.systemCode, query: o }, l = e.backendUrl, u = getBaseUrl(l, e.isTest) + "/common/common-data/find-datas";
+    http.post(u, i).then((t2) => {
+      e.optionSourceMap || (e.optionSourceMap = {});
+      for (const o2 in t2) {
+        e.optionSourceMap[o2] = t2[o2];
+        const n2 = getComponentRef(e, o2);
+        n2 && n2.updateOptions && n2.updateOptions(t2[o2]);
       }
-      n(e2);
-    }).catch((t2) => {
-      a(t2);
+      console.log("查询选项数据完成", t2), n(t2);
+    }).catch((e2) => {
+      console.log("查询选项数据失败", e2), a(e2);
     });
   });
 }
-function getOptionDatasFromPage(t, e) {
-  return getComponentOptionDatasFromPage(t, e.uuid);
+function getOptionDatasFromPage(e, t) {
+  return getComponentOptionDatasFromPage(e, t.uuid);
 }
-function getComponentOptionDatasFromPage(t, e) {
-  const o = getOptionDatasSourceMap(t)[e];
+function getComponentOptionDatasFromPage(e, t) {
+  const o = getOptionDatasSourceMap(e)[t];
   return o || [];
 }
-function getOptionDatasSourceMap(t) {
-  if (!t || !t.optionSourceMap) return {};
-  const e = t.optionSourceMap;
-  return e || {};
+function getOptionDatasSourceMap(e) {
+  if (!e || !e.optionSourceMap) return {};
+  const t = e.optionSourceMap;
+  return t || {};
 }
-function getChartDatasFromPage(t, e) {
-  if (!t || !t.chartDataSourceMap || !e) return null;
-  return t.chartDataSourceMap[e.uuid];
+function getChartDatasFromPage(e, t) {
+  if (!e || !e.chartDataSourceMap || !t) return null;
+  return e.chartDataSourceMap[t.uuid];
 }
-function queryOptionDatasources(t, e, o) {
-  return updateOptionDatasources(t, e ? [e] : [], o);
+function queryOptionDatasources(e, t, o) {
+  return updateOptionDatasources(e, t ? [t] : [], o);
 }
-function autoSetAfterSelect(t, e, o, n, a = []) {
+function autoSetAfterSelect(e, t, o, n, a = []) {
   if (!o || 0 == o.length) return;
-  const r = e.entity ? e.entity : {};
-  for (const t2 of o) {
-    if (!t2.source || !t2.target || a.includes(t2.target)) continue;
-    const e2 = getValuesByField(n, t2.source);
-    let o2 = t2.target;
+  const r = t.entity ? t.entity : {};
+  for (const e2 of o) {
+    if (!e2.source || !e2.target || a.includes(e2.target)) continue;
+    const t2 = getValuesByField(n, e2.source);
+    let o2 = e2.target;
     if (!o2 || !o2.startsWith("${")) continue;
     o2 = o2.substring(2, o2.length - 1);
-    const i = o2.split(".");
-    setVariableValue(r, i, null == e2 ? null : e2.join(","));
+    const s = o2.split(".");
+    setVariableValue(r, s, null == t2 ? null : t2.join(","));
   }
 }
-function getValuesByField(t, e) {
-  if (t) {
+function getValuesByField(e, t) {
+  if (e) {
     const o = [];
-    for (const n of t) {
-      let t2 = n[e];
-      null != t2 && null != t2 || (t2 = ""), o.push(t2);
+    for (const n of e) {
+      let e2 = n[t];
+      null != e2 && null != e2 || (e2 = ""), o.push(e2);
     }
     return o;
   }
   return null;
 }
-function getVariableValue(t, e) {
-  if (!t || !e || 0 == e.length) return;
-  let o = t;
-  for (let t2 = 0; t2 < e.length; t2++) {
+function getVariableValue(e, t) {
+  if (!e || !t || 0 == t.length) return;
+  let o = e;
+  for (let e2 = 0; e2 < t.length; e2++) {
     if (null == o) return o;
-    o = o[e[t2]];
+    o = o[t[e2]];
   }
   return o;
 }
-function setValueForVariableName(t, e, o) {
-  if (!e || !e.startsWith("${")) return;
-  setVariableValue(t, (e = e.substring(2, e.length - 1)).split("."), o);
+function setValueForVariableName(e, t, o) {
+  if (!t || !t.startsWith("${")) return;
+  setVariableValue(e, (t = t.substring(2, t.length - 1)).split("."), o);
 }
-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] = void 0 === o ? null : o : (void 0 === n[a] && (n[a] = {}), n = n[a]);
+function setVariableValue(e, t, o) {
+  if (!e || !t || 0 == t.length) return;
+  let n = e;
+  for (let e2 = 0; e2 < t.length; e2++) {
+    const a = t[e2];
+    e2 + 1 === t.length ? n[a] = void 0 === o ? null : o : (void 0 === n[a] && (n[a] = {}), n = n[a]);
   }
 }
-function setVariableValueWithProp(t, e, o) {
-  if (!t || !e) return;
-  setVariableValue(t, e.split("."), o);
+function setVariableValueWithProp(e, t, o) {
+  if (!e || !t) return;
+  setVariableValue(e, t.split("."), o);
 }
-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);
+function formatVariableValue(e, t) {
+  if (!e || "" == t || null == t || null == t) return t;
+  const o = e.entity ? e.entity : {}, n = getParamNames(t);
+  for (const e2 in n) {
+    const a = n[e2], r = getValueFromVariable(o, a);
     if (r && "[object Date]" === Object.prototype.toString.call(r)) return dayjs(r).format("YYYY-MM-DD HH:mm:ss");
     if (r && "number" == typeof r) return r;
-    e = e.replace(a, null == r ? "" : r);
+    t = t.replace(a, null == r ? "" : r);
   }
-  return e;
+  return t;
 }
-function getParamNames(t) {
-  if (!t) return [];
-  const e = t.match(/\$\{[^\{|\}]+\}/g);
-  return e || [];
+function getParamNames(e) {
+  if (!e) return [];
+  const t = e.match(/\$\{[^\{|\}]+\}/g);
+  return t || [];
 }
-function formatValueByType(t, e, o) {
-  if (!e || "" == t || null == t || null == t) return t;
-  if (o = o || {}, "number" == e || "percent" == e) {
-    if (isNaN(t)) return t;
+function formatValueByType(e, t, o) {
+  if (!t || "" == e || null == e || null == e) return e;
+  if (console.log("aaa", e, t, o), o = o || {}, "number" == t || "percent" == t) {
+    if (isNaN(e)) return e;
     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), e = parseFloat(e), "percent" == t && (e *= 100), n > -1 && (e = parseFloat(e.toFixed(n))), "percent" == t) e += "%";
     else {
       if (o.thousandsSeparator) {
-        const e2 = t.toString().split(".");
-        e2[0] = e2[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","), t = e2.length > 1 ? e2.join(".") : e2[0];
+        const t2 = e.toString().split(".");
+        t2[0] = t2[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","), e = t2.length > 1 ? t2.join(".") : t2[0];
       }
-      o.symbol && (t = o.symbol + "" + t);
+      o.symbol && (e = o.symbol + "" + e);
     }
-    return t;
+    return e;
   }
-  if ("date" == e || "time" == e) {
+  if ("date" == t || "time" == t) {
     let n = "";
-    return "date" == e ? (n = o.dateFormat, n || (n = "YYYY-MM-DD")) : (n = o.timeFormat, n || (n = "HH:mm:ss")), dayjs(t).format(n);
+    return "date" == t ? (n = o.dateFormat, n || (n = "YYYY-MM-DD")) : (n = o.timeFormat, n || (n = "HH:mm:ss")), dayjs(e).format(n);
   }
-  return "custom" == e && o.formatEventUuid, t;
-}
-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;
+  return "custom" == t && o.formatEventUuid && console.log("自定义方法", o), e;
+}
+function getValueFromVariable(e, t, o) {
+  if (null == t || null == t) return t;
+  if (t.startsWith("${") && t.endsWith("}")) {
+    let n = t.substring(2, t.length - 1), a = null, r = null;
+    if (n.startsWith("data.")) n = n.substring(5), r = e.data, a = "data";
+    else if (n.startsWith("page.")) n = n.substring(5), a = "page", r = e.page;
+    else if (n.startsWith("task.")) n = n.substring(5), a = "task", r = e.task;
+    else if (n.startsWith("request.")) n = n.substring(8), a = "request", r = e.request;
+    else if (n.startsWith("context.")) n = n.substring(8), a = "context", r = e.context;
+    else if (n.startsWith("system.")) n = n.substring(7), a = "system", r = e.system;
     else {
       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) : "";
+    return n ? getValueFromSource(r, n, a) : (console.log("获取变量失败", t, e), "");
   }
-  return e;
+  return t;
 }
-function getValueFromSource(t, e, o) {
-  if ("context" != o && !t || !e) return;
-  const n = e.indexOf(".");
+function getValueFromSource(e, t, o) {
+  if ("context" != o && !e || !t) return;
+  const n = t.indexOf(".");
   if (n > -1) {
-    const a = e.substring(0, n), r = e.substring(n + 1);
-    let i = t[a];
-    return i && Array.isArray(i) && i.length > 0 && (i = i[0]), getValueFromSource(i, r, o);
+    const a = t.substring(0, n), r = t.substring(n + 1);
+    let s = e[a];
+    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 (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();
+    if ("currentDate" == t || "currentTime" == t) return /* @__PURE__ */ new Date();
+    if (t.startsWith("currentDate") && t.length > 11) {
+      const e2 = t.substring(11), o2 = e2.substring(0, 1);
+      let n2 = parseInt(e2.substring(1, e2.length - 1), 10);
+      const a = e2.substring(e2.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 (!e) return;
   }
-  return t[e];
+  return e[t];
 }
 function caculateShowCondition(pageContext, showConditions, row) {
   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;
+  for (let e = 0; e < maxLen; e++) {
+    const t = showConditions[e], o = t.propName;
+    let n = t.operator;
     if (!o || "" === o) continue;
     n || (n = "EQ");
     const a = getValueFromVariable(entityData, o, row);
-    let r = getValueFromVariable(entityData, e.propValue, row);
-    const i = e.dataType;
+    let r = getValueFromVariable(entityData, t.propValue, row);
+    const s = t.dataType;
     "CONTAIN" != n && "NOT_CONTAIN" != n || a && !a.includes && (n = "CONTAIN" == n ? "EQ" : "NET");
-    let s = e.variableIsNull, u;
-    if (s || (s = "null"), "IS_NULL" !== n && "IS_NOT_NULL" !== n && (void 0 !== r && "" !== r || (r = null, "null" === s ? n = "IS_NULL" : "notequal" === s ? n = "IS_NOT_NULL" : u = true)), null == u) try {
-      u = executeExpression(a, n, r, i);
-    } catch (t2) {
-      u = false;
+    let i = t.variableIsNull, l;
+    if (i || (i = "null"), "IS_NULL" !== n && "IS_NOT_NULL" !== n && (void 0 !== r && "" !== r || (r = null, "null" === i ? n = "IS_NULL" : "notequal" === i ? n = "IS_NOT_NULL" : l = true)), null == l) try {
+      l = executeExpression(a, n, r, s);
+    } catch (e2) {
+      console.log("executeExpression error", e2), l = 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) {
-      const t2 = p.toLowerCase();
-      "and" === t2 ? p = t2.replace("and", "&&") : "or" === t2 && (p = t2.replace("or", "||")), conditions += p + " ";
+    const u = t.leftBracket, c = t.rightBracket;
+    let p = t.joinSign;
+    if (u && null !== u && "" !== u && (conditions += u, conditions += " "), conditions += l + " ", c && null !== c && "" !== c && (conditions += c, conditions += " "), e < maxLen - 1 && p && null !== p && "" !== p) {
+      const e2 = p.toLowerCase();
+      "and" === e2 ? p = e2.replace("and", "&&") : "or" === e2 && (p = e2.replace("or", "||")), conditions += p + " ";
     }
   }
   return !conditions || eval("(" + conditions + ")");
 }
-function monitorFieldChange(t, e, o) {
-  if (!o || !t || !e || 0 == e.length) return;
+function monitorFieldChange(e, t, o) {
+  if (!o || !e || !t || 0 == t.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 e2 of t) if (e2.startsWith("${")) {
+    e2 = e2.substring(2, e2.length - 1);
+    const t2 = e2.split(".");
+    "page" !== t2[0] && "task" !== t2[0] && "data" !== t2[0] || (n.push(t2), a.includes(t2[0]) || a.push(t2[0]));
   }
-  let r = getMonitorFieldValues(n, t.entity), i = false;
-  for (const e2 of a) watch(t.entity[e2], () => {
-    i && clearTimeout(i), i = setTimeout(function() {
-      const e3 = getMonitorFieldValues(n, t.entity);
-      r != e3 && (r = e3, o());
+  let r = getMonitorFieldValues(n, e.entity), s = false;
+  for (const t2 of a) watch(e.entity[t2], () => {
+    s && clearTimeout(s), s = setTimeout(function() {
+      const t3 = getMonitorFieldValues(n, e.entity);
+      r != t3 && (r = t3, o());
     }, 200);
   });
 }
-function getMonitorFieldValues(t, e) {
+function getMonitorFieldValues(e, t) {
   let o = "";
-  for (const n of t) o += "_" + getVariableValue(e, n);
+  for (const n of e) o += "_" + getVariableValue(t, n);
   return o;
 }
-function getFormPropName(t) {
-  return t && t.indexOf("${") >= 0 ? t.substring(t.indexOf(".") + 1, t.lastIndexOf("}")) : t;
+function getFormPropName(e) {
+  return e && e.indexOf("${") >= 0 ? e.substring(e.indexOf(".") + 1, e.lastIndexOf("}")) : e;
 }
-function getSizeConfig(t, e) {
-  const o = getPageModeType(t);
+function getSizeConfig(e, t) {
+  const o = getPageModeType(e);
   let n;
-  return e.props && e.props.size && e.props.size[o] && (n = e.props.size[o]), !n && e.props && e.props.size && (n = e.props.size.pc), n;
+  return t.props && t.props.size && t.props.size[o] && (n = t.props.size[o]), !n && t.props && t.props.size && (n = t.props.size.pc), n;
 }
-function getPageModeType(t) {
-  let e = t.dimensions;
-  return e || (e = "pc"), e;
+function getPageModeType(e) {
+  let t = e.dimensions;
+  return t || (t = "pc"), t;
 }
-function isPromise(t) {
-  return t && "[object Promise]" === Object.prototype.toString.call(t);
+function isPromise(e) {
+  return e && "[object Promise]" === Object.prototype.toString.call(e);
 }
-function decomposeVariable(t) {
-  if (!t) return [];
-  const e = t.match(/\${(.*?)}/);
-  return e ? e[1].split(".") : [];
+function decomposeVariable(e) {
+  if (!e) return [];
+  const t = e.match(/\${(.*?)}/);
+  return t ? t[1].split(".") : [];
 }
-function getModelFieldFromPageContext(t, e) {
-  if (!e.modelFieldsMap) return;
+function getModelFieldFromPageContext(e, t) {
+  if (!t.modelFieldsMap) return;
   let o = null;
-  for (let n = 0; n < t.length; n++) {
-    const a = t[n];
-    n + 1 === t.length && (o = e.modelFieldsMap[a]);
+  for (let n = 0; n < e.length; n++) {
+    const a = e[n];
+    n + 1 === e.length && (o = t.modelFieldsMap[a]);
   }
   return o;
 }
-function isNumberDataType(t) {
-  return "INTEGER" === t || "LONG" === t || "DOUBLE" === t || "FLOAT_COM" === t;
+function isNumberDataType(e) {
+  return "INTEGER" === e || "LONG" === e || "DOUBLE" === e || "FLOAT_COM" === e;
 }
-function isDateDataType(t) {
-  return "DATE" === (t = t ? t.toUpperCase() : "") || "TIME" === t || "DATETIME" === t || "TIMESTAMP" === t;
+function isDateDataType(e) {
+  return "DATE" === (e = e ? e.toUpperCase() : "") || "TIME" === e || "DATETIME" === e || "TIMESTAMP" === e;
 }
 export {
   autoSetAfterSelect,