-
Notifications
You must be signed in to change notification settings - Fork 1
feat(FormStore): support nested structures in form data handling #498
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
weareoutman
merged 1 commit into
master
from
williamcai/shared/form/FormStore/support_nested_structures_in_form_data_handling
Dec 10, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -313,7 +313,12 @@ describe("FormStore", () => { | |
|
|
||
| store.resetFields(); | ||
|
|
||
| expect(store.getAllValues()).toEqual({}); | ||
| expect(store.getAllValues()).toStrictEqual({ | ||
| a: undefined, | ||
| b: undefined, | ||
| c: undefined, | ||
| "validator-item": undefined, | ||
| }); | ||
| }); | ||
|
|
||
| it("scrollToField should work", () => { | ||
|
|
@@ -334,4 +339,245 @@ describe("FormStore", () => { | |
|
|
||
| expect(mockScrollTo).toHaveBeenCalledWith("a.scroll.to", null); | ||
| }); | ||
|
|
||
| test("support nested object and array structures", () => { | ||
| const store = new FormStore(); | ||
|
|
||
| store.setField("user.name", { | ||
| name: "user.name", | ||
| label: "用户名", | ||
| validate: { | ||
| required: true, | ||
| }, | ||
| }); | ||
| store.setField("user.age", { | ||
| name: "user.age", | ||
| label: "年龄", | ||
| validate: { | ||
| type: "number", | ||
| }, | ||
| }); | ||
| store.setField("items[0].name", { | ||
| name: "items[0].name", | ||
| label: "第一个项目名称", | ||
| validate: { | ||
| required: true, | ||
| }, | ||
| }); | ||
| store.setField("items[1].name", { | ||
| name: "items[1].name", | ||
| label: "第二个项目名称", | ||
| validate: {}, | ||
| }); | ||
|
|
||
| // setInitValue | ||
| store.setInitValue({ | ||
| user: { | ||
| name: "test", | ||
| age: 18, | ||
| }, | ||
| items: [{ name: "item1" }, { name: "item2" }], | ||
| }); | ||
|
|
||
| // getFieldsValue | ||
| expect(store.getFieldsValue("user.name")).toBe("test"); | ||
| expect(store.getFieldsValue("user.age")).toBe(18); | ||
| expect(store.getFieldsValue("items[0].name")).toBe("item1"); | ||
| expect(store.getFieldsValue("items[1].name")).toBe("item2"); | ||
|
|
||
| // getAllValues | ||
| const allValues = store.getAllValues(); | ||
| expect(allValues).toEqual({ | ||
| user: { | ||
| name: "test", | ||
| age: 18, | ||
| }, | ||
| items: [{ name: "item1" }, { name: "item2" }], | ||
| }); | ||
|
|
||
| // setFieldsValue | ||
| store.setFieldsValue({ | ||
| user: { | ||
| name: "updated", | ||
| age: 20, | ||
| }, | ||
| }); | ||
|
|
||
| expect(store.getFieldsValue("user.name")).toBe("updated"); | ||
| expect(store.getFieldsValue("user.age")).toBe(20); | ||
|
|
||
| // validateFields | ||
| const mockValidateFields = jest.fn(); | ||
| store.validateFields(mockValidateFields); | ||
|
|
||
| expect(mockValidateFields).toHaveBeenCalledWith(false, { | ||
| user: { | ||
| name: "updated", | ||
| age: 20, | ||
| }, | ||
| items: [{ name: "item1" }, { name: "item2" }], | ||
| }); | ||
|
|
||
| // resetFields | ||
| store.resetFields("user.name"); | ||
| expect(store.getFieldsValue("user.name")).toBeUndefined(); | ||
| expect(store.getFieldsValue("user.age")).toBe(20); | ||
|
|
||
| store.resetFields(); | ||
| expect(store.getAllValues()).toStrictEqual({ | ||
| items: [ | ||
| { | ||
| name: undefined, | ||
| }, | ||
| { | ||
| name: undefined, | ||
| }, | ||
| ], | ||
| user: { | ||
| age: undefined, | ||
| name: undefined, | ||
| }, | ||
| }); | ||
| }); | ||
willc001 marked this conversation as resolved.
Show resolved
Hide resolved
willc001 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| test("handle notRender fields when reading and setting values", () => { | ||
| const store = new FormStore(); | ||
|
|
||
| store.setField("visible-field", { | ||
| name: "visible-field", | ||
| validate: { | ||
| required: true, | ||
| }, | ||
| }); | ||
| store.setField("hidden-field", { | ||
| name: "hidden-field", | ||
| notRender: true, | ||
| validate: { | ||
| required: true, | ||
| }, | ||
| }); | ||
|
|
||
| store.setInitValue({ | ||
| "visible-field": "visible", | ||
| "hidden-field": "hidden", | ||
| }); | ||
|
|
||
| // getFieldsValue | ||
| expect(store.getFieldsValue("visible-field")).toBe("visible"); | ||
| expect(store.getFieldsValue("hidden-field")).toBeUndefined(); | ||
|
|
||
| // getAllValues | ||
| expect(store.getAllValues()).toEqual({ "visible-field": "visible" }); | ||
|
|
||
| // setFieldsValueByInitData | ||
| store.setInitValue({ | ||
| "visible-field": "init-visible", | ||
| "hidden-field": "init-hidden", | ||
| }); | ||
|
|
||
| store.resetFields("visible-field"); | ||
| expect(store.getFieldsValue("visible-field")).toBeUndefined(); | ||
|
|
||
| store.setFieldsValueByInitData("visible-field"); | ||
| store.setFieldsValueByInitData("hidden-field"); | ||
|
|
||
| expect(store.getFieldsValue("visible-field")).toBe("init-visible"); | ||
| expect(store.getFieldsValue("hidden-field")).toBeUndefined(); | ||
|
|
||
| // validateField | ||
| const validateResultVisible = store.validateField("visible-field"); | ||
| expect(validateResultVisible).toBeDefined(); | ||
|
|
||
| const validateResultHidden = store.validateField("hidden-field"); | ||
| expect(validateResultHidden).toBeUndefined(); | ||
| }); | ||
|
|
||
| test("onValuesChanged callback should receive correct changedValues", () => { | ||
| const mockOnValuesChanged = jest.fn(); | ||
| const store = new FormStore({ | ||
| onValuesChanged: mockOnValuesChanged, | ||
| }); | ||
|
|
||
| store.setField("name", { | ||
| name: "name", | ||
| label: "Name", | ||
| validate: {}, | ||
| }); | ||
| store.setField("age", { | ||
| name: "age", | ||
| label: "Age", | ||
| validate: {}, | ||
| }); | ||
| store.setField("email", { | ||
| name: "email", | ||
| label: "Email", | ||
| validate: {}, | ||
| }); | ||
|
|
||
| store.setInitValue({ | ||
| name: "John", | ||
| age: 30, | ||
| email: "[email protected]", | ||
| }); | ||
|
|
||
| mockOnValuesChanged.mockClear(); | ||
|
|
||
| store.setFieldsValue({ | ||
| name: "Jane", | ||
| age: 25, | ||
| }); | ||
|
|
||
| expect(mockOnValuesChanged).toHaveBeenCalledTimes(1); | ||
| expect(mockOnValuesChanged).toHaveBeenCalledWith({ | ||
| changedValues: { | ||
| name: "Jane", | ||
| age: 25, | ||
| }, | ||
| allValues: { | ||
| name: "Jane", | ||
| age: 25, | ||
| email: "[email protected]", | ||
| }, | ||
| }); | ||
|
|
||
| // test nested field update | ||
| mockOnValuesChanged.mockClear(); | ||
|
|
||
| store.setField("address.city", { | ||
| name: "address.city", | ||
| label: "City", | ||
| validate: {}, | ||
| }); | ||
| store.setField("address.zip", { | ||
| name: "address.zip", | ||
| label: "Zip Code", | ||
| validate: {}, | ||
| }); | ||
|
|
||
| store.setFieldsValue({ | ||
| address: { | ||
| city: "New York", | ||
| zip: "10001", | ||
| }, | ||
| }); | ||
|
|
||
| expect(mockOnValuesChanged).toHaveBeenCalledTimes(1); | ||
| expect(mockOnValuesChanged).toHaveBeenCalledWith({ | ||
| changedValues: { | ||
| address: { | ||
| city: "New York", | ||
| zip: "10001", | ||
| }, | ||
| }, | ||
| allValues: { | ||
| name: "Jane", | ||
| age: 25, | ||
| email: "[email protected]", | ||
| address: { | ||
| city: "New York", | ||
| zip: "10001", | ||
| }, | ||
| }, | ||
| }); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.