diff --git a/components/affix/__tests__/__snapshots__/demo.test.js.snap b/components/affix/__tests__/__snapshots__/demo.test.js.snap index 08b03fd46..df054edb0 100644 --- a/components/affix/__tests__/__snapshots__/demo.test.js.snap +++ b/components/affix/__tests__/__snapshots__/demo.test.js.snap @@ -13,7 +13,7 @@ exports[`renders ./components/affix/demo/basic.md correctly 1`] = ` exports[`renders ./components/affix/demo/on-change.md correctly 1`] = `
-
+
`; diff --git a/components/avatar/__tests__/__snapshots__/demo.test.js.snap b/components/avatar/__tests__/__snapshots__/demo.test.js.snap index 6fa5dfcce..975b09f29 100644 --- a/components/avatar/__tests__/__snapshots__/demo.test.js.snap +++ b/components/avatar/__tests__/__snapshots__/demo.test.js.snap @@ -9,6 +9,6 @@ exports[`renders ./components/avatar/demo/basic.md correctly 1`] = ` `; -exports[`renders ./components/avatar/demo/dynamic.md correctly 1`] = `
U
`; +exports[`renders ./components/avatar/demo/dynamic.md correctly 1`] = `
U
`; exports[`renders ./components/avatar/demo/type.md correctly 1`] = `
U USER U
`; diff --git a/components/badge/__tests__/__snapshots__/demo.test.js.snap b/components/badge/__tests__/__snapshots__/demo.test.js.snap index bb72f177c..38ee34f94 100644 --- a/components/badge/__tests__/__snapshots__/demo.test.js.snap +++ b/components/badge/__tests__/__snapshots__/demo.test.js.snap @@ -5,9 +5,9 @@ exports[`renders ./components/badge/demo/basic.md correctly 1`] = `

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

-
diff --git a/components/button/__tests__/__snapshots__/demo.test.js.snap b/components/button/__tests__/__snapshots__/demo.test.js.snap index 607148a5b..809f28832 100644 --- a/components/button/__tests__/__snapshots__/demo.test.js.snap +++ b/components/button/__tests__/__snapshots__/demo.test.js.snap @@ -1,15 +1,15 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders ./components/button/demo/basic.md correctly 1`] = `
`; +exports[`renders ./components/button/demo/basic.md correctly 1`] = `
`; -exports[`renders ./components/button/demo/block.md correctly 1`] = `
`; +exports[`renders ./components/button/demo/block.md correctly 1`] = `
`; exports[`renders ./components/button/demo/button-group.md correctly 1`] = `

Basic

-
-
-
+
+
+

With Icon




-
+



+
`; -exports[`renders ./components/button/demo/ghost.md correctly 1`] = `
`; +exports[`renders ./components/button/demo/ghost.md correctly 1`] = `
`; exports[`renders ./components/button/demo/icon.md correctly 1`] = `



`; exports[`renders ./components/button/demo/size.md correctly 1`] = `
-




