Merge remote-tracking branch 'origin/main' into main

frontend/src/lang/tw.js

@@ -90,7 +90,7 @@ export default {
     icon: '圖標',
     all: '全部',
     enable: '啟用',
-    disable: '停用',
+    disable: '禁用',
     yes: '是',
     no: '否',
     reset: '重置',

frontend/src/lang/zh.js

@@ -91,7 +91,7 @@ export default {
     icon: '图标',
     all: '全部',
     enable: '启用',
-    disable: '停用',
+    disable: '禁用',
     yes: '是',
     no: '否',
     reset: '重置',

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>

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

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()
       })
     },
@@ -71,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() {

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 {

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" />