summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangyu <[email protected]>2023-11-03 17:10:20 +0800
committerzhangyu <[email protected]>2023-11-03 17:10:20 +0800
commit507cb5752d6c6a19c8a176704e6f03e5aee5823d (patch)
treeed14015c25bcc5a462b6c396df699e377983e9ca
parent5456e8784d8c23763ee1ef25498058b31d5b617a (diff)
NEZ-3316 fix:chart新增 misc 部分图表 预览错误
-rw-r--r--nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss4
-rw-r--r--nezha-fronted/src/assets/css/components/common/project/topology.scss2
-rw-r--r--nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue2
-rw-r--r--nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue6
-rw-r--r--nezha-fronted/src/components/page/dashboard/dashboard.vue1
-rw-r--r--nezha-fronted/src/components/page/dashboard/explore/explore.vue3
6 files changed, 12 insertions, 6 deletions
diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
index 795e0a6e4..2a81d227f 100644
--- a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
@@ -59,7 +59,7 @@
}
}
- .nz-icon-shuidi {
+ .nz-icon-shuidi.nz-icon {
position: absolute;
font-size: 48px;
color: rgba(190, 233, 222, 0.45);
@@ -117,7 +117,7 @@
color: #FADED7;
}
- .nz-icon-model {
+ .nz-icon-model.nz-icon {
color: #23BF9A;
position: absolute;
top: -4px;
diff --git a/nezha-fronted/src/assets/css/components/common/project/topology.scss b/nezha-fronted/src/assets/css/components/common/project/topology.scss
index a2c9ce50a..c06b34639 100644
--- a/nezha-fronted/src/assets/css/components/common/project/topology.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/topology.scss
@@ -23,7 +23,7 @@
}
}
- .nz-icon-shuidi {
+ .nz-icon.nz-icon-shuidi {
position: absolute;
font-size: 48px;
color: rgba(190, 233, 222, 0.45);
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 58a3d48ab..43a863f84 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -106,7 +106,7 @@
v-if="previewShow"
:visible.sync="previewShow"
:show-close="false"
- class="nz-dialog chart-fullscreen"
+ class="nz-dialog chart-fullscreen no-transform-dialog"
destroy-on-close
fullscreen
:modal-append-to-body="false"
diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
index a3b3e5e1c..dd33ba564 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -23,7 +23,7 @@
<el-select
id="chart-box-type"
v-model="chartConfig.type"
- :disabled="!!(chartConfig.type==='group'&&chartConfig.id)"
+ :disabled="!!(chartConfig.type==='group'&&chartConfig.id && isInitGroup)"
:placeholder="$t('el.select.placeholder')"
popper-class="right-box-select-top prevent-clickoutside"
size="small"
@@ -404,11 +404,13 @@ export default {
querysArray: {},
currentProject: {},
params: {}
- }
+ },
+ isInitGroup: false
}
},
methods: {
init () {
+ this.isInitGroup = this.params.type === 'group'
this.chartConfig = JSON.parse(JSON.stringify(this.params))
this.reloadTopo()
bus.$on('showMeta2dPreview', (params) => {
diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue
index 7293a41e0..745852375 100644
--- a/nezha-fronted/src/components/page/dashboard/dashboard.vue
+++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue
@@ -1323,6 +1323,7 @@ export default {
},
beforeDestroy () {
// 移除键盘ESC事件
+ this.$store.dispatch('clearPanel')
document.removeEventListener('keydown', this.escExit)
bus.$off('refreshPanel')
this.$store.dispatch('dispatchPanelLock', { flag: true })
diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
index 8946669f0..acf64ed6d 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue
@@ -62,6 +62,9 @@ export default {
})
}
}
+ },
+ beforeDestroy() {
+ this.$store.dispatch('clearPanel')
}
}
</script>