Skip to content

Commit 8a4b3d9

Browse files
xlornexlorne
authored
Merge pull request #94 from codingapi/dev
Dev
2 parents a2a74fa + 956e5df commit 8a4b3d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+567
-496
lines changed

‎admin-pro-ui/src/components/form/captcha.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import "./form.scss";
88
const Captcha:React.FC<FormItemProps> = (props)=>{
99

1010
const [captchaImg, setCaptchaImg] = useState<string>('');
11-
const {formAction} = formFieldInit(props);
11+
const {formContext} = formFieldInit(props);
1212

1313
const reloadCaptcha = () => {
1414
props.onCaptchaRefresh && props.onCaptchaRefresh().then((res) => {
@@ -36,8 +36,8 @@ const Captcha:React.FC<FormItemProps> = (props)=>{
3636
placeholder={props.placeholder}
3737
onChange={(value) => {
3838
const currentValue = value.target.value;
39-
formAction?.setFieldValue(props.name, currentValue);
40-
props.onChange && props.onChange(currentValue,formAction);
39+
formContext?.setFieldValue(props.name, currentValue);
40+
props.onChange && props.onChange(currentValue,formContext);
4141
}}
4242
/>
4343

‎admin-pro-ui/src/components/form/cascader.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {FormItemProps} from "@/components/form/types";
33
import {Cascader, Form, Space} from "antd";
44
import formFieldInit from "@/components/form/common";
55
import "./form.scss";
6-
import {FormAction} from "@/components/form/index";
6+
import FormInstance from "@/components/form/domain/FormInstance";
77

88
const valueToForm = (value: string) => {
99
if (value && value.length > 0) {
@@ -20,11 +20,11 @@ const formToValue = (value: string[]) => {
2020
}
2121

2222
interface $CascaderProps extends FormItemProps{
23-
formAction?:FormAction;
23+
formInstance?:FormInstance;
2424
}
2525

2626
const $Cascader:React.FC<$CascaderProps> = (props)=>{
27-
const formAction = props.formAction;
27+
const formInstance = props.formInstance;
2828
return (
2929
<Space.Compact
3030
style={{
@@ -39,8 +39,8 @@ const $Cascader:React.FC<$CascaderProps> = (props)=>{
3939
prefix={props.prefix}
4040
options={props.options}
4141
onChange={(value) => {
42-
formAction?.setFieldValue(props.name, formToValue(value as string[]));
43-
props.onChange && props.onChange(value, formAction);
42+
formInstance?.setFieldValue(props.name, formToValue(value as string[]));
43+
props.onChange && props.onChange(value, formInstance);
4444
}}
4545
/>
4646
{props.addonAfter}
@@ -52,13 +52,13 @@ const FormCascader: React.FC<FormItemProps> = (props) => {
5252

5353
const [options, setOptions] = React.useState(props.options);
5454

55-
const {formAction} = formFieldInit(props, () => {
55+
const {formContext} = formFieldInit(props, () => {
5656
reloadOptions();
5757
});
5858

5959
const reloadOptions = () => {
6060
if (props.loadOptions) {
61-
props.loadOptions(formAction).then(res => {
61+
props.loadOptions(formContext).then(res => {
6262
setOptions(res);
6363
});
6464
}
@@ -90,7 +90,7 @@ const FormCascader: React.FC<FormItemProps> = (props) => {
9090
<$Cascader
9191
{...props}
9292
options={options}
93-
formAction={formAction}
93+
formInstance={formContext}
9494
/>
9595

9696
</Form.Item>

‎admin-pro-ui/src/components/form/checkbox.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ const formToValue = (value: string[]) => {
2121
const FormCheckbox: React.FC<FormItemProps> = (props) => {
2222
const [options, setOptions] = React.useState(props.options);
2323

24-
const {formAction} = formFieldInit(props, () => {
24+
const {formContext} = formFieldInit(props, () => {
2525
reloadOptions();
2626
});
2727

2828
const reloadOptions = () => {
2929
if (props.loadOptions) {
30-
props.loadOptions(formAction).then(res => {
30+
props.loadOptions(formContext).then(res => {
3131
setOptions(res);
3232
});
3333
}
@@ -58,8 +58,8 @@ const FormCheckbox: React.FC<FormItemProps> = (props) => {
5858
disabled={props.disabled}
5959
value={props.value}
6060
onChange={(e) => {
61-
formAction?.setFieldValue(props.name, formToValue(e as string[]));
62-
props.onChange && props.onChange(e, formAction)
61+
formContext?.setFieldValue(props.name, formToValue(e as string[]));
62+
props.onChange && props.onChange(e, formContext)
6363
}}
6464
>
6565
<Space direction={props.checkboxDirection}>

‎admin-pro-ui/src/components/form/code.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import CodeEditor from "@/components/CodeEditor";
88

99
const FormCode: React.FC<FormItemProps> = (props) => {
1010

11-
const {formAction} = formFieldInit(props);
11+
const {formContext} = formFieldInit(props);
1212

1313
return (
1414
<Form.Item
@@ -23,8 +23,8 @@ const FormCode: React.FC<FormItemProps> = (props) => {
2323
readonly={props.disabled}
2424
value={props.value}
2525
onChange={(value) => {
26-
formAction?.setFieldValue(props.name, value);
27-
props.onChange && props.onChange(value, formAction);
26+
formContext?.setFieldValue(props.name, value);
27+
props.onChange && props.onChange(value, formContext);
2828
}}
2929
theme={props.codeTheme}
3030
language={props.codeLanguage}

‎admin-pro-ui/src/components/form/color.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {ColorPicker, Form, Space} from "antd";
44
import formFieldInit from "@/components/form/common";
55
import "./form.scss";
66
import type {AggregationColor} from "antd/es/color-picker/color";
7-
import {FormAction} from "@/components/form/index";
7+
import FormInstance from "@/components/form/domain/FormInstance";
88

99
const formToValue = (value: AggregationColor) => {
1010
if (value) {
@@ -14,11 +14,11 @@ const formToValue = (value: AggregationColor) => {
1414
}
1515

1616
interface $ColorPickerProps extends FormItemProps{
17-
formAction?:FormAction;
17+
formInstance?:FormInstance;
1818
}
1919

2020
const $ColorPicker:React.FC<$ColorPickerProps> = (props)=>{
21-
const formAction = props.formAction;
21+
const formInstance = props.formInstance;
2222

2323
return (
2424
<Space.Compact
@@ -32,8 +32,8 @@ const $ColorPicker:React.FC<$ColorPickerProps> = (props)=>{
3232
value={props.value}
3333
onChange={(value) => {
3434
const currentValue = formToValue(value);
35-
formAction?.setFieldValue(props.name, currentValue);
36-
props.onChange && props.onChange(currentValue, formAction);
35+
formInstance?.setFieldValue(props.name, currentValue);
36+
props.onChange && props.onChange(currentValue, formInstance);
3737
}}
3838
/>
3939
{props.addonAfter}
@@ -43,7 +43,7 @@ const $ColorPicker:React.FC<$ColorPickerProps> = (props)=>{
4343

4444
const FormColor: React.FC<FormItemProps> = (props) => {
4545

46-
const {formAction} = formFieldInit(props);
46+
const {formContext} = formFieldInit(props);
4747

4848
return (
4949
<Form.Item
@@ -56,7 +56,7 @@ const FormColor: React.FC<FormItemProps> = (props) => {
5656
>
5757
<$ColorPicker
5858
{...props}
59-
formAction={formAction}
59+
formInstance={formContext}
6060
/>
6161

6262
</Form.Item>

‎admin-pro-ui/src/components/form/common.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {FormItemProps} from "@/components/form/types";
44

55
const formFieldInit = (props: FormItemProps,reloadOption?:()=>void) => {
66
const formContext = React.useContext(FormContext) || undefined;
7-
const formAction = formContext?.formAction;
8-
const validateContext = formContext?.validateContext;
7+
const formAction = formContext?.getFormAction();
8+
const validateContext = formContext?.getFormValidateContext();
99
const [random, setRandom] = React.useState(0);
1010

1111
useEffect(() => {
@@ -18,14 +18,14 @@ const formFieldInit = (props: FormItemProps,reloadOption?:()=>void) => {
1818
}
1919
}
2020
}
21-
const reloadContext = formContext?.reloadContext;
21+
const reloadContext = formContext?.getFormFieldReloadListenerContext();
2222
if (reloadContext) {
2323
reloadContext.addListener(props.name, () => {
2424
setRandom(Math.random);
2525
});
2626
}
2727

28-
const optionContext = formContext?.optionContext;
28+
const optionContext = formContext?.getFormFieldOptionListenerContext();
2929
if (optionContext) {
3030
optionContext.addListener(props.name, () => {
3131
if(reloadOption){
@@ -35,7 +35,7 @@ const formFieldInit = (props: FormItemProps,reloadOption?:()=>void) => {
3535
}
3636
}, [formContext]);
3737

38-
return {formAction, validateContext};
38+
return {formContext, validateContext};
3939
}
4040

4141
export default formFieldInit;

‎admin-pro-ui/src/components/form/date.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {DatePicker, Form, Space} from "antd";
44
import dayjs from "dayjs";
55
import formFieldInit from "@/components/form/common";
66
import "./form.scss";
7-
import {FormAction} from "@/components/form/index";
7+
import FormInstance from "@/components/form/domain/FormInstance";
88

99
const datePrecisionConverter = (precision?: string) => {
1010
if (precision === "day") {
@@ -64,12 +64,12 @@ const showTime = (precision?: string) => {
6464
}
6565

6666
interface $DatePicker extends FormItemProps{
67-
formAction?:FormAction;
67+
formInstance?:FormInstance;
6868
}
6969

7070
const $DatePicker:React.FC<$DatePicker> = (props)=>{
7171

72-
const formAction = props.formAction;
72+
const formInstance = props.formInstance;
7373

7474
const format = props.dateFormat || 'YYYY-MM-DD';
7575
const precision = datePrecisionConverter(props.datePrecision) || "date";
@@ -94,8 +94,8 @@ const $DatePicker:React.FC<$DatePicker> = (props)=>{
9494
showTime={showTimeConfig?{format: showTimeConfig.format}:false}
9595
onChange={(date, dateString) => {
9696
const currentDate = dayjs(date).format(format);
97-
formAction?.setFieldValue(props.name, currentDate);
98-
props.onChange && props.onChange(currentDate, formAction);
97+
formInstance?.setFieldValue(props.name, currentDate);
98+
props.onChange && props.onChange(currentDate, formInstance);
9999
}}
100100
/>
101101
{props.addonAfter}
@@ -105,7 +105,7 @@ const $DatePicker:React.FC<$DatePicker> = (props)=>{
105105

106106
const FormDate: React.FC<FormItemProps> = (props) => {
107107

108-
const {formAction} = formFieldInit(props);
108+
const {formContext} = formFieldInit(props);
109109

110110
return (
111111
<Form.Item
@@ -126,7 +126,7 @@ const FormDate: React.FC<FormItemProps> = (props) => {
126126
>
127127
<$DatePicker
128128
{...props}
129-
formAction={formAction}
129+
formInstance={formContext}
130130
/>
131131

132132
</Form.Item>

0 commit comments

Comments
 (0)