From dc74455489bc5573f377f19b0fafcb3c5c22e280 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 3 Jun 2021 15:49:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20assetMetaGroup=20=E4=BE=A7=E6=BB=91?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/language/cn.js      |  4 ++
 .../src/components/common/language/en.js      |  4 ++
 .../common/rightBox/assetMetaGroup.vue        | 43 ++++++++-----------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index d6a4aa55f..7ee027b35 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -645,6 +645,10 @@ const cn = {
   },
   config: {
     config: '设置',
+    assetMeta: {
+      addGroup: '新增组',
+      editGroup: '修改组'
+    },
     user: {
       userList: '用户列表',
       user: '用户',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index e9de75d16..55322d343 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -651,6 +651,10 @@ const en = {
   },
   config: {
     config: 'Setting', // "设置"
+    assetMeta: {
+      addGroup: 'Add group',
+      editGroup: 'Edit group'
+    },
     user: {
       userList: 'User list', // "用户列表"
       user: 'User',
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue b/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue
index 81a8ab9e2..d45326737 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaGroup.vue
@@ -1,33 +1,28 @@
 <template>
   <transition name="right-box-580">
-    <div class="right-box right-box-asset-meta-group z-top" v-clickoutside="{obj:editMetaGroup,func:clickOutside}">
-      <!-- begin--顶部按钮-->
-      <div class="right-box-top-btns right-box-form-delete">
-        <button @click="del" class="nz-btn nz-btn-size-normal nz-btn-size-alien" id="alert-box-del" type="button"
-                v-has="'alert_silence_delete'" v-if="editMetaGroup.id">
-          <span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-delete"></i></span>
-          <span class="right-box-top-btn-txt">{{$t('overall.delete')}}</span>
-        </button>
-      </div>
-      <!-- end--顶部按钮-->
-
+    <div class="right-box right-box-asset-meta" v-clickoutside="{obj:editMetaGroup,func:clickOutside}">
       <!-- begin--标题-->
-      <div class="right-box-title">{{editMetaGroup.id ? $t("config.assetMeta.editGroup") :
-        $t("config.assetMeta.addGroup")}}
+      <div class="right-box__header">
+        <div class="header__title">{{editMetaGroup.id ? $t("config.assetMeta.editGroup") : $t("config.assetMeta.addGroup")}}
+        </div>
+        <div class="header__operation">
+          <span v-cancel="{obj: editMetaGroup, func: esc}"><i class="nz-icon nz-icon-close"></i></span>
+        </div>
       </div>
-      <!-- end--标题-->
-
       <!-- begin--表单-->
-      <div class="right-box-form-box">
-        <el-form class="right-box-form right-box-form-left" label-width="120px"  :model="editMetaGroup" label-position = "top" ref="editMetaGroupForm">
-          <el-form-item :label='$t("config.assetMeta.groupName")' prop="name" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}">
-            <el-input placeholder="" maxlength="64" show-word-limit v-model="editMetaGroup.name" size="small" id="editMetaGroup-box-input-name"></el-input>
-          </el-form-item>
-          <el-form-item :label='$t("overall.remark")' prop="remark">
-            <el-input placeholder="" maxlength="256" type="textarea" show-word-limit v-model="editMetaGroup.remark" size="small" id="editMetaGroup-box-input-remark"></el-input>
-          </el-form-item>
-        </el-form>
+      <div class="right-box__container">
+        <div class="container__form">
+          <el-form label-width="120px"  :model="editMetaGroup" label-position = "top" ref="editMetaGroupForm">
+            <el-form-item :label='$t("overall.name")' prop="name" :rules="{required: true, message: $t('validate.required'), trigger: 'blur'}">
+              <el-input placeholder="" maxlength="64" show-word-limit v-model="editMetaGroup.name" size="small" id="editMetaGroup-box-input-name"></el-input>
+            </el-form-item>
+            <el-form-item :label='$t("overall.remark")' prop="remark">
+              <el-input placeholder="" maxlength="256" type="textarea" show-word-limit v-model="editMetaGroup.remark" size="small" id="editMetaGroup-box-input-remark"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
       </div>
+
       <!-- end--表单-->
 
       <!-- begin--底部按钮-->