mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-21 21:28:09 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity
13,655 Commits 23 Branches 734 Tags 437 MiB
1c98a79b2a
Commit Graph

393 Commits

Author SHA1 Message Date
Benjy Cui
8c632ef2cf fix: Modal.method should stop loading when promise throw err, close: #6183 2017-06-06 11:51:50 +08:00
afc163
fd625ef1a0 upgrade and fix tslint problems 2017-05-31 15:48:35 +08:00
Benjy Cui
0e5431d21b deps: upgrade antd-tools and code style 2017-05-25 16:54:15 +08:00
Benjy Cui
977a5a1cc7 docs: add missing API docs for Modal, close: #6239 2017-05-24 10:00:59 +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
leadream
d783c26263 css: add background color variable for modal mask. (#5890) 2017-04-25 16:43:42 +08:00
afc163
b9ff7ed613 enlarge close area of Modal 2017-04-19 11:15:46 +08:00
Manjit Kumar
4e055ed5d0 use PropTypes from 'prop-types' mdoule instead of React 
- as React.PropTypes is being deprecated
 - Warning: Accessing PropTypes via the main React package is deprecated. Use the prop-types package from npm instead.
 - Solution: https://facebook.github.io/react/blog/2017/04/07/react-v15.5.0.html#migrating-from-react.proptypes
 2017-04-12 02:22:05 +05:30
Benjy Cui
71495e71d2 test: fix warning, close: #5628 2017-04-05 16:21:21 +08:00
Wei Zhu
1a8e738142 Set snapshotSerializers 2017-04-02 18:09:23 +08:00
Benjy Cui
ce2fe2aa45 test: add test for Modal[footer=null] 2017-03-30 16:06:03 +08:00
Benjy Cui
af12ca7434 fix: Modal[footer] could be set to null to hide totally, close: #5462 2017-03-24 14:41:41 +08:00
偏右
674255bd14 [WIP] upgrade deps (#5455) 
* upgrade deps

* autofix some tslint problems

* Fix tslint problems manually
 2017-03-23 21:15:49 +08:00
afc163
6b2f6af85d use @info-color over @primary-color, close #5442 2017-03-23 13:57:30 +08:00
afc163
a42a507e2b percise modal document 2017-03-22 15:25:28 +08:00
Wei Zhu
f6b1e942e3 Jest 19 (#5361) 
* Upgeade to jest 19

* Use jest.spyOn
 2017-03-17 18:56:30 +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
elios
f3cc8dfe0d + call onCancel when pressing esc key (#5209) 
* + call onCancel when pressing esc key

* + call onCancel when press esc corrections
 2017-03-10 10:55:47 +08:00
afc163
0b62f77630 Tweak title color 2017-03-07 14:29:02 +08:00
邦
3d32a86547 refactor: improve modal static methods type definition (#5090) 
* refactor: improve modal static methods type definition

* chore: add exports.

* chore: remove unused import
 2017-03-03 11:40:54 +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
Benjy Cui
eee34f1829 fix: footer button should align with cross button 2017-02-13 10:23:55 +08:00
Benjy Cui
d2b8d65c87 style: update code style to please lint, close: #2179 2017-02-06 12:09:58 +08:00
afc163
0eb5c689a3 remove type="ghost" from demo 2017-02-04 22:35:33 +08:00
Graeme Yeates
1006015ef0 Add border customization variables (#4734) 
* Add border customization variables (#4712)

* Make border styles customizable (fixes #4712)
 2017-01-31 16:05:10 +08:00
afc163
f2bb4afd4d Merge from master 2017-01-27 17:23:51 +08:00
Wei Zhu
77b78a9389 docs: Unify type naming (#4636) 
* Unify name of ReactNode type in document

* Lowser all string type name

* Lowercase all number type name

* Lowercase all boolean type name

* Unify array type

* Lowercase all object type name

* Unify mutilple types
 2017-01-20 20:10:50 +08:00
afc163
35523be6e9 Merge from master 2017-01-20 18:28:09 +08:00
Benjy Cui
3e17551b7e site: improve build speed 2017-01-19 15:22:53 +08:00
afc163
75abadac84 Add doc about clearing Modal old state 2017-01-16 14:30:07 +08:00
afc163
4654db312f Fix some lesshint problems 2017-01-11 21:45:09 +08:00
afc163
af9a2cd8fb update modal style 2017-01-11 19:15:16 +08:00
Pixy Yuan
a2bef2b87e feat: Modal.confirm add maskClosable option (#4488) (#4490) 
* feat: Modal.confirm add maskClosable option (#4488)

* feat: Modal.confirm add maskClosable option (#4488)
 2017-01-08 19:14:28 +08:00
Benjy Cui
d4132ac558 chore: add missing definition for Modal 2017-01-05 12:08:43 +08:00
陆离
a0498e436f docs: add document for afterClose props for Modal (#4448) 
+ close #4445
 2017-01-05 12:06:27 +08:00
Benjy Cui
4758302ad5 deps: upgrade antd-tools, close: #4208 2016-12-19 14:01:52 +08:00
Wei Zhu
07103b9fb6 Don't ignore test files. 2016-12-14 14:48:09 +08:00
Wei Zhu
17a0a33283 Restructure tests. 2016-12-14 14:41:39 +08:00
afc163
3af1821bde remove whitespaces 2016-12-11 14:05:19 +08:00
Andrey G
a307a7acf7 refactor: remove unnecessary computed props for classNames (#4055) 
* remove unnecessary computed props for classNames

* rollback autocomplete optimization for possible css style order issue

* update snapshots

* remove more unnecessary computed props at Input
 2016-11-30 10:20:23 +08:00
Benjy Cui
932443099a css: use @component-background, ref: #4040 2016-11-29 11:56:10 +08:00
cathayandy
addb6e44dc Fix #4039. Replace background-color: #fff with background: @body-background (#4040) 2016-11-29 09:54:54 +08:00
Bruce Mitchener
36508ffabd Typo fixes. 2016-11-16 20:33:37 +07:00
afc163
f9319e244b Add compatible css centered demo code, close #3849 2016-11-15 15:02:30 +08:00
ddcat1115
0baef0627e docs: 调整组件导航结构 (#3758) 
- Layout 更名为 Grid
 2016-11-09 14:43:32 +08:00
afc163
0ec4276eab @font-size-lg (#1752) 2016-11-08 21:07:01 +08:00
afc163
e4974ac72a use @font-size-base (#1752) 2016-11-08 20:57:07 +08:00
afc163
0a48c62dcb use @text-color 2016-11-08 20:50:59 +08:00
afc163
9b81fe86d9 clear less variables and add @text-color-secondary 2016-11-08 20:48:03 +08:00
afc163
24f71ac6be remove some blanks 2016-11-02 16:55:15 +08:00
Benjy Cui
4878258f6c refactor: ref: #3490 2016-10-24 12:04:26 +08:00
yiminghe
8afe3965c1 upgrade ts 2.0 2016-10-19 17:52:23 +08:00
afc163
e520998166 Fix popover card arrow border 2016-10-14 21:43:59 +08:00
afc163
741eb732f0 fix lesshint 2016-10-11 20:00:25 +08:00
afc163
889548b1b6 Add shadow to Modal 2016-10-11 19:59:52 +08:00
afc163
dccc4ced95 Export @animation-duration-* to default theme 2016-10-07 18:29:55 +08:00
afc163
66891a7cc0 update demo text 2016-10-07 18:00:48 +08:00
afc163
6edac76abb prolong delay animation click time 2016-10-07 18:00:40 +08:00
afc163
2969f9d1e5 Improve confirm Modal style detail 2016-10-07 17:59:00 +08:00
afc163
466aea3ea5 fix some components style detail 2016-09-30 11:30:51 +08:00
Benjy Cui
bd7e9f00c0 style: update code style 2016-09-21 11:54:53 +08:00
Benjy Cui
3f67fd3f9f docs: update docs details 2016-09-21 11:28:38 +08:00
马金花儿
3d187d00a1 feat: 为Modal组件的confirm、success、error、warning、info 子组件增加快捷键，模仿原生体验。 (#3061) 
* Add hotkey for Modal.confirm

* Optimize

* 重构快捷键逻辑

* 根据CR 进一步优化逻辑

* timeoutId 改为非强制

* Update confirm.tsx

* 使用 onCancel 回调代替 onClose，并修改 onCancel 注释。

* 修改注释
 2016-09-20 08:58:20 +08:00
feng zhi hao
cad2d19be2 fix: complete loss declaration (#3068) 
* complete loss declaration

* fix error in ts-lint

* fix Icon name error
 2016-09-19 10:17:07 +08:00
偏右
354759cb17 Redesigned icons (#3041) 
* redesigned icons

* change iconfont content

* use same icons

* fix missing icons

* improve icon size
 2016-09-18 09:54:47 +08:00
afc163
73a6bfb055 Merge branch 'master' of github.com:ant-design/ant-design 2016-09-14 16:29:53 +08:00
马斯特
a25ec29fb8 refactor: 保证所有的tsx和less都正确使用prefix (#3024) 
* refactor: extract prefix cls as less variable

* refactor: apply ant icon prefix cls in less files

* refactor: all components support prefixCls props
 2016-09-14 16:18:33 +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
afc163
0e6f677ff9 Fix doc headings 2016-09-10 13:43:30 +08:00
Andrew Murray
0d00c5fb6c docs: Fixed typos (#2921) 2016-09-01 18:12:12 +08:00
afc163
e0eb9ae162 Merge branch "1.x-stable" 2016-08-29 21:02:59 +08:00
afc163
ee60b42d6d improve Modal code style 2016-08-29 20:48:47 +08:00
afc163
77949bb9e3 upgrade eslint-config, close #2811 2016-08-23 21:00:35 +08:00
Benjy Cui
5dcce12c2c fix: some tsc errors (#2804) 2016-08-22 17:26:14 +08:00
afc163
36293e2ccb fix tslint 2016-08-16 18:12:56 +08:00
afc163
24d2973c32 Merge branch "1.x-stable" 2016-08-16 17:54:59 +08:00
ddcat1115
2c76b19a1a fix #2688 避免对已经unmount的组件进行操作 (#2720) 2016-08-15 17:49:41 +08:00
ddcat1115
3bdd8212ec refactor: Ts rewrite patination notification modal menu (#2699) 2016-08-15 12:00:05 +08:00
Benjy Cui
8dd31d0bb2 fix: buttons of Modal.xxx should be disabled, close: #2684 (#2687) 2016-08-14 15:19:47 +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
afc163
b200f8a2d8 Merge 1.x-stable 2016-08-08 14:12:02 +08:00
RaoHai
3209edddca modal 添加小屏幕适配。 
+ 加入 768px 断点。当屏幕小于 768 时，宽度 auto 且 margin:10。其他不变。
 2016-08-03 15:25:33 +08:00
ddcat1115
ef84f8d408 refactor: ts LocaleProvider (#2548) 2016-08-02 16:10:26 +08:00
afc163
d7defe458b blank line 2016-07-15 12:37:53 +08:00
偏右
de359d2cf7 fix tslint problems (#2360) 2016-07-13 11:14:24 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
afc163
95351bfffa Merge branch '1.x-stable' 2016-06-27 19:31:38 +08:00
afc163
089f1ae512 update components category name 2016-06-27 18:21:12 +08:00
afc163
ef4c1a4749 Merge branch '1.x-stable' 2016-06-27 17:58:16 +08:00
afc163
b5f49a5aad improve modal zoom animation 2016-06-27 16:40:11 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00
陆离
0b3146dba0 modal destroy (#2124) 
* modal destroy

* document and typo

* remove blank line
 2016-06-21 18:50:07 +08:00
Benjy Cui
209e3c1f9d docs: remove deprecated Modal.warn 2016-06-19 09:54:36 +08:00
afc163
90c2d7ee12 downgrade rc-util 2016-06-16 22:34:54 +08:00
Benjy Cui
2144349741 style: enable react/jsx-closing-bracket-location 2016-06-06 13:54:10 +08:00
yiminghe
fc55cf6919 keep .warn 2016-05-31 15:29:24 +08:00
afc163
f1817e1a9e clear style 2016-05-19 11:12:05 +08:00
afc163
884f6510b2 Fix confirm icon color, close #1753 2016-05-18 19:07:14 +08:00
afc163
a15b601e6d Fix fixed modal, close #1751 2016-05-18 18:55:50 +08:00
Benjy Cui
8842d9342a site: update components' type 2016-05-16 15:41:55 +08:00
afc163
6c4adf3348 Fix modal close focus style, close #1668 2016-05-12 15:36:17 +08:00
afc163
c247e6ee6a fix lint 2016-05-12 15:11:25 +08:00
afc163
a3850a4df8 LocalePrivider should not dependconfirm 2016-05-12 13:25:00 +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
c45ed1365e Fix confirm missing style 2016-05-05 15:03:24 +08:00
afc163
03cb74ead5 upgrade eslint-config-airbnb version and fix some problems 2016-04-29 12:13:27 +08:00
afc163
0ca6a1c24a css modularize (#1448) 
* css modularize

* Add alert style

* Move more component style

* Move iconfont to common style

* Move layout style

* Move more component style

* Move all components

* Fix lots of mixin deps

* remove css-prefix from less

* fix a button icon style bug

* restructure

* fix index

* add dist

* fix jest

* fix some components style

* clean webpack config

* check more components style

* update tabs

* update scripts

* update scripts

* fix form style

* fix more style

* Fix select width

* Fix form and tabs style
 2016-04-27 20:44:36 +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
afc163
ae87f60075 remove Modal align in API document 2016-04-05 13:42:02 +08:00
afc163
71ee13a2a8 Fix Modal animation 2016-04-05 11:58:46 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
Benjy Cui
d5a6932c15 docs: update documentation format 2016-03-31 14:17:09 +08:00
Benjy Cui
03d09b66e8 docs: update demo format 2016-03-31 09:40:55 +08:00
Bruce Mitchener
0acce38f08 Convert more createClass over to extending Component. 2016-03-29 16:33:37 +07:00
afc163
fbda3c7b88 Merge master into develop-1.0.0 2016-03-28 16:15:36 +08:00
afc163
7cee16d153 Fix alert icons style 2016-03-28 16:09:13 +08:00
Benjy Cui
5e4786440d deps: remove object-assign 2016-03-25 18:16:48 +08:00
afc163
fb6c6abbc7 Merge master 2016-03-22 19:31:55 +08:00
Bruce Mitchener
11c0a6a203 Name classes without Ant* prefix. 
Where necessary, prefix the classes imported from react-component
with 'Rc' rather than prefixing the Ant classes with 'Ant'.

The prefixing of Ant classes wasn't consistent and isn't necessary
in many cases.
 2016-03-21 20:16:38 +07:00
afc163
04f747770e fix(docs), confirm demo & docs 2016-03-18 11:48:06 +08:00
Benjy Cui
ebab622add Merge branch 'master' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-15 09:47:55 +08:00
afc163
80d6ae30a8 Add propTypes and prop align in Modal docs 2016-03-14 11:46:48 +08:00
Benjy Cui
02f507f156 fix: should copy defaultLocale instead of refer 2016-03-10 10:32:50 +08:00
afc163
95c1ead55b fix text 2016-03-10 10:32:50 +08:00
afc163
83f96e5f19 Make LocalProvider compatible with Modal.xxx 2016-03-10 10:32:50 +08:00
afc163
2482140d2f Change context locale name 2016-03-10 10:32:50 +08:00
afc163
99b58e67ec Add other component for locale 2016-03-10 10:32:49 +08:00
afc163
5a9b7a295f update docs 2016-03-06 00:10:36 +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
afc163
cfc141b1c7 capture mousePosition event register in document 2016-01-22 13:54:53 +08:00
afc163
a16903009e merge from master 2016-01-13 22:22:33 +08:00
afc163
24bd1f09da fix Modal case bug 2016-01-13 16:46:38 +08:00
Benjy Cui
7ae966873a fix: cyclic reference in Modal 2016-01-12 17:07:24 +08:00
Benjy Cui
aa5c4f9595 style: update code style to please lint 2016-01-11 09:49:31 +08:00
Benjy Cui
b72d18fd44 style: update code style to please the fucking lint 2016-01-11 09:49:30 +08:00
Benjy Cui
209170e813 style: update demo code style to please lint 2016-01-11 09:49:30 +08:00
Benjy Cui
711d2d7413 style: update code style to please lint 2016-01-11 09:49:30 +08:00
Benjy Cui
a7b2c2e348 feat: expose closable for Modal 2016-01-06 10:21:02 +08:00
afc163
91bd7f22c0 use mountNode replace the long getElementById 2015-12-29 12:08:58 +08:00
Benjy Cui
7cd8b34015 chore: remove useless div 2015-12-15 17:54:43 +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
d1d3329674 fix boolean attribute lint errors 2015-11-25 18:10:35 +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
dba62729b0 refactor: set okText cancel defaultValue 2015-11-24 16:48:21 +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
e058e67cb4 fix iconfont 2015-11-20 11:05:34 +08:00
yiminghe
dc1650486d fix button 2015-11-03 20:06:44 +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
aed7eae2bc Fix confirmLoading 2015-10-20 10:45:49 +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
elrrrrrrr
244c3a78a5 chore: 迁移 modal iconfont 
- api 接口有变
 2015-10-02 15:41: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
a1d5030174 rollback blur mask 2015-09-11 17:11:00 +08:00
jljsj
9d5bc12db0 add modal bg blur, remove motion blur 2015-09-11 16:46:28 +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
691b0147b1 update eslintrc and fix code 2015-09-01 16:19:39 +08:00
afc163
8c2c65adf4 update modal custom.md 2015-08-25 17:08:43 +08:00
afc163
e6d92e37b1 update modal default props 2015-08-25 16:56:08 +08:00
afc163
94c9081c83 default modal width change to 520px 2015-08-25 16:25:08 +08:00
afc163
fdf19520d6 Add component type 2015-08-22 20:16:24 +08:00
afc163
281dd27e96 short delay for detecting mousePosition 2015-08-19 10:09:44 +08:00
afc163
c3294dfc64 use arrow function 2015-08-18 20:27:40 +08:00
afc163
e95e557077 detect mousePosition in click event 2015-08-18 18:36:31 +08:00
afc163
77651c0621 update code style 2015-08-18 16:24:18 +08:00
afc163
192f150bc2 use rc-util addEventListener 2015-08-18 16:21:56 +08:00
afc163
c0c9b4a8d5 remove this.onDocumentMousemove 2015-08-18 13:21:48 +08:00
afc163
ee8335856c Only listen mousemove once 
初始化时监听, 共享同一个 mousePosition
 2015-08-18 13:19:00 +08:00
afc163
f4964626d9 open confirm from current mouse position 2015-08-18 13:15:16 +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