super-page-runtime 2.0.74 → 2.0.76

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

@@ -2,7 +2,7 @@ import http from "agilebuilder-ui/src/utils/request";
 import { useRoute } from "vue-router";
 import { getAdditionalParamMap } from "./events/standard-event.js";
 import { PageDimensions } from "./interfaces/page-design-types.js";
-import { formatVariableValue, getFormPropName, setVariableValue } from "./page-helper-util.js";
+import { setVariableValue, formatVariableValue, getFormPropName } from "./page-helper-util.js";
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
 function queryPageDesignByCode(pageCode) {
   return http.get(
@@ -90,6 +90,9 @@ function getPageDimensions() {
 function getRequestObject(pageRequest) {
   const requestObj = {};
   if (pageRequest) {
+    const paramStoreId = pageRequest.paramStoreId;
+    packageAdditionalMap(paramStoreId, requestObj);
+    delete pageRequest.paramStoreId;
     Object.assign(requestObj, pageRequest);
   }
   let url = decodeURI(window.location.href);
@@ -109,20 +112,23 @@ function getRequestObject(pageRequest) {
     if (route.query) {
       Object.assign(requestObj, route.query);
       const paramStoreId = route.query.paramStoreId;
-      if (paramStoreId) {
-        const additionalParamMapJson = getSessionCache(paramStoreId);
-        if (additionalParamMapJson) {
-          const additionalParamMap = JSON.parse(additionalParamMapJson);
-          Object.assign(requestObj, additionalParamMap);
-          console.log("已获取到附加参数", additionalParamMap);
-        }
-      }
+      packageAdditionalMap(paramStoreId, requestObj);
     }
   }
   if (requestObj["_t_"])
     ;
   return requestObj;
 }
+function packageAdditionalMap(paramStoreId, requestObj) {
+  if (paramStoreId) {
+    const additionalParamMapJson = getSessionCache(paramStoreId);
+    if (additionalParamMapJson) {
+      const additionalParamMap = JSON.parse(additionalParamMapJson);
+      Object.assign(requestObj, additionalParamMap);
+      console.log("已获取到附加参数", additionalParamMap);
+    }
+  }
+}
 function getModelFields(pageContext, formItemConfigure, prop) {
   if (!formItemConfigure) {
     return ["temp"];
@@ -175,10 +181,8 @@ function getFormModelFields(pageContext, formItemConfigure, prop) {
 }
 function getDefaultValue(pageContext, defaultValueSet, componentType, multiple) {
   let defaultValue;
-  console.log("pageRuntime11---getDefaultValue---defaultValueSet---", defaultValueSet, "pageContext=", pageContext);
   if (defaultValueSet) {
     defaultValue = formatVariableValue(pageContext, defaultValueSet);
-    console.log("pageRuntime22---getDefaultValue---defaultValue---", defaultValue);
     if (defaultValue != null && defaultValue != void 0 && componentType) {
       let isMultiple = false;
       if (componentType == "checkbox") {

package/dist/es/components/runtime/views/super-page.vue.js

@@ -413,6 +413,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
           const jumpMode = openPageParams.jumpMode;
           const popPageSetting = openPageParams;
+          if (!parentEventParams.value) {
+            parentEventParams.value = {};
+          }
+          parentEventParams.value.paramStoreId = openPageParams.paramStoreId;
           popPageSetting.parentPageCode = parentPageContext.value.code;
           popPageSetting.parentPageVersion = parentPageContext.value.version;
           popPageSetting.isNewPage = true;

package/package.json

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