lambo-design-bi 0.0.165 → 0.0.166
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.
|
@@ -39,7 +39,8 @@ export default {
|
|
|
39
39
|
pageTitle: '',
|
|
40
40
|
childPageWidget: {},
|
|
41
41
|
params: {},
|
|
42
|
-
pageId: ''
|
|
42
|
+
pageId: '',
|
|
43
|
+
parentPageId: ''
|
|
43
44
|
}
|
|
44
45
|
},
|
|
45
46
|
methods: {
|
|
@@ -48,9 +49,10 @@ export default {
|
|
|
48
49
|
// 从路由参数中获取pageId
|
|
49
50
|
console.log("child-page-tm getConfig this.$route:", this.$route)
|
|
50
51
|
this.pageId = this.$route.query.pageId || ''
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
this.parentPageId = this.$route.query.parentPageId || ''
|
|
53
|
+
if (!this.pageId || !this.parentPageId) {
|
|
54
|
+
console.error("pageId或者parentPageId为空，请检查菜单配置:", this.pageId)
|
|
55
|
+
this.$Message.error('pageId或者parentPageId为空，请检查菜单配置')
|
|
54
56
|
return false
|
|
55
57
|
}
|
|
56
58
|
// 获取页面配置
|
|
@@ -93,7 +95,10 @@ export default {
|
|
|
93
95
|
}
|
|
94
96
|
if (parentRouteName) {
|
|
95
97
|
console.log("child-page-tm goBack parentRouteName:", parentRouteName)
|
|
96
|
-
this.$router.push({
|
|
98
|
+
this.$router.push({
|
|
99
|
+
name: parentRouteName,
|
|
100
|
+
query: { pageId: this.parentPageId }
|
|
101
|
+
})
|
|
97
102
|
} else {
|
|
98
103
|
console.log("child-page-tm goBack history.back()")
|
|
99
104
|
this.$router.go(-1)
|
|
@@ -40,8 +40,10 @@ export default {
|
|
|
40
40
|
this.$set(this.tableSearchParams, 'inJson', this.params)
|
|
41
41
|
},
|
|
42
42
|
goDetail(routerName, pageId, row) {
|
|
43
|
+
let parentPageId = this.widget.options.rootId || ''
|
|
43
44
|
let newQuery = Object.assign({}, this.params, row);
|
|
44
45
|
newQuery['pageId'] = pageId
|
|
46
|
+
newQuery['parentPageId'] = parentPageId
|
|
45
47
|
console.log("goDetail newQuery:", newQuery)
|
|
46
48
|
console.log("goDetail routerName:", routerName)
|
|
47
49
|
this.$router.push({
|