New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #10822 #10955

Merged
merged 2 commits into from Jun 22, 2018

Conversation

Projects
None yet
5 participants
@djyde
Contributor

djyde commented Jun 19, 2018

Add okButtonDisabled and cancelButtonDisabled props to disable ok button and cancel button 馃帀

They are false by default.

@ant-design-bot

This comment has been minimized.

ant-design-bot commented Jun 19, 2018

Deploy preview for ant-design ready!

Built with commit b4467e6

https://deploy-preview-10955--ant-design.netlify.com

@afc163

This comment has been minimized.

Member

afc163 commented Jun 19, 2018

Try okButtonProps and cancelButtonProps

@djyde

This comment has been minimized.

Contributor

djyde commented Jun 20, 2018

ok. Changed to okButtonProps and cancelButtonProps.

@codecov

This comment has been minimized.

codecov bot commented Jun 20, 2018

Codecov Report

Merging #10955 into feature-3.7.0 will increase coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##           feature-3.7.0   #10955      +/-   ##
=================================================
+ Coverage          91.83%   91.85%   +0.02%     
=================================================
  Files                196      196              
  Lines               4912     4912              
  Branches            1376     1376              
=================================================
+ Hits                4511     4512       +1     
+ Misses               397      396       -1     
  Partials               4        4
Impacted Files Coverage 螖
components/modal/Modal.tsx 78.57% <酶> (酶) 猬嗭笍
components/anchor/Anchor.tsx 90.9% <0%> (+0.82%) 猬嗭笍

Continue to review full report at Codecov.

Legend - Click here to learn more
螖 = absolute <relative> (impact), 酶 = not affected, ? = missing data
Powered by Codecov. Last update e7fa6ca...b4467e6. Read the comment docs.

@afc163

This comment has been minimized.

Member

afc163 commented Jun 22, 2018

@yutingzhao1991 娌¢棶棰樼殑 PR 鍙婃椂鍚堟帀鍚с

@yutingzhao1991 yutingzhao1991 merged commit a614a52 into ant-design:feature-3.7.0 Jun 22, 2018

6 checks passed

WIP ready for review
Details
codecov/patch Coverage not affected when comparing e7fa6ca...b4467e6
Details
codecov/project 91.85% (+0.02%) compared to e7fa6ca
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details
security/snyk - package.json No dependency changes
Details
@mauriciosoares

This comment has been minimized.

mauriciosoares commented Jul 4, 2018

any idea on when 3.7.0 will be released with this feature? :)

bors bot added a commit to mozilla/delivery-console that referenced this pull request Jul 16, 2018

Merge #310
310: Update dependency antd to v3.7.0 r=rehandalal a=renovate[bot]

