Commit Graph

2211 Commits

Author SHA1 Message Date
tangjinzhou
da0f17d1b6 Merge remote-tracking branch 'origin/master' into feat-1.4.0
# Conflicts:
#	components/affix/index.jsx
#	components/alert/index.jsx
#	components/back-top/index.jsx
#	components/carousel/index.jsx
#	components/cascader/index.jsx
#	components/comment/index.jsx
#	components/config-provider/index.jsx
#	components/divider/index.jsx
#	components/drawer/index.jsx
#	components/form/Form.jsx
#	components/input-number/index.jsx
#	components/menu/index.jsx
#	components/modal/confirm.js
#	components/modal/index.js
#	components/popconfirm/index.jsx
#	components/popover/index.jsx
#	components/rate/index.jsx
#	components/steps/index.jsx
#	components/switch/index.jsx
#	components/time-picker/index.jsx
#	components/tree-select/index.jsx
#	site/components.js
2019-08-28 22:36:44 +08:00
tanjinzhou
c9f1c26693 chore: add base.vue inconsistent vue version 2019-08-28 10:50:19 +08:00
tangjinzhou
2852ea295a update vc-pagination to 1.20.5 2019-08-27 23:14:19 +08:00
tangjinzhou
445c21d9fd cr dropdown 2019-08-27 21:57:27 +08:00
tangjinzhou
1e53fc85b3 update snapshots and prettier 2019-08-26 22:47:19 +08:00
tangjinzhou
6ea8f071f9 update vc-form to 2.4.8 2019-08-26 22:46:44 +08:00
tangjinzhou
b6a7f49c0d cr vc-progress 2019-08-26 21:12:11 +08:00
tangjinzhou
89601b5b8c update style 2019-08-26 21:11:46 +08:00
tangjinzhou
18005cc97c update package.json 2019-08-25 22:12:00 +08:00
tangjinzhou
2349348de0 Merge branch 'master' into feat-1.4.0
# Conflicts:
#	components/button/__tests__/__snapshots__/demo.test.js.snap
#	components/button/buttonTypes.js
#	components/button/demo/basic.md
#	components/button/style/index.less
#	components/button/style/mixin.less
#	components/form/__tests__/__snapshots__/demo.test.js.snap
#	components/input/__tests__/__snapshots__/demo.test.js.snap
#	components/select/__tests__/__snapshots__/demo.test.js.snap
#	components/select/__tests__/__snapshots__/index.test.js.snap
#	components/tabs/__tests__/__snapshots__/demo.test.js.snap
#	components/vc-collapse/src/Collapse.jsx
#	package.json
2019-08-25 22:09:55 +08:00
tangjinzhou
d459b20b20 bump 1.3.16 2019-08-25 21:56:51 +08:00
tangjinzhou
abc151252c Merge branch 'master' of https://github.com/vueComponent/ant-design-vue 2019-08-25 21:56:10 +08:00
Pythonfo
3d6fb50eee add upload dragger ts type (#1032) 2019-08-25 21:54:57 +08:00
tangjinzhou
c539568b76 doc: update doc 2019-08-25 20:58:10 +08:00
tanjinzhou
85702bb98f update site 2019-08-23 17:58:46 +08:00
tanjinzhou
8796c94315 update site 2019-08-22 18:29:50 +08:00
三点包子
f12d53bfc4
Merge pull request #1111 from zkwolf/fix-tree-select-dataRef-undefined
fix: treeNode dataRef is undefined
2019-08-22 17:31:17 +08:00
刘彦博
f32771d281 doc: [Transfer] basic demo codes issue (#1112)
* fix transfer basic demo issue

* typo
2019-08-22 13:55:56 +08:00
ly303550688
62e3c4b73a fix: throw exception when has none collapse-panel in default slot (#1116) 2019-08-22 13:51:47 +08:00
zkwolf
5f9ebe8b45 fix: treeNode dataRef is undefined 2019-08-21 15:17:21 +08:00
Alireza Valizade
095406eea6 fix: select error on unmounting component (#1091) 2019-08-20 10:39:05 +08:00
tanjinzhou
53e73ab6f8 bump 1.3.15 2019-08-17 17:39:55 +08:00
tangjinzhou
0eab2424d5 style: update prettier 2019-08-15 22:24:53 +08:00
tangjinzhou
4d1a4c9d33 fix: form validator number error #1090 2019-08-15 22:14:59 +08:00
tangjinzhou
9734ec0993 fix: form warning #1076 2019-08-15 22:12:50 +08:00
tangjinzhou
259f16b145 fix: ie scrollerbar trigger blur event #999 2019-08-14 18:41:49 +08:00
undefined
2964d2977f update site 2019-08-13 14:47:57 +08:00
tanjinzhou
e94a0f0eb7 update node to 12.4.0 2019-08-12 21:25:21 +08:00
tanjinzhou
3b1e49fc3b bump 1.3.14 2019-08-12 20:38:50 +08:00
tanjinzhou
d232bf65f3 doc: update doc 2019-08-12 20:38:09 +08:00
言肆
ad81186ec5 feat: button support link type (#1077) 2019-08-12 11:30:32 +08:00
wangxueliang
8e80e13d17 style: update code style 2019-08-08 19:04:21 +08:00
wangxueliang
f66fae47e3 feat: merge master 2019-08-08 19:02:54 +08:00
tangjinzhou
6d1a385fad feat: modal.confirm content ant title support function #824 2019-08-07 22:17:21 +08:00
tangjinzhou
f5d1fa6a9f fix: support v-slot #1058 2019-08-07 21:56:30 +08:00
Plane-walker
3406cecbd8 fix: '{' and ')' are not match (#1062)
* fix: '{' doesn't match

* fix: '}' doesn't match
2019-08-07 10:06:08 +08:00
tangjinzhou
9d78a27030 doc: update site image 2019-08-05 22:03:48 +08:00
tanjinzhou
d60d549f04 update site 2019-08-05 16:53:48 +08:00
Tudero Li
949cb6bdcc fix: error doc file in form components #1054 (#1055) 2019-08-04 21:21:36 +08:00
tangjinzhou
6064b97367 doc: add geektime ad 2019-08-04 21:14:08 +08:00
zkwolf
b3b4831c1a fix: input allowClear icon (#1040) 2019-07-31 22:11:03 +08:00
wangxueliang
71b7c9d338 fix: dropdown-button size not take effect 2019-07-31 11:22:47 +08:00
tangjinzhou
55a59f207f fix: ie scrollerbar trigger blur event #999 2019-07-30 19:51:49 +08:00
tangjinzhou
da92d8543f fix: tooltip builtinPlacements default value 2019-07-29 22:43:03 +08:00
Morphling
ef07315dc8 add builtinPlacements prop in shared props (#1021)
* add builtinPlacements prop in shared props

add builtinPlacements prop in shared props

* fix lint
2019-07-26 16:29:16 +08:00
tanjinzhou
7b3897305b fix: git ci error 2019-07-24 19:24:16 +08:00
tanjinzhou
80ebc2840a fix: cannot find module node-emoji #997 2019-07-24 19:23:47 +08:00
tanjinzhou
5be307bc71 fix: array class error #1009 2019-07-24 19:21:27 +08:00
tanjinzhou
c8d80d0cc8 bump 1.3.13 2019-07-22 12:39:29 +08:00
tanjinzhou
8352df87a3 bump 3.1.12 2019-07-22 11:56:13 +08:00