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

# Conflicts:
#	nezha-fronted/src/components/chart/chart/chartTimeSeries.vue

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

@@ -422,7 +422,7 @@
         </transition>
 
         <!--thresholdConfig-->
-        <div class="form__sub-title">
+        <div class="form__sub-title" v-if="isThresholdConfig(chartConfig.type)">
           <span>{{$t('dashboard.panel.chartForm.threshold')}}</span>
           <el-switch
             v-model="chartConfig.param.enable.thresholds"
@@ -431,7 +431,7 @@
           ></el-switch>
         </div>
         <transition name="el-zoom-in-top">
-          <el-row v-if="chartConfig.param.enable.thresholds">
+          <el-row v-if="chartConfig.param.enable.thresholds && isThresholdConfig(chartConfig.type)">
             <el-form-item
               v-for="(item,index) in chartConfig.param.thresholds"
               :key="index"