Skip to content

fix: getFieldProps should use initialValue when value does not exist #209

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.

Sign up for GitHub

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

Open
laysent wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: getFieldProps should use initialValue when value does not exist #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/createBaseForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,15 +225,20 @@ function createBaseForm(option = {}, mixins = []) {
fieldMeta.initialValue = fieldOption.initialValue;
}

const validateRules = normalizeValidateRules(validate, rules, validateTrigger);
const meta = {
...fieldMeta,
...fieldOption,
validate: validateRules,
};
const inputProps = {
...this.fieldsStore.getFieldValuePropValue(fieldOption),
...this.fieldsStore.getFieldValuePropValue(meta),
ref: this.getCacheBind(name, `${name}__ref`, this.saveRef),
};
if (fieldNameProp) {
inputProps[fieldNameProp] = formName ? `${formName}_${name}` : name;
}

const validateRules = normalizeValidateRules(validate, rules, validateTrigger);
const validateTriggers = getValidateTriggers(validateRules);
validateTriggers.forEach((action) => {
if (inputProps[action]) return;
Expand All @@ -245,11 +250,6 @@ function createBaseForm(option = {}, mixins = []) {
inputProps[trigger] = this.getCacheBind(name, trigger, this.onCollect);
}

const meta = {
...fieldMeta,
...fieldOption,
validate: validateRules,
};
this.fieldsStore.setFieldMeta(name, meta);
if (fieldMetaProp) {
inputProps[fieldMetaProp] = meta;
Expand Down
16 changes: 16 additions & 0 deletions tests/createForm.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,3 +305,19 @@ describe('mapPropsToFields', () => {
expect(form.getFieldValue('field2')).toBe(undefined);
});
});

describe('getFieldProps', () => {
it('use initialValue when value does not exist', () => {
const Form = createForm({ withRef: true })(class extends React.Component {
render() {
return <div />;
}
});
const wrapper = mount(<Form />);
const form = wrapper.ref('wrappedComponent').props.form;
form.getFieldProps('field', {
initialValue: 'initial',
});
expect(form.getFieldProps('field').value).toBe('initial');
});
});