mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-29 03:48:26 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
14,284 Commits 20 Branches 736 Tags 482 MiB
87a5f68806
Commit Graph

308 Commits

Author SHA1 Message Date
HeskeyBaozi
ee1d2469a8 upgrade test snapshot 2018-08-24 18:36:08 +08:00
HeskeyBaozi
43e6621fb7 use correct icon 2018-08-24 18:11:02 +08:00
zombiej
500ef62638 fix https://github.com/ant-design/ant-design/issues/11423. TreeNode can accept custom prop 2018-08-23 20:38:56 +08:00
HeskeyBaozi
96b38dd3ec use svg icon in introduce 2018-08-21 18:33:52 +08:00
HeskeyBaozi
ea6656f734 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-21 16:32:30 +08:00
HeskeyBaozi
65600c8a95 upgrade to 3.8.2 2018-08-20 14:00:51 +08:00
Alexey Yakovlev
3582f46347 Update TreeProps.onCheck callback signature. 2018-08-19 20:16:27 +08:00
HeskeyBaozi
33d270aaf2 tree dynamic icon 2018-08-17 16:36:33 +08:00
HeskeyBaozi
d185068c20 yarn upgrade rc-tree 2018-08-17 16:04:11 +08:00
HeskeyBaozi
796de6390b update test snapshot 2018-08-14 15:32:29 +08:00
HeskeyBaozi
b9a9c308c9 [breaking] remove iconfont-font class helper 2018-08-14 15:31:20 +08:00
HeskeyBaozi
35974d67b2 update test snap shot 2018-08-13 20:51:01 +08:00
Bartek
e107b03cc7 closing #11604, add selectable to AntTreeNodeProps (#11651) 2018-08-13 14:09:32 +08:00
HeskeyBaozi
6c42d711e8 Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-07-31 15:36:23 +08:00
afc163
56fa8629b5 Merge branch 'master' into feature-3.8.0 2018-07-30 17:58:21 +08:00
zombiej
6617f785fd fix #11458. Adjust treeNode draggable css 2018-07-30 13:56:49 +08:00
zombiej
17b82a251a update rc-tree 2018-07-30 12:05:29 +08:00
Ilan Hasanov
186496d840 💬 fix tree component typos 2018-07-29 01:15:02 +08:00
HeskeyBaozi
ee16585b6d update test cases 2018-07-25 11:51:19 +08:00
HeskeyBaozi
bab50e6bed Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 
# Conflicts:
#	components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap
#	components/transfer/__tests__/__snapshots__/demo.test.js.snap
#	components/transfer/__tests__/__snapshots__/index.test.js.snap
 2018-07-23 09:58:55 +08:00
