From 70b8dcb1741d362371d2d04b9009e98fc922a3c7 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Tue, 15 Nov 2022 17:05:05 +0800 Subject: [PATCH] refactor: Descriptions --- .../src/hooks/web/useCrudSchemas.ts | 8 ++++++++ yudao-ui-admin-vue3/src/views/bpm/form/index.vue | 9 +-------- .../src/views/bpm/group/index.vue | 6 ------ .../src/views/bpm/model/index.vue | 6 +----- .../src/views/bpm/processInstance/index.vue | 9 +-------- .../src/views/infra/apiAccessLog/index.vue | 6 ------ .../src/views/infra/apiErrorLog/index.vue | 12 +----------- .../src/views/infra/config/index.vue | 6 ------ .../src/views/infra/dataSourceConfig/index.vue | 6 +----- .../src/views/infra/fileConfig/index.vue | 12 +----------- .../src/views/infra/fileList/index.vue | 3 --- .../src/views/infra/job/JobLog.vue | 3 --- .../src/views/infra/job/index.vue | 3 --- yudao-ui-admin-vue3/src/views/pay/app/index.vue | 9 +-------- .../src/views/pay/merchant/index.vue | 9 +-------- .../src/views/pay/order/index.vue | 10 +--------- .../src/views/pay/refund/index.vue | 9 +-------- .../src/views/system/role/index.vue | 14 ++------------ .../src/views/system/sensitiveWord/index.vue | 9 +-------- .../src/views/system/sms/smsChannel/index.vue | 12 +----------- .../src/views/system/sms/smsLog/index.vue | 12 +----------- .../src/views/system/sms/smsTemplate/index.vue | 12 +----------- .../src/views/system/tenant/index.vue | 9 --------- .../src/views/system/user/index.vue | 16 ++-------------- 24 files changed, 26 insertions(+), 184 deletions(-) diff --git a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts index 57d0f8131..5043097f1 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts @@ -183,6 +183,14 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[ field: schemaItem.field, label: schemaItem.detail?.label || schemaItem.label } + if (schemaItem.dictType) { + descriptionsSchemaItem.dictType = schemaItem.dictType + } + if (schemaItem.detail?.dateFormat || schemaItem.formatter == 'formatDate') { + descriptionsSchemaItem.dateFormat = schemaItem.dateFormat + ? schemaItem?.detail?.dateFormat + : 'YYYY-MM-DD HH:mm:ss' + } // 删除不必要的字段 delete descriptionsSchemaItem.show diff --git a/yudao-ui-admin-vue3/src/views/bpm/form/index.vue b/yudao-ui-admin-vue3/src/views/bpm/form/index.vue index 812aa2133..7a4b8a00c 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/form/index.vue +++ b/yudao-ui-admin-vue3/src/views/bpm/form/index.vue @@ -149,14 +149,7 @@ getList() v-if="actionType === 'detail'" :schema="allSchemas.detailSchema" :data="detailRef" - > - - - + /> - -