super-page-runtime 2.2.26 → 2.2.29

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);
   });

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

@@ -57,7 +57,7 @@ function b(e2) {
 function y(e2, t2) {
   if (e2) {
     Object.assign(t2, e2);
-    E(e2.paramStoreId, t2), delete e2.paramStoreId;
+    E(e2.paramStoreId, t2), delete e2.paramStoreId, e2.jumpMode && (t2.jumpMode = e2.jumpMode);
   }
 }
 function h(e2, t2) {
@@ -102,7 +102,7 @@ function P(e2, t2, s2, i2) {
   }
   return n2;
 }
-function C(e2, t2) {
+function M(e2, t2) {
   if (!t2 || !e2 || t2.isTest) return "true";
   const s2 = [];
   if (e2.autoPermissions) for (const i2 of e2.autoPermissions) s2.push(t2.code + "." + i2.simpleCode);
@@ -116,13 +116,13 @@ function C(e2, t2) {
   }
   return s2.join(",");
 }
-function I(s2, i2, n2) {
+function j(s2, i2, n2) {
   const o2 = s2.tableRuntimes, r2 = t(i2);
   let l2;
   const a2 = i2.code;
   return r2 && Object.keys(r2) > 0 && (l2 = JSON.stringify(r2)), e.post(window.$vueApp.config.globalProperties.baseAPI + "/component/super-page-design/super-grids", { tableRuntimes: o2, additionalParamMapJson: l2, pageCode: a2, publishVersion: n2, pageType: s2.pageType });
 }
-function M(e2, t2) {
+function C(e2, t2) {
   var _a, _b;
   const s2 = t2.props && t2.props.base ? t2.props.base.prop : null;
   let n2 = false;
@@ -141,7 +141,7 @@ function M(e2, t2) {
     ((_b = t2.props) == null ? void 0 : _b.customRuleEvents) && (e2.customRuleEvents || (e2.customRuleEvents = []), e2.customRuleEvents.push({ prop: o2, events: t2.props.customRuleEvents }));
   }
 }
-function j(e2, t2) {
+function I(e2, t2) {
   if (e2.initInfo) {
     ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"].forEach((s2) => {
       const i2 = e2.initInfo[s2];
@@ -157,16 +157,16 @@ function j(e2, t2) {
   }
 }
 export {
-  j as controlObjectRenderState,
+  I as controlObjectRenderState,
   c as convertToPageContext,
   P as getDefaultValue,
   w as getFormModelFields,
   v as getModelFields,
-  C as getPermissionCodes,
+  M as getPermissionCodes,
   b as packageAdditionalMapWithLocationSearch,
   y as packageAdditionalMapWithPageRequest,
   h as packageAdditionalMapWithRoute,
-  M as packageFormRules,
+  C as packageFormRules,
   f as queryPageDesignByCode,
-  I as queryPageSuperGrids
+  j as queryPageSuperGrids
 };

package/dist/es/components/runtime/views/home-chart.vue.js

@@ -9,6 +9,7 @@ const C = { "element-loading-text": "加载中..." }, v = e({ name: "HomeChart",
   const v2 = e2, y = t(true), S = t(false), b = t({});
   let I, U = t(null);
   return v2.chartCode && g.get(window.$vueApp.config.globalProperties.baseAPI + "/mms/home-chart-layout/" + v2.chartCode).then((e3) => {
+    var _a, _b;
     if (e3 && e3.designJson) {
       const t2 = JSON.parse(e3.designJson);
       let a2 = window.localStorage.getItem("HOME_MY_CHARTS_ALIAS");
@@ -18,8 +19,8 @@ const C = { "element-loading-text": "加载中..." }, v = e({ name: "HomeChart",
       }
       const i2 = window.frameElement;
       b.value = t2.chartJson, b.value.homeChartSettingUserId = v2.homeChartSettingUserId, i2 && (b.value.runtime.common.style.pc_style.height = i2.clientHeight + "px");
-      const n2 = { showHomepageSearch: true, name: e3.pageName, code: e3.pageCode, label: "", dimensions: "", version: 1, isWorkflowEntity: false, variables: t2.variables, systemCode: e3.systemCode, uuid: e3.uuid, allChartUuids: [], backendUrl: e3.backendUrl, rules: {}, pageType: "chart", beanName: t2.beanName, initChartServiceConfigs: [t2.initChartServiceConfigs], entity: { data: {}, task: {}, request: {}, page: {}, context: e3.contextParam, system: e3.systemParam } };
-      if (t2.variables) {
+      const n2 = { showHomepageSearch: false, name: e3.pageName, code: e3.pageCode, label: "", dimensions: "", version: 1, isWorkflowEntity: false, variables: t2.variables, systemCode: e3.systemCode, uuid: e3.uuid, allChartUuids: [], backendUrl: e3.backendUrl, rules: {}, pageType: "chart", beanName: t2.beanName, initChartServiceConfigs: [t2.initChartServiceConfigs], entity: { data: {}, task: {}, request: {}, page: {}, context: e3.contextParam, system: e3.systemParam } };
+      if (((_a = b.value.pushHomepage) == null ? void 0 : _a.searchConditions) && ((_b = b.value.pushHomepage) == null ? void 0 : _b.searchConditions.length) > 0 && (n2.showHomepageSearch = true), t2.variables) {
         const e4 = n2.entity.page;
         for (const a3 of t2.variables) a3.name && (a3.isArrayElement ? e4[a3.name] = [] : a3.defaultValue ? e4[a3.name] = a3.defaultValue : e4[a3.name] = void 0);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.2.26",
+  "version": "2.2.29",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.1.11",
+    "agilebuilder-ui": "1.1.12",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",