Merge pull request #2175 from jumpserver/pr@v2.27@fix_reload_function

fix: 恢复刷新方法
This commit is contained in:
吴小白 2022-11-11 20:12:05 +08:00 committed by GitHub
commit 8a808e1242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 16 additions and 31 deletions

View File

@ -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>

View File

@ -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)
} }
} }

View File

@ -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)
} }
} }

View File

@ -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()
} }
} }

View File

@ -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 = {

View File

@ -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: {

View File

@ -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)
}) })
} }

View File

@ -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()
}) })
} }
} }

View File

@ -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)
} }

View File

@ -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) {

View File

@ -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) {

View File

@ -88,7 +88,7 @@ export default {
return toSafeLocalDateStr(dataStr) return toSafeLocalDateStr(dataStr)
}, },
reloadPage() { reloadPage() {
this.$store.commit('common/reload') window.location.reload()
} }
} }
} }

View File

@ -199,7 +199,7 @@ export default {
) )
}, },
reloadPage() { reloadPage() {
this.$store.commit('common/reload') window.location.reload()
} }
} }