From c8ef72ff4ddc3fe2477b6b3ebbd01353c036921c Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 27 Feb 2023 15:40:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?NEZ-2567=20fix:=203.6=20metric=20=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/common/bottomBox/bottomBox.scss   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
index 70ae83743..062faed40 100644
--- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
@@ -97,7 +97,7 @@
         }
       }
       .nz-btn-group {
-        #endpoint-query-changetime,
+        #endpoint-query-changetime:hover,
         #recordRules-query-changetime:hover {
           border: 1px solid $--asset-label-btn-border-color;
         }

From 8c791b722d93f9306df3eecc1b8a6e12964021e8 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 27 Feb 2023 15:41:31 +0800
Subject: [PATCH 2/6] =?UTF-8?q?NEZ-2568=20fix:=203.6=20notification=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=88=A0=E9=99=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/table/nzDataList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index 203d33847..81ff14db7 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -105,7 +105,7 @@
       :from="'endpoint'"
       :forceDeleteShow="forceDeleteShow"
       :deleteTitle="deleteTitle"
-      :type="'link'"
+      type=""
       :title="$t('overall.delete')"
       :api="api"
       :single="single"

From 3acc639ed2a8bd25b04c139f9ff689a9a860df99 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 27 Feb 2023 15:55:01 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix=EF=BC=9A=E6=97=B6=E9=97=B4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E6=A3=80=E9=AA=8C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chartList.vue        | 48 ++++++++++++-------
 .../src/components/common/timePicker.vue      |  4 +-
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index a79faedcb..1be4a84ff 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -44,6 +44,7 @@
         @container-resized="containerResizedEvent"
       >
         <panel-chart
+          :variablesInit="variablesInit"
           :ref="'chart' + item.id"
           @edit-chart="$emit('edit-chart', item)"
           :chart-info="item"
@@ -68,18 +69,17 @@
     </div>
     <!-- 全屏查看 -->
     <el-dialog
+      class="nz-dialog chart-fullscreen"
       v-if="fullscreen.visible"
       :visible.sync="fullscreen.visible"
       :show-close="false"
-      class="nz-dialog chart-fullscreen"
       destroy-on-close
       fullscreen
-      :modal-append-to-body="false"
+      :append-to-body="true"
     >
       <panel-chart
         :ref="'chart-fullscreen' + fullscreen.chartInfo.id"
         :chart-info="fullscreen.chartInfo"
-        :variablesInit="variablesInit"
         :from="from"
         :filter="filter"
         :is-fullscreen="true"
@@ -344,8 +344,18 @@ export default {
           this.$store.commit('setChartLastPosition', position)
         })
       }
