From 484e3c8af34051d26cda77e2085529738d714359 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 28 Sep 2023 16:38:32 +0800 Subject: [PATCH] chore: workflow design compose --- src/views/workflow/model/model.data.ts | 46 ++++++++++++-------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/views/workflow/model/model.data.ts b/src/views/workflow/model/model.data.ts index c265f35..a0a7070 100644 --- a/src/views/workflow/model/model.data.ts +++ b/src/views/workflow/model/model.data.ts @@ -6,59 +6,57 @@ export const columns: BasicColumn[] = [ { title: '流程名称', dataIndex: 'name', + width: 200, }, { title: '流程KEY', - dataIndex: ['formCategory', 'name'], + dataIndex: 'modelKey', + width: 200, }, { title: '分类', - dataIndex: ['formDefinitionJson', 'version'], - width: 200, + dataIndex: ['processDefinition', 'category'], + width: 150, customRender: ({ record }) => { - return record.formDefinitionJson?.version ? - h(Tag, {color: 'success'}, () => record.formDefinitionJson?.version): - h(Tag, {color: 'red'}, () => '暂无版本号'); + return record.processDefinition?.category ? + h(Tag, { color: 'success' }, () => String(record.processDefinition?.category).split(',')[1]) : + h(Tag, { color: 'warning' }, () => '暂无分类'); } }, { title: '流程版本', - dataIndex: ['formDefinitionJson', 'status'], - width: 200, + dataIndex: ['processDefinition', 'version'], + width: 150, customRender: ({ record }) => { - return record.formDefinitionJson?.status == '1' ? - h(Tag, { color: 'success' }, () => '已发布'): - h(Tag, { color: 'red' }, () => '未发布'); + const version = record.processDefinition?.version; + return h(Tag, { color: version ? 'success' : 'warning' }, () => version || '版本未发布'); } }, { title: '流程状态', - dataIndex: ['formDefinitionJson', 'isPrimary'], - width: 200, + dataIndex: ['processDefinition', 'suspend'], + width: 150, customRender: ({ record }) => { - return record.formDefinitionJson?.isPrimary == '1' ? - h(Tag, { color: 'success' }, () => '主版本'): - h(Tag, { color: 'red' }, () => '非主版本'); + const suspend = record.processDefinition?.suspend; + return h(Tag, { color: suspend ? 'error' : (typeof suspend === 'undefined' ? 'warning' :'success')}, + () => suspend ? '已挂起' : (typeof suspend === 'undefined' ? '草稿' : '已发布')); } }, { title: '更新时间', - dataIndex: ['formDefinitionJson', 'isPrimary'], + dataIndex: 'lastUpdated', width: 200, - customRender: ({ record }) => { - return record.formDefinitionJson?.isPrimary == '1' ? - h(Tag, { color: 'success' }, () => '主版本'): - h(Tag, { color: 'red' }, () => '非主版本'); - } } ]; export const searchFormSchema: FormSchema[] = [ { + field: 'name', label: '流程名称', - field: 'categoryId', - slot: 'categoryId', component: 'Input', + componentProps: { + placeholder: '请输入流程名称' + }, colProps: { span: 8 } } ];