From e7bc257339a6f28ac953b2fe074d02209c908ab3 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 11 Jul 2022 14:58:05 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2020=20=20=20fix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20module=20endpoint=20basic=5Fauth.pin=20=E4=B8=BA=20basic=5Fa?=
 =?UTF-8?q?uth.password?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/css/components/page/dashboard/chartBox.scss |  3 +++
 .../components/common/rightBox/batchModifyEndpoint.vue |  2 +-
 .../components/common/rightBox/editEndpointBoxNew.vue  | 10 +++++-----
 .../src/components/common/rightBox/moduleBox.vue       | 10 +++++-----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/chartBox.scss b/nezha-fronted/src/assets/css/components/page/dashboard/chartBox.scss
index 5eac08db9..9bbc7ebed 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/chartBox.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/chartBox.scss
@@ -146,5 +146,8 @@
       }
     }
   }
+  .nz-icon{
+    color: $--color-text-regular;
+  }
 }
 
diff --git a/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue b/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue
index 426860f3e..43c538ea5 100644
--- a/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue
+++ b/nezha-fronted/src/components/common/rightBox/batchModifyEndpoint.vue
@@ -178,7 +178,7 @@ export default {
           labelModule: [],
           basic_auth: {
             username: '',
-            pin: ''
+            password: ''
           },
           bearer_token: ''
         },
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
index 9e82b7373..e8755b406 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
@@ -325,12 +325,12 @@
                 </el-form-item>
 
                 <!--authtype 1-->
-                <el-form-item v-if="authType === 1" :label='$t("asset.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
+                <el-form-item v-if="authType === 1" :label='$t("profile.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
                   <el-input id="module-box-input-uername" v-model="editEndpoint.configs[0].config.basic_auth.username" placeholder='' size="small"></el-input>
                 </el-form-item>
 
-                <el-form-item v-if="authType === 1" :label='$t("login.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
-                  <el-input id="module-box-input-password" v-model="editEndpoint.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
+                <el-form-item v-if="authType === 1" :label='$t("login.pin")' class="half-form-item" prop="configs.0.config.basic_auth.password" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
+                  <el-input id="module-box-input-password" v-model="editEndpoint.configs[0].config.basic_auth.password" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
                 </el-form-item>
 
                 <!--authtype 2-->
@@ -1213,7 +1213,7 @@ export default {
       this.editEndpoint.configs.bearer_token = ''
       this.editEndpoint.configs.basic_auth = {
         username: '',
-        pin: ''
+        password: ''
       }
     },
     copyValue () {
@@ -1544,7 +1544,7 @@ export default {
           if (params[0].config.basic_auth && !params[0].config.basic_auth.username) {
             delete params[0].config.basic_auth
           }
-          if (params[0].config.basic_auth && !params[0].config.basic_auth.pin) {
+          if (params[0].config.basic_auth && !params[0].config.basic_auth.password) {
             delete params[0].config.basic_auth
           }
           if (params[0].config.param && !Object.keys(params[0].config.param).length) {
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index be9f2548c..a7b50020d 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -304,12 +304,12 @@
               </el-form-item>
 
               <!--authtype 1-->
-              <el-form-item v-if="authType === 1" :label='$t("asset.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
+              <el-form-item v-if="authType === 1" :label='$t("profile.username")' class="half-form-item" prop="configs.0.config.basic_auth.username" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
                 <el-input id="module-box-input-uername" v-model="editModule.configs[0].config.basic_auth.username" placeholder='' size="small"></el-input>
               </el-form-item>
 
-              <el-form-item v-if="authType === 1" :label='$t("login.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
-                <el-input id="module-box-input-password" v-model="editModule.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
+              <el-form-item v-if="authType === 1" :label='$t("login.pin")' class="half-form-item" prop="configs.0.config.basic_auth.password" :rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]">
+                <el-input id="module-box-input-password" v-model="editModule.configs[0].config.basic_auth.password" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
               </el-form-item>
 
               <!--authtype 2-->
@@ -1123,7 +1123,7 @@ export default {
       this.editModule.configs[0].config.bearer_token = ''
       this.editModule.configs[0].config.basic_auth = {
         username: '',
-        pin: ''
+        password: ''
       }
     },
     changeBasicType () {
@@ -1355,7 +1355,7 @@ export default {
           if (params[0].config.basic_auth && !params[0].config.basic_auth.username) {
             delete params[0].config.basic_auth
           }
-          if (params[0].config.basic_auth && !params[0].config.basic_auth.pin) {
+          if (params[0].config.basic_auth && !params[0].config.basic_auth.password) {
             delete params[0].config.basic_auth
           }
           if (params[0].config.param && !Object.keys(params[0].config.param).length) {