super-page-runtime 2.1.27 → 2.1.30

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

@@ -34,13 +34,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const enableDrill = props.configure.props ? props.configure.props.enableDrill : null;
     const drillEndTrigger = props.configure.props ? props.configure.props.drillEndTrigger : null;
     const linkPage = props.configure.props ? props.configure.props.linkPage : null;
-    const linkPageMap = {};
+    const linkConfigureMap = {};
     if (props.configure.items) {
       for (const item of props.configure.items) {
-        if (linkPage && linkPage.jumpPageUrl) {
-          linkPageMap[item.uuid] = linkPage;
-        } else if (item.props && item.props.linkPage && item.props.linkPage.jumpPageUrl) {
-          linkPageMap[item.uuid] = item.props.linkPage;
+        if (item.props && item.props.linkPage && item.props.linkPage.jumpPageUrl) {
+          linkConfigureMap[item.uuid] = item;
+        } else if (linkPage && linkPage.jumpPageUrl) {
+          linkConfigureMap[item.uuid] = props.configure;
         }
       }
     }
@@ -58,7 +58,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (resultData) {
         updateChartDatas(resultData);
       }
-      if (chartRef.value && (enableDrill || Object.keys(linkPageMap).length > 0)) {
+      if (chartRef.value && (enableDrill || Object.keys(linkConfigureMap).length > 0)) {
         chartRef.value.chart.on("click", function(params) {
           if (enableDrill) {
             if (headerRef.value && headerRef.value.drill) {
@@ -90,12 +90,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       console.log("clik1", clickParams);
       const selSerieUuid = chartOption.series[clickParams.seriesIndex].uuid;
       console.log("clik2", selSerieUuid);
-      const linkPage2 = linkPageMap[selSerieUuid];
-      console.log("clik3", linkPageMap, linkPage2);
-      if (!linkPage2) {
+      const linkConfigure = linkConfigureMap[selSerieUuid];
+      console.log("clik3", linkConfigure);
+      if (!linkConfigure) {
         return;
       }
-      doClickJumpPageEvent(props.pageContext, props.configure, void 0);
+      doClickJumpPageEvent(props.pageContext, linkConfigure, void 0);
     }
     let hisGroupValue = headerInfo.groupValue;
     watch(headerInfo, () => {

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

@@ -390,21 +390,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function getPopPageSetting(configureObj, eventParams, jumpPageSetting2) {
       return new Promise((resolve, reject) => {
+        var _a;
         if (jumpPageSetting2) {
           resolve(jumpPageSetting2);
         } else {
           const myJumpPageSetting = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
           if (myJumpPageSetting && myJumpPageSetting.jumpPageUrl) {
             const additionalParamMap = getAdditionalParamMap(pageContext);
-            let dataId = eventParams ? eventParams.id : null;
-            let ids = eventParams ? eventParams.ids : null;
-            let selections = eventParams ? eventParams.selections : [];
+            const isNeedId = ((_a = parentConfigureObj.value.props.linkPage) == null ? void 0 : _a.isNeedId) ? true : false;
             console.log(
-              "getPopPageSetting---selections=",
-              selections,
-              "parentPageContext.value=",
-              parentPageContext.value
+              "getPopPageSetting---isNeedId=",
+              isNeedId,
+              "parentConfigureObj.value=",
+              parentConfigureObj.value
             );
+            let dataId = isNeedId && eventParams ? eventParams.id : null;
+            let ids = isNeedId && eventParams ? eventParams.ids : null;
+            let selections = eventParams ? eventParams.selections : [];
             let entity = {};
             if (selections && selections.length > 0) {
               entity = selections[0];
@@ -418,6 +420,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 Object.assign(entity, dataModel);
               }
             }
+            const copyPageData = deepCopy(parentPageContext.value.entity.page);
+            myJumpPageSetting._pageData = copyPageData;
             jumpToPage(myJumpPageSetting, null, dataId, entity, additionalParamMap, ids).then(
               (openPageParams) => {
                 resolve(openPageParams);

package/package.json

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