diff --git a/.prettierignore b/.prettierignore index c77005801..f03c4e5e0 100644 --- a/.prettierignore +++ b/.prettierignore @@ -24,3 +24,6 @@ components/style/color/*.less .gitattributes .stylelintrc .vcmrc +.logo +.npmrc.template +.huskyrc \ No newline at end of file diff --git a/components/checkbox/__tests__/group.test.js b/components/checkbox/__tests__/group.test.js index beb821ac6..7760f7914 100644 --- a/components/checkbox/__tests__/group.test.js +++ b/components/checkbox/__tests__/group.test.js @@ -40,7 +40,10 @@ describe('CheckboxGroup', () => { it('does not trigger onChange callback of both Checkbox and CheckboxGroup when CheckboxGroup is disabled', () => { const onChangeGroup = jest.fn(); - const options = [{ label: 'Apple', value: 'Apple' }, { label: 'Pear', value: 'Pear' }]; + const options = [ + { label: 'Apple', value: 'Apple' }, + { label: 'Pear', value: 'Pear' }, + ]; const groupWrapper = mount( { @@ -95,7 +98,10 @@ describe('CheckboxGroup', () => { }); it('passes prefixCls down to checkbox', () => { - const options = [{ label: 'Apple', value: 'Apple' }, { label: 'Orange', value: 'Orange' }]; + const options = [ + { label: 'Apple', value: 'Apple' }, + { label: 'Orange', value: 'Orange' }, + ]; const wrapper = mount({ render() { @@ -106,7 +112,10 @@ describe('CheckboxGroup', () => { expect(wrapper.html()).toMatchSnapshot(); }); it('should be controlled by value', async () => { - const options = [{ label: 'Apple', value: 'Apple' }, { label: 'Orange', value: 'Orange' }]; + const options = [ + { label: 'Apple', value: 'Apple' }, + { label: 'Orange', value: 'Orange' }, + ]; const wrapper = mount(Checkbox.Group, { propsData: { options }, diff --git a/components/date-picker/__tests__/utils.js b/components/date-picker/__tests__/utils.js index 5727862a2..6ad15af12 100644 --- a/components/date-picker/__tests__/utils.js +++ b/components/date-picker/__tests__/utils.js @@ -1,4 +1,3 @@ -/* eslint-disable import/prefer-default-export */ export function $$(className) { return document.body.querySelectorAll(className); } diff --git a/components/date-picker/demo/disabled-date.md b/components/date-picker/demo/disabled-date.md index 6a64efda6..0e91e0ee3 100644 --- a/components/date-picker/demo/disabled-date.md +++ b/components/date-picker/demo/disabled-date.md @@ -24,7 +24,7 @@ Disabled part of dates and time by `disabledDate` and `disabledTime` respectivel :disabledDate="disabledDate" :disabledTime="disabledRangeTime" :showTime="{ - hideDisabledOptions: true, + hideDisabledOptions: true, defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('11:59:59', 'HH:mm:ss')] }" format="YYYY-MM-DD HH:mm:ss" diff --git a/components/drawer/index.jsx b/components/drawer/index.jsx index 38ebfea0a..17649a318 100644 --- a/components/drawer/index.jsx +++ b/components/drawer/index.jsx @@ -162,7 +162,7 @@ const Drawer = { return (
{this.renderHeader(prefixCls)} diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx index 07f04f239..95bdec62f 100644 --- a/components/form/FormItem.jsx +++ b/components/form/FormItem.jsx @@ -96,7 +96,8 @@ export default { const { help, validateStatus } = this.$props; warning( this.getControls(this.slotDefault, true).length <= 1 || - (help !== undefined || validateStatus !== undefined), + help !== undefined || + validateStatus !== undefined, '`Form.Item` cannot generate `validateStatus` and `help` automatically, ' + 'while there are more than one `getFieldDecorator` in it.', ); diff --git a/components/form/demo/validate-other.vue b/components/form/demo/validate-other.vue index 9b73edee3..38e03320e 100644 --- a/components/form/demo/validate-other.vue +++ b/components/form/demo/validate-other.vue @@ -9,7 +9,12 @@ Demonstration of validation configuration for form controls which are not shown