Commit ae26343826775bebcd906096d2ef5ea31a0d079d
1 parent
ee0eb181
fix: use tenant admin configuration user role happend error
Showing
2 changed files
with
5 additions
and
1 deletions
@@ -43,6 +43,7 @@ | @@ -43,6 +43,7 @@ | ||
43 | import { findDictItemByCode } from '/@/api/system/dict'; | 43 | import { findDictItemByCode } from '/@/api/system/dict'; |
44 | import { RoleEnum } from '/@/enums/roleEnum'; | 44 | import { RoleEnum } from '/@/enums/roleEnum'; |
45 | import { Spin } from 'ant-design-vue'; | 45 | import { Spin } from 'ant-design-vue'; |
46 | + import { useUserStore } from '/@/store/modules/user'; | ||
46 | 47 | ||
47 | type TreeData = MenuRecord & TreeItem; | 48 | type TreeData = MenuRecord & TreeItem; |
48 | 49 | ||
@@ -79,6 +80,7 @@ | @@ -79,6 +80,7 @@ | ||
79 | }); | 80 | }); |
80 | }; | 81 | }; |
81 | 82 | ||
83 | + const userStore = useUserStore(); | ||
82 | const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { | 84 | const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => { |
83 | allCheckedKeys.value = []; | 85 | allCheckedKeys.value = []; |
84 | originMenus.value = []; | 86 | originMenus.value = []; |
@@ -88,7 +90,8 @@ | @@ -88,7 +90,8 @@ | ||
88 | // 在打开弹窗时清除所有选择的菜单 | 90 | // 在打开弹窗时清除所有选择的菜单 |
89 | treeRef.value && treeRef.value?.setCheckedKeys([]); | 91 | treeRef.value && treeRef.value?.setCheckedKeys([]); |
90 | isUpdate.value = data.isUpdate; | 92 | isUpdate.value = data.isUpdate; |
91 | - const roleType = data?.record?.roleType || RoleEnum.SYS_ADMIN; | 93 | + const roleType = data?.record?.roleType || userStore.getRoleList.at(0); |
94 | + | ||
92 | try { | 95 | try { |
93 | spinning.value = true; | 96 | spinning.value = true; |
94 | // 需要在setFieldsValue之前先填充treeData,否则Tree组件可能会报key not exist警告 | 97 | // 需要在setFieldsValue之前先填充treeData,否则Tree组件可能会报key not exist警告 |
@@ -11,6 +11,7 @@ export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum } | @@ -11,6 +11,7 @@ export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum } | ||
11 | [RoleEnum.PLATFORM_ADMIN]: { key: 'enabled_platform_admin_auth', keyType: KeysTypeEnum.ENABLED }, | 11 | [RoleEnum.PLATFORM_ADMIN]: { key: 'enabled_platform_admin_auth', keyType: KeysTypeEnum.ENABLED }, |
12 | [RoleEnum.SYS_ADMIN]: { key: 'enabled_sysadmin_auth', keyType: KeysTypeEnum.ENABLED }, | 12 | [RoleEnum.SYS_ADMIN]: { key: 'enabled_sysadmin_auth', keyType: KeysTypeEnum.ENABLED }, |
13 | [RoleEnum.TENANT_ADMIN]: { key: 'disabled_tenant_auth', keyType: KeysTypeEnum.DISABLED }, | 13 | [RoleEnum.TENANT_ADMIN]: { key: 'disabled_tenant_auth', keyType: KeysTypeEnum.DISABLED }, |
14 | + [RoleEnum.CUSTOMER_USER]: { key: 'disabled_tenant_auth', keyType: KeysTypeEnum.DISABLED }, | ||
14 | }; | 15 | }; |
15 | 16 | ||
16 | export const columns: BasicColumn[] = [ | 17 | export const columns: BasicColumn[] = [ |