mirror of
https://github.com/jumpserver/lina.git
synced 2025-04-28 03:20:24 +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>
|
||||
<div id="app">
|
||||
<router-view v-if="isRouterAlive" />
|
||||
<router-view />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapState } from 'vuex'
|
||||
|
||||
export default {
|
||||
name: 'App',
|
||||
computed: {
|
||||
...mapState({
|
||||
isRouterAlive: state => state.common.isRouterAlive
|
||||
})
|
||||
}
|
||||
name: 'App'
|
||||
}
|
||||
</script>
|
||||
|
||||
|
@ -2,8 +2,7 @@ import { optionUrlMeta } from '@/api/common'
|
||||
|
||||
const getDefaultState = () => {
|
||||
return {
|
||||
metaMap: {},
|
||||
isRouterAlive: true
|
||||
metaMap: {}
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,12 +11,6 @@ const state = getDefaultState()
|
||||
const mutations = {
|
||||
SET_URL_META: (state, { 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) {
|
||||
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.$refs.select2.clearSelected()
|
||||
this.$message.success(this.$t('common.updateSuccessMsg'))
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
this.$refs.listTable.$refs.ListTable.reloadTable()
|
||||
}
|
||||
}
|
||||
|
@ -93,7 +93,7 @@ export default {
|
||||
onAddSuccess: (items, that) => {
|
||||
this.$log.debug('AssetSelect value', that.assets)
|
||||
this.$message.success(this.$t('common.updateSuccessMsg'))
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
}
|
||||
},
|
||||
nodeRelationConfig: {
|
||||
@ -120,7 +120,7 @@ export default {
|
||||
that.iHasObjects = [...that.iHasObjects, ...objects]
|
||||
that.$refs.select2.clearSelected()
|
||||
this.$message.success(this.$t('common.updateSuccessMsg'))
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
},
|
||||
performDelete: (item) => {
|
||||
const data = {
|
||||
|
@ -93,7 +93,7 @@ export default {
|
||||
this.$message.success(this.$t('common.updateSuccessMsg'))
|
||||
this.$refs.ListTable.reloadTable()
|
||||
that.$refs.assetSelect.$refs.select2.clearSelected()
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
}
|
||||
},
|
||||
nodeRelationConfig: {
|
||||
|
@ -49,7 +49,7 @@ export default {
|
||||
const msg = vm.$t('sessions.TerminateTaskSendSuccessMsg')
|
||||
vm.$message.success(msg)
|
||||
window.setTimeout(function() {
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
}, 50000)
|
||||
})
|
||||
}
|
||||
|
@ -175,7 +175,7 @@ export default {
|
||||
}).then(() => {
|
||||
restoreInterface().then(res => {
|
||||
this.$message.success(res.success)
|
||||
this.$store.commit('common/reload')
|
||||
location.reload()
|
||||
})
|
||||
})
|
||||
}.bind(this)
|
||||
@ -221,7 +221,7 @@ export default {
|
||||
}
|
||||
}
|
||||
updateInterface(form).then(res => {
|
||||
this.$store.commit('common/reload')
|
||||
location.reload()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -140,7 +140,6 @@ export default {
|
||||
window.open(url, '_blank')
|
||||
},
|
||||
importLicense() {
|
||||
const vm = this
|
||||
if (this.licenseFile['file'] === undefined) {
|
||||
return
|
||||
}
|
||||
@ -149,7 +148,7 @@ export default {
|
||||
importLicense(formData).then(res => {
|
||||
if (res.status) {
|
||||
this.$message.success(res.msg)
|
||||
setTimeout(() => vm.$store.commit('common/reload'), 500)
|
||||
setTimeout(() => location.reload(), 500)
|
||||
} else {
|
||||
this.$message.error(res.msg)
|
||||
}
|
||||
|
@ -236,7 +236,7 @@ export default {
|
||||
return toSafeLocalDateStr(dataStr)
|
||||
},
|
||||
reloadPage() {
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
},
|
||||
handleApprove() {
|
||||
if (this.object.approval_step === this.object.process_map.length) {
|
||||
|
@ -244,7 +244,7 @@ export default {
|
||||
return toSafeLocalDateStr(dataStr)
|
||||
},
|
||||
reloadPage() {
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
},
|
||||
handleApprove() {
|
||||
if (this.object.approval_step === this.object.process_map.length) {
|
||||
|
@ -88,7 +88,7 @@ export default {
|
||||
return toSafeLocalDateStr(dataStr)
|
||||
},
|
||||
reloadPage() {
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -199,7 +199,7 @@ export default {
|
||||
)
|
||||
},
|
||||
reloadPage() {
|
||||
this.$store.commit('common/reload')
|
||||
window.location.reload()
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user