From 7b17076a3c1452e05d7c83fb8dee6bdccd5b98e9 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Sun, 19 Jan 2020 19:50:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug=20issue:NEZ-41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss              |  7 ++++++-
 .../src/components/common/rightBox/editEndpointBox.vue | 10 +++++-----
 .../src/components/common/rightBox/moduleBox.vue       |  6 +++++-
 nezha-fronted/src/components/page/asset/asset.vue      |  2 +-
 nezha-fronted/src/components/page/project/project.vue  |  2 +-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index b3c856f8d..21b1101fb 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -206,7 +206,12 @@ li{
   padding: 0 5px;
   font-size: 12px;
 }
-
+.el-textarea .el-input__count { /*防止字数限制提示信息遮挡内容和滚动条*/
+  right: 20px;
+}
+.el-textarea__inner {
+  padding: 5px 60px 5px 15px;
+}
 .nz-input-group-prepend {
   border-radius: 4px 0 0 4px;
 }
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
index 4ed2dc14d..55768799e 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
@@ -137,8 +137,8 @@
                 </button>
               </div>
             </template>
-            <div class="param-box param-box-module">
-              <div class="param-box-row" v-for="(item, index) in endpoint.paramObj" v-if="rightBox.isEdit">
+            <div v-if="rightBox.isEdit" class="param-box param-box-module">
+              <div class="param-box-row" v-for="(item, index) in endpoint.paramObj">
                 <el-form-item class="param-box-row-key" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}" :prop="'paramObj.' + index + '.key'">
                   <el-input placeholder="key" size="mini" v-model="item.key"></el-input>
                 </el-form-item>
@@ -148,9 +148,9 @@
                 </el-form-item>
                 <span class="param-box-row-symbol" @click="removeParam(index)"><i class="nz-icon nz-icon-minus-square"></i></span>
               </div>
-              <div class="param-box-row" v-for="(item, index) in endpoint.paramObj" v-if="!rightBox.isEdit">
-                <div  class="right-box-form-content-txt">{{item.key}}={{item.value}}</div>
-              </div>
+            </div>
+            <div v-else v-for="(item, index) in endpoint.paramObj" v-if="!rightBox.isEdit">
+              <div  class="right-box-form-content-txt">{{item.key}}={{item.value}}</div>
             </div>
 
           </el-form-item>
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 09acbdf1d..a5f262c2e 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -121,8 +121,12 @@
             {required: true, message: this.$t('validate.required'), trigger: 'change'}
           ],
           port: [
-            {validator:port, trigger: 'blur'}
+            {validator:port, trigger: 'blur'},
+            {required: true, message: this.$t('validate.required'), trigger: 'blur'},
           ],
+          path: [
+            {required: true, message: this.$t('validate.required'), trigger: 'blur'},
+          ]
         },
         projectList: [],
       }
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index d97e09985..5956a4c34 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -11,7 +11,7 @@
           <el-checkbox class="sidebar-info-item" :class="{'sidebar-info-item-active': indOf(checkList, item.id)}"
                        v-for="(item,key) in checkListData" :key="key" :label=item.id>
             <div class="sidebar-info-item-txt">
-              <el-popover v-if="item.name.length > 12" trigger="hover" placement="top-start" :content="item.name" >
+              <el-popover v-if="item.name.length > 16" trigger="hover" placement="top-start" :content="item.name" >
                 <span slot="reference">{{item.name}}</span>
               </el-popover>
               <span v-else>{{item.name}}</span>
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 35040f065..7006e30e0 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -11,7 +11,7 @@
           :id="'project-module-'+item.id"
         >
           <div class="sidebar-info-item-txt">
-            <el-popover v-if="item.name.length > 12" trigger="hover" placement="top-start" :content="item.name" >
+            <el-popover v-if="item.name.length > 16" trigger="hover" placement="top-start" :content="item.name" >
               <span slot="reference">{{item.name}}</span>
             </el-popover>
             <span v-else>{{item.name}}</span>