mirror of
https://github.com/jumpserver/lina.git
synced 2025-08-22 08:36:42 +00:00
Merge pull request #2175 from jumpserver/pr@v2.27@fix_reload_function
fix: 恢复刷新方法
This commit is contained in:
commit
8a808e1242
11
src/App.vue
11
src/App.vue
@ -1,19 +1,12 @@
|
|||||||
<template>
|
<template>
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<router-view v-if="isRouterAlive" />
|
<router-view />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { mapState } from 'vuex'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'App',
|
name: 'App'
|
||||||
computed: {
|
|
||||||
...mapState({
|
|
||||||
isRouterAlive: state => state.common.isRouterAlive
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -2,8 +2,7 @@ import { optionUrlMeta } from '@/api/common'
|
|||||||
|
|
||||||
const getDefaultState = () => {
|
const getDefaultState = () => {
|
||||||
return {
|
return {
|
||||||
metaMap: {},
|
metaMap: {}
|
||||||
isRouterAlive: true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -12,12 +11,6 @@ const state = getDefaultState()
|
|||||||
const mutations = {
|
const mutations = {
|
||||||
SET_URL_META: (state, { url, meta }) => {
|
SET_URL_META: (state, { url, meta }) => {
|
||||||
state.metaMap[url] = meta
|
state.metaMap[url] = meta
|
||||||
},
|
|
||||||
reload: (state) => {
|
|
||||||
state.isRouterAlive = false
|
|
||||||
setTimeout(() => {
|
|
||||||
state.isRouterAlive = true
|
|
||||||
}, 0)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ async function changeOrg(org) {
|
|||||||
if (index !== -1) {
|
if (index !== -1) {
|
||||||
location.href = path.substring(0, index)
|
location.href = path.substring(0, index)
|
||||||
}
|
}
|
||||||
setTimeout(() => store.commit('common/reload'), 400)
|
setTimeout(() => location.reload(), 400)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ export default {
|
|||||||
that.iHasObjects = [...that.iHasObjects, ...objects]
|
that.iHasObjects = [...that.iHasObjects, ...objects]
|
||||||
that.$refs.select2.clearSelected()
|
that.$refs.select2.clearSelected()
|
||||||
this.$message.success(this.$t('common.updateSuccessMsg'))
|
this.$message.success(this.$t('common.updateSuccessMsg'))
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
this.$refs.listTable.$refs.ListTable.reloadTable()
|
this.$refs.listTable.$refs.ListTable.reloadTable()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -93,7 +93,7 @@ export default {
|
|||||||
onAddSuccess: (items, that) => {
|
onAddSuccess: (items, that) => {
|
||||||
this.$log.debug('AssetSelect value', that.assets)
|
this.$log.debug('AssetSelect value', that.assets)
|
||||||
this.$message.success(this.$t('common.updateSuccessMsg'))
|
this.$message.success(this.$t('common.updateSuccessMsg'))
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
nodeRelationConfig: {
|
nodeRelationConfig: {
|
||||||
@ -120,7 +120,7 @@ export default {
|
|||||||
that.iHasObjects = [...that.iHasObjects, ...objects]
|
that.iHasObjects = [...that.iHasObjects, ...objects]
|
||||||
that.$refs.select2.clearSelected()
|
that.$refs.select2.clearSelected()
|
||||||
this.$message.success(this.$t('common.updateSuccessMsg'))
|
this.$message.success(this.$t('common.updateSuccessMsg'))
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
},
|
},
|
||||||
performDelete: (item) => {
|
performDelete: (item) => {
|
||||||
const data = {
|
const data = {
|
||||||
|
@ -93,7 +93,7 @@ export default {
|
|||||||
this.$message.success(this.$t('common.updateSuccessMsg'))
|
this.$message.success(this.$t('common.updateSuccessMsg'))
|
||||||
this.$refs.ListTable.reloadTable()
|
this.$refs.ListTable.reloadTable()
|
||||||
that.$refs.assetSelect.$refs.select2.clearSelected()
|
that.$refs.assetSelect.$refs.select2.clearSelected()
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
nodeRelationConfig: {
|
nodeRelationConfig: {
|
||||||
|
@ -49,7 +49,7 @@ export default {
|
|||||||
const msg = vm.$t('sessions.TerminateTaskSendSuccessMsg')
|
const msg = vm.$t('sessions.TerminateTaskSendSuccessMsg')
|
||||||
vm.$message.success(msg)
|
vm.$message.success(msg)
|
||||||
window.setTimeout(function() {
|
window.setTimeout(function() {
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
}, 50000)
|
}, 50000)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -175,7 +175,7 @@ export default {
|
|||||||
}).then(() => {
|
}).then(() => {
|
||||||
restoreInterface().then(res => {
|
restoreInterface().then(res => {
|
||||||
this.$message.success(res.success)
|
this.$message.success(res.success)
|
||||||
this.$store.commit('common/reload')
|
location.reload()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}.bind(this)
|
}.bind(this)
|
||||||
@ -221,7 +221,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
updateInterface(form).then(res => {
|
updateInterface(form).then(res => {
|
||||||
this.$store.commit('common/reload')
|
location.reload()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -140,7 +140,6 @@ export default {
|
|||||||
window.open(url, '_blank')
|
window.open(url, '_blank')
|
||||||
},
|
},
|
||||||
importLicense() {
|
importLicense() {
|
||||||
const vm = this
|
|
||||||
if (this.licenseFile['file'] === undefined) {
|
if (this.licenseFile['file'] === undefined) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -149,7 +148,7 @@ export default {
|
|||||||
importLicense(formData).then(res => {
|
importLicense(formData).then(res => {
|
||||||
if (res.status) {
|
if (res.status) {
|
||||||
this.$message.success(res.msg)
|
this.$message.success(res.msg)
|
||||||
setTimeout(() => vm.$store.commit('common/reload'), 500)
|
setTimeout(() => location.reload(), 500)
|
||||||
} else {
|
} else {
|
||||||
this.$message.error(res.msg)
|
this.$message.error(res.msg)
|
||||||
}
|
}
|
||||||
|
@ -236,7 +236,7 @@ export default {
|
|||||||
return toSafeLocalDateStr(dataStr)
|
return toSafeLocalDateStr(dataStr)
|
||||||
},
|
},
|
||||||
reloadPage() {
|
reloadPage() {
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
},
|
},
|
||||||
handleApprove() {
|
handleApprove() {
|
||||||
if (this.object.approval_step === this.object.process_map.length) {
|
if (this.object.approval_step === this.object.process_map.length) {
|
||||||
|
@ -244,7 +244,7 @@ export default {
|
|||||||
return toSafeLocalDateStr(dataStr)
|
return toSafeLocalDateStr(dataStr)
|
||||||
},
|
},
|
||||||
reloadPage() {
|
reloadPage() {
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
},
|
},
|
||||||
handleApprove() {
|
handleApprove() {
|
||||||
if (this.object.approval_step === this.object.process_map.length) {
|
if (this.object.approval_step === this.object.process_map.length) {
|
||||||
|
@ -88,7 +88,7 @@ export default {
|
|||||||
return toSafeLocalDateStr(dataStr)
|
return toSafeLocalDateStr(dataStr)
|
||||||
},
|
},
|
||||||
reloadPage() {
|
reloadPage() {
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -199,7 +199,7 @@ export default {
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
reloadPage() {
|
reloadPage() {
|
||||||
this.$store.commit('common/reload')
|
window.location.reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user