+      this.copyDataList.forEach(item => {
+        this.tempList.forEach(subItem => {
+          if (item.id == subItem.id) {
+            subItem.y = item.y
+          }
+        })
+      })
     },
     onScroll (scrollTop = 0, groupTop = 0) {
+      if (!this.variablesInit) { // 变量未加载完成 不请求数据
+        return
+      }
       const self = this
       if (this.scrollTopTimer) {
         clearTimeout(this.scrollTopTimer)
@@ -395,7 +405,7 @@ export default {
             if ((mainOffsetTop + mainHeight / 4) < (windowScrollTop + windowHeight)) {
               item.loaded = true
               setTimeout(() => {
-                this.$refs['chart' + item.id] && this.$refs['chart' + item.id][0].getChartData()
+                this.$refs['chart' + item.id] && this.$refs['chart' + item.id][0] && this.$refs['chart' + item.id][0].getChartData()
               }, i * 100)
               i++
             }
@@ -481,7 +491,7 @@ export default {
     // 比较变量 图表是否显示/隐藏
     compareVariables () {
       // 防止group中的chartList执行
-      if (this.groupInfo) {
+      if (this.isGroup) {
         return
       }
       const isRegExp = (v) => {
@@ -557,7 +567,6 @@ export default {
       if (!this.panelLock) {
         return false
       }
-      this.copyDataList = JSON.parse(JSON.stringify(this.tempList))
       for (let i = 0; i < this.copyDataList.length; i++) {
         const item = this.copyDataList[i]
         if ((this.$loadsh.get(this.showHidden[item.id], 'visibility') && this.$loadsh.get(this.showHidden[item.id], 'visibility') === 'hidden') && item.id !== -2) {
@@ -565,18 +574,18 @@ export default {
           i--
         }
       }
-      // this.tempList.forEach(item => {
-      //   if ((!this.$loadsh.get(this.showHidden[item.id], 'visibility') || this.$loadsh.get(this.showHidden[item.id], 'visibility') === 'show') && item.id !== -2 && !this.copyDataList.find(chart => chart.id === item.id)) {
-      //     this.copyDataList.push(item)
-      //   }
-      // })
+      this.tempList.forEach(item => {
+        if ((!this.$loadsh.get(this.showHidden[item.id], 'visibility') || this.$loadsh.get(this.showHidden[item.id], 'visibility') === 'show') && item.id !== -2 && !this.copyDataList.find(chart => chart.id === item.id)) {
+          this.copyDataList.push(item)
+        }
+      })
       this.onScroll(this.scrollTop)
     },
 
     // group设置repeat 便利变量重复渲染图表
     repeatVariableFn () {
       // 防止group中的chartList执行
-      if (this.groupInfo) {
+      if (this.isGroup) {
         return
       }
       // 先删除掉复制的数据
@@ -608,11 +617,13 @@ export default {
           const item = arr[index]
           const repeatVariable = this.$loadsh.get(item.param.repeat, 'variable')
           const repeatEnable = this.$loadsh.get(item.param.enable, 'repeat')
-          if (item.type === 'group' && repeatVariable && this.$loadsh.get(this.showHidden[item.id], 'visibility') !== 'hidden' && repeatEnable) {
+          const visibility = this.$loadsh.get(this.showHidden[item.id], 'visibility') !== 'hidden'
+          if (item.type === 'group' && repeatVariable && repeatEnable && visibility) {
             const itemPrev = arr[index - 1]
             const repeatPrevVariable = this.$loadsh.get(itemPrev.param.repeat, 'variable')
-            const repeatPrevEnable = this.$loadsh.get(item.param.enable, 'repeat')
-            if (itemPrev && itemPrev.type === 'group' && repeatPrevVariable === repeatVariable && repeatPrevEnable) {
+            const repeatPrevEnable = this.$loadsh.get(itemPrev.param.enable, 'repeat')
+            const itemVisibility = this.$loadsh.get(this.showHidden[itemPrev.id], 'visibility') !== 'hidden'
+            if (itemPrev && itemPrev.type === 'group' && repeatPrevVariable === repeatVariable && repeatPrevEnable && itemVisibility) {
               const arr = variablesRepeat[repeatVariable]
               arr[arr.length - 1].repeatArr.push(item)
               arr[arr.length - 1].lastGroup = item
@@ -716,6 +727,10 @@ export default {
         if (!flag) {
           this.tempList.forEach(item => {
             if (!this.copyDataList.find(chart => chart.id === item.id)) {
+              delete item.repeatIndex
+              delete item.repeatVariable
+              delete item.repeatValue
+              item.y -= 0.03
               this.copyDataList.push(item)
             }
           })
@@ -746,7 +761,7 @@ export default {
           const position = getLayoutPosition(n)
           this.$store.commit('setChartLastPosition', position)
         }
-        let tempList = n.map(item => {
+        const tempList = n.map(item => {
           let param = ''
           let height = ''
           if (this.isPhone && item.type !== 'group') {
@@ -809,7 +824,6 @@ export default {
           this.compareVariables()
 
           this.repeatVariableFn()
-          tempList = null
           setTimeout(() => {
             this.gridLayoutShow = true
             if (!this.isGroup) {
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index 5d9c83c23..320e2b767 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -411,10 +411,11 @@ export default {
           this.oldSearchTime[1] = bus.timeFormate(this.oldSearchTime[1])
         }
       }
-      // console.log(moment(this.oldSearchTime[0], timeFormatMain).isValid(), moment(this.oldSearchTime[1], timeFormatMain).isValid(), !moment(this.oldSearchTime[0]).isBefore(this.oldSearchTime[1]))
       if (moment(this.oldSearchTime[0], timeFormatMain).isValid() && moment(this.oldSearchTime[1], timeFormatMain).isValid() && !moment(this.oldSearchTime[0]).isBefore(this.oldSearchTime[1])) {
         this.oldSearchTimeError[0] = true
         this.inputError = this.$t('date.fromGreaterTo')
+      } else if (moment(this.oldSearchTime[0], timeFormatMain).isValid() && moment(this.oldSearchTime[1], timeFormatMain).isValid() && moment(this.oldSearchTime[0]).isBefore(this.oldSearchTime[1])) {
+        this.oldSearchTimeError[0] = false
       }
     },
     dateChange () {
@@ -422,7 +423,6 @@ export default {
       this.oldSearchTimeError[1] = false
     },
     setCustomTime (timeGroup, timeRange) {
-      console.log(timeGroup)
       if (timeGroup) {
         this.showTime = this.nowTimeType = this.timeData.find(
           (item) => item.id == timeGroup.id

From 20ac0ef046cc71b83eec7122cc7242bbe251ee59 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 27 Feb 2023 16:14:49 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=203.6=20ping=20&=20traceroute=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E8=A1=A8=E5=8D=95=E5=85=83=E7=B4=A0=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/common/rightBoxCommon.scss | 23 ++++++++-----------
 .../common/bottomBox/bottomBox.scss           |  4 ++++
 .../components/common/rightBox/panelBox.scss  |  2 +-
 .../css/components/common/timePicker.scss     |  2 +-
 .../page/dashboard/explore/promqlInput.scss   |  3 +++
 .../assets/css/components/page/tool/ping.scss |  4 ++--
 .../css/components/page/tool/trace.scss       |  4 ++--
 .../assets/css/themes/src/input-number.scss   |  4 ++--
 .../src/assets/css/themes/src/input.scss      |  4 ++--
 9 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
index 19871f333..f9fe330f0 100644
--- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
+++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
@@ -43,11 +43,6 @@
     }
   }
 }
-.right-box-container__left.right-box__container {
-  .el-textarea__inner {
-    padding: 5px 70px 4px 10px;
-  }
-}
 .right-box__container {
   color: $--color-text-regular;
   .right-box-form{
@@ -58,16 +53,16 @@
   overflow-x: hidden;
   overflow-y: auto;
   box-sizing: border-box;
-  .el-textarea__inner {
-    padding: 5px 70px 4px 15px;
-  }
+  // .el-textarea__inner {
+  //   padding: 5px 70px 4px 15px;
+  // }
   .container__form-width.container__form{
     .input-box {
       .el-textarea {
         .el-textarea__inner {
           width: 522px;
           height: 32px;
-          padding: 5px 70px 4px 10px;
+          // padding: 5px 70px 4px 10px;
         }
         .el-input__count {
           right: -40px;
@@ -87,7 +82,7 @@
         .el-textarea__inner {
           width: 509px;
           height: 32px;
-          padding: 5px 70px 4px 10px;
+          // padding: 5px 70px 4px 10px;
         }
         .el-input__count {
           right: -40px;
@@ -114,13 +109,13 @@
     height: 30px;
   }
   .el-input__inner, .el-textarea__inner {
-    padding: 0 10px;
+    // padding: 0 10px;
     border-radius: $--border-radius-small;
     border: 1px solid $--border-color-light;
   }
-  .el-textarea__inner {
-    padding: 5px 70px 4px 15px;
-  }
+  // .el-textarea__inner {
+  //   padding: 5px 70px 4px 15px;
+  // }
   .el-form {
     padding-top: 20px;
 
diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
index 062faed40..59d471e22 100644
--- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
@@ -377,6 +377,10 @@
     .text-too-long {
       display: none;
     }
+    .ql-editor{
+      padding: 12px 10px;
+    }
+
     .ql-editor.ql-blank::before {
       font-style: normal;
       color: $--color-text-placeholder;
diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss
index 0524a62b8..8b90d5c42 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss
@@ -22,7 +22,7 @@
     }
   }
   .el-input--suffix.el-date-editor--datetime .el-input__inner{
-    padding-left: 15px;
+    padding-left: 10px;
   }
   .form-items--half-width-group{
     .item-receivers{
diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss
index 1eebab8e0..44e1c949c 100644
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -199,7 +199,7 @@
           border: 1px solid $--border-color-light;
           border-radius: 2px;
           width: 230px;
-          padding: 0 8px;
+          padding: 0 10px;
           //height: 30px;
           //line-height: 30px;
           //outline: #169AFF;
diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
index b8fa0fad3..7b1660dd8 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
@@ -28,6 +28,9 @@
     .input-box {
       flex: auto;
       margin-right: 10px;
+      .ͼ1 .cm-line{
+        padding-left: 10px;
+      }
       .not-fixed-height.no-resize.el-textarea {
 
       }
diff --git a/nezha-fronted/src/assets/css/components/page/tool/ping.scss b/nezha-fronted/src/assets/css/components/page/tool/ping.scss
index 40555355a..574ee8799 100644
--- a/nezha-fronted/src/assets/css/components/page/tool/ping.scss
+++ b/nezha-fronted/src/assets/css/components/page/tool/ping.scss
@@ -41,10 +41,10 @@
   }
   .choose-box {
     overflow: hidden;
-    width: calc(100% - 7px);
+    width: calc(100% - 12px);
     height: 30px;
     border: 1px solid $--border-color-light;
-    padding-left: 5px;
+    padding-left: 10px;
     display: flex;
     //align-items: center;
     .nz-icon-arrow-down6{
diff --git a/nezha-fronted/src/assets/css/components/page/tool/trace.scss b/nezha-fronted/src/assets/css/components/page/tool/trace.scss
index 47d4c27be..51c1fd764 100644
--- a/nezha-fronted/src/assets/css/components/page/tool/trace.scss
+++ b/nezha-fronted/src/assets/css/components/page/tool/trace.scss
@@ -41,10 +41,10 @@
   }
   .choose-box {
     overflow: hidden;
-    width: calc(100% - 7px);
+    width: calc(100% - 12px);
     height: 30px;
     border: 1px solid $--border-color-light;
-    padding-left: 5px;
+    padding-left: 10px;
     display: flex;
     //align-items: center;
     .nz-icon-arrow-down6{
diff --git a/nezha-fronted/src/assets/css/themes/src/input-number.scss b/nezha-fronted/src/assets/css/themes/src/input-number.scss
index 67594bf49..110af9e85 100644
--- a/nezha-fronted/src/assets/css/themes/src/input-number.scss
+++ b/nezha-fronted/src/assets/css/themes/src/input-number.scss
@@ -158,14 +158,14 @@
 
   @include when(without-controls) {
     .el-input__inner {
-      padding-left: 15px;
+      padding-left: 10px;
       padding-right: 15px;
     }
   }
 
   @include when(controls-right) {
     .el-input__inner {
-      padding-left: 15px;
+      padding-left: 10px;
       padding-right: #{$--input-height + 10};
     }
 
diff --git a/nezha-fronted/src/assets/css/themes/src/input.scss b/nezha-fronted/src/assets/css/themes/src/input.scss
index 99641eb92..1428b6bbb 100644
--- a/nezha-fronted/src/assets/css/themes/src/input.scss
+++ b/nezha-fronted/src/assets/css/themes/src/input.scss
@@ -11,7 +11,7 @@
   @include e(inner) {
     display: block;
     resize: vertical;
-    padding: 5px 15px;
+    padding: 5px 70px 4px 10px;
     line-height: 1.5;
     box-sizing: border-box;
     width: 100%;
@@ -116,7 +116,7 @@
     height: $--input-height;
     line-height: $--input-height;
     outline: none;
-    padding: 0 15px;
+    padding: 0 10px;
     transition: $--border-transition-base;
     width: 100%;
 

From 950ed9ec478a455378b1065427b687de47014ae0 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 27 Feb 2023 17:50:30 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=20asset?=
 =?UTF-8?q?=20pin=20=E5=BF=85=E5=A1=AB=E7=9A=84=E6=A0=A1=E9=AA=8C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/asset/assetBox.vue        | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index 1e69198b8..ba2f52c8a 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -200,7 +200,7 @@
                 :rules="[
                   { required: editAsset.showSSH, message: $t('validate.required'), trigger: 'change' }
                  ]">
-                <el-select v-model="editAsset.authType" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value" clearable>
+                <el-select @change="selectAuthType" v-model="editAsset.authType" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="value" clearable>
                   <el-option v-for="type in assetConstants.authTypeOptions" :key="type.value" :label="$t(type.label)" :value="type.value"/>
                 </el-select>
               </el-form-item>
@@ -210,15 +210,15 @@
                 <el-input maxlength="64" show-word-limit v-model="editAsset.authUsername" size="small"/>
               </el-form-item>
               <!-- Key支持私钥 -->
-              <template v-if="editAsset.authType === assetConstants.authTypeData.key" :rules="[
-                  { required: editAsset.showSSH, message: $t('validate.required'), trigger: 'change' }
-                 ]">
-                <el-form-item :label="$t('asset.privateKey')" prop="authPriKey">
+              <template v-if="editAsset.authType === assetConstants.authTypeData.key">
+                <el-form-item :label="$t('asset.privateKey')" prop="authPriKey" :key="'authPriKey'"
+                              :rules="[{ required: requiredPriKey, message: $t('validate.required'), trigger: 'change' }]"
+                >
                   <el-input v-model="editAsset.authPriKey" size="small"/>
                 </el-form-item>
               </template>
               <el-form-item :label="$t('login.pin')" prop="authPin" :rules="[
-                  { required: editAsset.showSSH && editAsset.authType != assetConstants.authTypeData.key && !editAsset.id, message: $t('validate.required'), trigger: 'change' }
+                  { required: editAsset.showSSH && editAsset.authType != assetConstants.authTypeData.key && requiredPin, message: $t('validate.required'), trigger: 'change' }
                  ]">
                 <el-input maxlength="256" show-word-limit v-model="editAsset.authPin" size="small" type="password" auto-complete="new-password" />
               </el-form-item>
@@ -238,7 +238,7 @@
               <el-form-item :label="$t('profile.username')" prop="authUsername" :rules=" { required: editAsset.showTelnet, message: $t('validate.required'), trigger: 'change' }">
                 <el-input maxlength="64" show-word-limit v-model="editAsset.authUsername" size="small"/>
               </el-form-item>
-              <el-form-item :label="$t('login.pin')" prop="authPin" :rules=" { required: !editAsset.id, message: $t('validate.required'), trigger: 'change' }">
+              <el-form-item :label="$t('login.pin')" prop="authPin" :rules=" { required: requiredPin, message: $t('validate.required'), trigger: 'change' }">
                 <el-input maxlength="256" show-word-limit v-model="editAsset.authPin" size="small"  type="password" auto-complete="new-password" />
               </el-form-item>
               <el-form-item :label="$t('asset.usernamePrompt')" prop="authUserTip">
@@ -354,6 +354,8 @@ export default {
     const vm = this
     return {
       assetConstants,
+      requiredPin: true,
+      requiredPriKey: true,
       judgeTypes: true,
       showAllTalonOption: false,
       showAddressOption: true,
@@ -468,8 +470,12 @@ export default {
         const editAsset = JSON.parse(JSON.stringify(n))
         if (editAsset.authType) {
           editAsset.showSSH = true
+          this.requiredPin = false
+          this.requiredPriKey = false
         } else {
           editAsset.showSSH = false
+          this.requiredPin = true
+          this.requiredPriKey = true
         }
         if (editAsset.type && editAsset.type.authProtocol == assetConstants.authProtocolData.telnet && editAsset.authType) {
           editAsset.showTelnet = true
@@ -520,6 +526,7 @@ export default {
               this.editAsset.authProtocolPort = 23
             }
           }
+          // this.requiredPin = true
         }
       }
     },
@@ -750,7 +757,6 @@ export default {
       if (this.editAsset.type.authProtocol != assetConstants.authProtocolData.ssh) {
         this.editAsset.authType = ''
       }
-      console.log(this.editAsset.type.authProtocol, assetConstants.authProtocolData.telnet, this.editAsset.showTelnet)
       if (this.editAsset.type.authProtocol == assetConstants.authProtocolData.telnet && this.editAsset.showTelnet) {
         this.editAsset.authType = 1
       }
@@ -926,6 +932,15 @@ export default {
           callback(new Error(this.$t('validate.required')))
         }
       }, 100)
+    },
+    selectAuthType () {
+      if (this.editAsset.authType != this.obj.authType) {
+        if (this.editAsset.authType == 1) {
+          this.requiredPin = true
+        } else {
+          this.requiredPriKey = true
+        }
+      }
     }
   }
 }

From c9b0ecc5c37451d3297df5379cb5709da6db1520 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 28 Feb 2023 10:55:12 +0800
Subject: [PATCH 6/6] =?UTF-8?q?style=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=20agent?=
 =?UTF-8?q?=20=E4=B8=8B=E8=BD=BD=E5=BC=B9=E7=AA=97=20=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=B6=88=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index f92d13c3c..3f4137a0d 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -667,6 +667,9 @@ textarea {
     box-sizing: border-box;
   }
 }
+.el-dialog__header{
+  position: relative;
+}
 .el-message__content{
   white-space:pre-line
 }