Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

nezha-fronted/src/components/charts/line-chart-block.vue

@@ -83,7 +83,7 @@
           </div>
         </template>
         <template v-else>
-          <div class='legend-container' ref="legendArea" v-show="firstShow">
+          <div class='legend-container' ref="legendArea" v-show="firstShow&&legendListMore.length">
             <table style="width: 100%" border="0" cellpadding="0" cellspacing="0">
               <th style="width: 100%"></th>
               <template v-for="(legendOption, index) in legendOptions">
@@ -146,7 +146,7 @@
           </el-popover>
           </span>
           <div slot="title" >
-            <span class="nz-dialog-title" v-show="!isExplore">{{data.title}}</span>
+            <span class="nz-dialog-title" v-show="!isExplore">{{data.name}}</span>
             <span class="nz-dialog-title" v-show="isExplore">&nbsp;</span>
             <div class="float-right panel-calendar dialog-tool">
 

nezha-fronted/src/components/common/ChartDiagram/diagram.vue

@@ -781,7 +781,13 @@ export default {
     openTopologyData (data) {
       return new Promise(resolve => {
         if (!getTopology(this.topologyIndex)) {
-          const canvas = new Topology('topology-canvas' + this.topologyIndexF, canvasOptions)
+          const options = {
+            ...canvasOptions
+          }
+          if (this.isPanel) {
+            options.disableScale = true
+          }
+          const canvas = new Topology('topology-canvas' + this.topologyIndexF, options)
           setTopology(this.topologyIndex, canvas)
         } else {
           getTopology(this.topologyIndex).open(data)

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

@@ -4,7 +4,7 @@
       <div class="profile-change__Pin-from">
         <el-form :model="user" label-position = "top" label-width="150px" :rules="rules" ref="changePinForm">
           <el-form-item class="profile-change__Pin-input" :label="$t('profile.oldPassword')" prop="pin">
-            <el-input v-model="user.pin" type="password" size="small"/>
+            <el-input v-model="user.oldPin" type="password" size="small"/>
           </el-form-item>
           <el-form-item class="profile-change__Pin-input" :label="$t('profile.newPassword')" prop="newPin">
             <el-input v-model="user.newPin" type="password" size="small"/>
@@ -50,13 +50,12 @@ export default {
     }
     return {
       user: {
-        pin: '',
+        oldPin: '',
         newPin: '',
         confirmPin: ''
       },
-      userId: localStorage.getItem('nz-user-id'),
       rules: {
-        pin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
+        oldPin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }],
         newPin: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' }, { validator: validatePass, trigger: 'blur' }],
         confirmPin: [{ required: true, message: this.$t('config.user.reinputPin'), trigger: 'blur' }, { validator: validateConfirmPass, trigger: 'blur' }]
       },
@@ -80,14 +79,13 @@ export default {
       this.$refs.changePinForm.validate((valid) => {
         if (valid) {
           const paramObj = {
-            pin: this.user.pin,
-            newPin: this.user.newPin,
-            id: this.userId
+            oldPin: this.user.oldPin,
+            newPin: this.user.newPin
           }
-          this.$put('/sys/user/pin?oldPin=' + paramObj.pin + '&newPin=' + paramObj.newPin + '&id=' + paramObj.id).then(response => {
+          this.$put('/sys/user/pin', paramObj).then(response => {
             if (response && response.code == 200) {
               this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') })
-              this.user.pin = ''
+              this.user.oldPin = ''
               this.user.newPin = ''
               this.user.confirmPin = ''
             } else {

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

@@ -611,7 +611,7 @@ export default {
               const step = bus.getStep(this.filterTime[0], this.filterTime[1])
               promqlInputIndexs.push(index)
               queryExpression.push(item)
-              requestArr.push(this.$get('/prom/api/v1/query_range?query=' + item + '&start=' + this.$stringTimeParseToUnix(this.filterTime[0]) + '&end=' + this.$stringTimeParseToUnix(this.filterTime[1]) + '&step=' + step))
+              requestArr.push(this.$get('/prom/api/v1/query_range?query=' + item + '&start=' + this.$stringTimeParseToUnix(this.filterTime[0]) + '&end=' + this.$stringTimeParseToUnix(this.filterTime[1]) + '&step=' + step + '&nullType=null'))
             }
           })
           if (requestArr.length > 0) {