Commit Graph

105 Commits

Author SHA1 Message Date
tangjinzhou
4ce99b91e1 update configProvider 2019-09-11 22:51:52 +08:00
tanjinzhou
f94f50f326 cr exxx to nxxx 2019-09-11 18:11:48 +08:00
tangjinzhou
c31aab0685 cr button 2019-09-08 20:16:17 +08:00
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
1e53fc85b3 update snapshots and prettier 2019-08-26 22:47:19 +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
259f16b145 fix: ie scrollerbar trigger blur event #999 2019-08-14 18:41:49 +08:00
wangxueliang
f66fae47e3 feat: merge master 2019-08-08 19:02:54 +08:00
Tudero Li
949cb6bdcc fix: error doc file in form components #1054 (#1055) 2019-08-04 21:21:36 +08:00
tangjinzhou
55a59f207f fix: ie scrollerbar trigger blur event #999 2019-07-30 19:51:49 +08:00
tangjinzhou
ecf7c8b42c fix: update icon focusable="false" #924 2019-07-07 21:27:16 +08:00
drafish
b0c95d36ae fix issue #930 (#931) 2019-07-05 09:44:12 +08:00
tangjinzhou
5f41fa5e99 cr vc-rate 2019-07-03 21:56:30 +08:00
tangjinzhou
adbd82b910 Merge branch 'master' into feat-1.4.0
# Conflicts:
#	components/table/interface.js
#	components/vc-upload/demo/simple.jsx
2019-06-24 21:47:23 +08:00
blackywkl
4cc05d24ba docs(form-cn): Remove duplicate brace (#844) 2019-06-07 11:14:19 +08:00
wangxueliang
76d8491b66 style: fix code format 2019-05-28 11:37:38 +08:00
tangjinzhou
056ef16f58 docs: update form demo 2019-05-26 15:30:55 +08:00
wangxueliang
5d8d9248a3 test: update snapshots 2019-05-18 15:49:50 +08:00
wangxueliang
3a2977a2ed feat: update form 2019-04-20 14:19:13 +08:00
wangxueliang
0566ae23e1 test: update snapshots 2019-04-09 20:39:49 +08:00
wangxueliang
7d6678265e feat: merge master 2019-04-07 09:05:54 +08:00
wangxueliang
341374c44e feat: update style to 3.13.6 2019-03-30 16:06:06 +08:00
tangjinzhou
dfc46a0de7 fix: select title error #588 2019-03-16 09:14:55 +08:00
tangjinzhou
faf9ba0033 fix: input repeat classname 2019-03-15 23:11:25 +08:00
wangxueliang
3eb046f10a test: update snapshots 2019-03-11 21:06:53 +08:00
wangxueliang
2f81ea75c5 style: fix code conflict 2019-02-28 19:54:10 +08:00
wangxueliang
96afcdf30f test: update snapshots 2019-02-28 19:46:40 +08:00
tangjinzhou
8a173180fd docs: update form doc 2019-02-22 21:58:03 +08:00
tangjinzhou
be12d2eee9 test: update snapshots 2019-02-16 22:46:47 +08:00
tangjinzhou
805d4e3295 docs: update url path 2019-02-16 16:51:21 +08:00
tangjinzhou
7ddc17b3bd docs: add form vuex demo close #465 2019-02-11 22:22:15 +08:00
tangjinzhou
9a463899fb perf: avoid multiple decorator when FormItem is nested 2019-02-02 15:25:43 +08:00
tangjinzhou
55a8dca9e7 style: update lint and format code 2019-02-01 17:23:00 +08:00
tangjinzhou
beef6c6662 perf: update formItem give some tip 2019-01-30 21:31:36 +08:00
tangjinzhou
c34a446f73 fix: avoid update when formitem from slot 2019-01-29 22:58:28 +08:00
tangjinzhou
de68d08798 perf: inject default 2019-01-28 21:09:13 +08:00
tangjinzhou
c9d3f7b79c fix: formItem not update when a-form-item in child component #446 2019-01-27 21:47:27 +08:00
tangjinzhou
663d00f5ab docs: delete test code 2019-01-20 21:16:36 +08:00
tangjinzhou
ad0325a11e docs: form add preserve 2019-01-19 17:53:55 +08:00
tangjinzhou
782eebccee fix: remove autoFormCreate 2019-01-16 11:22:58 +08:00
tangjinzhou
67c31867d2 style: prettier code 2019-01-15 09:41:07 +08:00
tangjinzhou
c924f4ca82 perf: form 2019-01-14 22:42:04 +08:00
tangjinzhou
ffb2a593b1 style: lint add semi and prettier 2019-01-12 12:46:29 +08:00
tangjinzhou
ad0727898e test: update snapshots 2019-01-05 16:24:52 +08:00
tangjinzhou
380e4cd53d perf: some code 2019-01-05 11:24:25 +08:00
tangjinzhou
e706170669 test: update snapshots 2019-01-03 21:03:39 +08:00
tangjinzhou
4d6627dcd4 docs: update form demo 2019-01-03 20:48:09 +08:00
tangjinzhou
27880b0110 feat: optimize the display of the button icon 2019-01-03 13:06:27 +08:00
tangjinzhou
14dfebab0b feat: update style to 3.11.6 2019-01-02 21:01:56 +08:00