From cf0ad7bad625158311204d66c3deb8a576cd344f Mon Sep 17 00:00:00 2001 From: wang-liang0615 <53748875+wang-liang0615@users.noreply.github.com> Date: Tue, 12 Dec 2023 09:38:50 +0800 Subject: [PATCH] fix(cmdb-ui):set localstorage '' after unsubscribe ci (#296) --- cmdb-ui/src/components/Menu/menu.js | 4 ++++ cmdb-ui/src/modules/cmdb/views/ci/index.vue | 4 ++++ cmdb-ui/src/modules/cmdb/views/preference/index.vue | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/cmdb-ui/src/components/Menu/menu.js b/cmdb-ui/src/components/Menu/menu.js index dd959df..b2b8a66 100644 --- a/cmdb-ui/src/components/Menu/menu.js +++ b/cmdb-ui/src/components/Menu/menu.js @@ -95,6 +95,10 @@ export default { const unsubTree = subscribeTreeView(citypeId, '') Promise.all([unsubCIType, unsubTree]).then(() => { that.$message.success('取消订阅成功') + const lastTypeId = window.localStorage.getItem('ops_ci_typeid') || undefined + if (Number(citypeId) === Number(lastTypeId)) { + localStorage.setItem('ops_ci_typeid', '') + } // 删除路由 const href = window.location.href const hrefSplit = href.split('/') diff --git a/cmdb-ui/src/modules/cmdb/views/ci/index.vue b/cmdb-ui/src/modules/cmdb/views/ci/index.vue index ac9700f..0c31669 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci/index.vue @@ -879,6 +879,10 @@ export default { unsubscribe(ciType, type = 'all') { const promises = [subscribeCIType(this.typeId, ''), subscribeTreeView(this.typeId, '')] Promise.all(promises).then(() => { + const lastTypeId = window.localStorage.getItem('ops_ci_typeid') || undefined + if (Number(ciType) === Number(lastTypeId)) { + localStorage.setItem('ops_ci_typeid', '') + } this.$message.success('取消订阅成功') this.resetRoute() this.$router.push('/cmdb/preference') diff --git a/cmdb-ui/src/modules/cmdb/views/preference/index.vue b/cmdb-ui/src/modules/cmdb/views/preference/index.vue index 71e1436..0987d23 100644 --- a/cmdb-ui/src/modules/cmdb/views/preference/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/preference/index.vue @@ -314,6 +314,12 @@ export default { } Promise.all(promises).then(() => { + if (type === 'all' || type === 'ci') { + const lastTypeId = window.localStorage.getItem('ops_ci_typeid') || undefined + if (Number(ciType.id) === Number(lastTypeId)) { + localStorage.setItem('ops_ci_typeid', '') + } + } that.$message.success('取消订阅成功') that.resetRoute() })