gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.8' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.10-uPlot

Browse Source
This commit is contained in:
zhangyu
2023-11-03 17:11:20 +08:00
parent 7217f93ee0 507cb5752d
commit 97768006c0
6 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
View File

@@ -59,7 +59,7 @@
} }
} }
.nz-icon-shuidi { .nz-icon-shuidi.nz-icon {
position: absolute; position: absolute;
font-size: 48px; font-size: 48px;
color: rgba(190, 233, 222, 0.45); color: rgba(190, 233, 222, 0.45);
@@ -117,7 +117,7 @@
color: #FADED7; color: #FADED7;
} }
.nz-icon-model { .nz-icon-model.nz-icon {
color: #23BF9A; color: #23BF9A;
position: absolute; position: absolute;
top: -4px; top: -4px;

2
nezha-fronted/src/assets/css/components/common/project/topology.scss
View File

@@ -23,7 +23,7 @@
} }
} }
.nz-icon-shuidi { .nz-icon.nz-icon-shuidi {
position: absolute; position: absolute;
font-size: 48px; font-size: 48px;
color: rgba(190, 233, 222, 0.45); color: rgba(190, 233, 222, 0.45);

2
nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
View File

@@ -108,7 +108,7 @@
v-if="previewShow" v-if="previewShow"
:visible.sync="previewShow" :visible.sync="previewShow"
:show-close="false" :show-close="false"
class="nz-dialog chart-fullscreen" class="nz-dialog chart-fullscreen no-transform-dialog"
destroy-on-close destroy-on-close
fullscreen fullscreen
:modal-append-to-body="false" :modal-append-to-body="false"

6
nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
View File

@@ -23,7 +23,7 @@
<el-select <el-select
id="chart-box-type" id="chart-box-type"
v-model="chartConfig.type" v-model="chartConfig.type"
:disabled="!!(chartConfig.type==='group'&&chartConfig.id)" :disabled="!!(chartConfig.type==='group'&&chartConfig.id && isInitGroup)"
:placeholder="$t('el.select.placeholder')" :placeholder="$t('el.select.placeholder')"
popper-class="right-box-select-top prevent-clickoutside" popper-class="right-box-select-top prevent-clickoutside"
size="small" size="small"
@@ -369,7 +369,8 @@ export default {
querysArray: {}, querysArray: {},
currentProject: {}, currentProject: {},
params: {} params: {}
} },
isInitGroup: false
} }
}, },
methods: { methods: {
@@ -378,6 +379,7 @@ export default {
this.change() this.change()
}, },
init () { init () {
this.isInitGroup = this.params.type === 'group'
this.chartConfig = JSON.parse(JSON.stringify(this.params)) this.chartConfig = JSON.parse(JSON.stringify(this.params))
this.reloadTopo() this.reloadTopo()
bus.$on('showMeta2dPreview', (params) => { bus.$on('showMeta2dPreview', (params) => {

1
nezha-fronted/src/components/page/dashboard/dashboard.vue
View File

@@ -1278,6 +1278,7 @@ export default {
}, },
beforeDestroy () { beforeDestroy () {
// 移除键盘ESC事件 // 移除键盘ESC事件
this.$store.dispatch('clearPanel')
document.removeEventListener('keydown', this.escExit) document.removeEventListener('keydown', this.escExit)
bus.$off('refreshPanel') bus.$off('refreshPanel')
this.$store.dispatch('dispatchPanelLock', { flag: true }) this.$store.dispatch('dispatchPanelLock', { flag: true })

3
nezha-fronted/src/components/page/dashboard/explore/explore.vue
View File

@@ -62,6 +62,9 @@ export default {
}) })
} }
} }
},
beforeDestroy() {
this.$store.dispatch('clearPanel')
} }
} }
</script> </script>