zombiej
ed7630053e fix #11366. action trigger expand also trigger the onExpand 2018-07-20 10:50:20 +08:00
HeskeyBaozi
4a553a2006 upgrade test cases 2018-07-19 20:37:47 +08:00
HeskeyBaozi
8df086f022 update test cases 2018-07-18 13:39:02 +08:00
HeskeyBaozi
9338f33c1c update test cases 2018-07-18 10:33:54 +08:00
afc163
8eb8c686ce Merge branch 'master' into feature-3.7.0 2018-07-11 22:21:01 +08:00
Zhiqiang Gong
722b24b813 add disabled prop (#11188) 
First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

* [x] Make sure that you propose PR to right branch: bugfix for `master`, feature for latest active branch `feature-x.x`.
* [x] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
* [x] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
* [x] Rebase before creating a PR to keep commit history clear.
* [x] Add some descriptions and refer relative issues for you PR.

Extra checklist:

**if** *isBugFix* **:**

  * [x] Make sure that you add at least one unit test for the bug which you had fixed.

**elif** *isNewFeature* **:**

  * [ ] Update API docs for the component.
  * [ ] Update/Add demo to demonstrate new feature.
  * [ ] Update TypeScript definition for the component.
  * [ ] Add unit tests for the feature.

tslint检测时报错
类型“IntrinsicAttributes & IntrinsicClassAttributes<Tree> & Readonly<{ children?: ReactNode; }> & Read...”上不存在属性“disabled”。
 2018-07-11 19:39:41 +08:00
afc163
0981ef06a4 fix demo lint 2018-06-27 16:14:47 +08:00
afc163
56020cda39 Merge branch 'master' into feature-3.7.0 2018-06-27 16:14:14 +08:00
afc163
009ed08580 upgrade eslint-config-airbnb 2018-06-27 16:09:58 +08:00
Wei Zhu
b374297ca6 Merge branch 'master' into feature-3.7.0 2018-06-25 11:44:35 +08:00
愚指导
d11d44e413
Bump 3.6.4 and fix some lint issue. 2018-06-23 16:35:42 +08:00
Wei Zhu
3fb478e743 Update Tree types 2018-06-21 14:38:44 +08:00
zombiej
ac9368298f miss ? for TreeNode className prop 2018-06-20 17:41:12 +08:00
zombiej
17da353575 close #10950. Add className in TreeNode prop 2018-06-20 09:47:24 +08:00
Wei Zhu
b7879e909f docs: use title instead of key 
Address #10949
 2018-06-19 17:30:06 +08:00
afc163
99d6e4c96c Merge branch 'master' into feature-3.7.0 2018-06-12 15:34:51 +08:00
Wei Zhu
99cad890ef Fix Tree types, TreeNode is a ComponentClass 
Close #10868
 2018-06-12 10:57:19 +08:00
zombiej
c488aca05e close #10666 #10821.Update tree support loadedKeys 2018-06-08 16:55:17 +08:00
afc163
89f3b253a4 Merge branch 'master' into feature-3.7.0 2018-06-08 16:22:15 +08:00
Kirill Alexander Khalitov
0ca1a990be Makes TreeNode component more type safe 
Makes TreeNode component more type safe
 2018-06-08 10:32:00 +08:00
Kirill Alexander Khalitov
74755fef99 Fix #10838 
Fix [#10838](https://github.com/ant-design/ant-design/issues/10838)
 2018-06-08 10:32:00 +08:00
zombieJ
a825ed4e66
Directory Tree (#10139) 
Support DirTree. close #7749
 2018-06-04 11:20:17 +08:00
zombiej
06ffd9ca04 Adjust Tree icon vertical-align, fix #10603 2018-05-21 21:24:16 +08:00
Wei Zhu
bf03d954d4 docs: Fix indent 2018-05-14 12:29:04 +08:00
Xiping.wang
413479a5b9 修改案例title值，原title值容易产生误导 
修改案例title值，原title值容易产生误导
 2018-05-14 12:08:50 +08:00
zombiej
0437d858f2 update testcase sync with Tree 1.8.12. Ref: https://github.com/ant-design/ant-design/issues/9899 2018-04-10 19:29:18 +08:00
jim
a5e2020908 add icon prop in .d.ts 2018-04-09 14:22:06 +08:00
zombieJ
49719b20d8
update tree doc for customize icon (#9893) 
* update doc for customize icon
* add test case
 2018-04-04 16:39:50 +08:00
zombiej
c135572730 Fix conduct logic on node disabled, update test snapshot 2018-03-29 19:46:01 +08:00
zombiej
08b6011ed7 update deps of rc-tree 2018-03-29 18:09:54 +08:00
valleykid
ae78a4bbec When treeNode is disabled, its switcher is highlight and clickabled (#9539) 
* When treeNode is disabled, its switcher is highlight and clickabled

* rc-tree@1.7.11
 2018-03-09 15:04:09 +08:00
偏右
8226ede38e
Fix test case for new jsdom (#9527) 
* Fix test case for new jsdom

* use setTimeout as raf in jest jsdom

* Fix cancelAnimationFrame

* Add comment for facebook/jest#5147

* longer timeout

* fix snap

* upgrade antd-tools
 2018-03-06 21:21:01 +08:00
Wei Zhu
5c00985fed Add children to AntTreeNodeProps 2018-01-30 16:50:49 +08:00
luyiming
e511c2ac33 fix tree demo drag&drop bug (#9131) 2018-01-26 13:30:44 +08:00
Wei Zhu
999d6184ad docs: Sort api table 2017-12-29 20:22:58 +08:00
Wei Zhu
01f4b4e713 Merge branch 'master' into antd-3.0 2017-12-01 11:50:07 +08:00
Wei Zhu
8e907cebde Fix tree draggable demo 
Close #8246
 2017-11-24 15:29:36 +08:00
Wei Zhu
6837aedf69 Imporve tree and tree-select type definitions 2017-11-20 17:11:13 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports (#8218) 2017-11-17 14:38:54 +08:00
偏右
bdceb5f083
Review fix (#8125) 
* Fix style

* Fix style

* fix lint

* Fix more styles

* Fix more styles

* update snap
 2017-11-06 21:28:51 +08:00
翁润雨
58fe3277d8 add the 'selectable' attribute (#8048) 2017-10-31 13:57:45 +08:00
翁润雨
f64e24af8c add the 'selectable' attribute (#8048) 2017-10-28 19:39:33 +08:00
Wei Zhu
bbb1a3a828 Merge branch 'master' into antd-3.0 2017-10-25 10:27:38 +08:00
Wei Zhu
36227a10db docs: sort api table 2017-10-25 10:25:44 +08:00
偏右
ffffd0f4c5 Fix styles (#7924) 
* update demo

* Fix styles

* fix snap

* Fix back-top ci
 2017-10-18 17:16:14 +08:00
Wei Zhu
c5487ad1eb React 16 + Enzyme 3 2017-10-09 19:18:04 +08:00
偏右
2bced36f0c New component styles (#7731) 
* Tweak button padding

* upgrade input and button size

* update form controls size

* update components size

* Add lemon color and update rate color

* Add new icons

* update layout style

* breadcrumb and dropdown

* update menu arrow width

* update layout and menu

* update steps

* fix var name

* update cascasder style

* Update DatePicker

* update InputNumber and Mention

* radio and switch

* select and transfer

* TimePicker & Upload

* more components

* calendar and list

* Tree Timeline Popover Tag

* divider modal popover

* update search input

* update card style

* update switch disabled opacity

* update shoadow and mask

* Add v2-compatible-reset.less

* Fix undefined className

* update snahshotssssssssssssssssss 👻
 2017-09-27 22:32:49 +08:00
afc163
caec11c03a Fix snapshot 2017-09-27 20:21:28 +08:00
nikogu
7899dcf299 update snapshots 2017-09-27 15:03:22 +08:00
偏右
759b0bb821 seperate reset styles (#7682) 
* seperate reset styles

* not reset ul/ol/p/heading

* revert reset.less idea

* move label style into ant-form-item, #5851

* revert reset.less idea

* update base.less

* Better typography from bootstrap@4

use reboot replace normalize

ref:
b4d84b9cdf/scss/_reboot.scss

close #6162
 2017-09-22 18:33:29 +08:00
afc163
3cdb06fe70 Fix Tree showLine style 2017-09-21 18:16:53 +08:00
afc163
27e4f1b658 Fix Tree showLine style 2017-09-21 18:15:10 +08:00
afc163
acc4061eeb Tweak align problems 2017-09-21 18:13:36 +08:00
afc163
ea5ccce90d Merge branch 'master' into antd-3.0 2017-09-15 11:16:19 +08:00
afc163
9df6e06d70 fix lint 2017-09-15 11:14:22 +08:00
afc163
b36df9da2b update tree controlled demo 2017-09-15 10:57:07 +08:00
afc163
ae87b663bf Tweak tree demo 2017-09-13 22:18:44 +08:00
afc163
89ce2254af Improve tree node loading icon position, close #7584 2017-09-13 22:17:13 +08:00
afc163
77d64971e5 Refactor tree loadData demo 2017-09-13 22:06:53 +08:00
Benjy Cui
070b2696ba chore: remove hacks for IE8-, close: #7447 (#7512) 2017-09-08 13:08:46 +08:00
nikogu
e4860bfac0 update snapshots again 2017-08-30 13:51:27 +08:00
nikogu
0a9e28226b update snapshots 2017-08-30 11:53:46 +08:00
afc163
8f6c0d8fc9 Fix snapshot 2017-08-27 14:12:42 +08:00
afc163
53ffc83d23 Fix snapshot 2017-08-27 14:10:29 +08:00
afc163
988e12f54b tweak some font weight 2017-08-17 22:10:40 +08:00
afc163
6a17efcbf1 upgrade some devDeps and fix stylelint 2017-08-04 18:01:40 +08:00
Flynn
8e8c0b4db3 update docoument for #7026 (#7039) 2017-08-01 11:26:18 +08:00
afc163
d00871acdd upgrade snapshot 2017-07-29 14:20:48 +08:00
Benjy Cui
fff756ff5f deps: upgrade rc-tree 2017-07-28 11:38:39 +08:00
Benjy Cui
c63c8b6c04 test: update snapshot 2017-07-28 09:59:30 +08:00
Benjy Cui
7582ab7481 test: update snapshot 2017-07-27 17:51:07 +08:00
Wei Zhu
90511c3261 docs: use indexOf instead of search 
fix #6962
 2017-07-26 13:24:58 +08:00
afc163
c2e7d18663 Make tree select item wider 2017-07-20 17:17:56 +08:00
afc163
ca89227568 test: fix snapshot 2017-07-12 21:44:46 +08:00
afc163
b0aef6cad5 Fix Tree and TreeSelect disabled style, close #6320 2017-06-01 16:54:47 +08:00
Wei Zhu
c962705f03 Increase click area of Tree icons 
Close #6120
 2017-05-18 14:28:48 +08:00
Benjy Cui
12a6060304 docs: fix code style 2017-05-15 14:37:22 +08:00
Graeme Yeates
d8d17a6401 Seperate @active-item-bg into 2 variables 2017-05-03 10:57:14 -04:00
Graeme Yeates
4eb2855871 Add @active-item-bg to control hover and active states 2017-05-02 11:05:28 -04:00
Wei Zhu
2190f63959 docs: Fix Tree drag demo 
close #5837
 2017-05-02 16:47:40 +08:00