direv/admin_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin_new P0+P1 全批次合并 (84 commits) #2

Merged
direv merged 85 commits from develop into main 2026-08-07 11:27:17 +08:00
Conversation 0 Commits 85 Files Changed 94 +8 -7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dfdc8ef4ff - Show all commits

15
src/modules/generic/mockTableConfigs.ts
View File

@ -542,13 +542,14 @@ const transactionMock = [
]
// ========== user/message ==========
// W13.4: 后端字段是 name/content/readFlag/createDate, 不是 title/receiver/status/sendTime
const messageCols: MockColumn[] = [
{ prop: 'id', label: 'ID', width: 80 },
{ prop: 'title', label: '消息标题', minWidth: 220 },
{ prop: 'type', label: '类型', width: 100 },
{ prop: 'receiver', label: '接收人', width: 140 },
{ prop: 'status', label: '状态', width: 100, type: 'status' },
{ prop: 'sendTime', label: '发送时间', width: 180, type: 'text' }
{ prop: 'name', label: '消息标题', minWidth: 200 },
{ prop: 'content', label: '内容', minWidth: 260 },
{ prop: 'type', label: '类型', width: 80, format: (r: any) => r.type === 1 ? '系统' : r.type === 2 ? '业务' : String(r.type ?? '--') },
{ prop: 'readFlag', label: '状态', width: 80, format: (r: any) => r.readFlag === 1 ? '已读' : r.readFlag === 0 ? '未读' : String(r.readFlag ?? '--') },
{ prop: 'createDate', label: '发送时间', width: 180, type: 'text' }
]
const messageMock = [
{ id: '1', title: '订单已发货', type: '订单通知', receiver: '深圳科技公司', status: 1, sendTime: now(0) },
@ -763,7 +764,7 @@ export const MOCK_TABLE_CONFIGS: Record<string, MockConfig> = {
'user-finance-transaction': { endpoint: '/user/finance/transaction-record/page', title: '交易流水', columns: transactionCols, mockData: transactionMock, queryKey: 'orderNo', queryLabel: '关联单号' },
// user/message (2)
'user-message': { endpoint: '/user/message/message/page', title: '系统消息', columns: messageCols, mockData: messageMock, queryKey: 'title', queryLabel: '消息标题' },
'user-message': { endpoint: '/user/message/page', title: '系统消息', columns: messageCols, mockData: messageMock, queryKey: 'title', queryLabel: '消息标题' },
'user-message-handel': { endpoint: '/user/message/messageHandel/page', title: '待处理消息', columns: messageHandelCols, mockData: messageHandelMock, queryKey: 'title', queryLabel: '事项' },
// sys/log (3)
@ -779,7 +780,7 @@ export const MOCK_TABLE_CONFIGS: Record<string, MockConfig> = {
'sys-userManagement': { endpoint: '/sys/userManagement/page', title: '全国运营中心', columns: operationCols, mockData: userManagementMock, queryKey: 'name', queryLabel: '运营中心' },
// sys (4)
'sys-dict': { endpoint: '/sys/dict-type/page', title: '字典类型', columns: dictTypeCols, mockData: dictTypeMock, queryKey: 'dictType', queryLabel: '字典类型' },
'sys-dict': { endpoint: '/sys/dict/type/page', title: '字典类型', columns: dictTypeCols, mockData: dictTypeMock, queryKey: 'dictType', queryLabel: '字典类型' },
'sys-notice': { endpoint: '/sys/notice/page', title: '通知公告', columns: noticeCols, mockData: noticeMock, queryKey: 'title', queryLabel: '标题' },
'sys-params': { endpoint: '/sys/params/page', title: '参数配置', columns: paramsCols, mockData: paramsMock, queryKey: 'paramKey', queryLabel: '参数键' },
'sys-notice-user': { endpoint: '/sys/notice-user/page', title: '用户通知', columns: noticeUserCols, mockData: noticeUserMock, queryKey: 'userName', queryLabel: '接收人' }