diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 94adcab6a3..74d4d004e3 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -277,6 +277,7 @@ export default { this.curItem.name = newComponentId this.viewDialogVisible = false this.activeTabName = newComponentId + this.$store.dispatch('chart/setViewId', component.propValue.viewId) this.styleChange() }) // this.setComponentInfo() @@ -308,6 +309,7 @@ export default { this.activeTabName = this.element.options.tabList[activIndex].name } } + this.$store.dispatch('chart/setViewId', null) this.styleChange() }, @@ -334,6 +336,7 @@ export default { this.element.options.tabList.forEach(item => { if (item && item.name === name && item.content && item.content.propValue && item.content.propValue.viewId) { this.filterMap[item.content.propValue.viewId] = item.content.filters + this.$store.dispatch('chart/setViewId', item.content.propValue.viewId) } }) // console.log(tab) diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index fe648333aa..8c378cf307 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -455,6 +455,15 @@ export default { computed: { // 侧边显示控制 chartEditParam() { + if (this.curComponent) { + if (this.curComponent.type === 'view') { + return { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' } + } else if (this.curComponent.type === 'de-tabs' && this.$store.state.chart.viewId) { + return { 'id': this.$store.state.chart.viewId, 'optType': 'edit' } + } else { + return {} + } + } return this.curComponent ? { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' } : {} }, // 侧边显示控制 @@ -463,7 +472,7 @@ export default { }, // 显示视图工具栏 showViewToolsAside() { - return this.curComponent && this.curComponent.type === 'view' + return this.curComponent && (this.curComponent.type === 'view' || this.curComponent.type === 'de-tabs') }, showViewToolAsideType() { if (this.curComponent) { @@ -624,6 +633,9 @@ export default { this.outerParamsSetVisible = false }, changeRightDrawOpen(param) { + if (!param) { + this.$store.dispatch('chart/setViewId', null) + } this.rightDrawOpen = param if (this.rightDrawOpen) { setTimeout(() => {