From 2fd2fc5f6275679f77686e28a3ac4a5c8dca5256 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 16 May 2024 13:31:47 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/index.vue | 2 +- src/components/Libs/Krry/paging/index.vue | 2 +- src/components/Table/ListTable/TableAction/index.vue | 2 +- src/components/Table/ListTable/index.vue | 4 ++-- src/layout/components/GenericListPage/index.vue | 1 - src/layout/components/NavHeader/Organization.vue | 1 + src/views/users/User/UserList.vue | 8 +++++++- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue index b70f614d1..290999aa8 100644 --- a/src/components/Dialog/index.vue +++ b/src/components/Dialog/index.vue @@ -127,7 +127,7 @@ export default { &__footer { border-top: 1px solid #dee2e6; - padding: 16px; + padding: 16px 25px; justify-content: flex-end; } } diff --git a/src/components/Libs/Krry/paging/index.vue b/src/components/Libs/Krry/paging/index.vue index 33199cc0e..04963359a 100644 --- a/src/components/Libs/Krry/paging/index.vue +++ b/src/components/Libs/Krry/paging/index.vue @@ -428,7 +428,7 @@ export default { vertical-align: middle; text-align: center; margin: 180px 8px; - width: 100%; + width: calc(100% - 10px); @media screen and (max-width: 992px) { margin: 8px 8px; text-align:start diff --git a/src/components/Table/ListTable/TableAction/index.vue b/src/components/Table/ListTable/TableAction/index.vue index 5698979c0..c26c2034b 100644 --- a/src/components/Table/ListTable/TableAction/index.vue +++ b/src/components/Table/ListTable/TableAction/index.vue @@ -221,7 +221,7 @@ $headerHeight: 30px; } .mobile .right-side { - padding-top: 10px; + padding-top: 3px; } @media (max-width: 481px) { diff --git a/src/components/Table/ListTable/index.vue b/src/components/Table/ListTable/index.vue index 757fc4785..9d45f0e80 100644 --- a/src/components/Table/ListTable/index.vue +++ b/src/components/Table/ListTable/index.vue @@ -174,8 +174,8 @@ export default { if (!preURL || preURL === location.href) { return } - this.tableUrl[this.tableUrl] = location.href - this.$log.info('Reload the table get latest data: pre ', preURL, ' current: ', location.href) + this.urlUpdated[this.tableUrl] = location.href + this.$log.debug('Reload the table get latest data: pre ', preURL, ' current: ', location.href) setTimeout(() => { this.reloadTable() }, 500) diff --git a/src/layout/components/GenericListPage/index.vue b/src/layout/components/GenericListPage/index.vue index 289c93995..30e18eb53 100644 --- a/src/layout/components/GenericListPage/index.vue +++ b/src/layout/components/GenericListPage/index.vue @@ -13,7 +13,6 @@ export default { components: { Page, GenericListTable }, - methods: { reloadTable() { this.$refs.ListTable.reloadTable() diff --git a/src/layout/components/NavHeader/Organization.vue b/src/layout/components/NavHeader/Organization.vue index 10bb39f60..aa2c84567 100644 --- a/src/layout/components/NavHeader/Organization.vue +++ b/src/layout/components/NavHeader/Organization.vue @@ -173,6 +173,7 @@ $height: 28px; .org-select >>> .el-input.is-disabled .el-input__inner { color: #ffffff !important; + background-color: transparent; } .icon { diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index 3b5dcdfe7..4e7aeb7e0 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -305,6 +305,12 @@ export default { this.$refs.GenericListPage.reloadTable() }, bulkActionCallback(selectedRows, reloadTable, actionType) { + const msgs = { + 'disable': 'DisableSuccessMsg', + 'activate': 'ActivateSuccessMsg', + 'remove': 'RemoveSuccessMsg', + 'delete': 'DeleteSuccessMsg' + } const vm = this const url = '/api/v1/users/users/' const data = selectedRows.map(row => { @@ -313,7 +319,7 @@ export default { if (data.length === 0) return this.$axios.patch(url, data).then(() => { reloadTable() - vm.$message.success(vm.$t(`${actionType}SuccessMsg`)) + vm.$message.success(vm.$t(msgs[actionType])) }) }, handleInviteDialogClose() {