From a916c17ebcd4738da536833001b6bddcfdceaee3 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 25 Mar 2021 18:30:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9group=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=B7=BB=E5=8A=A0email=E7=9A=84Example?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/asset/components/assetTagEx.vue      | 23 ++++++++++++++-----
 .../src/components/page/config/assetMeta.vue  |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/components/page/asset/components/assetTagEx.vue b/nezha-fronted/src/components/page/asset/components/assetTagEx.vue
index 14596c54b..e00402cb4 100644
--- a/nezha-fronted/src/components/page/asset/components/assetTagEx.vue
+++ b/nezha-fronted/src/components/page/asset/components/assetTagEx.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="type==='text'">
-      <el-input size="small" maxlength="128"/>
+      <el-input v-model="inputValue" size="small" maxlength="128"/>
     </div>
     <div v-else-if="type==='multitext'">
       <el-row v-for="(item, index) in inputArr" :key="index" style="margin-bottom: 10px">
@@ -21,7 +21,7 @@
       </el-row>
     </div>
     <div v-else-if="type==='textarea'">
-      <el-input size="small" type="textarea" maxlength="512" :autosize="{ minRows: 2, maxRows: 4}"/>
+      <el-input v-model="inputValue" size="small" type="textarea" maxlength="512" :autosize="{ minRows: 2, maxRows: 4}"/>
     </div>
     <div v-else-if="type==='radio'">
       <el-radio-group v-model="optionValue" >
@@ -39,10 +39,10 @@
       </el-select>
     </div>
     <div v-else-if="type==='integer'">
-      <el-input-number size="small" maxlength="64" :controls="false"></el-input-number>
+      <el-input-number v-model="inputValue" size="small" maxlength="64" :controls="false"></el-input-number>
     </div>
     <div v-else-if="type==='double'">
-      <el-input-number  size="small" :precision="param.decimals" :controls="false"></el-input-number>
+      <el-input-number  v-model="inputValue" size="small" :precision="param.decimals" :controls="false"></el-input-number>
     </div>
     <div v-else-if="type==='datetime'">
       <div v-if="param.subType==='date'">
@@ -78,6 +78,9 @@
         </el-date-picker>
       </div>
     </div>
+    <div v-else-if="type==='email'" :class="emailError?'emailError':''">
+      <el-input v-model="inputValue" size="small" @blur="emailChange"/>
+    </div>
   </div>
 </template>
 
@@ -106,7 +109,9 @@ export default {
       optionValue: '',
       checkOption: [],
       daterange: [],
-      date: null
+      date: null,
+      emailError: false,
+      inputValue: ''
     }
   },
   watch: {
@@ -151,11 +156,17 @@ export default {
         return
       }
       this.inputArr.splice(index, 1)
+    },
+    emailChange (val) {
+      const reg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/
+      this.emailError = !reg.test(val)
     }
   }
 }
 </script>
 
 <style scoped>
-
+.emailError /deep/ .el-input__inner{
+  border-color: #F56C6C;
+}
 </style>
diff --git a/nezha-fronted/src/components/page/config/assetMeta.vue b/nezha-fronted/src/components/page/config/assetMeta.vue
index d25d97e69..cbce0524e 100644
--- a/nezha-fronted/src/components/page/config/assetMeta.vue
+++ b/nezha-fronted/src/components/page/config/assetMeta.vue
@@ -123,7 +123,7 @@
             </span>
               </div>
               <div v-else-if=" item.prop === 'group' ">
-                {{scope.row[item.prop].name}}
+                {{scope.row[item.prop]?scope.row[item.prop].name:'-'}}
               </div>
               <div v-else-if=" item.prop === 'display' ">
                 <el-switch