Skip to content

Commit d503b2c

Browse files
committed
fix: update schema field auto refer to data
1 parent 9941b41 commit d503b2c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/v2/hooks/useField.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ export const useField = <TSchema extends ISchemaFieldCore>(props: {
2020
const { form: formContext } = useContext(FormContext);
2121
const { form = formContext, schema } = props as { form: IForm<TSchema>, schema: TSchema };
2222
const _ref = useRef<any>();
23-
const _state = useRef(form.getSchemaFieldState<TSchema["initialValue"], TSchema["propStateType"] & IDefaultProp>(schema as any));
23+
const _state = useRef({});
2424
const update = useUpdate();
2525

2626
const latestState = useCallback(
2727
() => {
2828
const latestState = _state.current;
29-
const state = form.getSchemaFieldState<TSchema["initialValue"], TSchema["propStateType"] & IDefaultProp>(schema as any);
29+
const state = form.getSchemaFieldState(schema as any);
3030
if (JSON.stringify(state) !== JSON.stringify(latestState)) {
3131
_state.current = state;
3232
update();
@@ -53,7 +53,7 @@ export const useField = <TSchema extends ISchemaFieldCore>(props: {
5353
}, [schema.config.name]);
5454

5555
return {
56-
state: _state.current,
56+
state: form.getSchemaFieldState<TSchema["initialValue"], TSchema["propStateType"] & IDefaultProp>(schema as any),
5757
formState: form.state.containerFormState,
5858
ref: _ref,
5959
form,

src/v2/hooks/useFieldArray.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const useFieldArray = <TSchema extends ISchemaFieldCore>(props: {
6969
}, [schema.config.name]);
7070

7171
return {
72-
state: _state.current,
72+
state: form.getSchemaFieldState<TSchema["initialValue"], TSchema["propStateType"] & IDefaultProp>(schema as any),
7373
formState: form.state.containerFormState,
7474
ref: _ref,
7575
form,

src/v2/hooks/useView.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ export const useView = <TSchema extends ISchemaCore>(props: {
1818
}) => {
1919
const { form: formContext } = useContext(FormContext);
2020
const { form = formContext, schema } = props as { form: IForm<TSchema>, schema: TSchema };
21-
const _state = useRef(form.getSchemaViewState<TSchema["propStateType"] & IDefaultProp>(schema as any));
21+
const _state = useRef({});
2222
const update = useUpdate();
2323

2424
const latestState = useCallback(
2525
() => {
2626
const latestState = _state.current;
27-
const state = form.getSchemaViewState<TSchema["propStateType"] & IDefaultProp>(schema as any);
27+
const state = form.getSchemaViewState(schema as any);
2828
if (JSON.stringify(state) !== JSON.stringify(latestState)) {
2929
_state.current = state;
3030
update();
@@ -44,7 +44,7 @@ export const useView = <TSchema extends ISchemaCore>(props: {
4444
}, [schema]);
4545

4646
return {
47-
state: _state.current,
47+
state: form.getSchemaViewState<TSchema["propStateType"] & IDefaultProp>(schema as any),
4848
data: schema.config.data || {},
4949
form,
5050
};

0 commit comments

Comments
 (0)