`; +exports[`Button fixbug renders {0} , 0 and {false} 1`] = ``; -exports[`Button fixbug renders {0} , 0 and {false} 2`] = ``; +exports[`Button fixbug renders {0} , 0 and {false} 2`] = ``; -exports[`Button fixbug renders {0} , 0 and {false} 3`] = ``; +exports[`Button fixbug renders {0} , 0 and {false} 3`] = ``; exports[`Button renders Chinese characters correctly 1`] = ` - `; exports[`Button renders Chinese characters correctly 2`] = ` - `; exports[`Button renders Chinese characters correctly 3`] = ` - `; exports[`Button renders Chinese characters correctly 4`] = ` - `; exports[`Button renders Chinese characters correctly 5`] = ` - `; -exports[`Button renders correctly 1`] = ``; +exports[`Button renders correctly 1`] = ``; exports[`Button should not render as link button when href is undefined 1`] = ``; -exports[`Button should support link button 1`] = `link button`; +exports[`Button should support link button 1`] = `link button`; diff --git a/components/button/button-group.jsx b/components/button/button-group.jsx index 9c5351dc5..5ad0909cc 100644 --- a/components/button/button-group.jsx +++ b/components/button/button-group.jsx @@ -1,10 +1,9 @@ import { filterEmpty } from '../_util/props-util'; +import PropTypes from '../_util/vue-types'; import { ConfigConsumerProps } from '../config-provider'; const ButtonGroupProps = { - prefixCls: { - type: String, - }, + prefixCls: PropTypes.string, size: { validator(value) { return ['small', 'large', 'default'].includes(value); diff --git a/components/button/button.jsx b/components/button/button.jsx index 15d29ed17..b6b4baefd 100644 --- a/components/button/button.jsx +++ b/components/button/button.jsx @@ -60,9 +60,11 @@ export default { }, }, watch: { - loading(val) { - clearTimeout(this.delayTimeout); - if (typeof val !== 'boolean' && val && val.delay) { + loading(val, preVal) { + if (preVal && typeof preVal !== 'boolean') { + clearTimeout(this.delayTimeout); + } + if (val && typeof val !== 'boolean' && val.delay) { this.delayTimeout = setTimeout(() => { this.sLoading = !!val; }, val.delay); diff --git a/components/button/buttonTypes.js b/components/button/buttonTypes.js index ca9c6bc6d..14fa70f37 100644 --- a/components/button/buttonTypes.js +++ b/components/button/buttonTypes.js @@ -1,7 +1,7 @@ import PropTypes from '../_util/vue-types'; export default () => ({ - prefixCls: PropTypes.string.def('ant-btn'), - type: PropTypes.oneOf(['primary', 'danger', 'dashed', 'ghost', 'link', 'default']).def('default'), + prefixCls: PropTypes.string, + type: PropTypes.string, htmlType: PropTypes.oneOf(['button', 'submit', 'reset']).def('button'), icon: PropTypes.string, shape: PropTypes.oneOf(['circle', 'circle-outline', 'round']), diff --git a/components/card/__tests__/__snapshots__/demo.test.js.snap b/components/card/__tests__/__snapshots__/demo.test.js.snap index 3b06e5716..e1984b8d8 100644 --- a/components/card/__tests__/__snapshots__/demo.test.js.snap +++ b/components/card/__tests__/__snapshots__/demo.test.js.snap @@ -213,7 +213,7 @@ exports[`renders ./components/card/demo/loading.md correctly 1`] = `
-
+
`; diff --git a/components/card/__tests__/__snapshots__/index.test.js.snap b/components/card/__tests__/__snapshots__/index.test.js.snap index 5b491c89c..eaef0c1bb 100644 --- a/components/card/__tests__/__snapshots__/index.test.js.snap +++ b/components/card/__tests__/__snapshots__/index.test.js.snap @@ -54,7 +54,7 @@ exports[`Card title should be vertically aligned 1`] = `
Card title
-
+
diff --git a/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap b/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap index 68cd8232f..7f573b2c3 100644 --- a/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap +++ b/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Drawer render correctly 1`] = ` -
+
diff --git a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap index 14f14aa39..d1f1c8d18 100644 --- a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap +++ b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap @@ -16,7 +16,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
@@ -44,11 +44,11 @@ exports[`renders ./components/dropdown/demo/overlay-visible.md correctly 1`] = ` `; exports[`renders ./components/dropdown/demo/placement.md correctly 1`] = ` -
- -
- - +
+ +
+ +
`; diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap index 567fae527..fe1c1668f 100644 --- a/components/form/__tests__/__snapshots__/demo.test.js.snap +++ b/components/form/__tests__/__snapshots__/demo.test.js.snap @@ -106,7 +106,7 @@ exports[`renders ./components/form/demo/advanced-search.vue correctly 1`] = `
-
+ @@ -436,7 +436,7 @@ exports[`renders ./components/form/demo/register.vue correctly 1`] = `
-
+
We must make sure that your are a human.
diff --git a/components/input/__tests__/__snapshots__/Search.test.js.snap b/components/input/__tests__/__snapshots__/Search.test.js.snap index 2d42a743a..5b7e85929 100644 --- a/components/input/__tests__/__snapshots__/Search.test.js.snap +++ b/components/input/__tests__/__snapshots__/Search.test.js.snap @@ -1,5 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Input.Search should support custom Button 1`] = ``; +exports[`Input.Search should support custom Button 1`] = ``; exports[`Input.Search should support custom button 1`] = ``; diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap index 98e6c5562..5cf72c47b 100644 --- a/components/input/__tests__/__snapshots__/demo.test.js.snap +++ b/components/input/__tests__/__snapshots__/demo.test.js.snap @@ -58,12 +58,12 @@ exports[`renders ./components/input/demo/password-input.md correctly 1`] = `
`; -exports[`renders ./components/input/demo/search-input.md correctly 1`] = `






