super-page-runtime 2.1.73 → 2.1.77

package/dist/es/components/runtime/utils/events/event-util.js

@@ -4,7 +4,7 @@ import { validateDataModelFunc } from "./validator-util.js";
 import { getComponentRef, getComponentRefByCode } from "../global-refs.js";
 import { ElMessage } from "element-plus";
 import { analysisCondition } from "agilebuilder-ui/src/utils/util";
-import { getListCode, deepCopy } from "../common-util.js";
+import { getListCode } from "../common-util.js";
 import eventBus from "../eventBus.js";
 import { getValueFromSource } from "../page-helper-util.js";
 import { expressJump } from "../table-utils.js";
@@ -378,29 +378,19 @@ function doAfterClickFunc(pageContext, configure, eventParams, isStandardEvent,
   }
 }
 function doClickEvent(pageContext, configure, clickEventFunObj, eventParams) {
-  const linkPage = configure.props.linkPage;
+  let linkPage = configure.props.linkPage;
   if (linkPage && linkPage instanceof Array) {
-    pageContext.canClick = true;
     const row = getRowData(eventParams);
     const result = expressJump(pageContext, configure, linkPage, row);
     let show = false;
     let toLinkPage;
     if (result) {
       show = result.show;
-      toLinkPage = result.toPage;
+      toLinkPage = show ? result.toPage : null;
     }
-    if (show && toLinkPage) {
-      let configureObj = deepCopy(configure);
-      configureObj.props.linkPage = toLinkPage.linkPage;
-      doClickJumpPageEvent(pageContext, configureObj, eventParams);
-    } else {
-      ElMessage({
-        showClose: true,
-        type: "warning",
-        message: "没有符合条件的跳转页面"
-      });
-    }
-  } else if (linkPage && linkPage.jumpPageUrl) {
+    linkPage = toLinkPage;
+  }
+  if (linkPage && linkPage.jumpPageUrl) {
     pageContext.canClick = true;
     doClickJumpPageEvent(pageContext, configure, eventParams);
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.73",
+  "version": "2.1.77",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",