This Pull Request updates dependency [antd](https://github.com/ant-design/ant-design) from `v3.6.6` to `v3.7.0`



<details>
<summary>Release Notes</summary>

### [`v3.7.0`](https://github.com/ant-design/ant-design/releases/3.7.0)
[Compare Source](ant-design/ant-design@3.6.6...3.7.0)
3.7.0 is a heavy update that brings a lot of exciting changes and new features.  
Here are some highlights :
- 馃専 Add drawer component : [Drawer](https://ant.design/components/drawer-cn/). [#&#8203;10791](`ant-design/ant-design#10791)
- 馃専 Horizontal menu automatically collapses when there is no enough space. [#&#8203;11234](`ant-design/ant-design#11234)
![demo](https://user-images.githubusercontent.com/1731837/42550555-0fef7878-8505-11e8-9d2f-f708fec66b44.gif)
- 馃専 Add `Tree.DirectoryTree` component as the built-in directory tree. [#&#8203;7749](`ant-design/ant-design#7749)
Component Fixes / Enhancements:
- Upgrade `rc-tree-select` to `2.0.5` for TreeSelect, refactored to fix the logic of the check.
  - 馃専 Add `autoClearSearchValue` prop to clear the value of search input when multiple select is selected or deselected. [10996](`ant-design/ant-design#10996)
  - 馃専 Add `searchValue` prop to set the value of search input. [6ff7dd8](ant-design/ant-design@6ff7dd8#diff-1e8e47abbdbe6e12d009aa61619ab22f)
  - 馃専 Add `maxTagCount` prop to set the max count of visible tags. [fb96c9d](ant-design/ant-design@fb96c9d)
  - 馃専 Add `maxTagPlaceholder` prop to set the content when the tag is hidden. [fb96c9d](ant-design/ant-design@fb96c9d)
  - 馃専 Search input now supports case sensitive search. [#&#8203;10990](`ant-design/ant-design#10990)
  - 馃棏 Remove `label` prop and use `title` prop instead in the `treeData`. 
- Upgrade `rc-upload` to `2.5.0` for Upload. 
  - 馃専 Add `directory` prop to support folder uploading. [#&#8203;7315](`ant-design/ant-design#7315)
  - 馃専 `action` prop supports to be the a function which returns a Promise object. [fd96967](ant-design/ant-design@fd96967)
- Dropdown
  - 馃専 Provide default margin for icon in the menu item. [8e60a59](ant-design/ant-design@8e60a59)
  - 馃専 Be able to adjust the menu position for the trigger mode of `contextMenu` automatically. [16e4260](ant-design/ant-design@16e4260)
- Upgrade `rc-table` to `6.2.2` for Table. [f2fddff](ant-design/ant-design@f2fddff)
  - 馃専 Add `expanded` as the fourth param of `expandedRowRender` prop to get the expanded state of current row. [#&#8203;10379](`ant-design/ant-design#10379)
  - 馃専 Add the ability to override the filter menu without the fully controlled component. [59cc3a8](ant-design/ant-design@59cc3a8) [@&#8203;chrvadala]
  - 馃専 `filterIcon` prop  supports to be a render function which returns ReactNode. [1af4392](ant-design/ant-design@1af4392)
  - 馃悶 Fix the row dislocation problem when the column is fixed. [#&#8203;10392](`ant-design/ant-design#10392)
- 馃専 Allow to pass `data-*`, `aria-*` and `role-*` props to the inner for Alert. [f0b684d](ant-design/ant-design@f0b684d)
- 馃専 Add `alt` prop for Avatar to set the text when the image is unable to display. [#&#8203;10798](`ant-design/ant-design#10798)
- 馃専 Allow to pass `data-*`, `aria-*` and `role-*` props to the inner Input for DatePicker. [e63f9d4](ant-design/ant-design@e63f9d4)
- 馃専 Add `event` object as the second param of `onSearch` prop for Input.Search. [#&#8203;11015](`ant-design/ant-design#11015)
- 馃専 Add `onBreakPoint` prop for Layout.Sider to be the callback function when breakpoint is triggered. [#&#8203;10750](`ant-design/ant-design#10750) [@&#8203;nuintun]
- 馃専 Add `okButtonProps` prop to set the props of ok button and add `cancelButtonProps` prop to set the props of cancal button for Modal. [#&#8203;10955](`ant-design/ant-design#10955) [@&#8203;djyde]
- 馃専 Add `strokeColor` prop to set the color of progress bar for Progress. [#&#8203;10725](`ant-design/ant-design#10725)
- 馃専 Add `buttonStyle` prop whose optional value is `outline` or `solid` to set the Radio.Group style. [60e3cfa](ant-design/ant-design@60e3cfa#diff-c2ee8b5a368a121e9d2cc2661212045d)
- 馃専 Add `setDefaultIndicator` static function to set global indicator for Spin. [#&#8203;10787](`ant-design/ant-design#10787)
- 馃専 Add `visible` prop to set the visibility for `Tag`. [4ac0277](ant-design/ant-design@4ac0277)
- Upgrade `rc-tree` to `1.12.0` for Tree
  - 馃専 Add `loadedKeys` prop to set the loaded nodes, which usually works with loadData prop. [#&#8203;10666](`ant-design/ant-design#10666)
  - 馃専 Add `onLoad` prop to be the callback function when all the nodes are loaded. [c488aca](ant-design/ant-design@c488aca)
- 馃棏 Deprecate `combobox` value for `Select[mode]` and please replace it with `AutoComplete`. [53046a4](ant-design/ant-design@53046a4)
- 馃悶 Cascader adds `fieldNames` and discards the misspelled `filedNames`. [#&#8203;10896](`ant-design/ant-design#10896)
- 馃悶 Fix Timeline dot not working with Tooltip. [0e3b67e](ant-design/ant-design@0e3b67e)
- 馃悶 Fix border radius when avatar has custom size. [e1e6523](ant-design/ant-design@e1e6523)
- 馃専 Add `okButtonDisabled` and `cancelButtonDisabled` props to disable ok button and cancel button. [#&#8203;10955](`ant-design/ant-design#10955)


---


3.7.0鏄竴涓噸纾呮洿鏂帮紝甯︽潵浜嗗緢澶氭縺鍔ㄤ汉蹇冪殑鍙樺寲鍜屾柊鐗规с  
浠ヤ笅鏄竴浜涗寒鐐锛
- 馃敟 澧炲姞鎶藉眽缁勪欢 : [`Drawer`](https://ant.design/components/drawer-cn/) [#&#8203;10791](`ant-design/ant-design#10791)
- 馃敟 Menu 澧炲姞涓涓í鍚戣彍鍗曞湪绌洪棿涓嶈冻鏃舵孩鍑洪儴鍒嗚嚜鍔ㄦ敹璧风殑鐗规с俒#&#8203;11234](`ant-design/ant-design#11234)
![demo](https://user-images.githubusercontent.com/1731837/42550555-0fef7878-8505-11e8-9d2f-f708fec66b44.gif)
- 馃敟 鏂板 `Tree.DirectoryTree` 缁勪欢锛屼綔涓哄唴缃殑鐩綍鏍戙俒#&#8203;7749](`ant-design/ant-design#7749)
缁勪欢淇/鍔熻兘澧炲己锛
- TreeSelect 缁勪欢鍗囩骇 `rc-tree-select` 鍒 `2.0.5`锛岃繘琛屼簡閲嶆瀯锛屼慨澶嶄簡 check 鐨勯昏緫銆
  - 馃専 鏂板 `autoClearSearchValue` 灞炴э紝褰撳閫夋ā寮忎笅鍊艰閫夋嫨锛岀敤浜庤嚜鍔ㄦ竻绌烘悳绱㈡銆俒10996](`ant-design/ant-design#10996)
  - 馃専 鏂板 `searchValue` 灞炴э紝鐢ㄤ簬璁剧疆鎼滅储妗嗙殑鍊笺俒6ff7dd8](ant-design/ant-design@6ff7dd8#diff-1e8e47abbdbe6e12d009aa61619ab22f)
  - 馃専 鏂板 `maxTagCount` 灞炴э紝鐢ㄤ簬璁剧疆鏄剧ず鏍囩鐨勬渶澶ф暟閲忋俒fb96c9d](ant-design/ant-design@fb96c9d)
  - 馃専 鏂板 `maxTagPlaceholder` 灞炴э紝鐢ㄤ簬璁剧疆鏍囩闅愯棌鏃舵樉绀虹殑鍐呭銆俒fb96c9d](ant-design/ant-design@fb96c9d)
  - 馃専 鎼滅储妗嗘敮鎸佸ぇ灏忓啓鏁忔劅銆俒#&#8203;10990](`ant-design/ant-design#10990)
  - 馃棏 `treeData` 鏁版嵁鏍煎紡涓殑 `label` 灞炴ц搴熷純锛屼娇鐢 `title` 灞炴т唬鏇裤
- Upload 缁勪欢鍗囩骇 `rc-upload` 鍒 `2.5.0`
  - 馃専 鏂板 `directory` 灞炴э紝鏀寔涓婁紶涓涓枃浠跺す銆俒#&#8203;7315](`ant-design/ant-design#7315)
  - 馃専 `action` 灞炴ф敮鎸佷綔涓轰竴涓繑鍥 `Promise` 瀵硅薄鐨勫嚱鏁帮紝浣跨敤鏇村姞鐏垫椿銆俒fd96967](ant-design/ant-design@fd96967)
- Dropdown 澧炲姞鏂扮壒鎬э紝鍙互鍋氫负鍙抽敭鑿滃崟鏉ヤ娇鐢ㄣ
  - 馃専 缁欒彍鍗曢」鐨 icon 鎻愪緵榛樿鐨勫闂磋窛鏍峰紡銆俒8e60a59](ant-design/ant-design@8e60a59)
  - 馃専 瑙﹀彂鏂瑰紡涓 `contextMenu` 鏃惰嚜鍔ㄨ皟鏁磋彍鍗曠殑浣嶇疆銆俒16e4260](ant-design/ant-design@16e4260)
- Table 缁勪欢鍗囩骇 `rc-table` 鍒 `6.2.2`銆 [f2fddff](ant-design/ant-design@f2fddff)
  - 馃専 鏂板 `expanded` 浣滀负 `expandedRowRender` 灞炴у嚱鏁扮殑绗洓涓弬鏁帮紝鐢ㄤ簬鑾峰彇褰撳墠琛屾槸鍚﹀睍寮銆俒#&#8203;10379](`ant-design/ant-design#10379)
  - 馃専 鏂板鏃犻』浣跨敤瀹屽叏鍙楁帶缁勪欢涔熻兘瑕嗙洊绛涢夎彍鍗曠殑鑳藉姏銆俒59cc3a8](ant-design/ant-design@59cc3a8) [@&#8203;chrvadala]
  - 馃専 `filterIcon` 灞炴ф敮鎸佷綔涓轰竴涓繑鍥 `ReactNode` 鐨勫嚱鏁般俒1af4392](ant-design/ant-design@1af4392)
  - 馃悶 淇鍦ㄥ浐瀹氬垪鏃跺鑷寸殑琛岄敊浣嶇殑闂銆俒#&#8203;10392](`ant-design/ant-design#10392)
  - 馃悶 淇鍦ㄧ粍浠朵腑浣跨敤 `combobox` 妯″紡鐨 `Select` 瀵艰嚧鐨勯噸褰遍棶棰樸俒#&#8203;10828](`ant-design/ant-design#10828)
  - 馃悶 淇 components 灞炴у间笉鑳藉彉鍖栫殑闂銆 [c380186](ant-design/ant-design@c380186)
- 馃棏 Select 缁勪欢搴熷純浜 `combobox` 妯″紡锛岃浣跨敤 `AutoComplete` 缁勪欢浠f浛銆俒53046a4](ant-design/ant-design@53046a4)
- 馃専 Alert 缁勪欢鍏佽浼犻 `data-*`銆乣aria-*` 鍜 `role-*` 灞炴у埌缁勪欢鍐呴儴銆俒f0b684d](ant-design/ant-design@f0b684d)
- 馃専 Avatar 缁勪欢鏂板 `alt` 灞炴э紝鐢ㄤ簬璁剧疆鍥惧儚鏃犳硶鏄剧ず鏃剁殑鏇夸唬鏂囨湰銆俒#&#8203;10798](`ant-design/ant-design#10798)
- 馃専 DatePicker 缁勪欢鍏佽浼犻 `data-*`銆乣aria-*` 鍜 `role-*` 灞炴у埌缁勪欢鍐呴儴鐨 `Input`銆俒e63f9d4](ant-design/ant-design@e63f9d4)
- 馃専 Input.Search 缁勪欢鏂板 `event` 浜嬩欢瀵硅薄浣滀负 `onSearch` 灞炴у嚱鏁扮殑绗簩涓弬鏁般俒#&#8203;11015](`ant-design/ant-design#11015)
- 馃専 Layout.Sider 缁勪欢鏂板 `onBreakPoint` 灞炴э紝鐢ㄤ綔鍝嶅簲寮忓竷灞鐨勬柇鐐硅Е鍙戞椂鐨勫洖璋冨嚱鏁般俒#&#8203;10750](`ant-design/ant-design#10750) [@&#8203;nuintun]
- 馃専 Modal 缁勪欢鏂板 `okButtonProps` 鍜 `cancelButtonProps` 灞炴э紝鍒嗗埆鐢ㄤ簬璁剧疆 `鍙栨秷` 鎸夐挳鍜 `纭畾` 鎸夐挳鐨勫睘鎬с俒#&#8203;10955](`ant-design/ant-design#10955) [@&#8203;djyde]
- 馃専 Progress 缁勪欢鏂板 `strokeColor` 灞炴э紝鐢ㄤ簬璁剧疆杩涘害鏉$殑棰滆壊銆俒#&#8203;10725](`ant-design/ant-design#10725)
- 馃専 Radio.Group 缁勪欢鏂板 `buttonStyle` 灞炴 (鍙夊 `outline | solid`)锛岀敤浜庤缃 `RadioButton` 鐨勯鏍兼牱寮忋俒60e3cfa](ant-design/ant-design@60e3cfa#diff-c2ee8b5a368a121e9d2cc2661212045d)
- 馃専 Spin 缁勪欢鏂板 `setDefaultIndicator` 闈欐佹柟娉曪紝鐢ㄤ簬璁剧疆鍏ㄥ眬鐨勫姞杞芥寚绀虹銆俒#&#8203;10787](`ant-design/ant-design#10787)
- 馃専 Tag 缁勪欢鏂板 `visible` 灞炴э紝鐢ㄤ簬璁剧疆鏄惁鏄剧ず鏍囩銆俒4ac0277](ant-design/ant-design@4ac0277)
- Tree 缁勪欢鍗囩骇 `rc-tree` 鍒 `1.12.0`
  - 馃専 鏂板 `loadedKeys` 灞炴э紝鐢ㄤ簬璁剧疆宸茬粡鍔犺浇鐨勮妭鐐癸紝闇瑕侀厤鍚 `loadData` 浣跨敤銆俒#&#8203;10666](`ant-design/ant-design#10666)
  - 馃専 鏂板 `onLoad` 灞炴э紝浣滀负鑺傜偣鍔犺浇瀹屾瘯鏃剁殑鍥炶皟鍑芥暟銆俒c488aca](ant-design/ant-design@c488aca)
- 馃専 澧炲姞 `okButtonDisabled` and `cancelButtonDisabled` 灞炴х敤浜庣鐢ㄧ‘瀹氬拰鍙栨秷鎸夐挳銆俒#&#8203;10955](`ant-design/ant-design#10955)
- 馃専 Cascader 鏂板 fieldNames 骞跺簾寮冩嫾鍐欓敊璇殑 filedNames銆 [#&#8203;10896](`ant-design/ant-design#10896)
- 馃悶 淇鏃堕棿杞翠笉鑳戒笌`Tooltip`涓璧蜂娇鐢ㄧ殑闂銆  [0e3b67e](ant-design/ant-design@0e3b67e)
- 馃悶 淇褰 Avata 鑷畾涔夊ぇ灏忔椂锛屽渾瑙掍笉鏀瑰彉鐨勯棶棰樸俒e1e6523](ant-design/ant-design@e1e6523)

---

</details>




---

This PR has been generated by [Renovate Bot](https://renovatebot.com).

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment