From 40aac6544cb9b22e2362f2a2d99c0a9cc2f7fb57 Mon Sep 17 00:00:00 2001 From: bowen <54492610+jiaowoxiaobala@users.noreply.github.com> Date: Tue, 17 Oct 2023 20:40:51 +0800 Subject: [PATCH] fix(demo): account page table without dept (#3164) --- mock/demo/system.ts | 1 + src/views/demo/system/account/account.data.ts | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/mock/demo/system.ts b/mock/demo/system.ts index c4177273..4c5d8deb 100644 --- a/mock/demo/system.ts +++ b/mock/demo/system.ts @@ -12,6 +12,7 @@ const accountList = (() => { role: '@first', createTime: '@datetime', remark: '@cword(10,20)', + 'dept|0-2': 1, 'status|1': ['0', '1'], }); } diff --git a/src/views/demo/system/account/account.data.ts b/src/views/demo/system/account/account.data.ts index c45284b3..a30c685a 100644 --- a/src/views/demo/system/account/account.data.ts +++ b/src/views/demo/system/account/account.data.ts @@ -1,6 +1,28 @@ import { getAllRoleList, isAccountExist } from '/@/api/demo/system'; import { BasicColumn, FormSchema } from '/@/components/Table'; +/** + * transform mock data + * { + * 0: '华东分部', + * '0-0': '华东分部-研发部' + * '0-1': '华东分部-市场部', + * ... + * } + */ +const deptMap = (() => { + const pDept = ['华东分部', '华南分部', '西北分部']; + const cDept = ['研发部', '市场部', '商务部', '财务部']; + + return pDept.reduce((map, p, pIdx) => { + map[pIdx] = p; + + cDept.forEach((c, cIndex) => (map[`${pIdx}-${cIndex}`] = `${p}-${c}`)); + + return map; + }, {}); +})(); + export const columns: BasicColumn[] = [ { title: '用户名', @@ -27,6 +49,13 @@ export const columns: BasicColumn[] = [ dataIndex: 'role', width: 200, }, + { + title: '所属部门', + dataIndex: 'dept', + customRender: ({ value }) => { + return deptMap[value]; + }, + }, { title: '备注', dataIndex: 'remark',