super-page-runtime 2.1.87 → 2.1.91

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

@@ -219,10 +219,8 @@ const functions = {
     if (!params.taskParamMap) {
       params.taskParamMap = pageContext.entity.task;
     }
-    let baseUrl = pageContext.backendUrl;
-    if (!baseUrl) {
-      baseUrl = window["$vueApp"].config.globalProperties.baseURL;
-    }
+    const backendUrl = pageContext.backendUrl;
+    const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
     return http.post(`${baseUrl}/dsc/service-flow/execute/${pageCode}/${flowCode}`, params);
   },
   openPage: function(pageContext, openParam) {

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

@@ -3,7 +3,7 @@ import dayjs from "dayjs";
 import { executeExpression } from "agilebuilder-ui/src/utils/calculator/calculator-util";
 import { getComponentRef } from "./global-refs.js";
 import { watch } from "vue";
-import { deepCopy } from "./common-util.js";
+import { deepCopy, getBaseUrl } from "./common-util.js";
 function getComponentOptionConfigs(component, pageContext2) {
   if (!component.props || !component.props.dataOrigin) {
     return;
@@ -181,10 +181,8 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
       systemCode: pageContext2.systemCode,
       pageCode: pageContext2.code
     };
-    let baseUrl = pageContext2.backendUrl;
-    if (!baseUrl) {
-      baseUrl = window["$vueApp"].config.globalProperties.baseURL;
-    }
+    const backendUrl = pageContext2.backendUrl;
+    const baseUrl = getBaseUrl(backendUrl, pageContext2.isTest);
     const url = baseUrl + "/common/common-data/find-chart-datas";
     http.post(url, param).then((result) => {
       if (!pageContext2.chartDataSourceMap) {
@@ -240,10 +238,8 @@ function updateOptionDatasources(pageContext2, dataSourceConfs, query) {
       systemCode: pageContext2.systemCode,
       query
     };
-    let baseUrl = pageContext2.backendUrl;
-    if (!baseUrl) {
-      baseUrl = window["$vueApp"].config.globalProperties.baseURL;
-    }
+    const backendUrl = pageContext2.backendUrl;
+    const baseUrl = getBaseUrl(backendUrl, pageContext2.isTest);
     const url = baseUrl + "/common/common-data/find-datas";
     http.post(url, param).then((result) => {
       if (!pageContext2.optionSourceMap) {

package/dist/es/components/runtime/views/assemblys/chart/table/table-runtime.vue2.js

@@ -98,7 +98,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       watch(
         () => path.reduce((obj, key) => obj[key], props.pageContext.entity),
         (newVal) => {
-          loadTable(JSON.parse(JSON.stringify(newVal)), null);
+          console.log("统计表格监听数据变量的变化 newVal：", newVal);
+          if (newVal) {
+            loadTable(JSON.parse(JSON.stringify(newVal)), null);
+          } else {
+            tableData.value = [];
+            resetTableColumns();
+          }
         }
       );
     }
@@ -120,25 +126,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       dataConfig.autoRefresh = false;
     }
     function updateTable(resultData) {
-      if (props.configure.props.modelCustom) {
-        const func = getCustomFunc(props.pageContext, props.configure.props.modelCustom);
-        if (func) {
-          const resultValue = func.apply(func, [
-            {
-              pageContext: props.pageContext,
-              configureObj: props.configure,
-              value: resultData
-            }
-          ]);
-          if (isPromise(resultValue)) {
-            resultValue.then((res) => {
-              tableColumnsConfig.value = res.columns;
-            });
-          } else {
-            tableColumnsConfig.value = resultValue.columns;
-          }
-        }
-      }
+      setCustomColumns(resultData);
       if (props.configure.props.dataOrigin.dataSource === "service" && resultData.result) {
         tmpTableData = resultData.result[props.configure.props.dataOrigin.service.serviceDataField];
       } else if (props.configure.props.dataOrigin.dataSource === "variable") {
@@ -417,6 +405,39 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const showCondition = column.showCondition;
       return caculateShowCondition(props.pageContext, showCondition);
     }
+    function resetTableColumns() {
+      console.log("重置统计表格列配置");
+      if (!props.configure.props.modelCustom) {
+        if (!isEnableGroupHeader.value) {
+          tableColumnsConfig.value = props.configure.items;
+        } else {
+          groupColumnsConfig.value = props.configure.props.groupHeaders;
+        }
+      } else {
+        setCustomColumns(null);
+      }
+    }
+    function setCustomColumns(resultData) {
+      if (props.configure.props.modelCustom) {
+        const func = getCustomFunc(props.pageContext, props.configure.props.modelCustom);
+        if (func) {
+          const resultValue = func.apply(func, [
+            {
+              pageContext: props.pageContext,
+              configureObj: props.configure,
+              value: resultData
+            }
+          ]);
+          if (isPromise(resultValue)) {
+            resultValue.then((res) => {
+              tableColumnsConfig.value = res.columns;
+            });
+          } else {
+            tableColumnsConfig.value = resultValue.columns;
+          }
+        }
+      }
+    }
     function exportChart() {
     }
     __expose({

package/dist/es/components/runtime/views/assemblys/form/rich-text/richtext-runtime.vue2.js

@@ -7,6 +7,7 @@ import { handleAfterInitEvent, handleFormEvent } from "../../../../utils/events/
 import http from "agilebuilder-ui/src/utils/request";
 import { $t } from "../../../../utils/i18n-util.js";
 import { getToken } from "agilebuilder-ui/src/utils/auth";
+import { getBaseUrl } from "../../../../utils/common-util.js";
 const _hoisted_1 = { style: { "width": "100%", "height": "100%" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "richtext-runtime",
@@ -195,10 +196,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "Content-Type": "multipart/form-data"
         }
       };
-      let baseUrl = props.pageContext.backendUrl;
-      if (!baseUrl) {
-        baseUrl = window["$vueApp"].config.globalProperties.baseURL;
-      }
+      const backendUrl = props.pageContext.backendUrl;
+      const baseUrl = getBaseUrl(backendUrl, props.pageContext.isTest);
       return http.post(baseUrl + "/common/fs-upload/rich-editor-image", params, config);
     }
     function dataURLtoFile(dataurl, filename) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.87",
+  "version": "2.1.91",
   "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.0.98",
+    "agilebuilder-ui": "1.1.0",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",