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

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;

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);

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

@@ -108,7 +108,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"

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"
@@ -369,7 +369,8 @@ export default {
         querysArray: {},
         currentProject: {},
         params: {}
-      }
+      },
+      isInitGroup: false
     }
   },
   methods: {
@@ -378,6 +379,7 @@ export default {
       this.change()
     },
     init () {
+      this.isInitGroup = this.params.type === 'group'
       this.chartConfig = JSON.parse(JSON.stringify(this.params))
       this.reloadTopo()
       bus.$on('showMeta2dPreview', (params) => {

nezha-fronted/src/components/page/dashboard/dashboard.vue

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

nezha-fronted/src/components/page/dashboard/explore/explore.vue

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