From 5cefbbfb517efc97bd25a941cecc2b67638741d7 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 18 Dec 2023 17:55:46 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20labels=20=E5=85=B3?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Libs/Krry/paging/index.vue | 2 +- src/views/labels/LabelList.vue | 12 +++++++++++- src/views/labels/LabelResourcesDialog.vue | 8 +++++++- src/views/users/User/UserCreateUpdate.vue | 5 +---- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/components/Libs/Krry/paging/index.vue b/src/components/Libs/Krry/paging/index.vue index 98cefcda6..9327dc219 100644 --- a/src/components/Libs/Krry/paging/index.vue +++ b/src/components/Libs/Krry/paging/index.vue @@ -383,7 +383,7 @@ export default { if (Array.isArray(resData) && resData.length) { this.asyncDataList = resData this.notSelectDataList = resData - this.initData(true) + this.initData(false) this.isLastPage = resData.length < this.pageSize } else { this.notSelectDataList = [] diff --git a/src/views/labels/LabelList.vue b/src/views/labels/LabelList.vue index 9bea5d237..ae2166d57 100644 --- a/src/views/labels/LabelList.vue +++ b/src/views/labels/LabelList.vue @@ -15,6 +15,7 @@ import { GenericListPage } from '@/layout/components' import BindDialog from './BindDialog.vue' import LabelResourcesDialog from '@/views/labels/LabelResourcesDialog.vue' +import { mapGetters } from 'vuex' export default { components: { @@ -31,10 +32,13 @@ export default { tableConfig: { url: '/api/v1/labels/labels/', columnsShow: { - default: ['name', 'value', 'res_count', 'date_created', 'date_updated', 'actions'], + default: ['name', 'value', 'res_count', 'date_created', 'action'], min: ['name', 'action'] }, columnsMeta: { + name: { + formatter: (row) => row.name + }, res_count: { formatter: (row) => { const onClick = () => { @@ -54,6 +58,9 @@ export default { callback: ({ row }) => { this.label = row this.bindVisible = true + }, + can: () => { + return !this.currentOrgIsRoot } } ] @@ -67,6 +74,9 @@ export default { } } }, + computed: { + ...mapGetters(['currentOrgIsRoot']) + }, methods: { handleClickResCount(row) { this.label = row diff --git a/src/views/labels/LabelResourcesDialog.vue b/src/views/labels/LabelResourcesDialog.vue index e66452c62..f7241aff7 100644 --- a/src/views/labels/LabelResourcesDialog.vue +++ b/src/views/labels/LabelResourcesDialog.vue @@ -1,5 +1,11 @@ diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue index b33d17cb6..517c12faa 100644 --- a/src/views/users/User/UserCreateUpdate.vue +++ b/src/views/users/User/UserCreateUpdate.vue @@ -120,10 +120,7 @@ export default { ajax: { url: '/api/v1/rbac/system-roles/?id!=00000000-0000-0000-0000-000000000004', transformOption: (item) => { - if (item.name !== 'SystemComponent') { - return { label: item.display_name, value: item.id } - } - return false + return { label: item.display_name, value: item.id } } } },