`; +exports[`renders ./components/input/demo/search-input.md correctly 1`] = `






`; exports[`renders ./components/input/demo/size.md correctly 1`] = `
`; exports[`renders ./components/input/demo/textarea.md correctly 1`] = ``; -exports[`renders ./components/input/demo/textarea-resize.md correctly 1`] = `
`; +exports[`renders ./components/input/demo/textarea-resize.md correctly 1`] = `
`; exports[`renders ./components/input/demo/tooltip.md correctly 1`] = ``; diff --git a/components/list/__tests__/__snapshots__/demo.test.js.snap b/components/list/__tests__/__snapshots__/demo.test.js.snap index c29ee9091..bf2263ae1 100644 --- a/components/list/__tests__/__snapshots__/demo.test.js.snap +++ b/components/list/__tests__/__snapshots__/demo.test.js.snap @@ -154,7 +154,7 @@ exports[`renders ./components/list/demo/loadmore.md correctly 1`] = `
-
+
`; diff --git a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap index 259d11794..2ded8f0c8 100644 --- a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap @@ -43,7 +43,7 @@ exports[`renders ./components/locale-provider/demo/all.md correctly 1`] = `
-
Click to confirm
+
Click to confirm
diff --git a/components/message/__tests__/__snapshots__/demo.test.js.snap b/components/message/__tests__/__snapshots__/demo.test.js.snap index 999f25c3c..c505ce7eb 100644 --- a/components/message/__tests__/__snapshots__/demo.test.js.snap +++ b/components/message/__tests__/__snapshots__/demo.test.js.snap @@ -1,11 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders ./components/message/demo/duration.md correctly 1`] = ``; +exports[`renders ./components/message/demo/duration.md correctly 1`] = ``; exports[`renders ./components/message/demo/info.md correctly 1`] = ``; -exports[`renders ./components/message/demo/loading.md correctly 1`] = ``; +exports[`renders ./components/message/demo/loading.md correctly 1`] = ``; -exports[`renders ./components/message/demo/other.md correctly 1`] = `
`; +exports[`renders ./components/message/demo/other.md correctly 1`] = `
`; -exports[`renders ./components/message/demo/thenable.md correctly 1`] = ``; +exports[`renders ./components/message/demo/thenable.md correctly 1`] = ``; diff --git a/components/modal/__tests__/__snapshots__/Modal.test.js.snap b/components/modal/__tests__/__snapshots__/Modal.test.js.snap index 6c9b4ad1d..eb3fb4901 100644 --- a/components/modal/__tests__/__snapshots__/Modal.test.js.snap +++ b/components/modal/__tests__/__snapshots__/Modal.test.js.snap @@ -12,7 +12,7 @@ exports[`Modal render correctly 1`] = `
Here is content of Modal
@@ -37,7 +37,7 @@ exports[`Modal render correctly 2`] = `
Here is content of Modal
diff --git a/components/modal/__tests__/__snapshots__/demo.test.js.snap b/components/modal/__tests__/__snapshots__/demo.test.js.snap index 81158ed41..b4813bc12 100644 --- a/components/modal/__tests__/__snapshots__/demo.test.js.snap +++ b/components/modal/__tests__/__snapshots__/demo.test.js.snap @@ -18,11 +18,11 @@ exports[`renders ./components/modal/demo/button-props.md correctly 1`] = `
`; -exports[`renders ./components/modal/demo/confirm.md correctly 1`] = `
`; +exports[`renders ./components/modal/demo/confirm.md correctly 1`] = `
`; -exports[`renders ./components/modal/demo/confirm-promise.md correctly 1`] = ``; +exports[`renders ./components/modal/demo/confirm-promise.md correctly 1`] = ``; -exports[`renders ./components/modal/demo/confirm-router.md correctly 1`] = ``; +exports[`renders ./components/modal/demo/confirm-router.md correctly 1`] = ``; exports[`renders ./components/modal/demo/footer.md correctly 1`] = `
@@ -30,14 +30,14 @@ exports[`renders ./components/modal/demo/footer.md correctly 1`] = `
`; -exports[`renders ./components/modal/demo/info.md correctly 1`] = `
`; +exports[`renders ./components/modal/demo/info.md correctly 1`] = `
`; exports[`renders ./components/modal/demo/locale.md correctly 1`] = `
-

+

`; -exports[`renders ./components/modal/demo/manual.md correctly 1`] = ``; +exports[`renders ./components/modal/demo/manual.md correctly 1`] = ``; exports[`renders ./components/modal/demo/position.md correctly 1`] = `
diff --git a/components/notification/__tests__/__snapshots__/demo.test.js.snap b/components/notification/__tests__/__snapshots__/demo.test.js.snap index 9674ae227..5883672e6 100644 --- a/components/notification/__tests__/__snapshots__/demo.test.js.snap +++ b/components/notification/__tests__/__snapshots__/demo.test.js.snap @@ -24,4 +24,4 @@ exports[`renders ./components/notification/demo/update.md correctly 1`] = `Open the notification box`; -exports[`renders ./components/notification/demo/with-icon.md correctly 1`] = `
`; +exports[`renders ./components/notification/demo/with-icon.md correctly 1`] = `
`; diff --git a/components/popconfirm/__tests__/__snapshots__/demo.test.js.snap b/components/popconfirm/__tests__/__snapshots__/demo.test.js.snap index 9902a02c8..7033f012f 100644 --- a/components/popconfirm/__tests__/__snapshots__/demo.test.js.snap +++ b/components/popconfirm/__tests__/__snapshots__/demo.test.js.snap @@ -13,9 +13,9 @@ exports[`renders ./components/popconfirm/demo/local.md correctly 1`] = ` -
-
-
-
+
+
+
+
`; diff --git a/components/popconfirm/__tests__/__snapshots__/index.test.js.snap b/components/popconfirm/__tests__/__snapshots__/index.test.js.snap index 52bf3be23..0ddb0151f 100644 --- a/components/popconfirm/__tests__/__snapshots__/index.test.js.snap +++ b/components/popconfirm/__tests__/__snapshots__/index.test.js.snap @@ -10,7 +10,7 @@ exports[`Popconfirm should show overlay when trigger is clicked 1`] = `
code
-
+
diff --git a/components/popover/__tests__/__snapshots__/demo.test.js.snap b/components/popover/__tests__/__snapshots__/demo.test.js.snap index 2512896e1..86f96ad7f 100644 --- a/components/popover/__tests__/__snapshots__/demo.test.js.snap +++ b/components/popover/__tests__/__snapshots__/demo.test.js.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders ./components/popover/demo/arrow-point-at-center.md correctly 1`] = `
`; +exports[`renders ./components/popover/demo/arrow-point-at-center.md correctly 1`] = `
`; exports[`renders ./components/popover/demo/basic.md correctly 1`] = ``; exports[`renders ./components/popover/demo/control.md correctly 1`] = ``; -exports[`renders ./components/popover/demo/hover-with-click.md correctly 1`] = ``; +exports[`renders ./components/popover/demo/hover-with-click.md correctly 1`] = ``; exports[`renders ./components/popover/demo/placement.md correctly 1`] = `
-
-
-
-
+
+
+
+
`; diff --git a/components/progress/__tests__/__snapshots__/demo.test.js.snap b/components/progress/__tests__/__snapshots__/demo.test.js.snap index 5413c25aa..aaee0fbc7 100644 --- a/components/progress/__tests__/__snapshots__/demo.test.js.snap +++ b/components/progress/__tests__/__snapshots__/demo.test.js.snap @@ -47,9 +47,9 @@ exports[`renders ./components/progress/demo/circle-dynamic.md correctly 1`] = ` a 47,47 0 1 1 0,-94" stroke-linecap="round" stroke-width="0" fill-opacity="0" class="ant-progress-circle-path" style="stroke: #108ee9; stroke-dasharray: 0px 295.3097094374406px; stroke-dashoffset: -0px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s;"> 0% -
@@ -117,9 +117,9 @@ exports[`renders ./components/progress/demo/dynamic.md correctly 1`] = ` 0% -
diff --git a/components/skeleton/__tests__/__snapshots__/demo.test.js.snap b/components/skeleton/__tests__/__snapshots__/demo.test.js.snap index 6ae40a9a9..92db24c68 100644 --- a/components/skeleton/__tests__/__snapshots__/demo.test.js.snap +++ b/components/skeleton/__tests__/__snapshots__/demo.test.js.snap @@ -31,7 +31,7 @@ exports[`renders ./components/skeleton/demo/children.md correctly 1`] = `

