mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-03 00:09:39 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity
23,091 Commits 21 Branches 732 Tags 434 MiB
d5c17a9a7c
Commit Graph

151 Commits

Author SHA1 Message Date
RyanHui
c095cb4665 modal add mask colse (#12556) 2018-10-10 22:28:38 +08:00
C.J. Winslow
b9a86b2ea1 Pass the ok and cancel button props in the confirm API (#12425) 
This PR adds the `okButtonProps` and `cancelButtonProps` API to the `Modal.confirm` and associated methods.


* [x] Make sure that you propose PR to right branch: bugfix for `master`, feature for branch `feature`.
* [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:

*isNewFeature* **:**

  * [x] Update API docs for the component.
  * [x] Update/Add demo to demonstrate new feature.
  * [x] Update TypeScript definition for the component.
  * [x] Add unit tests for the feature.
 2018-09-30 14:50:03 +08:00
afc163
2952a8625b site: remove old version hint of API 2018-09-12 21:43:01 +08:00
afc163
325bff5324 update modal demo button text 2018-08-25 22:57:24 +08:00
afc163
b8b9c02fb9 Add update function for Modal.method, close #11721 2018-08-25 22:57:24 +08:00
yoyo837
ef31697d26 Support centered settings 2018-07-31 21:14:48 +08:00
Ilan Hasanov
86398d910a 💬 misc typos and blank spaces fixes 2018-07-29 01:15:02 +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
Randy
a614a525c4 fix #10822 (#10955) 
Add `okButtonProps` and `cancelButtonProps` props to ok button and cancel button
 2018-06-22 19:56:41 +08:00
偏右
9053192ae9 Fix component style (#7848) 
* fix components style

* fix snapshot

* update travis node version

* change upload action in ci
 2017-10-11 12:01:27 +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
Meow-z
e165b8a705 fix: model (#7675) 
add confirmLoading in async model state.
 2017-09-20 09:22:53 -05:00
yociduo
528a7645ca remove cancel text 2017-08-07 10:40:33 +08:00
Eden Wang
a5a1458148 add missing trailing commna 2017-08-07 10:40:33 +08:00
Eden Wang
f7b918add3 update confirm demo 2017-08-07 10:40:33 +08:00
Benjy Cui
523ad8c802 docs: show demo for #6121 2017-05-16 15:09:10 +08:00
Benjy Cui
9ce3a1ea35 docs: update docs details for Modal, close: #6121 2017-05-16 10:43:12 +08:00
Benjy Cui
12a6060304 docs: fix code style 2017-05-15 14:37:22 +08:00
ddcat1115
24e6fb4ba6 fix Modal.confirm error when onCancel not set (#5294) 
* fix Modal.confirm error when onCancel not set

* add test case
 2017-03-17 11:47:36 +08:00
ddcat1115
e07cdf5387 add left out event parameters for Modal[onOk] Popconfirm[onConfirm] Popconfirm[onCancel] (#5042) 2017-02-24 16:07:39 +08:00
afc163
5e0f5e1902 rewrite Modal demos to es6 component, #4878 2017-02-20 22:02:12 +08:00
afc163
b427adec21 docs: add instrunction about footer={null} 2017-02-19 01:42:58 +08:00
Benjy Cui
200b88246f docs: update docs format 2017-02-13 10:55:53 +08:00
afc163
0eb5c689a3 remove type="ghost" from demo 2017-02-04 22:35:33 +08:00
Benjy Cui
3e17551b7e site: improve build speed 2017-01-19 15:22:53 +08:00
afc163
f9319e244b Add compatible css centered demo code, close #3849 2016-11-15 15:02:30 +08:00
afc163
66891a7cc0 update demo text 2016-10-07 18:00:48 +08:00
afc163
bbe6606dc3 fix demo 2016-09-14 14:49:12 +08:00
Benjy Cui
25cb3e2d30 docs: update demo to catch errors, close: #2912 2016-09-10 18:14:23 +08:00
Andrew Murray
0d00c5fb6c docs: Fixed typos (#2921) 2016-09-01 18:12:12 +08:00
afc163
77949bb9e3 upgrade eslint-config, close #2811 2016-08-23 21:00:35 +08:00
Benjy Cui
2ed192db52 docs: fix demo style 2016-08-11 11:47:28 +08:00
Gray Choi
5c2087311f docs: translate modal (#2634) 2016-08-11 11:41:06 +08:00
陆离
0b3146dba0 modal destroy (#2124) 
* modal destroy

* document and typo

* remove blank line
 2016-06-21 18:50:07 +08:00
Benjy Cui
2144349741 style: enable react/jsx-closing-bracket-location 2016-06-06 13:54:10 +08:00
Benjy Cui
ecaa6c56c3 style: enable comma-dangle 2016-05-11 09:32:33 +08:00
afc163
51693994b5 upgrade center modal demo 2016-05-09 16:46:46 +08:00
afc163
72f68fa003 support custom Modal position and add vertical middle demo 2016-05-05 16:52:36 +08:00
afc163
03cb74ead5 upgrade eslint-config-airbnb version and fix some problems 2016-04-29 12:13:27 +08:00
afc163
5ee64fe105 Add Modal.warning 2016-04-11 14:59:37 +08:00
afc163
4c60da7316 Modal.confirm, iconClassName => iconType 2016-04-11 14:57:29 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
Benjy Cui
03d09b66e8 docs: update demo format 2016-03-31 09:40:55 +08:00
afc163
04f747770e fix(docs), confirm demo & docs 2016-03-18 11:48:06 +08:00
Benjy Cui
c1659c2ce3 style: update code style to please lint 2016-02-22 10:52:30 +08:00
Benjy Cui
9d022ff84c style: update code style to please lint 2016-02-17 15:57:33 +08:00
afc163
6700dbba2a Fix Modal onCancel argument, ref #980 2016-02-02 14:54:34 +08:00
Benjy Cui
68b51e298d style: update code style for space-before-function-paren 2016-01-27 17:00:58 +08:00
afc163
66b7ee81ad fix eslint problems, eslint-config-airbnb@4.x 2016-01-23 15:22:16 +08:00
Benjy Cui
aa5c4f9595 style: update code style to please lint 2016-01-11 09:49:31 +08:00
Benjy Cui
209170e813 style: update demo code style to please lint 2016-01-11 09:49:30 +08:00
afc163
91bd7f22c0 use mountNode replace the long getElementById 2015-12-29 12:08:58 +08:00
afc163
bd14d75419 Merge pull request #584 from ant-design/feat-button-text 
Add i18n for `Table` `Modal` `Popconfirm`
 2015-11-26 11:59:20 +08:00
afc163
16abf46071 Fix markdown eslint errors, update .eslintrc 2015-11-25 18:10:34 +08:00
shelwin
042f016dd4 update modal confirm demo 2015-11-25 16:17:58 +08:00
Benjy Cui
b110b8787b docs: update demos 2015-11-24 16:39:16 +08:00
Benjy Cui
fdd9ef7d18 feat: Modal should support internationalization 2015-11-24 11:01:36 +08:00
afc163
753c01ae18 ES6 syntax for demo code 
fix antd.notification
 2015-10-28 20:55:49 +08:00
afc163
e19186f783 confirmLoading is fully controlled by props now, fix #392 2015-10-27 19:57:18 +08:00
afc163
5a50df6b78 use ghost button to match primary button 2015-10-26 11:08:36 +08:00
afc163
cad3fdff45 lg => large, sm => small 2015-10-26 11:02:48 +08:00
yiminghe
76b0f673ec beta2 2015-10-20 16:47:55 +08:00
afc163
8e00cdedf4 Merge branch 'master' into develop-0.10.0 2015-10-15 11:26:32 +08:00
afc163
ed7114e25e update modal info 2015-10-15 11:26:07 +08:00
Benjy Cui
5b86a4be1d refactor: replace button tag with Button component 2015-10-08 15:13:04 +08:00
afc163
176adab763 update modal basic demo 2015-09-22 15:11:29 +08:00
afc163
c5cab1d687 Add confirmLoading prop for Modal 
You can use `confirmLoading` to cancel button loading status.

```
onOk() {
  ...
  this.setState({
    confirmLoading: false
  });
}
```

Fix #322
 2015-09-22 15:06:10 +08:00
afc163
d6a4094bc4 Allow multiple confirm dialogs popup 2015-09-18 16:00:12 +08:00
afc163
6dbb7ba8ba update confirm modal button text 2015-09-08 15:03:02 +08:00
afc163
0ac1f76553 Fix visible state bug in handleCancel 2015-09-08 12:38:21 +08:00
afc163
a63e2f8c0c Remove console.log 2015-09-07 21:48:30 +08:00
afc163
75d710a1b8 Add some info type Modal, close #244 2015-09-07 11:48:57 +08:00
afc163
8c2c65adf4 update modal custom.md 2015-08-25 17:08:43 +08:00
afc163
ee8335856c Only listen mousemove once 
初始化时监听, 共享同一个 mousePosition
 2015-08-18 13:19:00 +08:00
afc163
56b06e168f get mousePosition from mousemove listener for more elegant API 2015-08-18 12:26:19 +08:00
afc163
1c5e3485e7 Fix cancel button can not close modal 
1. 关闭取消按钮的修复
2. 优化 loading 按钮的效果
 2015-08-18 11:46:07 +08:00
yiminghe
099999ffc1 support mousePosition 2015-08-17 23:46:09 +08:00
yiminghe
867c4f2a85 support mousePosition 2015-08-17 23:42:52 +08:00
afc163
9d5e0a2e58 remove unused state visible 2015-08-17 16:44:38 +08:00
afc163
539ac64998 除了自定义页脚外，点击取消不需要手动设置关闭 2015-08-17 16:42:33 +08:00
afc163
edc0f4bbc0 modal custom footer demo 2015-08-14 14:35:15 +08:00
afc163
12b26137ea Add confirm button loading effect for modal 2015-07-22 17:32:22 +08:00
yiminghe
0a7410973e clean warning 2015-07-08 20:53:11 +08:00
yiminghe
82913b8610 support promise for modal 2015-06-25 15:35:46 +08:00
yiminghe
abcdaddcaa support promise for modal 2015-06-25 15:29:56 +08:00
afc163
74c30f4128 update modal style 2015-06-18 15:46:59 +08:00
afc163
4adae8b3ed fix modal style 2015-06-15 21:30:17 +08:00
afc163
22c48941e9 tweak code style 2015-06-14 13:20:35 +08:00
yiminghe
d5f760f9e7 remove ref 2015-06-12 23:31:44 +08:00
afc163
646c6853d6 move confirm into modal 2015-06-12 19:41:30 +08:00
afc163
b5ae8925f2 update modal demos 2015-06-12 17:44:29 +08:00
afc163
0cbf1b9cc3 update modal demos 2015-06-12 17:37:39 +08:00
afc163
2dc587269f update modal demos 2015-06-12 17:11:32 +08:00
yiminghe
c634b4d14c add confirm 2015-06-10 22:02:13 +08:00
afc163
ab6599b367 update modal demo 2015-06-10 16:43:35 +08:00
yiminghe
3a9619ed68 update modal 2015-06-05 15:16:55 +08:00
yiminghe
d3823e95d2 update modal 2015-06-05 12:05:52 +08:00
afc163
196566039b tweak code 2015-06-05 10:42:47 +08:00