From 1263d9f4437b42ef45916629bdb001db4c00f53c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 21 May 2021 10:41:04 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/system/group/UserGroup.vue          | 16 +++++++++-------
 frontend/src/business/components/xpack           |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/src/business/components/settings/system/group/UserGroup.vue b/frontend/src/business/components/settings/system/group/UserGroup.vue
index b4080444c3..63e5368b38 100644
--- a/frontend/src/business/components/settings/system/group/UserGroup.vue
+++ b/frontend/src/business/components/settings/system/group/UserGroup.vue
@@ -6,7 +6,8 @@
                          create-tip="创建用户组" title="用户组与权限"/>
       </template>
 
-      <el-table :data="groups">
+      <el-table :data="groups" border class="adjust-table" style="width: 100%"
+                :height="screenHeight">
         <el-table-column prop="name" :label="$t('commons.name')"/>
         <el-table-column prop="type" label="所属类型">
           <template v-slot="scope">
@@ -30,7 +31,7 @@
           <template v-slot:default="scope">
             <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)">
               <template v-slot:middle>
-<!--                <ms-table-operator-button tip="复制" icon="el-icon-document-copy" @exec="copy(scope.row)"/>-->
+                <!--                <ms-table-operator-button tip="复制" icon="el-icon-document-copy" @exec="copy(scope.row)"/>-->
                 <ms-table-operator-button tip="设置权限" icon="el-icon-s-tools" @exec="setPermission(scope.row)"/>
               </template>
             </ms-table-operator>
@@ -76,8 +77,9 @@ export default {
       currentPage: 1,
       pageSize: 10,
       total: 0,
+      screenHeight: 'calc(100vh - 275px)',
       groups: []
-    }
+    };
   },
   activated() {
     this.initData();
@@ -95,7 +97,7 @@ export default {
           this.total = data.itemCount;
           this.groups = data.listObject;
         }
-      })
+      });
     },
     create() {
       this.$refs.editUserGroup.open({}, 'create');
@@ -107,19 +109,19 @@ export default {
       this.result = this.$get("/user/group/delete/" + row.id, () => {
         this.$success(this.$t('commons.delete_success'));
         this.initData();
-      })
+      });
     },
     del(row) {
       this.$refs.deleteConfirm.open(row);
     },
     copy(row) {
-      console.log(row)
+      console.log(row);
     },
     setPermission(row) {
       this.$refs.editPermission.open(row);
     },
   }
-}
+};
 </script>
 
 <style scoped>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 097d3a5a00..d5ede4fbff 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 097d3a5a00beaa660d34525765d93b35e63f52c0
+Subproject commit d5ede4fbffde2f7171fd0c49856ee1f23155c717