From cea63d47431f25cbb4e4f72f77010c573400323b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 5 Aug 2021 16:11:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=9D=E5=AD=98=E6=97=B6=20?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E7=9A=84=E9=80=89=E9=A1=B9=E5=8D=A1?=
 =?UTF-8?q?=E7=9A=84=E5=88=87=E6=8D=A2=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/components/common/language/cn.js    |  3 ++-
 nezha-fronted/src/components/common/language/en.js    |  3 ++-
 .../components/common/rightBox/batchAddEndpoint.vue   |  3 +++
 .../components/common/rightBox/editEndpointBoxNew.vue |  2 +-
 .../src/components/common/rightBox/moduleBox.vue      | 11 +++++++++--
 .../common/table/settings/endpointTable.vue           |  4 ++--
 .../components/page/monitor/endpoint/endpointList.vue |  2 +-
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 6127083e0..3ec12970a 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -1356,7 +1356,8 @@ const cn = {
       status: 'Endpoint 状态',
       basicTypeFile: '路径',
       basicTypeJournal: '单位',
-      basicTypeSyslog: '监听地址'
+      basicTypeSyslog: '监听地址',
+      basicAppName: '应用名称'
     },
     metrics: {
       metrics: '指标',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 8df279458..21b73b6a9 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -1358,7 +1358,8 @@ const en = {
       status: 'Endpoint status',
       basicTypeFile: 'Path',
       basicTypeJournal: 'Unit',
-      basicTypeSyslog: 'Listen address'
+      basicTypeSyslog: 'Listen address',
+      basicAppName: 'App name'
     },
     metrics: {
       metrics: 'Metrics', // "指标"
diff --git a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
index 8301f6375..c253d334e 100644
--- a/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
+++ b/nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue
@@ -143,6 +143,7 @@
 
 <script>
 import editEndpointBoxNew from './editEndpointBoxNew'
+import editRigthBox from '@/components/common/mixin/editRigthBox'
 export default {
   name: 'batchAddEndpointBox',
   props: {
@@ -150,6 +151,7 @@ export default {
     currentModule: Object,
     selectEndpointList: Array
   },
+  mixins: [editRigthBox],
   components: {
     'edit-endpoint-box-new': editEndpointBoxNew
   },
@@ -440,6 +442,7 @@ export default {
     }
   },
   created () {
+    this.isEdit = true
     this.getModuleList()
     this.getAssetList()
   },
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
index b4ee3b30d..25ea2d5bd 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
@@ -232,7 +232,7 @@
                 </el-form-item>
 
                 <el-form-item v-if="authType === 1" :label='$t("project.endpoint.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]">
-                  <el-input id="module-box-input-password" v-model.number="editEndpoint.configs[0].config.basic_auth.pin" placeholder='' size="small"></el-input>
+                  <el-input id="module-box-input-password" v-model.number="editEndpoint.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
                 </el-form-item>
 
                 <!--authtype 2-->
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 576d5995d..76bab65c0 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -229,7 +229,7 @@
               </el-form-item>
 
               <el-form-item v-if="authType === 1" :label='$t("project.endpoint.pin")' class="half-form-item" prop="configs.0.config.basic_auth.pin" :rules="[{ required: true, message: this.$t('validate.required'), trigger: 'blur' }]">
-                <el-input id="module-box-input-password" v-model.number="editModule.configs[0].config.basic_auth.pin" placeholder='' size="small"></el-input>
+                <el-input id="module-box-input-password" v-model.number="editModule.configs[0].config.basic_auth.pin" type="password" autocomplete="new-password" placeholder='' size="small"></el-input>
               </el-form-item>
 
               <!--authtype 2-->
@@ -774,7 +774,14 @@ export default {
               }
             } else if (key.indexOf('configs.1') !== -1) {
               const keyArr = key.split('.')
-              this.activeNameLogs[keyArr[3]] = keyArr[4].trim().toLowerCase().replace(keyArr[4][0], keyArr[4][0].toUpperCase())
+              const str = keyArr[4]
+              if (str === 'fileName' || str === 'unit' || str === 'listenAddress' || str === 'appName') {
+                this.activeNameLogs[keyArr[3]] = 'Basic'
+              } else if (str === 'labels') {
+                this.activeNameLogs[keyArr[3]] = 'Labels'
+              } else if (str === 'pipeline') {
+                this.activeNameLogs[keyArr[3]] = 'Pipeline'
+              }
               this.activeNameLogs = [...this.activeNameLogs]
             }
           }
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index 6c795905d..a3588cfbd 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -60,14 +60,14 @@
           </span>
         </template>
         <template v-else-if="item.prop === 'configs'">
-          <el-tooltip placement="left" effect="light" :popper-class="'endpointConfigsTips'">
+          <el-tooltip placement="left" effect="light" :popper-class="'endpointConfigsTips'" v-if="scope.row.configs[0].enable">
             <span class="configs-endpoint metrics">{ Metrics }</span>
             <div class="endpointConfigsTips" slot="content">
               <span class="copy-value-content"> <i class="nz-icon nz-icon-override" @click="copyValue(scope.row.configs[0].config)"></i></span>
               <pre >{{JSON.stringify(scope.row.configs[0].config,null,2)}}</pre>
             </div>
           </el-tooltip>
-          <el-tooltip placement="right" effect="light" :popper-class="'endpointConfigsTips'">
+          <el-tooltip placement="right" effect="light" :popper-class="'endpointConfigsTips'" v-if="scope.row.configs[1].enable">
             <span class="configs-endpoint logs">{ Logs }</span>
             <div class="endpointConfigsTips" slot="content">
               <span class="copy-value-content"> <i class="nz-icon nz-icon-override" @click="copyValue(scope.row.configs[1].config)"></i></span>
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index a5f37232f..df1369ded 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -228,7 +228,7 @@ export default {
       silenceBoxShow: false,
       tableId: 'endpointTable',
       queryPermission: 'account_view',
-      endpointTableHeight: 'calc(100% - 193px)', // 主列表table高度
+      endpointTableHeight: 'calc(100% - 224px)', // 主列表table高度
       dataListLayout: ['searchInput', 'elementSet', 'clickSearch'],
       searchMsg: { // 给搜索框子组件传递的信息
         zheze_none: true,