From f3091f9e8031653056ee008d571914e2bebb7fa5 Mon Sep 17 00:00:00 2001 From: cuiwenlong7 Date: Mon, 29 Nov 2021 16:29:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E8=A1=A8=E5=8D=95=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=E6=8C=89=E9=92=AEactions=E9=85=8D=E7=BD=AE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/form/index.tsx | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/steps/form/index.tsx b/src/steps/form/index.tsx index 0df776c..4a00bb1 100644 --- a/src/steps/form/index.tsx +++ b/src/steps/form/index.tsx @@ -1,6 +1,6 @@ import React from 'react' import { FormStep } from 'ccms' -import { IForm, IFormItem, IFormStepModal, FormConfig } from 'ccms/dist/src/steps/form' +import { IForm, IFormItem, IFormStepModal, FormConfig, IButtonProps } from 'ccms/dist/src/steps/form' import { Button, Form, Space, Modal } from 'antd' import { FormProps } from 'antd/lib/form' @@ -30,6 +30,7 @@ export default class FormStepComponent extends FormStep { renderComponent = (props: IForm) => { const { layout, + actions, onSubmit, onCancel, submitText, @@ -57,8 +58,13 @@ export default class FormStepComponent extends FormStep { { (onSubmit || onCancel) && - {onSubmit && } - {onCancel && } + { Object.prototype.toString.call(actions) === '[object Array]' + ? actions + : + {onSubmit && } + {onCancel && } + + } } @@ -66,6 +72,19 @@ export default class FormStepComponent extends FormStep { ) } + renderButtonComponent = (props: IButtonProps) => { + const { + mode, + label, + onClick + } = props + return ( + mode === 'link' + ? + : + ) + } + renderItemComponent = (props: IFormItem) => { const { key, -- Gitee From 297b0672badb02dba617b175df2b9f1a748f9c08 Mon Sep 17 00:00:00 2001 From: cuiwenlong7 Date: Mon, 29 Nov 2021 17:09:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E5=AD=90?= =?UTF-8?q?=E7=B1=BBOperationHelper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/form/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/steps/form/index.tsx b/src/steps/form/index.tsx index 4a00bb1..fae2de1 100644 --- a/src/steps/form/index.tsx +++ b/src/steps/form/index.tsx @@ -5,12 +5,14 @@ import { Button, Form, Space, Modal } from 'antd' import { FormProps } from 'antd/lib/form' import getALLComponents from '../../components/formFields' +import OperationHelper from '../../util/operation' import styles from "./index.less" import { formItemLayout } from '../../components/formFields/common' import newstyles from "../../main.less" export default class FormStepComponent extends FormStep { getALLComponents = (type: any) => getALLComponents[type] + OperationHelper = OperationHelper renderModalComponent= (props: IFormStepModal) => { return new Promise((resolve) => { -- Gitee From 5bacd6e89447330bd1d7afa1bbb404f7ee9c7945 Mon Sep 17 00:00:00 2001 From: cuiwenlong7 Date: Mon, 29 Nov 2021 19:44:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20button=20type=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/form/index.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/steps/form/index.tsx b/src/steps/form/index.tsx index fae2de1..2ff7885 100644 --- a/src/steps/form/index.tsx +++ b/src/steps/form/index.tsx @@ -80,11 +80,7 @@ export default class FormStepComponent extends FormStep { label, onClick } = props - return ( - mode === 'link' - ? - : - ) + return } renderItemComponent = (props: IFormItem) => { -- Gitee From 147eb03198f4fba496cd563d363139c05642a7e8 Mon Sep 17 00:00:00 2001 From: niuxiaoguang Date: Wed, 1 Dec 2021 10:48:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/form/index.tsx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/steps/form/index.tsx b/src/steps/form/index.tsx index 2ff7885..6f42746 100644 --- a/src/steps/form/index.tsx +++ b/src/steps/form/index.tsx @@ -14,7 +14,7 @@ export default class FormStepComponent extends FormStep { getALLComponents = (type: any) => getALLComponents[type] OperationHelper = OperationHelper - renderModalComponent= (props: IFormStepModal) => { + renderModalComponent = (props: IFormStepModal) => { return new Promise((resolve) => { Modal.error({ getContainer: () => { @@ -58,13 +58,13 @@ export default class FormStepComponent extends FormStep { > {children} { - (onSubmit || onCancel) && + (Object.prototype.toString.call(actions) === '[object Array]' || onSubmit || onCancel) && - { Object.prototype.toString.call(actions) === '[object Array]' + {Object.prototype.toString.call(actions) === '[object Array]' ? actions : - {onSubmit && } - {onCancel && } + {onSubmit && } + {onCancel && } } @@ -80,7 +80,7 @@ export default class FormStepComponent extends FormStep { label, onClick } = props - return + return } renderItemComponent = (props: IFormItem) => { @@ -102,7 +102,7 @@ export default class FormStepComponent extends FormStep { {...formItemLayout(layout, fieldType, label)} validateStatus={status === 'normal' ? undefined : status === 'error' ? 'error' : 'validating'} help={fieldType === 'group' || fieldType === 'import_subform' || message === '' ? null : message} - style={ visitable ? {} : { overflow: 'hidden', width: 0, height: 0, margin: 0, padding: 0 } } + style={visitable ? {} : { overflow: 'hidden', width: 0, height: 0, margin: 0, padding: 0 }} className={styles[`ccms-antd-mini-form-${fieldType}`]} > {children} @@ -111,7 +111,7 @@ export default class FormStepComponent extends FormStep { } } // -export const PropsType = (props: IForm) => {}; +export const PropsType = (props: IForm) => { }; -export const PropsTypeFormConfig = (props: FormConfig) => {}; -export const PropsTypeStep = (props: FormStep) => {}; \ No newline at end of file +export const PropsTypeFormConfig = (props: FormConfig) => { }; +export const PropsTypeStep = (props: FormStep) => { }; \ No newline at end of file -- Gitee