Browse Source

perf(系统-角色): 添加租户支持

shizhongming 2 years ago
parent
commit
acbb5fada1
  1. 8
      src/modules/smart-system/views/role/RoleListView.config.ts
  2. 2
      src/modules/smart-system/views/role/RoleListView.vue
  3. 5
      src/modules/smart-system/views/role/components/RoleSetFunction.vue
  4. 1
      src/modules/smart-system/views/role/lang/en_US.ts
  5. 1
      src/modules/smart-system/views/role/lang/zh_CN.ts

8
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,

2
src/modules/smart-system/views/role/RoleListView.vue

@ -13,7 +13,7 @@
</SmartTable>
</a-layout-content>
<a-layout-sider theme="light" class="layout-set-function" width="240px">
<RoleSetFunction :role-id="currentRow.roleId" />
<RoleSetFunction :is-super-admin="currentRow.superAdminYn" :role-id="currentRow.roleId" />
</a-layout-sider>
</a-layout>
<SmartUserSelectModal

5
src/modules/smart-system/views/role/components/RoleSetFunction.vue

@ -8,6 +8,7 @@
<Spin :spinning="dataLoading">
<BasicTree
ref="treeRef"
:disabled="isSuperAdmin"
:treeData="functionTreeData"
v-model:checkedKeys="checkedKeysModel"
checkable
@ -21,6 +22,7 @@
v-permission="permissions.setFunction"
:loading="saveLoading"
block
:disabled="isSuperAdmin"
type="primary"
@click="handleSave"
>
@ -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',
},

1
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',

1
src/modules/smart-system/views/role/lang/zh_CN.ts

@ -9,6 +9,7 @@ export default {
roleName: '角色名称',
roleCode: '角色编码',
roleType: '角色类型',
superAdminYn: '超级管理角色',
},
validate: {
roleName: '请输入角色名称',

Loading…
Cancel
Save