From 5b86a4be1d22e307e6b78cb320a97ff644e36db8 Mon Sep 17 00:00:00 2001 From: Benjy Cui Date: Thu, 8 Oct 2015 15:13:04 +0800 Subject: [PATCH 1/2] refactor: replace `button` tag with `Button` component --- components/affix/demo/basic.md | 3 ++- components/affix/demo/offset.md | 3 ++- components/button/demo/menu.md | 25 ------------------- components/checkbox/demo/controller.md | 11 ++++---- components/dropdown/demo/basic.md | 5 ++-- components/dropdown/demo/event.md | 5 ++-- components/dropdown/demo/item.md | 5 ++-- components/dropdown/demo/trigger.md | 9 ++++--- components/enter-animation/demo/basic.md | 3 ++- components/enter-animation/demo/enter-data.md | 3 ++- .../enter-animation/demo/enter-leave.md | 3 ++- components/enter-animation/demo/form.md | 5 ++-- components/enter-animation/demo/page.md | 3 ++- components/enter-animation/demo/style.md | 3 ++- components/form/demo/horizontal-form.md | 3 ++- components/form/demo/inline-form.md | 3 ++- components/input-number/demo/disabled.md | 3 ++- components/message/demo/duration.md | 3 ++- components/message/demo/error.md | 3 ++- components/message/demo/info.md | 3 ++- components/message/demo/loading.md | 5 ++-- components/message/demo/success.md | 5 ++-- components/modal/confirm.jsx | 11 ++++---- components/modal/demo/basic.md | 3 ++- components/modal/demo/confirm-promise.md | 5 ++-- components/modal/demo/confirm.md | 5 ++-- components/modal/demo/custom.md | 4 ++- components/modal/demo/footer.md | 11 ++++---- components/modal/demo/info.md | 7 +++--- components/modal/index.jsx | 13 +++++----- components/notification/demo/basic.md | 3 ++- components/notification/demo/duration.md | 3 ++- components/notification/demo/onclose.md | 3 ++- components/notification/demo/with-btn.md | 7 +++--- components/notification/demo/with-icon.md | 9 ++++--- components/popconfirm/index.jsx | 5 ++-- components/popover/demo/basic.md | 4 ++- components/popover/demo/placement.md | 10 +++++--- components/popover/demo/triggerType.md | 8 +++--- components/progress/demo/circle-dynamic.md | 14 ++++++----- components/progress/demo/dynamic.md | 14 ++++++----- components/radio/demo/disable.md | 5 ++-- components/steps/demo/step-next.md | 3 ++- components/switch/demo/disabled.md | 3 ++- components/table/demo/ajax.md | 9 ++++--- components/table/demo/local-data.md | 6 +++-- components/upload/demo/basic.md | 5 ++-- components/upload/demo/defaultFileList.md | 5 ++-- components/upload/demo/fileList.md | 5 ++-- components/upload/demo/multiple.md | 5 ++-- components/validation/demo/basic.md | 7 +++--- components/validation/demo/customize.md | 7 +++--- 52 files changed, 173 insertions(+), 140 deletions(-) delete mode 100644 components/button/demo/menu.md diff --git a/components/affix/demo/basic.md b/components/affix/demo/basic.md index 4ce1fa9649..c3a70cf206 100644 --- a/components/affix/demo/basic.md +++ b/components/affix/demo/basic.md @@ -8,10 +8,11 @@ ````jsx var Affix = antd.Affix; +var Button = antd.Button; React.render( - + , document.getElementById('components-affix-demo-basic')); ```` diff --git a/components/affix/demo/offset.md b/components/affix/demo/offset.md index 87858a2385..b761d7cf36 100644 --- a/components/affix/demo/offset.md +++ b/components/affix/demo/offset.md @@ -8,10 +8,11 @@ ````jsx var Affix = antd.Affix; +var Button = antd.Button; React.render( - + , document.getElementById('components-affix-demo-offset')); ```` diff --git a/components/button/demo/menu.md b/components/button/demo/menu.md deleted file mode 100644 index da802870f0..0000000000 --- a/components/button/demo/menu.md +++ /dev/null @@ -1,25 +0,0 @@ -# 菜单按钮 - -- order: 5 - -**注**: 下拉按钮的 icon 大小统一成 **10px**。 - -> 更多交互，详见 [Dropdown 下拉菜单](http://ant.design/components/dropdown/)。 - ---- - -````jsx -var Icon = antd.Icon; - -React.render( -
- - -
-, document.getElementById('components-button-demo-menu')); -```` diff --git a/components/checkbox/demo/controller.md b/components/checkbox/demo/controller.md index e7de3ca435..4bbbf2af99 100644 --- a/components/checkbox/demo/controller.md +++ b/components/checkbox/demo/controller.md @@ -8,6 +8,7 @@ ````jsx var Checkbox = antd.Checkbox; +var Button = antd.Button; var container = document.getElementById('components-checkbox-demo-controller'); var App = React.createClass({ @@ -30,15 +31,15 @@ var App = React.createClass({

- - +

; }, diff --git a/components/dropdown/demo/basic.md b/components/dropdown/demo/basic.md index e689d8244c..86017b4ec7 100644 --- a/components/dropdown/demo/basic.md +++ b/components/dropdown/demo/basic.md @@ -9,6 +9,7 @@ ````jsx var Menu = antd.Menu; var Dropdown = antd.Dropdown; +var Button = antd.Button; var Icon = antd.Icon; var menu = @@ -25,9 +26,9 @@ var menu = React.render( - + , document.getElementById('components-dropdown-demo-basic')); ```` diff --git a/components/dropdown/demo/event.md b/components/dropdown/demo/event.md index 2431e66b44..7303d60ac9 100644 --- a/components/dropdown/demo/event.md +++ b/components/dropdown/demo/event.md @@ -9,6 +9,7 @@ ````jsx var Menu = antd.Menu; var Dropdown = antd.Dropdown; +var Button = antd.Button; var Icon = antd.Icon; var onSelect = function ({key}){ alert('选中了菜单' + key); @@ -22,9 +23,9 @@ var menu = React.render( - + , document.getElementById('components-dropdown-demo-event')); ```` diff --git a/components/dropdown/demo/item.md b/components/dropdown/demo/item.md index 667a99f505..172aec5c55 100644 --- a/components/dropdown/demo/item.md +++ b/components/dropdown/demo/item.md @@ -9,6 +9,7 @@ ````jsx var Menu = antd.Menu; var Dropdown = antd.Dropdown; +var Button = antd.Button; var Icon = antd.Icon; var menu = @@ -24,9 +25,9 @@ var menu = React.render( - + , document.getElementById('components-dropdown-demo-item')); ```` diff --git a/components/dropdown/demo/trigger.md b/components/dropdown/demo/trigger.md index 0c858e463f..0999b2d7b8 100644 --- a/components/dropdown/demo/trigger.md +++ b/components/dropdown/demo/trigger.md @@ -9,6 +9,7 @@ ````jsx var Menu = antd.Menu; var Dropdown = antd.Dropdown; +var Button = antd.Button; var Icon = antd.Icon; var menu = @@ -24,14 +25,14 @@ var menu = React.render(
- + - +
, document.getElementById('components-dropdown-demo-trigger')); ```` diff --git a/components/enter-animation/demo/basic.md b/components/enter-animation/demo/basic.md index 820da54238..a935789371 100644 --- a/components/enter-animation/demo/basic.md +++ b/components/enter-animation/demo/basic.md @@ -8,6 +8,7 @@ ````jsx var EnterAnimation = antd.EnterAnimation; +var Button = antd.Button; var Test = React.createClass({ getInitialState() { @@ -24,7 +25,7 @@ var Test = React.createClass({ return (
- +
{this.state.show ? diff --git a/components/enter-animation/demo/enter-data.md b/components/enter-animation/demo/enter-data.md index 8ca6b7ed2d..5f04de4d86 100644 --- a/components/enter-animation/demo/enter-data.md +++ b/components/enter-animation/demo/enter-data.md @@ -9,6 +9,7 @@ ````jsx var EnterAnimation = antd.EnterAnimation; +var Button = antd.Button; var Test = React.createClass({ getInitialState() { @@ -33,7 +34,7 @@ var Test = React.createClass({ return (
- +
{this.state.show ?
diff --git a/components/enter-animation/demo/enter-leave.md b/components/enter-animation/demo/enter-leave.md index 858b127f9d..fd91b69320 100644 --- a/components/enter-animation/demo/enter-leave.md +++ b/components/enter-animation/demo/enter-leave.md @@ -9,6 +9,7 @@ ````jsx var EnterAnimation = antd.EnterAnimation; +var Button = antd.Button; var Test = React.createClass({ getInitialState() { @@ -40,7 +41,7 @@ var Test = React.createClass({ return (
- +
{this.state.show ? diff --git a/components/enter-animation/demo/form.md b/components/enter-animation/demo/form.md index 0b7b191e9f..abde1f6c41 100644 --- a/components/enter-animation/demo/form.md +++ b/components/enter-animation/demo/form.md @@ -13,6 +13,7 @@ var Option = Select.Option; var Checkbox = antd.Checkbox; var Radio = antd.Radio; var RadioGroup = antd.Radio.Group; +var Button = antd.Button; var Test = React.createClass({ getInitialState() { @@ -43,7 +44,7 @@ var Test = React.createClass({ return (
- +
{this.state.show ?
@@ -85,7 +86,7 @@ var Test = React.createClass({
- +
: null} diff --git a/components/enter-animation/demo/page.md b/components/enter-animation/demo/page.md index 976be46fb6..3e0e563654 100644 --- a/components/enter-animation/demo/page.md +++ b/components/enter-animation/demo/page.md @@ -8,6 +8,7 @@ ````jsx var EnterAnimation = antd.EnterAnimation; +var Button = antd.Button; var Test = React.createClass({ getInitialState() { @@ -34,7 +35,7 @@ var Test = React.createClass({ return (
- +
{this.state.show ?
diff --git a/components/enter-animation/demo/style.md b/components/enter-animation/demo/style.md index fffe32fedb..a2147a6b03 100644 --- a/components/enter-animation/demo/style.md +++ b/components/enter-animation/demo/style.md @@ -9,6 +9,7 @@ ````jsx var EnterAnimation = antd.EnterAnimation; +var Button = antd.Button; var Test = React.createClass({ getInitialState() { @@ -35,7 +36,7 @@ var Test = React.createClass({ return (
- +
{this.state.show ?
diff --git a/components/form/demo/horizontal-form.md b/components/form/demo/horizontal-form.md index cc94edde72..c954917d7c 100644 --- a/components/form/demo/horizontal-form.md +++ b/components/form/demo/horizontal-form.md @@ -16,6 +16,7 @@ var Checkbox = antd.Checkbox; var Radio = antd.Radio; var RadioGroup = antd.Radio.Group; +var Button = antd.Button; React.render(
@@ -56,7 +57,7 @@ React.render(
- +
diff --git a/components/form/demo/inline-form.md b/components/form/demo/inline-form.md index 577d731951..a6d741679f 100644 --- a/components/form/demo/inline-form.md +++ b/components/form/demo/inline-form.md @@ -8,6 +8,7 @@ ````jsx var Checkbox = antd.Checkbox; +var Button = antd.Button; React.render(
@@ -24,7 +25,7 @@ React.render( 记住我
- + , document.getElementById('components-form-demo-inline-form')); ```` diff --git a/components/input-number/demo/disabled.md b/components/input-number/demo/disabled.md index 23c8cc723b..f0555f146a 100644 --- a/components/input-number/demo/disabled.md +++ b/components/input-number/demo/disabled.md @@ -8,6 +8,7 @@ ````jsx var InputNumber = antd.InputNumber; +var Button = antd.Button; var Test = React.createClass({ getInitialState() { @@ -24,7 +25,7 @@ var Test = React.createClass({ return
- +
; } diff --git a/components/message/demo/duration.md b/components/message/demo/duration.md index faeeb01747..6a7b1e7335 100644 --- a/components/message/demo/duration.md +++ b/components/message/demo/duration.md @@ -7,13 +7,14 @@ --- ````jsx +var Button = antd.Button; var message = antd.message; var success = function() { message.success('这是一条成功的提示,并将于10秒后消失', 10); }; -React.render( +React.render( , document.getElementById('components-message-demo-duration')); ```` diff --git a/components/message/demo/error.md b/components/message/demo/error.md index 644178262c..d1afedb408 100644 --- a/components/message/demo/error.md +++ b/components/message/demo/error.md @@ -7,12 +7,13 @@ --- ````jsx +var Button = antd.Button; var message = antd.message; var error = function() { message.error('这是一条失败的提示这是一条失败的提示这是一条失败的提示'); }; -React.render( +React.render( , document.getElementById('components-message-demo-error')); ```` diff --git a/components/message/demo/info.md b/components/message/demo/info.md index fce6d05d7c..a26d1061db 100644 --- a/components/message/demo/info.md +++ b/components/message/demo/info.md @@ -7,12 +7,13 @@ --- ````jsx +var Button = antd.Button; var message = antd.message; var info = function() { message.info('这是一条普通的提醒'); }; -React.render( +React.render( , document.getElementById('components-message-demo-info')); ```` diff --git a/components/message/demo/loading.md b/components/message/demo/loading.md index 9ba5a846cd..a5deb714fc 100644 --- a/components/message/demo/loading.md +++ b/components/message/demo/loading.md @@ -7,14 +7,15 @@ --- ````jsx -var message = antd.message; +var Button = antd.Button; +var message = antd.message; var success = function() { var hide = message.loading('正在执行中...', 0); // 异步手动移除 setTimeout(hide, 2500); }; -React.render( +React.render( , document.getElementById('components-message-demo-loading')); ```` diff --git a/components/message/demo/success.md b/components/message/demo/success.md index 4b104e02f4..6d8c3b730d 100644 --- a/components/message/demo/success.md +++ b/components/message/demo/success.md @@ -7,13 +7,14 @@ --- ````jsx -var message = antd.message; +var Button = antd.Button; +var message = antd.message; var success = function() { message.success('这是一条成功的提示'); }; -React.render( +React.render( , document.getElementById('components-message-demo-success')); ```` diff --git a/components/modal/confirm.jsx b/components/modal/confirm.jsx index e9295003c3..e3f14c4f5e 100644 --- a/components/modal/confirm.jsx +++ b/components/modal/confirm.jsx @@ -1,6 +1,7 @@ import React from 'react'; import Dialog from './index'; import Icon from '../iconfont'; +import {Button} from '../button'; export default function (props) { let div = document.createElement('div'); @@ -71,18 +72,18 @@ export default function (props) {
{props.content}
; let footer =
- - + +
; if (props.okCancel) { footer =
- - + +
; } else { footer =
- +
; } diff --git a/components/modal/demo/basic.md b/components/modal/demo/basic.md index 90271120d9..7fa59a1d1b 100644 --- a/components/modal/demo/basic.md +++ b/components/modal/demo/basic.md @@ -8,6 +8,7 @@ ````jsx var Modal = antd.Modal; +var Button = antd.Button; var App = React.createClass({ getInitialState() { @@ -32,7 +33,7 @@ var App = React.createClass({ }, render() { return
- +

对话框的内容

diff --git a/components/modal/demo/confirm-promise.md b/components/modal/demo/confirm-promise.md index 947c9adee1..8accc69d4c 100644 --- a/components/modal/demo/confirm-promise.md +++ b/components/modal/demo/confirm-promise.md @@ -8,6 +8,7 @@ ````jsx var confirm = antd.Modal.confirm; +var Button = antd.Button; function showConfirm(){ confirm({ @@ -24,7 +25,7 @@ function showConfirm(){ } React.render( -, document.getElementById('components-modal-demo-confirm-promise')); +, document.getElementById('components-modal-demo-confirm-promise')); ```` diff --git a/components/modal/demo/confirm.md b/components/modal/demo/confirm.md index fcfd550581..1713b8a4dd 100644 --- a/components/modal/demo/confirm.md +++ b/components/modal/demo/confirm.md @@ -8,6 +8,7 @@ ````jsx var confirm = antd.Modal.confirm; +var Button = antd.Button; function showConfirm(){ confirm({ @@ -21,7 +22,7 @@ function showConfirm(){ } React.render( -, document.getElementById('components-modal-demo-confirm')); +, document.getElementById('components-modal-demo-confirm')); ```` diff --git a/components/modal/demo/custom.md b/components/modal/demo/custom.md index cbcf5f0fab..1ac135e520 100644 --- a/components/modal/demo/custom.md +++ b/components/modal/demo/custom.md @@ -8,6 +8,8 @@ ````jsx var Modal = antd.Modal; +var Button = antd.Button; + var ModalText = '对话框的内容'; var Test = React.createClass({ @@ -40,7 +42,7 @@ var Test = React.createClass({ }, render() { return
- + - + 返 回, - , + + ]}>

对话框的内容

对话框的内容

diff --git a/components/modal/demo/info.md b/components/modal/demo/info.md index 1eedb5d511..81aa1f6610 100644 --- a/components/modal/demo/info.md +++ b/components/modal/demo/info.md @@ -8,6 +8,7 @@ ````jsx var Modal = antd.Modal; +var Button = antd.Button; function info() { Modal.info({ @@ -37,9 +38,9 @@ function error() { } React.render(
- - - + + +
, document.getElementById('components-modal-demo-info')); ```` diff --git a/components/modal/index.jsx b/components/modal/index.jsx index 309e92dad6..3dbf0f8007 100644 --- a/components/modal/index.jsx +++ b/components/modal/index.jsx @@ -2,6 +2,7 @@ import React from 'react'; import Dialog from 'rc-dialog'; import { Dom } from 'rc-util'; import confirm from './confirm'; +import { Button } from '../button'; function noop() { } @@ -73,16 +74,16 @@ let AntModal = React.createClass({ }, render() { - let loadingClass = this.state.confirmLoading ? ' ant-btn-loading' : ''; let props = this.props; let defaultFooter = [ - , - , + + ]; let footer = props.footer || defaultFooter; let visible = this.state.visible; diff --git a/components/notification/demo/basic.md b/components/notification/demo/basic.md index 83abb67bfc..5c34d4e4b4 100644 --- a/components/notification/demo/basic.md +++ b/components/notification/demo/basic.md @@ -8,6 +8,7 @@ ````jsx var notification = antd.Notification; +var Button = antd.Button; var openNotification = function() { notification.open({ @@ -18,7 +19,7 @@ var openNotification = function() { React.render(
- +
, document.getElementById('components-notification-demo-basic')); ```` diff --git a/components/notification/demo/duration.md b/components/notification/demo/duration.md index 63d6e15377..150fc769e5 100644 --- a/components/notification/demo/duration.md +++ b/components/notification/demo/duration.md @@ -8,6 +8,7 @@ ````jsx var notification = antd.Notification; +var Button = antd.Button; var openNotification = function() { var args = { @@ -19,6 +20,6 @@ var openNotification = function() { }; React.render( - + , document.getElementById('components-notification-demo-duration')); ```` diff --git a/components/notification/demo/onclose.md b/components/notification/demo/onclose.md index f1a2c62d91..ba896c6774 100644 --- a/components/notification/demo/onclose.md +++ b/components/notification/demo/onclose.md @@ -8,6 +8,7 @@ ````jsx var notification = antd.Notification; +var Button = antd.Button; var close = function() { console.log("我被默认的关闭按钮关闭了！"); @@ -24,7 +25,7 @@ var openNotification = function() { React.render(
- +
, document.getElementById('components-notification-demo-onclose')); ```` diff --git a/components/notification/demo/with-btn.md b/components/notification/demo/with-btn.md index ae28cbbefb..a1622f6e35 100644 --- a/components/notification/demo/with-btn.md +++ b/components/notification/demo/with-btn.md @@ -8,6 +8,7 @@ ````jsx var notification = antd.Notification; +var Button = antd.Button; var close = function(){ console.log('我被默认的关闭按钮关闭了！'); @@ -19,9 +20,9 @@ var openNotification = function() { // 隐藏提醒框 notification.close(key); }; - var btn = ; + ; notification.open({ message: "这是标题", description: "这是提示框的文案这是提示框示框的文案这是提示是提示框的文案这是提示框的文案", @@ -33,7 +34,7 @@ var openNotification = function() { React.render(
- +
, document.getElementById('components-notification-demo-with-btn')); ```` diff --git a/components/notification/demo/with-icon.md b/components/notification/demo/with-icon.md index 6c8940ac36..1378331770 100644 --- a/components/notification/demo/with-icon.md +++ b/components/notification/demo/with-icon.md @@ -8,6 +8,7 @@ ````jsx var notification = antd.Notification; +var Button = antd.Button; var openNotificationWithIcon = function(type) { return function(){ @@ -19,10 +20,10 @@ var openNotificationWithIcon = function(type) { }; React.render(
- - - - + + + +
, document.getElementById('components-notification-demo-with-icon')); ```` diff --git a/components/popconfirm/index.jsx b/components/popconfirm/index.jsx index fd969ad59c..f325090c4e 100644 --- a/components/popconfirm/index.jsx +++ b/components/popconfirm/index.jsx @@ -1,6 +1,7 @@ import React from 'react'; import Tooltip from 'rc-tooltip'; import Icon from '../iconfont'; +import { Button } from '../button'; const prefixCls = 'ant-popover'; export default React.createClass({ @@ -47,8 +48,8 @@ export default React.createClass({

- - + +
; diff --git a/components/popover/demo/basic.md b/components/popover/demo/basic.md index 513086c33a..6a79e72974 100644 --- a/components/popover/demo/basic.md +++ b/components/popover/demo/basic.md @@ -8,6 +8,8 @@ ````jsx var Popover = antd.Popover; +var Button = antd.Button; + var content =

内容

内容

@@ -15,7 +17,7 @@ var content =
React.render( - + , document.getElementById('components-popover-demo-basic')); ```` diff --git a/components/popover/demo/placement.md b/components/popover/demo/placement.md index dd02dfcdef..ce1aa760a5 100644 --- a/components/popover/demo/placement.md +++ b/components/popover/demo/placement.md @@ -8,6 +8,8 @@ ````jsx var Popover = antd.Popover; +var Button = antd.Button; + var text = 标题; var content =

内容

@@ -16,16 +18,16 @@ var content =
React.render(
- + - + - + - +
, document.getElementById('components-popover-demo-placement')); ```` diff --git a/components/popover/demo/triggerType.md b/components/popover/demo/triggerType.md index 26c14e6095..5d5ed753e4 100644 --- a/components/popover/demo/triggerType.md +++ b/components/popover/demo/triggerType.md @@ -8,6 +8,8 @@ ````jsx var Popover = antd.Popover; +var Button = antd.Button; + var content =

内容

内容

@@ -15,13 +17,13 @@ var content =
React.render(
- + - 聚焦 + - +
, document.getElementById('components-popover-demo-triggertype')); ```` diff --git a/components/progress/demo/circle-dynamic.md b/components/progress/demo/circle-dynamic.md index 37a94fb84c..1ca37ca20d 100644 --- a/components/progress/demo/circle-dynamic.md +++ b/components/progress/demo/circle-dynamic.md @@ -8,6 +8,8 @@ ````jsx var ProgressCircle = antd.Progress.Circle; +var Button = antd.Button; +var ButtonGroup = antd.ButtonGroup; var Icon = antd.Icon; var MyProgress = React.createClass({ @@ -33,14 +35,14 @@ var MyProgress = React.createClass({ render() { return
-
- - + -
+ +
; } }); diff --git a/components/progress/demo/dynamic.md b/components/progress/demo/dynamic.md index 3e93767d1d..3281f5a610 100644 --- a/components/progress/demo/dynamic.md +++ b/components/progress/demo/dynamic.md @@ -8,6 +8,8 @@ ````jsx var Progress = antd.Progress.Line; +var Button = antd.Button; +var ButtonGroup = antd.ButtonGroup; var Icon = antd.Icon; var MyProgress = React.createClass({ @@ -33,14 +35,14 @@ var MyProgress = React.createClass({ render() { return
-
- - + -
+ +
; } }); diff --git a/components/radio/demo/disable.md b/components/radio/demo/disable.md index 324e60e88e..c5b9eef834 100644 --- a/components/radio/demo/disable.md +++ b/components/radio/demo/disable.md @@ -8,6 +8,7 @@ Radio 不可用。 ````jsx var Radio = antd.Radio; +var Button = antd.Button; function toggleDisabled() { disabled = !disabled; @@ -30,9 +31,9 @@ var App = React.createClass({
不可用
- +
; } diff --git a/components/steps/demo/step-next.md b/components/steps/demo/step-next.md index d3744e4613..da1e5d7665 100644 --- a/components/steps/demo/step-next.md +++ b/components/steps/demo/step-next.md @@ -15,6 +15,7 @@ ````jsx var Steps = antd.Steps; var Step = Steps.Step; +var Button = antd.Button; var container = document.getElementById('components-steps-demo-step-next'); var array = Array.apply(null, Array(Math.floor(Math.random() * 3) + 3)); var steps = array.map(function(item, i) { @@ -47,7 +48,7 @@ var App = React.createClass({ {steps.map((s, i) => )}
- +
); diff --git a/components/switch/demo/disabled.md b/components/switch/demo/disabled.md index f6c58c73e4..596f69ae71 100644 --- a/components/switch/demo/disabled.md +++ b/components/switch/demo/disabled.md @@ -8,6 +8,7 @@ Switch 失效状态。 ````jsx var Switch = antd.Switch; +var Button = antd.Button; var container = document.getElementById('components-switch-demo-disabled'); var Test = React.createClass({ @@ -26,7 +27,7 @@ var Test = React.createClass({

- +
; } }); diff --git a/components/table/demo/ajax.md b/components/table/demo/ajax.md index 7024590a76..d31eea88d6 100644 --- a/components/table/demo/ajax.md +++ b/components/table/demo/ajax.md @@ -10,6 +10,7 @@ ````jsx var Table = antd.Table; +var Button = antd.Button; var columns = [{ title: '姓名', @@ -85,13 +86,13 @@ var Test = React.createClass({ render() { return
- +   - + ; } }); diff --git a/components/table/demo/local-data.md b/components/table/demo/local-data.md index aa9d5a4455..48cd3999b7 100644 --- a/components/table/demo/local-data.md +++ b/components/table/demo/local-data.md @@ -8,6 +8,8 @@ ````jsx var Table = antd.Table; +var Button = antd.Button; + var columns = [{ title: '姓名', dataIndex: 'name', @@ -73,9 +75,9 @@ var App = React.createClass({ render() { return
- +   - + ; } }) diff --git a/components/upload/demo/basic.md b/components/upload/demo/basic.md index 5b867e6106..d73217de25 100644 --- a/components/upload/demo/basic.md +++ b/components/upload/demo/basic.md @@ -9,6 +9,7 @@ ````jsx var Upload = antd.Upload; var message = antd.message; +var Button = antd.Button; var Icon = antd.Icon; var props = { @@ -28,9 +29,9 @@ var props = { React.render( - + , document.getElementById('components-upload-demo-basic')); ```` diff --git a/components/upload/demo/defaultFileList.md b/components/upload/demo/defaultFileList.md index e60953a6a8..283ced92c9 100644 --- a/components/upload/demo/defaultFileList.md +++ b/components/upload/demo/defaultFileList.md @@ -8,6 +8,7 @@ ````jsx var Upload = antd.Upload; +var Button = antd.Button; var Icon = antd.Icon; var props = { @@ -33,9 +34,9 @@ var props = { React.render( - + , document.getElementById('components-upload-demo-defaultfilelist')); ```` diff --git a/components/upload/demo/fileList.md b/components/upload/demo/fileList.md index 429e784649..39c9089e70 100644 --- a/components/upload/demo/fileList.md +++ b/components/upload/demo/fileList.md @@ -14,6 +14,7 @@ ````jsx var Upload = antd.Upload; +var Button = antd.Button; var Icon = antd.Icon; var fileList = [{ uid: -1, @@ -63,9 +64,9 @@ var MyUpload = React.createClass({ multiple: true }; return - + ; } }); diff --git a/components/upload/demo/multiple.md b/components/upload/demo/multiple.md index b27f0d2166..e54ff6b5d0 100644 --- a/components/upload/demo/multiple.md +++ b/components/upload/demo/multiple.md @@ -9,6 +9,7 @@ ````jsx var Upload = antd.Upload; var message = antd.message; +var Button = antd.Button; var Icon = antd.Icon; var props = { @@ -28,9 +29,9 @@ var props = { React.render( - + , document.getElementById('components-upload-demo-multiple')); ```` diff --git a/components/validation/demo/basic.md b/components/validation/demo/basic.md index 012c0dc0e1..ba1849d3ad 100644 --- a/components/validation/demo/basic.md +++ b/components/validation/demo/basic.md @@ -17,6 +17,7 @@ var Select = antd.Select; var Option = Select.Option; var Radio = antd.Radio; var RadioGroup = antd.Radio.Group; +var Button = antd.Button; function cx(classNames) { if (typeof classNames === 'object') { @@ -146,7 +147,7 @@ var Form = React.createClass({ var status = this.state.status; return ( - +
@@ -249,9 +250,9 @@ var Form = React.createClass({
- +     - 重 置 +
diff --git a/components/validation/demo/customize.md b/components/validation/demo/customize.md index 8e83769319..2006e5bad3 100644 --- a/components/validation/demo/customize.md +++ b/components/validation/demo/customize.md @@ -11,6 +11,7 @@ ````jsx var Validation = antd.Validation; var Validator = Validation.Validator; +var Button = antd.Button; function cx(classNames) { if (typeof classNames === 'object') { @@ -150,7 +151,7 @@ var Form = React.createClass({ var status = this.state.status; return ( - +
@@ -189,9 +190,9 @@ var Form = React.createClass({
- +     - 重 置 +
From 0183694f9c3ab561c35eab6462d07b027e0439ec Mon Sep 17 00:00:00 2001 From: Benjy Cui Date: Fri, 9 Oct 2015 14:38:26 +0800 Subject: [PATCH 2/2] refactor: remove `.ant-btn-menu` --- style/components/button.less | 6 ------ style/components/dropdown.less | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/style/components/button.less b/style/components/button.less index 303de6f952..edf573f8d7 100644 --- a/style/components/button.less +++ b/style/components/button.less @@ -72,12 +72,6 @@ } } - &-menu { - > .@{iconfont-css-prefix} { - .iconfont-size-under-12px(10px); - } - } - &-group { .btn-group(@btn-prefix-cls); } diff --git a/style/components/dropdown.less b/style/components/dropdown.less index e5d3d1649e..184e18d7f2 100644 --- a/style/components/dropdown.less +++ b/style/components/dropdown.less @@ -1,4 +1,5 @@ -@dropdown-prefix-cls: ant-dropdown; +@import "../mixins/index"; +@dropdown-prefix-cls: ~"@{css-prefix}dropdown"; .@{dropdown-prefix-cls} { position: absolute; @@ -13,6 +14,11 @@ &-wrap { position: relative; + + .@{btn-prefix-cls} > .@{iconfont-css-prefix}-down { + .iconfont-size-under-12px(10px); + } + .anticon-down:before { transition: transform 0.2s ease; }