Skip to content

Commit 8022c66

Browse files
author
piexlMax(奇淼
committed
fix(layout): 将Iframe路由名称更新为gvaLayoutIframe
1 parent aa84605 commit 8022c66

File tree

3 files changed

+4
-24
lines changed

3 files changed

+4
-24
lines changed

web/src/view/layout/aside/headMode.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
}
6464
6565
watchEffect(() => {
66-
if (route.name === 'Iframe') {
66+
if (route.name === 'gvaLayoutIframe') {
6767
active.value = decodeURIComponent(route.query.url)
6868
return
6969
}
@@ -110,7 +110,7 @@
110110
window.open(index, '_blank')
111111
return
112112
}
113-
if (index === 'Iframe') {
113+
if (index === 'gvaLayoutIframe') {
114114
query.url = decodeURIComponent(index)
115115
}
116116
router.push({ name: index, query, params })

web/src/view/layout/aside/normalMode.vue

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
}
6666
})
6767
watchEffect(() => {
68-
if (route.name === 'Iframe') {
68+
if (route.name === 'gvaLayoutIframe') {
6969
active.value = decodeURIComponent(route.query.url)
7070
return
7171
}
@@ -95,18 +95,8 @@
9595
})
9696
if (index === route.name) return
9797
if (index.indexOf('http://') > -1 || index.indexOf('https://') > -1) {
98-
if (index === 'Iframe') {
99-
query.url = decodeURIComponent(index)
100-
router.push({
101-
name: 'Iframe',
102-
query,
103-
params
104-
})
105-
return
106-
} else {
10798
window.open(index, '_blank')
10899
return
109-
}
110100
} else {
111101
router.push({ name: index, query, params })
112102
}

web/src/view/layout/aside/sidebarMode.vue

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,8 @@
186186
})
187187
if (index === route.name) return
188188
if (index.indexOf('http://') > -1 || index.indexOf('https://') > -1) {
189-
if (index === 'Iframe') {
190-
query.url = decodeURIComponent(index)
191-
router.push({
192-
name: 'Iframe',
193-
query,
194-
params
195-
})
196-
return
197-
} else {
198189
window.open(index, '_blank')
199190
return
200-
}
201191
} else {
202192
router.push({ name: index, query, params })
203193
}
@@ -210,7 +200,7 @@
210200
211201
212202
watchEffect(() => {
213-
if (route.name === 'Iframe') {
203+
if (route.name === 'gvaLayoutIframe') {
214204
active.value = decodeURIComponent(route.query.url)
215205
return
216206
}

0 commit comments

Comments
 (0)