Commit Graph

12 Commits (3c292a51e119baed32c561dcad43d39cdaec8224)

Author SHA1 Message Date
tanjinzhou 6069a254db Merge remote-tracking branch 'origin/master' into 2.0
# Conflicts:
#	antdv-demo
#	components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
#	components/avatar/__tests__/__snapshots__/demo.test.js.snap
#	components/button/__tests__/__snapshots__/demo.test.js.snap
#	components/collapse/__tests__/__snapshots__/demo.test.js.snap
#	components/date-picker/__tests__/__snapshots__/demo.test.js.snap
#	components/form/__tests__/__snapshots__/demo.test.js.snap
#	components/input/__tests__/__snapshots__/demo.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap
#	components/select/__tests__/__snapshots__/demo.test.js.snap
#	components/tag/__tests__/__snapshots__/demo.test.js.snap
#	components/vc-dialog/Dialog.jsx
2020-05-26 17:49:55 +08:00
tanjinzhou a28962bfe7 fix: tabs key support 0 as key #2167 2020-04-29 11:35:25 +08:00
PanStar fd28043172
fix: renderTabBar not work #2157 (#2158)
close #2157
2020-04-27 13:52:11 +08:00
tangjinzhou 1836b2e7f4 Merge branch 'master' into 2.0 2020-04-15 22:05:10 +08:00
baojie223 603dcec087
fix: tabBarGutter not work
* fix: #2083

* fix: #2083

Co-authored-by: baojie <baojie223@qq.com>
2020-04-15 20:26:17 +08:00
tangjinzhou 518cc852af Merge remote-tracking branch 'origin/master' into 2.0
# Conflicts:
#	antdv-demo
#	components/alert/__tests__/__snapshots__/demo.test.js.snap
#	components/auto-complete/__tests__/__snapshots__/demo.test.js.snap
#	components/avatar/__tests__/__snapshots__/demo.test.js.snap
#	components/badge/__tests__/__snapshots__/demo.test.js.snap
#	components/calendar/__tests__/__snapshots__/demo.test.js.snap
#	components/calendar/__tests__/__snapshots__/index.test.js.snap
#	components/card/__tests__/__snapshots__/demo.test.js.snap
#	components/cascader/__tests__/__snapshots__/demo.test.js.snap
#	components/cascader/__tests__/__snapshots__/index.test.js.snap
#	components/collapse/__tests__/__snapshots__/demo.test.js.snap
#	components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap
#	components/date-picker/__tests__/__snapshots__/demo.test.js.snap
#	components/date-picker/__tests__/__snapshots__/other.test.js.snap
#	components/dropdown/__tests__/__snapshots__/demo.test.js.snap
#	components/empty/__tests__/__snapshots__/demo.test.js.snap
#	components/form-model/__tests__/__snapshots__/demo.test.js.snap
#	components/form/__tests__/__snapshots__/demo.test.js.snap
#	components/icon/__tests__/__snapshots__/index.test.js.snap
#	components/icon/index.js
#	components/input-number/__tests__/__snapshots__/demo.test.js.snap
#	components/input/__tests__/__snapshots__/demo.test.js.snap
#	components/input/__tests__/__snapshots__/index.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap
#	components/modal/__tests__/__snapshots__/Modal.test.js.snap
#	components/page-header/__tests__/__snapshots__/demo.test.js.snap
#	components/page-header/index.jsx
#	components/pagination/__tests__/__snapshots__/demo.test.js.snap
#	components/rate/__tests__/__snapshots__/demo.test.js.snap
#	components/select/__tests__/__snapshots__/demo.test.js.snap
#	components/select/__tests__/__snapshots__/index.test.js.snap
#	components/slider/__tests__/__snapshots__/demo.test.js.snap
#	components/spin/__tests__/__snapshots__/demo.test.js.snap
#	components/steps/__tests__/__snapshots__/demo.test.js.snap
#	components/switch/__tests__/__snapshots__/demo.test.js.snap
#	components/table/__tests__/__snapshots__/Table.filter.test.js.snap
#	components/table/__tests__/__snapshots__/Table.sorter.test.js.snap
#	components/table/__tests__/__snapshots__/demo.test.js.snap
#	components/tabs/__tests__/__snapshots__/demo.test.js.snap
#	components/tabs/__tests__/__snapshots__/index.test.js.snap
#	components/time-picker/__tests__/__snapshots__/demo.test.js.snap
#	components/time-picker/__tests__/__snapshots__/index.test.js.snap
#	components/timeline/__tests__/__snapshots__/demo.test.js.snap
#	components/tree-select/__tests__/__snapshots__/demo.test.js.snap
#	components/tree/__tests__/__snapshots__/demo.test.js.snap
#	components/upload/__tests__/__snapshots__/demo.test.js.snap
#	components/upload/__tests__/__snapshots__/uploadlist.test.js.snap
#	types/message.d.ts
2020-04-05 15:09:21 +08:00
wangxueliang 035e152292 feat: update tabs icon 2020-03-30 23:43:35 +08:00
tanjinzhou ff9f408879 fix: tabs keydown event trigger twice #1947 2020-03-26 17:24:13 +08:00
tangjinzhou ffb2a593b1 style: lint add semi and prettier 2019-01-12 12:46:29 +08:00
tangjinzhou d4c388f564 feat: update vc-tabs to 9.5.7 2018-12-14 23:31:02 +08:00
tangjinzhou 34876b5b61 fix 2018-12-12 21:42:22 +08:00
tangjinzhou 6f71252753 test: update snapshots 2018-12-12 21:31:18 +08:00