fix: merge

Author: wangxueliang

.huskyrc

@@ -0,0 +1,7 @@
+{
+  "hooks": {
+    "pre-commit": "pretty-quick --staged",
+    "pre-publish": "npm run lint",
+    "commit-msg": "commitlint -x @commitlint/config-conventional -e $GIT_PARAMS"
+  }
+}

.prettierignore

@@ -24,3 +24,6 @@ components/style/color/*.less
 .gitattributes
 .stylelintrc
 .vcmrc
+.logo
+.npmrc.template
+.huskyrc

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 },

components/date-picker/__tests__/utils.js

@@ -1,4 +1,3 @@
-/* eslint-disable import/prefer-default-export */
 export function $$(className) {
   return document.body.querySelectorAll(className);
 }

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"

components/drawer/index.jsx

@@ -162,7 +162,7 @@ const Drawer = {
       return (
         <div
           class={`${prefixCls}-wrapper-body`}
-          style={{...containerStyle, ...wrapStyle}}
+          style={{ ...containerStyle, ...wrapStyle }}
           onTransitionend={this.onDestroyTransitionEnd}
         >
           {this.renderHeader(prefixCls)}

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.',
     );

components/form/demo/validate-other.vue

@@ -9,7 +9,12 @@ Demonstration of validation configuration for form controls which are not shown
 </us>
 
 <template>
-  <a-form id="components-form-demo-validate-other" :form="form" v-bind="formItemLayout" @submit="handleSubmit">
+  <a-form
+    id="components-form-demo-validate-other"
+    :form="form"
+    v-bind="formItemLayout"
+    @submit="handleSubmit"
+  >
     <a-form-item label="Plain Text">
       <span class="ant-form-text">
         China

components/locale-provider/__tests__/index.test.js

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-multi-comp */
 import { mount } from '@vue/test-utils';
 import Vue from 'vue';
 import moment from 'moment';

components/radio/__tests__/group.test.js

@@ -218,7 +218,10 @@ describe('Radio', () => {
   });
 
   it('passes prefixCls down to radio', () => {
-    const options = [{ label: 'Apple', value: 'Apple' }, { label: 'Orange', value: 'Orange' }];
+    const options = [
+      { label: 'Apple', value: 'Apple' },
+      { label: 'Orange', value: 'Orange' },
+    ];
 
     const wrapper = mount(RadioGroup, {
       propsData: {