From 374ef8050987e6be0e2e13d0b935d59f63ad5367 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Sun, 19 Jan 2020 19:34:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.add asset时，model添加没反应的问题
2.更改了alert rule里三个框的高度，增加长度限制
3.修复dc弹框电话校验问题
---
 nezha-fronted/src/components/common/header.vue         |  4 ++--
 nezha-fronted/src/components/common/js/validate.js     |  4 +++-
 .../src/components/common/rightBox/alertConfigBox.vue  | 10 +++-------
 .../src/components/common/rightBox/moduleBox.vue       | 10 +++++-----
 nezha-fronted/src/components/page/asset/asset.vue      |  3 ++-
 .../src/components/page/asset/assetAddUnit.vue         |  5 ++---
 nezha-fronted/src/components/page/project/project.vue  |  3 ++-
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index dea7119e4..5a3acd045 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -43,7 +43,7 @@
         <template v-for="(item, index) in projectData">
           <el-menu-item :index="'2-' + index">
             <div @click="jumpToProject(item)" :class="{'menu-item-active' :(activeIndex == 'project' && activeItemIndex == item.id)}">
-              <span>{{item.name}}</span>
+              <span class="too-long-split" style="width: 135px;">{{item.name}}</span>
               <div @click.stop="toEditProject(item)" class="menu-edit"><i style="color: inherit" class="nz-icon nz-icon-edit"></i></div>
             </div>
           </el-menu-item>
@@ -56,7 +56,7 @@
         <template v-for="(item, index) in assetData">
           <el-menu-item :index="'3-' + index">
             <div @click="jumpToAsset(item.id)" :class="{'menu-item-active' : (activeIndex == 'asset' && indOf(activeItemIndexes, item.id) > -1) }">
-              <span>{{item.name}}</span>
+              <span class="too-long-split" style="width: 130px;">{{item.name}}</span>
               <idc-config-box :post-idc="item" ref="idcConfigBox" placement="left" @after="getIDCOptionData" :button-class="'menu-edit'">
                 <template v-slot:optionZone>
                   <div @click="closeAllPop" class="menu-edit">
diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js
index fce7ee240..cf8c23ccf 100644
--- a/nezha-fronted/src/components/common/js/validate.js
+++ b/nezha-fronted/src/components/common/js/validate.js
@@ -14,7 +14,9 @@ export function host(rule, value, callback) {
 export function phone(rule, value, callback) {
   const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
   setTimeout(() => {
-    if (!Number.isInteger(+value)) {
+    if (!value) {
+      callback()
+    } else if (!Number.isInteger(+value)) {
       callback(new Error(vm.$t('validate.tel')))
     } else {
       if (phoneReg.test(value)) {
diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
index fd5943d75..1875ab25a 100644
--- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
@@ -11,10 +11,6 @@
           <span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-edit"></i></span>
           <span class="right-box-top-btn-txt">{{$t('overall.edit')}}</span>
         </button>
-
-        <!--<button type="button" @click="esc" class="nz-btn nz-btn-size-normal nz-btn-style-light nz-btn-style-square" id="alert-box-esc">
-          <span class="top-tool-btn-txt"><i class="el-icon-close"></i></span>
-        </button>-->
       </div>
 
       <!-- end--顶部按钮-->
@@ -47,7 +43,7 @@
             </el-form-item>
             <!--expr-->
             <el-form-item :label="$t('alert.config.expr')" prop="expr">
-              <el-input v-if="rightBox.isEdit" type="textarea"  placeholder="" v-model="alertRule.expr" size="small"></el-input>
+              <el-input maxlength="512" rows="4" show-word-limit v-if="rightBox.isEdit" type="textarea"  placeholder="" v-model="alertRule.expr" size="small"></el-input>
               <div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.expr}}</div>
             </el-form-item>
             <!--last-->
@@ -71,12 +67,12 @@
             </el-form-item>
             <!--summary-->
             <el-form-item :label="$t('alert.summary')" prop="summary">
-              <el-input v-if="rightBox.isEdit" type="text"  placeholder="" v-model="alertRule.summary" size="small"></el-input>
+              <el-input maxlength="512" rows="3" type="textarea" show-word-limit v-if="rightBox.isEdit" placeholder="" v-model="alertRule.summary" size="small"></el-input>
               <div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.summary}}</div>
             </el-form-item>
             <!--description-->
             <el-form-item :label="$t('alert.description')" prop="description">
-              <el-input v-if="rightBox.isEdit" type="textarea" placeholder="" v-model="alertRule.description" size="small"></el-input>
+              <el-input maxlength="512" rows="4" show-word-limit v-if="rightBox.isEdit" type="textarea" placeholder="" v-model="alertRule.description" size="small"></el-input>
               <div v-if="!rightBox.isEdit" class="right-box-form-content-txt">{{alertRule.description}}</div>
             </el-form-item>
             <!--receiver-->
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 31cb16f51..09acbdf1d 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -61,8 +61,8 @@
                 </button>
               </div>
             </template>
-            <div class="param-box param-box-module">
-              <div class="param-box-row" v-for="(item, index) in module.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 module.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>
@@ -72,9 +72,9 @@
                 </el-form-item>
                 <span class="param-box-row-symbol" :id="'moduel-remove-param-'+index" @click="removeParam(index)"><i class="nz-icon nz-icon-minus-square"></i></span>
               </div>
-              <div class="param-box-row" v-for="(item, index) in module.paramObj" v-if="!rightBox.isEdit">
-                <div  class="right-box-form-content-txt">{{item.key}}={{item.value}}</div>
-              </div>
+            </div>
+            <div v-for="(item, index) in module.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/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 6ff630f1d..d97e09985 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -11,9 +11,10 @@
           <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 trigger="hover" placement="right-end" :content="item.name" >
+              <el-popover v-if="item.name.length > 12" trigger="hover" placement="top-start" :content="item.name" >
                 <span slot="reference">{{item.name}}</span>
               </el-popover>
+              <span v-else>{{item.name}}</span>
             </div>
 
             <idc-config-box ref="idcConfigBox" :post-idc="item" placement="left" @after="getIDCOptionData" :button-class="'checkbox-edit'">
diff --git a/nezha-fronted/src/components/page/asset/assetAddUnit.vue b/nezha-fronted/src/components/page/asset/assetAddUnit.vue
index 10e7ddcbe..f12527c44 100644
--- a/nezha-fronted/src/components/page/asset/assetAddUnit.vue
+++ b/nezha-fronted/src/components/page/asset/assetAddUnit.vue
@@ -137,7 +137,6 @@
                 trigger="click"
                 width="370"
                 v-model="popCompVisible"
-                :disabled=popState
                 v-clickoutside="clickOutSide"
                 @hide="resetVendor"
                 popper-class="nz-pop2"
@@ -243,7 +242,7 @@
               </el-popover>
             </div>
           </el-form-item>
-          <el-form-item :label="this.$t('asset.createAssetTab.purchaseDate')" class="right-box-form-content">
+          <el-form-item :label="$t('asset.createAssetTab.purchaseDate')" class="right-box-form-content">
             <el-date-picker
               size="mini"
               v-model="assetData.purchaseDate"
@@ -256,7 +255,7 @@
           <div class="asset-sub-title">{{$t('asset.createAssetTab.dc')}}</div>
           <div class="line-100 asset-line"></div>
           <!------------------------------------------IDC---------------------------------------------->
-          <el-form-item :label="this.$t('asset.createAssetTab.dcName')" class="right-box-form-content" prop="idcId">
+          <el-form-item :label="$t('asset.createAssetTab.dcName')" class="right-box-form-content" prop="idcId">
             <el-select popper-class="asset-dropdown" size="mini" v-model="assetData.idcId" clearable @change="getSingleIDCData" class="right-box-row-with-btn" placeholder="">
               <el-option
                 :id="'asset-add-idc-op'+item.key"
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 4d696ecab..35040f065 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -11,9 +11,10 @@
           :id="'project-module-'+item.id"
         >
           <div class="sidebar-info-item-txt">
-            <el-popover trigger="hover" placement="right-end" :content="item.name" >
+            <el-popover v-if="item.name.length > 12" trigger="hover" placement="top-start" :content="item.name" >
               <span slot="reference">{{item.name}}</span>
             </el-popover>
+            <span v-else>{{item.name}}</span>
           </div>
           <div class="side-bar-menu-edit" @click.stop="toEditModule(item)" :id="'project-module-edit-'+item.id"><i class="nz-icon nz-icon-edit"></i></div>
         </div>