Commit Graph

15880 Commits

Author SHA1 Message Date
偏右
cf138cbaf3
Merge pull request #15292 from inian/patch-1
Typo
2019-03-09 00:07:55 +08:00
偏右
40ef69321d
Merge pull request #15291 from yoyo837/update-CHANGELOG-3.15.0
fix PR Author
2019-03-09 00:07:20 +08:00
Inian
c443909bca
Typo 2019-03-08 21:29:58 +08:00
yoyo837
9b12f6715a fix PR Author 2019-03-08 19:42:23 +08:00
Yu
f2b95d0a7f
chore: add changelog for 3.15.0 (#15281)
* chore: add changelog for 3.15.0
2019-03-08 18:51:05 +08:00
偏右
a79c78833b
Merge pull request #15282 from ant-design/feature
feat: merge feature to master for prepare 3.15.0
2019-03-08 17:37:08 +08:00
偏右
b807859cc3
Merge branch 'master' into feature 2019-03-08 16:58:57 +08:00
afc163
8f8471fa5d
💄 fix missing semicolon 2019-03-08 16:57:39 +08:00
偏右
4cb2850ae2
Merge pull request #15283 from ant-design/chore/mergem
Sync master changes to feature branch
2019-03-08 16:52:26 +08:00
愚道
e3a2c38e67 Merge branch 'master' into chore/mergem 2019-03-08 16:32:40 +08:00
偏右
194dedd013
Merge pull request #15286 from ant-design/improve-code
Refactor some code after #15254
2019-03-08 16:20:42 +08:00
偏右
884e13582a
Merge pull request #15285 from jinxin0112/patch-1
fix: two colons will appear in FormItem label
2019-03-08 16:13:41 +08:00
afc163
bd0eb34487
make sure count compare as number 2019-03-08 15:57:07 +08:00
偏右
71440a218b
Update components/form/style/index.less
Co-Authored-By: jinxin0112 <m18508218948@163.com>
2019-03-08 15:53:27 +08:00
afc163
da6662562b
refactor some code after #15254 2019-03-08 15:43:46 +08:00
JinXin
7ccf6855c6
fix: appear two colons
If the label attribute of the component Form.Item is a ReactNode and the same label tag exists inside the ReactNode, two colons will appear.
2019-03-08 15:31:46 +08:00
愚道
a4f73ff64e chore: sync master to feature 2019-03-08 15:21:36 +08:00
偏右
d02ec78567
Merge pull request #15276 from DiamondYuan/form-prop
feat: Form support set colon
2019-03-08 14:50:31 +08:00
偏右
120ea3a38d
Merge pull request #15252 from yoyo837/add-label-align
add labelAlign for Form and FormItem
2019-03-08 14:50:13 +08:00
偏右
94cd2ac3f4
Merge pull request #15210 from ant-design/fix-list-item-text-margin
Refactor List Item dom structure
2019-03-08 14:44:06 +08:00
zombiej
a87cfc2d92 use babel ast tree 2019-03-08 14:38:26 +08:00
偏右
5415b81f63
Merge pull request #15254 from zy410419243/migrate
refactor: migrate lifecycle method
2019-03-08 14:13:24 +08:00
偏右
ee65a2d8de
Merge branch 'feature' into form-prop 2019-03-08 14:10:07 +08:00
偏右
057f215061
Merge pull request #15279 from ant-design/master
Sync master changes to feature branch
2019-03-08 14:09:45 +08:00
DiamondYuan
c8ba4da309 docs: add since comment for FormProps 2019-03-08 13:03:29 +08:00
偏右
952d2ec06a
Merge branch 'feature' into master 2019-03-08 12:38:04 +08:00
Cheng
c882a4b918 Style tree content to full width (#14858)
*  (tree) new blockNode props

* 💄 (tree) style for blockNode

* 📝 (tree) update draggable demo

* 🐛 (tree) fix custom switcherIcon class

*  (tree) update snapshots

* 📝 (tree) update docs

* 👌 opt trans
2019-03-08 12:36:46 +08:00
ztplz
2e0a85324b Fix type (#15266)
* Fix type

* Update index.tsx
2019-03-08 12:26:01 +08:00
偏右
d4140713ab
Merge pull request #15241 from zy410419243/issue-14775
pref: lift up coverage rate
2019-03-08 12:23:56 +08:00
偏右
c443421176
Merge pull request #15272 from ant-design/fix-demo-test-fail-in-react-15
Fix test fails in React 15
2019-03-08 12:10:32 +08:00
DiamondYuan
5b162897a8 feat: support props colon of Form 2019-03-08 11:25:37 +08:00
afc163
f44ff94dec
Fix test fails in React 15 2019-03-08 11:00:33 +08:00
偏右
bd76dc6b9e
Merge pull request #15264 from ant-design/xiaohuoni-patch-1
change badge text types
2019-03-08 00:30:42 +08:00
陈小聪
85a293eacb
change badge text types
```jsx
<Badge status="default" text={<span style={{ color: 'rgba(0, 0, 0, 0.45)' }}>未响应</span>} />
```
2019-03-08 00:21:53 +08:00
Amumu
9549ed308d fix doc (#15259) 2019-03-07 20:40:06 +08:00
偏右
65b69b7265
Merge pull request #15256 from yoyo837/fix-steps-label-align
fix when size is small and label is vertical the label text not align center
2019-03-07 18:01:50 +08:00
偏右
93820ba90e
Merge pull request #15150 from ant-design/affox
Fix Affix updatePosition logic.
2019-03-07 17:59:40 +08:00
yoyo837
6b84c079dd fix when size is small and label is vertical the label text not align center 2019-03-07 17:04:31 +08:00
zy410419243
7642cbf18d refactor: update lifecycle method for Menu 2019-03-07 16:58:53 +08:00
zy410419243
555af0a40d Revert "refactor: update lifecycle method for Affix"
revert: related to #15150
2019-03-07 16:49:36 +08:00
zy410419243
4601144f3f refactor: update lifecycle method for Calendar 2019-03-07 16:33:59 +08:00
zy410419243
4dc533c202 refactor: update lifecycle method for Badge 2019-03-07 16:03:02 +08:00
zy410419243
ad30c02710 refactor: update lifecycle method for Affix 2019-03-07 15:50:07 +08:00
zombieJ
dd435afadb
fix warning check logic (#15251) 2019-03-07 15:47:43 +08:00
zy410419243
774cbf92e0 chore: export with polyfill 2019-03-07 15:39:34 +08:00
yoyo837
0b1410a710 don't disclose some props define in doc 2019-03-07 15:34:11 +08:00
偏右
01cf2114cc
Merge pull request #15245 from ant-design/update-demo
update Collapse demo adding stopPropagation sample
2019-03-07 15:24:32 +08:00
zy410419243
63616479ec refactor: update lifecycle method for Transfer 2019-03-07 15:18:57 +08:00
yoyo837
5281d7b7f2 add labelAlign for Form and FormItem 2019-03-07 15:14:27 +08:00
zy410419243
8d43f4b032 test: update cases for Modal 2019-03-07 14:43:25 +08:00