From 7b069ffe261f263cd95910f46b1fc4f2c73b9310 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 26 May 2021 14:40:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E7=9B=98):=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E7=94=A8=E6=88=B7=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/GrantAuth/user/index.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/panel/GrantAuth/user/index.vue b/frontend/src/views/panel/GrantAuth/user/index.vue
index ebef162293..a4296b02e0 100644
--- a/frontend/src/views/panel/GrantAuth/user/index.vue
+++ b/frontend/src/views/panel/GrantAuth/user/index.vue
@@ -8,8 +8,15 @@
       :row-style="{height: '35px'}"
       @filter-change="filterChange"
     >
-      <el-table-column :column-key="fieldName" :label="columnLabel" :prop="fieldName" filter-placement="right-start"
-                       :filters="filter_options" :filter-multiple="false" :filter-method="filterHandler" />
+      <el-table-column
+        :column-key="fieldName"
+        :label="columnLabel"
+        :prop="fieldName"
+        filter-placement="right-start"
+        :filters="filter_options"
+        :filter-multiple="false"
+        :filter-method="filterHandler"
+      />
       <el-table-column type="selection" fixd />
     </el-table>
   </div>
@@ -56,7 +63,7 @@ export default {
       userLists(1, 0, param).then(response => {
         const data = response.data
         // this.total = data.itemCount
-        this.data = data.listObject
+        this.data = data.listObject.filter(ele => ele.id !== this.$store.getters.user.userId)
         this.queryShareNodeIds()
       })
     },

From eedc3076a011525f5b7e3ec0577f118eed19c68a Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 26 May 2021 15:36:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E7=9B=98):=E5=88=86?=
 =?UTF-8?q?=E4=BA=ABfilter=E5=88=87=E6=8D=A2=E4=BF=9D=E7=95=99=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=B7=B2=E5=88=86=E4=BA=AB=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/GrantAuth/role/index.vue | 7 +++++--
 frontend/src/views/panel/GrantAuth/user/index.vue | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/panel/GrantAuth/role/index.vue b/frontend/src/views/panel/GrantAuth/role/index.vue
index 1af7f475d3..3167339bda 100644
--- a/frontend/src/views/panel/GrantAuth/role/index.vue
+++ b/frontend/src/views/panel/GrantAuth/role/index.vue
@@ -71,9 +71,12 @@ export default {
       const arr = obj[this.fieldName]
       if (arr.length === 0) {
         this.initColumnLabel()
-        return
+      } else {
+        this.columnLabel = this.filter_options[arr[0]].text
       }
-      this.columnLabel = this.filter_options[arr[0]].text
+      this.$nextTick(() => {
+        this.setCheckNodes()
+      })
     },
     save() {
       const rows = this.$refs.table.store.states.selection
diff --git a/frontend/src/views/panel/GrantAuth/user/index.vue b/frontend/src/views/panel/GrantAuth/user/index.vue
index a4296b02e0..7ee56ffa87 100644
--- a/frontend/src/views/panel/GrantAuth/user/index.vue
+++ b/frontend/src/views/panel/GrantAuth/user/index.vue
@@ -78,9 +78,12 @@ export default {
       const arr = obj[this.fieldName]
       if (arr.length === 0) {
         this.initColumnLabel()
-        return
+      } else {
+        this.columnLabel = this.filter_options[arr[0]].text
       }
-      this.columnLabel = this.filter_options[arr[0]].text
+      this.$nextTick(() => {
+        this.setCheckNodes()
+      })
     },
 
     save() {

From 6502f7213b5a5e77f76a81072da200a28267aa6d Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 26 May 2021 15:54:00 +0800
Subject: [PATCH 3/3] feat(frontend):UI fix

---
 frontend/src/lang/tw.js                    | 2 +-
 frontend/src/lang/zh.js                    | 2 +-
 frontend/src/layout/components/AppMain.vue | 2 ++
 frontend/src/views/system/about/index.vue  | 1 +
 frontend/src/views/system/dept/form.vue    | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index b9d7f43f3a..d51dbf2a99 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -90,7 +90,7 @@ export default {
     icon: '圖標',
     all: '全部',
     enable: '啟用',
-    disable: '停用',
+    disable: '禁用',
     yes: '是',
     no: '否',
     reset: '重置',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index caa7469699..d66fce4791 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -91,7 +91,7 @@ export default {
     icon: '图标',
     all: '全部',
     enable: '启用',
-    disable: '停用',
+    disable: '禁用',
     yes: '是',
     no: '否',
     reset: '重置',
diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue
index 1a249a656a..0111801d9d 100644
--- a/frontend/src/layout/components/AppMain.vue
+++ b/frontend/src/layout/components/AppMain.vue
@@ -28,6 +28,7 @@ export default {
         /* topbar 56  */
         min-height: calc(100vh - 56px);
         width: 100%;
+        height: 100%;
         position: relative;
         overflow: hidden;
     }
@@ -37,6 +38,7 @@ export default {
     }
 
     .ms-main-container {
+        height: 100%;
         padding: 0;
     }
 </style>
diff --git a/frontend/src/views/system/about/index.vue b/frontend/src/views/system/about/index.vue
index f9fd67f46b..9e91f43c2c 100644
--- a/frontend/src/views/system/about/index.vue
+++ b/frontend/src/views/system/about/index.vue
@@ -159,6 +159,7 @@ export default {
         margin-top: 5%;
         flex-direction: row;
         width: 640px;
+        min-width: 640px;
         height: 400px;
         position: relative;
         >>>div.el-card__header {
diff --git a/frontend/src/views/system/dept/form.vue b/frontend/src/views/system/dept/form.vue
index 04948a5c4a..d98c7a9ca5 100644
--- a/frontend/src/views/system/dept/form.vue
+++ b/frontend/src/views/system/dept/form.vue
@@ -1,5 +1,5 @@
 <template>
-  <layout-content :header="formType=='add' ? $t('organization.create') : $t('organization.modify')" back-name="system-dept">
+  <layout-content :header="formType=='add' ? $t('organization.create') : $t('organization.modify')" back-name="system-dept" style="height: 100%;">
     <el-form ref="deptForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
       <el-form-item :label="$t('organization.name')" prop="name">
         <el-input v-model="form.name" />