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

nezha-fronted/src/components/chart/chart/chartTimeSeries.vue

@@ -154,7 +154,7 @@ export default {
         this.isInit && setChart(this.chartId, myChart) // 缓存；不使用vue的data是为避免整个chart被监听导致卡顿
 
         this.$store.commit('setCurrentMousemove', 0)
-        if (this.isInit) {
+        if (this.isInit && !this.isFullscreen) {
           // timeSeries类型图表设置group 用于多表联动
           myChart.group = 'timeSeriesGroup'
           myChart.getZr().on('mousemove', params => {

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

@@ -74,8 +74,8 @@
           <!--state-->
           <el-form-item :label="$t('overall.state')" prop="state" >
             <el-select v-model="editRecordRule.state" class="right-box__select"  placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
-              <el-option :label="$t('overall.disabled')" value="0">{{$t('overall.disabled')}}</el-option>
               <el-option :label="$t('overall.enabled')" value="1">{{$t('overall.enabled')}}</el-option>
+              <el-option :label="$t('overall.disabled')" value="0">{{$t('overall.disabled')}}</el-option>
             </el-select>
           </el-form-item>
           <!-- labels -->
@@ -154,7 +154,7 @@ export default {
         inr: '',
         labels: [{ label: '', value: '' }],
         remark: '',
-        state: ''
+        state: '1'
       },
       rules: {
         name: [

nezha-fronted/src/components/page/config/recordRule.vue

@@ -141,7 +141,7 @@ export default {
         inr: '',
         labels: [{ label: '', value: '' }],
         remark: '',
-        state: ''
+        state: '1'
       }
     }
   },