super-page-runtime 2.3.0-tmp2 → 2.3.2-sit1

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

@@ -4,94 +4,94 @@ 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(t, e, n, o) {
+  return getComponentOptionConfigsBase(t, (e == null ? void 0 : e.systemCode) ? e.systemCode : n, (e == null ? void 0 : e.systemVersion) ? e == null ? void 0 : e.systemVersion : o);
 }
-function getComponentOptionConfigsBase(t, e, o) {
+function getComponentOptionConfigsBase(t, e, n) {
   if (!t.props || !t.props.dataOrigin) return;
   if (t.name && "table" === t.name) return;
-  const n = t.props.dataOrigin, a = { uuid: t.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);
+  const o = t.props.dataOrigin, a = { uuid: t.uuid };
+  if ("optionGroup" == o.optionValueSetType) a.type = "optionGroup", a.props = { code: o.optionGroup };
+  else if ("dynamicData" == o.optionValueSetType) a.type = "dynamicData", a.filterType = o.filterType, a.props = { code: o.dynamicDataSourceCode };
+  else if ("dataTable" == o.optionValueSetType) {
+    a.filterType = o.filterType;
+    const t2 = getTableQueryInfo(o, e, n);
     Object.assign(a, t2);
-  } else if ("service" == n.optionValueSetType) {
-    a.filterType = n.filterType;
-    const t2 = getServiceQueryInfo(n, e, o);
+  } else if ("service" == o.optionValueSetType) {
+    a.filterType = o.filterType;
+    const t2 = getServiceQueryInfo(o, e, n);
     Object.assign(a, t2);
   }
   return a.type ? a : void 0;
 }
-function getTableQueryInfo(t, e, o) {
-  const n = { type: "dataTable" };
-  if (n.valueLabelSwitch = !!t.valueLabelSwitch, n.props = { tableName: t.tableName, systemCode: t.tableSysCode ? t.tableSysCode : e, systemVersion: t.tableSysVersion ? t.tableSysVersion : o }, t.sortFields) {
+function getTableQueryInfo(t, e, n) {
+  const o = { type: "dataTable" };
+  if (o.valueLabelSwitch = !!t.valueLabelSwitch, o.props = { tableName: t.tableName, systemCode: t.tableSysCode ? t.tableSysCode : e, systemVersion: t.tableSysVersion ? t.tableSysVersion : n }, 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;
+    for (const n2 of t.sortFields) n2.name && e2.push({ prop: n2.name, order: n2.type ? n2.type : "asc" });
+    o.props.sorts = e2;
   }
   const a = [];
   if (t.filterList) {
     const e2 = [];
-    for (const o2 of t.filterList) {
-      if (!o2.propName) continue;
-      o2.propDbName || (o2.propDbName = o2.propName);
+    for (const n2 of t.filterList) {
+      if (!n2.propName) continue;
+      n2.propDbName || (n2.propDbName = n2.propName);
       const t2 = {};
-      Object.assign(t2, 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);
+      Object.assign(t2, n2);
+      const o2 = getParamNames(n2.propValue);
+      for (const t3 of o2) t3 && (t3.startsWith("${data.") || t3.startsWith("${task.") || t3.startsWith("${page.")) && (a.includes(t3) || a.push(t3));
+      n2.propValue, e2.push(t2);
     }
-    n.props.searchForm = e2;
+    o.props.searchForm = e2;
   }
-  n.props.monitorFields = a;
+  o.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 (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, o) {
-  const n = { type: "service" };
-  if (n.valueLabelSwitch = !!t.valueLabelSwitch, n.props = { serivceCode: t.serviceCode, systemCode: t.tableSysCode ? t.tableSysCode : e, systemVersion: t.tableSysVersion ? t.tableSysVersion : o }, t.serviceInputs) {
+function getServiceQueryInfo(t, e, n) {
+  const o = { type: "service" };
+  if (o.valueLabelSwitch = !!t.valueLabelSwitch, o.props = { serivceCode: t.serviceCode, systemCode: t.tableSysCode ? t.tableSysCode : e, systemVersion: t.tableSysVersion ? t.tableSysVersion : n }, t.serviceInputs) {
     const e2 = [];
-    for (const o2 of t.serviceInputs) {
-      if (!o2.name || o2.value) continue;
+    for (const n2 of t.serviceInputs) {
+      if (!n2.name || n2.value) continue;
       const t2 = {};
-      Object.assign(t2, o2), e2.push(t2);
+      Object.assign(t2, n2), e2.push(t2);
     }
-    n.props.inputs = e2;
+    o.props.inputs = e2;
   }
-  return n.props.dataSetField = t.serviceDataSetField, n.props.valueField = t.serviceValueField, n.props.labelField = t.serviceLabelField, n;
+  return o.props.dataSetField = t.serviceDataSetField, o.props.valueField = t.serviceValueField, o.props.labelField = t.serviceLabelField, o;
 }
-function updateChartDatasources(t, e, o, n) {
+function updateChartDatasources(t, e, n, o) {
   return new Promise((a, r) => {
     if (!e || 0 == e.length) return void r(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);
-        }), delete o2[0].serviceInputs);
+      const n2 = e2.services;
+      if (n2 && n2.length > 0) {
+        const e3 = n2[0].serviceInputs;
+        e3 && (n2[0].serviceInParams = {}, e3.forEach((e4) => {
+          const o2 = e4.name, a2 = e4.value;
+          n2[0].serviceInParams[o2] = getValueFromVariable(t.entity, a2);
+        }), delete n2[0].serviceInputs);
       }
     });
     const i = t.entity ? t.entity : {}, u = {};
-    i.request && Object.assign(u, i.request), i.page && Object.assign(u, i.page), o && Object.assign(u, o);
+    i.request && Object.assign(u, i.request), i.page && Object.assign(u, i.page), n && Object.assign(u, n);
     const l = {};
     i.task && Object.assign(l, i.task);
     const c = { entityMap: i.data, additionalParamMap: u, taskMap: l, dataSourceList: s, 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) => {
       var _a, _b;
       t.chartDataSourceMap || (t.chartDataSourceMap = {});
-      for (const o2 in e2) {
-        t.chartDataSourceMap[o2] = e2[o2];
-        const a2 = getComponentRef(t, o2);
+      for (const n2 in e2) {
+        t.chartDataSourceMap[n2] = e2[n2];
+        const a2 = getComponentRef(t, n2);
         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 : {};
+          if ((!o || r2 && (void 0 === r2.initializationQuery || r2.initializationQuery)) && a2.updateChartDatas && (a2.updateChartDatas(e2[n2]), (_b = (_a = r2.runtime) == null ? void 0 : _a.dataConfig) == null ? void 0 : _b.resultSet)) {
+            const o2 = e2[n2] && e2[n2].length > 0 ? e2[n2][0] : {}, a3 = o2 && o2.result ? o2.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);
           }
@@ -104,23 +104,23 @@ function updateChartDatasources(t, e, o, n) {
   });
 }
 function updateChartDatasourcesByComponent(t, e) {
-  const o = t.initChartServiceConfigs.find((t2) => t2.uuid === e);
-  o && updateChartDatasources(t, [o], null, false);
+  const n = t.initChartServiceConfigs.find((t2) => t2.uuid === e);
+  n && updateChartDatasources(t, [n], null, false);
 }
-function updateOptionDatasources(t, e, o) {
-  return new Promise((n, a) => {
+function updateOptionDatasources(t, e, n) {
+  return new Promise((o, 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";
+    r.request && Object.assign(s, r.request), r.page && Object.assign(s, r.page), s.query = n;
+    const i = { entityMap: r.data, additionalParamMap: s, dataSourceList: e, systemCode: t.systemCode, query: n }, 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) {
-        t.optionSourceMap[o2] = e2[o2];
-        const n2 = getComponentRef(t, o2);
-        n2 && n2.updateOptions && n2.updateOptions(e2[o2]);
+      for (const n2 in e2) {
+        t.optionSourceMap[n2] = e2[n2];
+        const o2 = getComponentRef(t, n2);
+        o2 && o2.updateOptions && o2.updateOptions(e2[n2]);
       }
-      n(e2);
+      o(e2);
     }).catch((t2) => {
       a(t2);
     });
@@ -130,8 +130,8 @@ function getOptionDatasFromPage(t, e) {
   return getComponentOptionDatasFromPage(t, e.uuid);
 }
 function getComponentOptionDatasFromPage(t, e) {
-  const o = getOptionDatasSourceMap(t)[e];
-  return o || [];
+  const n = getOptionDatasSourceMap(t)[e];
+  return n || [];
 }
 function getOptionDatasSourceMap(t) {
   if (!t || !t.optionSourceMap) return {};
@@ -142,63 +142,63 @@ function getChartDatasFromPage(t, e) {
   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;
-  const a = 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(","));
+function queryOptionDatasources(t, e, n) {
+  return updateOptionDatasources(t, e ? [e] : [], n);
+}
+function autoSetAfterSelect(t, e, n, o, a = []) {
+  if (!n || 0 == n.length) return;
+  const r = e.entity ? e.entity : {};
+  for (const t2 of n) {
+    if (!t2.source || !t2.target || a.includes(t2.target)) continue;
+    const e2 = getValuesByField(o, t2.source);
+    let n2 = t2.target;
+    if (!n2 || !n2.startsWith("${")) continue;
+    n2 = n2.substring(2, n2.length - 1);
+    setVariableValue(r, n2.split("."), e2.join(","));
   }
 }
 function getValuesByField(t, e) {
   if (t) {
-    const o = [];
-    for (const n of t) {
-      let t2 = n[e];
-      null != t2 && null != t2 || (t2 = ""), o.push(t2);
+    const n = [];
+    for (const o of t) {
+      let t2 = o[e];
+      null != t2 && null != t2 || (t2 = ""), n.push(t2);
     }
-    return o;
+    return n;
   }
   return [""];
 }
 function getVariableValue(t, e) {
   if (!t || !e || 0 == e.length) return;
-  let o = t;
+  let n = t;
   for (let t2 = 0; t2 < e.length; t2++) {
-    if (null == o) return o;
-    o = o[e[t2]];
+    if (null == n) return n;
+    n = n[e[t2]];
   }
-  return o;
+  return n;
 }
-function setValueForVariableName(t, e, o) {
+function setValueForVariableName(t, e, n) {
   if (!e || !e.startsWith("${")) return;
-  setVariableValue(t, (e = e.substring(2, e.length - 1)).split("."), o);
+  setVariableValue(t, (e = e.substring(2, e.length - 1)).split("."), n);
 }
-function setVariableValue(t, e, o) {
+function setVariableValue(t, e, n) {
   if (!t || !e || 0 == e.length) return;
-  let n = t;
+  let o = 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]);
+    t2 + 1 === e.length ? o[a] = n : (void 0 === o[a] && (o[a] = {}), o = o[a]);
   }
 }
-function setVariableValueWithProp(t, e, o) {
+function setVariableValueWithProp(t, e, n) {
   if (!t || !e) return;
-  setVariableValue(t, e.split("."), o);
+  setVariableValue(t, e.split("."), n);
 }
 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");
+  const n = t.entity ? t.entity : {}, o = getParamNames(e);
+  for (const t2 in o) {
+    const a = o[t2], r = getValueFromVariable(n, 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);
   }
@@ -209,60 +209,60 @@ function getParamNames(t) {
   const e = t.match(/\$\{[^\{|\}]+\}/g);
   return e || [];
 }
-function formatValueByType(t, e, o) {
+function formatValueByType(t, e, n) {
   if (!e || "" == t || null == t || null == t) return t;
-  if (o = o || {}, "number" == e || "percent" == e) {
+  if (n = n || {}, "number" == e || "percent" == e) {
     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 += "%";
+    let o = parseInt(n.decimalDigit);
+    if ((null == o || isNaN(o)) && (o = -1), t = parseFloat(t), "percent" == e && (t *= 100), o > -1 && (t = parseFloat(t.toFixed(o))), "percent" == e) t += "%";
     else {
-      if (o.thousandsSeparator) {
+      if (n.thousandsSeparator) {
         const e2 = t.toString().split(".");
         e2[0] = e2[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","), t = e2.length > 1 ? e2.join(".") : e2[0];
       }
-      o.symbol && (t = o.symbol + "" + t);
+      n.symbol && (t = n.symbol + "" + t);
     }
     return t;
   }
   if ("date" == e || "time" == e) {
-    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);
+    let o = "";
+    return "date" == e ? (o = n.dateFormat, o || (o = "YYYY-MM-DD")) : (o = n.timeFormat, o || (o = "HH:mm:ss")), dayjs(t).format(o);
   }
-  return "custom" == e && o.formatEventUuid, t;
+  return "custom" == e && n.formatEventUuid, t;
 }
-function getValueFromVariable(t, e, o) {
+function getValueFromVariable(t, e, n) {
   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 o = e.substring(2, e.length - 1), a = null, r = null;
+    if (o.startsWith("data.")) o = o.substring(5), r = t.data, a = "data";
+    else if (o.startsWith("page.")) o = o.substring(5), a = "page", r = t.page;
+    else if (o.startsWith("task.")) o = o.substring(5), a = "task", r = t.task;
+    else if (o.startsWith("request.")) o = o.substring(8), a = "request", r = t.request;
+    else if (o.startsWith("context.")) o = o.substring(8), a = "context", r = t.context;
+    else if (o.startsWith("system.")) o = o.substring(7), a = "system", r = t.system;
     else {
-      if (n.startsWith("fixed.")) return n.substring(6);
-      n.startsWith("row.") && (n = n.substring(4), r = o, a = "row");
+      if (o.startsWith("fixed.")) return o.substring(6);
+      o.startsWith("row.") && (o = o.substring(4), r = n, a = "row");
     }
-    return n ? getValueFromSource(r, n, a) : "";
+    return o ? getValueFromSource(r, o, a) : "";
   }
   return e;
 }
-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);
+function getValueFromSource(t, e, n) {
+  if ("context" != n && !t || !e) return;
+  const o = e.indexOf(".");
+  if (o > -1) {
+    const a = e.substring(0, o), r = e.substring(o + 1);
     let s = t[a];
-    return s && Array.isArray(s) && s.length > 0 && (s = s[0]), getValueFromSource(s, r, o);
+    return s && Array.isArray(s) && s.length > 0 && (s = s[0]), getValueFromSource(s, r, n);
   }
-  if ("context" == o) {
+  if ("context" == n) {
     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 t2 = e.substring(11), n2 = t2.substring(0, 1);
+      let o2 = 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;
+      return o2 = "+" === n2 ? o2 : -o2, "d" === a || "w" === a ? (o2 = "w" === a ? 7 * o2 : o2, r.setDate(r.getDate() + o2)) : "m" === a ? r.setMonth(r.getMonth() + o2) : "y" === a && r.setFullYear(r.getFullYear() + o2), r;
     }
     if (!t) return;
   }
@@ -274,17 +274,17 @@ function caculateShowCondition(pageContext, showConditions, row) {
   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;
-    n || (n = "EQ");
-    const a = getValueFromVariable(entityData, o, row);
+    const e = showConditions[t], n = e.propName;
+    let o = e.operator;
+    if (!n || "" === n) continue;
+    o || (o = "EQ");
+    const a = getValueFromVariable(entityData, n, 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");
+    "CONTAIN" != o && "NOT_CONTAIN" != o || a && !a.includes && (o = "CONTAIN" == o ? "EQ" : "NET");
     let i = e.variableIsNull, u;
-    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" : u = true)), null == u) try {
-      u = executeExpression(a, n, r, s);
+    if (i || (i = "null"), "IS_NULL" !== o && "IS_NOT_NULL" !== o && (void 0 !== r && "" !== r || (r = null, "null" === i ? o = "IS_NULL" : "notequal" === i ? o = "IS_NOT_NULL" : u = true)), null == u) try {
+      u = executeExpression(a, o, r, s);
     } catch (t2) {
       u = false;
     }
@@ -297,34 +297,34 @@ function caculateShowCondition(pageContext, showConditions, row) {
   }
   return !conditions || eval("(" + conditions + ")");
 }
-function monitorFieldChange(t, e, o) {
-  if (!o || !t || !e || 0 == e.length) return;
-  const n = [], a = [];
+function monitorFieldChange(t, e, n) {
+  if (!n || !t || !e || 0 == e.length) return;
+  const o = [], 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]));
+    "page" !== e2[0] && "task" !== e2[0] && "data" !== e2[0] || (o.push(e2), a.includes(e2[0]) || a.push(e2[0]));
   }
-  let r = getMonitorFieldValues(n, t.entity), s = false;
+  let r = getMonitorFieldValues(o, t.entity), s = false;
   for (const e2 of a) watch(t.entity[e2], () => {
     s && clearTimeout(s), s = setTimeout(function() {
-      const e3 = getMonitorFieldValues(n, t.entity);
-      r != e3 && (r = e3, o());
+      const e3 = getMonitorFieldValues(o, t.entity);
+      r != e3 && (r = e3, n());
     }, 200);
   });
 }
 function getMonitorFieldValues(t, e) {
-  let o = "";
-  for (const n of t) o += "_" + getVariableValue(e, n);
-  return o;
+  let n = "";
+  for (const o of t) n += "_" + getVariableValue(e, o);
+  return n;
 }
 function getFormPropName(t) {
   return t && t.indexOf("${") >= 0 ? t.substring(t.indexOf(".") + 1, t.lastIndexOf("}")) : t;
 }
 function getSizeConfig(t, e) {
-  const o = getPageModeType(t);
-  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;
+  const n = getPageModeType(t);
+  let o;
+  return e.props && e.props.size && e.props.size[n] && (o = e.props.size[n]), !o && e.props && e.props.size && (o = e.props.size.pc), o;
 }
 function getPageModeType(t) {
   let e = t.dimensions;
@@ -340,12 +340,12 @@ function decomposeVariable(t) {
 }
 function getModelFieldFromPageContext(t, e) {
   if (!e.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]);
+  let n = null;
+  for (let o = 0; o < t.length; o++) {
+    const a = t[o];
+    o + 1 === t.length && (n = e.modelFieldsMap[a]);
   }
-  return o;
+  return n;
 }
 function isNumberDataType(t) {
   return "INTEGER" === t || "LONG" === t || "DOUBLE" === t || "FLOAT_COM" === t;

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

@@ -88,8 +88,11 @@ function w(e2, t2, s2) {
     t2 && (s3 = t2.props.base ? t2.props.base : {}, l2 = t2.name, a2 = s3.multiple);
     const p2 = n(r2, i2);
     if (null == p2) {
-      const t3 = P(e2, s3 ? s3.defaultValue : null, l2, a2);
-      null != t3 && o(r2, i2, t3);
+      const t3 = s3 ? s3.defaultValue : null;
+      if (t3) {
+        const s4 = P(e2, t3, l2, a2);
+        null != s4 && o(r2, i2, s4);
+      }
     }
   }
   return i2;

package/dist/es/components/runtime/views/assemblys/chart/common/common-homepage-search.vue2.js

@@ -14,50 +14,50 @@ import "../../../../utils/page-store.js";
 import "agilebuilder-ui/src/utils/i18n-util";
 import "vue-i18n";
 import "../../../../utils/events/print-label.js";
-const _ = { style: { overflow: "auto", height: "calc(100vh - 140px)" }, ref: "dialogBody" }, b = { class: "dialog-footer" }, O = e({ __name: "common-homepage-search", props: { configure: { type: Object, required: true }, pageContext: { type: Object, default: () => {
-} } }, setup(e2, { expose: O2 }) {
-  const x = e2, N = t(false), J = t({}), j = t(0);
+const b = { style: { overflow: "auto", height: "calc(100vh - 140px)" }, ref: "dialogBody" }, O = { class: "dialog-footer" }, x = e({ __name: "common-homepage-search", props: { configure: { type: Object, required: true }, pageContext: { type: Object, default: () => {
+} } }, setup(e2, { expose: x2 }) {
+  const N = e2, _ = t(false), J = t({}), j = t(0);
   let I;
   o(() => {
     I = setTimeout(() => {
-      J.value = JSON.parse(JSON.stringify(x.pageContext.entity));
+      J.value = JSON.parse(JSON.stringify(N.pageContext.entity));
     }, 200);
   }), i(() => {
     I && clearTimeout(I);
   });
   const k = t([]), w = () => {
-    N.value = false;
+    _.value = false;
   }, T = () => {
     const e3 = y.service({ lock: true, text: "Loading", background: "rgba(0, 0, 0, 0.7)" });
-    v(x.pageContext, x.pageContext.initChartServiceConfigs, null, false).then(() => {
-      N.value = false;
+    v(N.pageContext, N.pageContext.initChartServiceConfigs, null, false).then(() => {
+      _.value = false;
     }).finally(() => {
-      N.value = false, e3.close();
+      _.value = false, e3.close();
     });
   };
   function H() {
-    x.pageContext.entity = JSON.parse(JSON.stringify(J.value)), j.value++;
+    N.pageContext.entity = JSON.parse(JSON.stringify(J.value)), j.value++;
   }
   function A() {
     const e3 = {};
-    x.pageContext.variables.forEach((t3) => {
+    N.pageContext.variables.forEach((t3) => {
       const o3 = "${page." + t3.name + "}";
-      e3[o3] = h(x.pageContext.entity, o3, null);
+      e3[o3] = h(N.pageContext.entity, o3, null);
     });
     let t2 = window.localStorage.getItem("HOME_MY_CHARTS_CONDITIONS"), o2 = {};
-    t2 && (o2 = JSON.parse(t2)), o2[x.configure.homeChartSettingUserId] = e3;
+    t2 && (o2 = JSON.parse(t2)), o2[N.configure.homeChartSettingUserId] = e3;
     const i2 = JSON.stringify(e3);
-    window.localStorage.setItem("HOME_MY_CHARTS_CONDITIONS", JSON.stringify(o2)), J.value = JSON.parse(JSON.stringify(x.pageContext.entity)), S.post(window.$vueApp.config.globalProperties.baseAPI + "/component/home-chart-settings/search-conditions", { id: x.configure.homeChartSettingUserId, searchConditionsJson: i2 }).then((e4) => {
+    window.localStorage.setItem("HOME_MY_CHARTS_CONDITIONS", JSON.stringify(o2)), J.value = JSON.parse(JSON.stringify(N.pageContext.entity)), S.post(window.$vueApp.config.globalProperties.baseAPI + "/component/home-chart-settings/search-conditions", { id: N.configure.homeChartSettingUserId, searchConditionsJson: i2 }).then((e4) => {
       C.success("保存成功"), T();
     });
   }
-  return O2({ openSearch: () => {
-    N.value = true, k.value = x.configure.pushHomepage.searchConditions;
+  return x2({ openSearch: () => {
+    _.value = true, k.value = N.configure.pushHomepage.searchConditions;
   } }), (t2, o2) => {
     const i2 = l("el-empty"), v2 = l("el-form"), h2 = l("el-button"), y2 = l("el-dialog");
-    return r(), a(y2, { modelValue: N.value, "onUpdate:modelValue": o2[0] || (o2[0] = (e3) => N.value = e3), title: "筛选", close: w, "append-to-body": "", fullscreen: "", top: "40vh", append: "", width: "70%", draggable: "" }, { default: n(() => [u("div", _, [k.value && 0 !== k.value.length ? c("", true) : (r(), a(i2, { key: 0, description: "未设置筛选条件", "image-size": 50 })), (r(), a(v2, { key: j.value }, { default: n(() => [(r(true), g(m, null, d(k.value, (t3) => (r(), a(f, { key: t3.uuid, configure: t3, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"]))), 128))]), _: 1 }))], 512)]), footer: n(() => [u("div", b, [s(h2, { type: "primary", onClick: T }, { default: n(() => o2[1] || (o2[1] = [p(" 确定 ")])), _: 1, __: [1] }), s(h2, { type: "default", onClick: H }, { default: n(() => o2[2] || (o2[2] = [p("重置")])), _: 1, __: [2] }), s(h2, { type: "primary", onClick: A }, { default: n(() => o2[3] || (o2[3] = [p(" 保存为默认条件 ")])), _: 1, __: [3] })])]), _: 1 }, 8, ["modelValue"]);
+    return r(), a(y2, { modelValue: _.value, "onUpdate:modelValue": o2[0] || (o2[0] = (e3) => _.value = e3), title: "筛选", close: w, "append-to-body": "", fullscreen: "", top: "40vh", append: "", width: "70%", draggable: "" }, { default: n(() => [u("div", b, [k.value && 0 !== k.value.length ? c("", true) : (r(), a(i2, { key: 0, description: "未设置筛选条件", "image-size": 50 })), (r(), a(v2, { key: j.value }, { default: n(() => [(r(true), g(m, null, d(k.value, (t3) => (r(), a(f, { key: t3.uuid, configure: t3, pageContext: e2.pageContext }, null, 8, ["configure", "pageContext"]))), 128))]), _: 1 }))], 512)]), footer: n(() => [u("div", O, [s(h2, { type: "primary", onClick: T }, { default: n(() => o2[1] || (o2[1] = [p(" 确定 ")])), _: 1 }), s(h2, { type: "default", onClick: H }, { default: n(() => o2[2] || (o2[2] = [p("重置")])), _: 1 }), s(h2, { type: "primary", onClick: A }, { default: n(() => o2[3] || (o2[3] = [p(" 保存为默认条件 ")])), _: 1 })])]), _: 1 }, 8, ["modelValue"]);
   };
 } });
 export {
-  O as default
+  x as default
 };

package/dist/es/components/runtime/views/assemblys/container/tabs/tabs-runtime.vue.js

@@ -1,7 +1,7 @@
 import t from "./tabs-runtime.vue2.js";
 /* empty css                  */
 import e from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const r = e(t, [["__scopeId", "data-v-9d724974"]]);
+const r = e(t, [["__scopeId", "data-v-50669d0c"]]);
 export {
   r as default
 };