From acbb5fada1509bc321353341aeed6de705c5ed4b Mon Sep 17 00:00:00 2001 From: shizhongming Date: Thu, 11 Apr 2024 10:41:36 +0800 Subject: [PATCH] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F-=E8=A7=92=E8=89=B2):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smart-system/views/role/RoleListView.config.ts | 8 +++++++- src/modules/smart-system/views/role/RoleListView.vue | 2 +- .../views/role/components/RoleSetFunction.vue | 5 ++++- src/modules/smart-system/views/role/lang/en_US.ts | 1 + src/modules/smart-system/views/role/lang/zh_CN.ts | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/modules/smart-system/views/role/RoleListView.config.ts b/src/modules/smart-system/views/role/RoleListView.config.ts index a39a6c7aa..80fade824 100644 --- a/src/modules/smart-system/views/role/RoleListView.config.ts +++ b/src/modules/smart-system/views/role/RoleListView.config.ts @@ -1,6 +1,6 @@ import type { SmartColumn, SmartSearchFormSchema } from '@/components/SmartTable'; import type { FormSchema } from '@/components/Form'; -import { tableUseYnClass } from '@/components/SmartTable'; +import { tableBooleanClass, tableUseYnClass } from '@/components/SmartTable'; export const getTableColumns = (): SmartColumn[] => { return [ @@ -27,6 +27,12 @@ export const getTableColumns = (): SmartColumn[] => { field: 'roleType', width: 120, }, + { + title: '{system.views.role.table.superAdminYn}', + field: 'superAdminYn', + width: 120, + ...tableBooleanClass('superAdminYn'), + }, { ...tableUseYnClass(), sortable: true, diff --git a/src/modules/smart-system/views/role/RoleListView.vue b/src/modules/smart-system/views/role/RoleListView.vue index 369458b8a..a4312ecab 100644 --- a/src/modules/smart-system/views/role/RoleListView.vue +++ b/src/modules/smart-system/views/role/RoleListView.vue @@ -13,7 +13,7 @@ - + @@ -44,6 +46,7 @@ const props = defineProps({ roleId: propTypes.number, + isSuperAdmin: propTypes.bool.def(false), }); const treeRef = ref(); @@ -70,7 +73,7 @@ try { const result = await defHttp.post({ service: ApiServiceEnum.SMART_SYSTEM, - url: 'sys/function/list', + url: 'sys/function/listTenantFunction', data: { sortName: 'seq', }, diff --git a/src/modules/smart-system/views/role/lang/en_US.ts b/src/modules/smart-system/views/role/lang/en_US.ts index 0bcb55ea4..b20cccb0a 100644 --- a/src/modules/smart-system/views/role/lang/en_US.ts +++ b/src/modules/smart-system/views/role/lang/en_US.ts @@ -9,6 +9,7 @@ export default { roleName: 'Role name', roleCode: 'Role code', roleType: 'Role type', + superAdminYn: 'Super admin', }, validate: { roleName: 'Please enter role name', diff --git a/src/modules/smart-system/views/role/lang/zh_CN.ts b/src/modules/smart-system/views/role/lang/zh_CN.ts index 2124c1cab..f7039a264 100644 --- a/src/modules/smart-system/views/role/lang/zh_CN.ts +++ b/src/modules/smart-system/views/role/lang/zh_CN.ts @@ -9,6 +9,7 @@ export default { roleName: '角色名称', roleCode: '角色编码', roleType: '角色类型', + superAdminYn: '超级管理角色', }, validate: { roleName: '请输入角色名称',