super-page-runtime 2.1.75 → 2.1.77
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -4,7 +4,7 @@ import { validateDataModelFunc } from "./validator-util.js";
|
|
|
4
4
|
import { getComponentRef, getComponentRefByCode } from "../global-refs.js";
|
|
5
5
|
import { ElMessage } from "element-plus";
|
|
6
6
|
import { analysisCondition } from "agilebuilder-ui/src/utils/util";
|
|
7
|
-
import { getListCode
|
|
7
|
+
import { getListCode } from "../common-util.js";
|
|
8
8
|
import eventBus from "../eventBus.js";
|
|
9
9
|
import { getValueFromSource } from "../page-helper-util.js";
|
|
10
10
|
import { expressJump } from "../table-utils.js";
|
|
@@ -378,29 +378,19 @@ function doAfterClickFunc(pageContext, configure, eventParams, isStandardEvent,
|
|
|
378
378
|
}
|
|
379
379
|
}
|
|
380
380
|
function doClickEvent(pageContext, configure, clickEventFunObj, eventParams) {
|
|
381
|
-
|
|
381
|
+
let linkPage = configure.props.linkPage;
|
|
382
382
|
if (linkPage && linkPage instanceof Array) {
|
|
383
|
-
pageContext.canClick = true;
|
|
384
383
|
const row = getRowData(eventParams);
|
|
385
384
|
const result = expressJump(pageContext, configure, linkPage, row);
|
|
386
385
|
let show = false;
|
|
387
386
|
let toLinkPage;
|
|
388
387
|
if (result) {
|
|
389
388
|
show = result.show;
|
|
390
|
-
toLinkPage = result.toPage;
|
|
389
|
+
toLinkPage = show ? result.toPage : null;
|
|
391
390
|
}
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
doClickJumpPageEvent(pageContext, configureObj, eventParams);
|
|
396
|
-
} else {
|
|
397
|
-
ElMessage({
|
|
398
|
-
showClose: true,
|
|
399
|
-
type: "warning",
|
|
400
|
-
message: "没有符合条件的跳转页面"
|
|
401
|
-
});
|
|
402
|
-
}
|
|
403
|
-
} else if (linkPage && linkPage.jumpPageUrl) {
|
|
391
|
+
linkPage = toLinkPage;
|
|
392
|
+
}
|
|
393
|
+
if (linkPage && linkPage.jumpPageUrl) {
|
|
404
394
|
pageContext.canClick = true;
|
|
405
395
|
doClickJumpPageEvent(pageContext, configure, eventParams);
|
|
406
396
|
} else {
|