From 75d649d799a87abc839dd5dd932bd93844ff867a Mon Sep 17 00:00:00 2001 From: cuiwenlong7 Date: Wed, 22 Dec 2021 15:38:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20group=E6=96=87=E5=AD=97=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E3=80=81=E5=8A=A8=E6=80=81=E5=AD=90=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=B8=8B=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/formFields/group/index.less | 3 +++ src/components/formFields/importSubform/index.tsx | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/formFields/group/index.less b/src/components/formFields/group/index.less index 7100f82..f1b7868 100644 --- a/src/components/formFields/group/index.less +++ b/src/components/formFields/group/index.less @@ -32,4 +32,7 @@ } } } +} +.ccms-antd-mini-form-desc:not(:last-child) { + margin-bottom: 0px!important; } \ No newline at end of file diff --git a/src/components/formFields/importSubform/index.tsx b/src/components/formFields/importSubform/index.tsx index 3f045af..bc3d9c9 100644 --- a/src/components/formFields/importSubform/index.tsx +++ b/src/components/formFields/importSubform/index.tsx @@ -39,13 +39,13 @@ export default class ImportSubformFieldComponent extends ImportSubformField { } = props const formItemLayout: FormItemProps = { labelAlign: 'left' } - if (fieldType === 'form' || fieldType === 'group' || fieldType === 'object' || fieldType === 'import_subform') { - formItemLayout.labelCol = { span: 24 } - formItemLayout.wrapperCol = { span: 24 } - } else { - formItemLayout.labelCol = { span: 24 } - formItemLayout.wrapperCol = { span: 18 } - } + // if (fieldType === 'form' || fieldType === 'group' || fieldType === 'object' || fieldType === 'import_subform') { + // formItemLayout.labelCol = { span: 24 } + // formItemLayout.wrapperCol = { span: 24 } + // } else { + // formItemLayout.labelCol = { span: 24 } + // formItemLayout.wrapperCol = { span: 18 } + // } return ( Date: Wed, 22 Dec 2021 18:20:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=88=97=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8Falign?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/table/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/steps/table/index.tsx b/src/steps/table/index.tsx index 0c3995c..1ca32da 100644 --- a/src/steps/table/index.tsx +++ b/src/steps/table/index.tsx @@ -49,6 +49,7 @@ export default class TableStepComponent extends TableStep { key: index, dataIndex: column.field, title: column.label, + align: column.align, render: (value: any, record: { [field: string]: any }, index: number) => column.render(value, record, index) }))} dataSource={data} -- Gitee