Ant Design Vue, a design language

We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.

-
+ `; diff --git a/components/table/__tests__/__snapshots__/demo.test.js.snap b/components/table/__tests__/__snapshots__/demo.test.js.snap index 49b3ef0fc..fc1947307 100644 --- a/components/table/__tests__/__snapshots__/demo.test.js.snap +++ b/components/table/__tests__/__snapshots__/demo.test.js.snap @@ -382,7 +382,7 @@ exports[`renders ./components/table/demo/custom-filter-panel.md correctly 1`] = `; exports[`renders ./components/table/demo/edit-cell.md correctly 1`] = ` -
+
@@ -2290,7 +2290,7 @@ exports[`renders ./components/table/demo/nested-table.md correctly 1`] = ` exports[`renders ./components/table/demo/reset-filter.md correctly 1`] = `
-
+
diff --git a/components/tabs/__tests__/__snapshots__/demo.test.js.snap b/components/tabs/__tests__/__snapshots__/demo.test.js.snap index 44524bff7..7cca2c333 100644 --- a/components/tabs/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tabs/__tests__/__snapshots__/demo.test.js.snap @@ -100,7 +100,7 @@ exports[`renders ./components/tabs/demo/card-top.md correctly 1`] = ` exports[`renders ./components/tabs/demo/custom-add-trigger.md correctly 1`] = `
-
+
@@ -247,7 +247,7 @@ exports[`renders ./components/tabs/demo/editable-card.md correctly 1`] = ` exports[`renders ./components/tabs/demo/extra.md correctly 1`] = `
-
+
diff --git a/components/tag/__tests__/__snapshots__/demo.test.js.snap b/components/tag/__tests__/__snapshots__/demo.test.js.snap index f30ce3780..bf5c2432c 100644 --- a/components/tag/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tag/__tests__/__snapshots__/demo.test.js.snap @@ -72,7 +72,7 @@ exports[`renders ./components/tag/demo/controlled.md correctly 1`] = ` Movies

