Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.7

nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss

@@ -38,3 +38,6 @@
 .ip-detail-available {
   color:$--color-success !important;
 }
+.right-box-select-top.right-box-select-width {
+  width: 640px !important;
+}

nezha-fronted/src/assets/css/components/page/tool/trace.scss

@@ -164,6 +164,14 @@
       }
       height: 100%;
       overflow: hidden;
+      &>span{
+        display: block;
+        font-size: 14px;
+        color: $--color-text-regular;
+        letter-spacing: 0;
+        font-weight: 400;
+        margin: 30px 0 11px 0;
+      }
       .data-top{
         width: 100%;
         padding-left: 15px;

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

@@ -33,7 +33,7 @@
           class="element-item form-row-item thresholds-from-item"
           style="margin-bottom: 10px !important"
           v-for="index of chartConfig.elements.length"
-          :key="index"
+          :key="expressionName[index-1] + index"
         >
           <div class="chart-title chart-title-config">
             <span class="chart-title-content el-form-item" :class="{

nezha-fronted/src/components/common/rightBox/chart/publicConfig.js

@@ -434,6 +434,7 @@ export default {
       if (this.expressions.length) {
         this.chartConfig.elements = []
         this.expressions.forEach((expr, i) => {
+          if (this.expressionsShow[i]) {
             this.chartConfig.elements.push({
               id: this.expressionsShow[i].elementId,
               expression: expr,
@@ -443,6 +444,7 @@ export default {
               state: this.expressionsShow[i].state,
               orderNum: i
             })
+          }
         })
       } else {
         this.chartConfig.elements = []
@@ -551,12 +553,6 @@ export default {
           elementId: ''
         }
       )
-      this.$nextTick(() => {
-        this.expressions.forEach((ex, index) => {
-          this.$refs[`promql-${index}`][0].metricChange(ex)
-          this.$refs[`promql-${index}`][0].promqlInputChange(ex)
-        })
-      })
       this.expressionChange()
     },
     removeExpression (index) {
@@ -573,12 +569,6 @@ export default {
         this.chartConfig.elements.forEach((item, index) => {
           this.$refs.chartForm.validateField('elements.' + index + '.expression')
         })
-        this.$nextTick(() => {
-          this.expressions.forEach((ex, index) => {
-            this.$refs[`promql-${index}`][0].metricChange(ex)
-            this.$refs[`promql-${index}`][0].promqlInputChange(ex)
-          })
-        })
         this.expressionChange()
       }
     },

nezha-fronted/src/components/common/rightBox/ipDetailsBox.vue

@@ -25,7 +25,7 @@
             <el-select
               v-model="editipDetails.state"
               class="right-box__select"
-              popper-class="right-box-select-top prevent-clickoutside"
+              popper-class="right-box-select-top prevent-clickoutside right-box-select-width"
               size="small"
               :placeholder="$t('el.select.placeholder')"
               value-key="id">

nezha-fronted/src/components/common/rightBox/ipamBox.vue

@@ -50,7 +50,7 @@
           </div>
           <el-form-item :label="$t('overall.dc')" prop="dc.name">
             <div class="right-box-form-content">
-              <el-select id="prom-box-input-dc" v-model="editipam.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id">
+              <el-select id="prom-box-input-dc" v-model="editipam.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside right-box-select-width" size="small" value-key="id">
                 <el-option v-for="item in dcData" :id="'prom-edit-dc-op-'+item.id" :key="item.id" :label="item.name" :value="item">
                   <span class="config-dropdown-label-txt">{{item.name}}</span>
                 </el-option>