+

`; diff --git a/components/tooltip/__tests__/__snapshots__/demo.test.js.snap b/components/tooltip/__tests__/__snapshots__/demo.test.js.snap index b279e5f74..d68293435 100644 --- a/components/tooltip/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tooltip/__tests__/__snapshots__/demo.test.js.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders ./components/tooltip/demo/arrow-point-at-center.md correctly 1`] = `
`; +exports[`renders ./components/tooltip/demo/arrow-point-at-center.md correctly 1`] = `
`; -exports[`renders ./components/tooltip/demo/auto-adjust-overflow.md correctly 1`] = `

`; +exports[`renders ./components/tooltip/demo/auto-adjust-overflow.md correctly 1`] = `

`; exports[`renders ./components/tooltip/demo/basic.md correctly 1`] = ` @@ -12,9 +12,9 @@ exports[`renders ./components/tooltip/demo/basic.md correctly 1`] = ` exports[`renders ./components/tooltip/demo/placement.md correctly 1`] = `
-
-
-
-
+
+
+
+
`; diff --git a/components/transfer/__tests__/__snapshots__/demo.test.js.snap b/components/transfer/__tests__/__snapshots__/demo.test.js.snap index 7805df074..b1ed9fbb0 100644 --- a/components/transfer/__tests__/__snapshots__/demo.test.js.snap +++ b/components/transfer/__tests__/__snapshots__/demo.test.js.snap @@ -31,7 +31,7 @@ exports[`renders ./components/transfer/demo/advanced.md correctly 1`] = `
- +
- +
`;