From 1ef95ec1ec7f555a09221e80a4303dda985cc0fb Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 11:16:58 +0800
Subject: [PATCH 01/65] improve demo for select optionFilterProp

---
 components/select/demo/search.md | 16 +++++++++-------
 components/select/index.md       |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/components/select/demo/search.md b/components/select/demo/search.md
index d52f216f3d..3ab81a4c84 100644
--- a/components/select/demo/search.md
+++ b/components/select/demo/search.md
@@ -15,14 +15,16 @@ function handleChange(value) {
 }
 
 ReactDOM.render(
-  <Select defaultValue="lucy" showSearch style={{ width: 200 }}
-    notFoundContent="找不到呐！"
-    searchPlaceholder="输入"
+  <Select showSearch
+    style={{ width: 200 }}
+    placeholder="请选择人员"
+    optionFilterProp="children"
+    notFoundContent="无法找到"
+    searchPlaceholder="输入关键词"
     onChange={handleChange}>
-    <Option value="jack">jack</Option>
-    <Option value="lucy">lucy</Option>
-    <Option value="disabled" disabled>disabled</Option>
-    <Option value="yiminghe">yiminghe</Option>
+    <Option value="jack">杰克</Option>
+    <Option value="lucy">露西</Option>
+    <Option value="tom">汤姆</Option>
   </Select>
 , mountNode);
 ````
diff --git a/components/select/index.md b/components/select/index.md
index 0289b7ba9e..27d5a7c25d 100644
--- a/components/select/index.md
+++ b/components/select/index.md
@@ -38,7 +38,7 @@
 | searchPlaceholder | 搜索框默认文字 | string | 无 |
 | notFoundContent | 当下拉列表为空时显示的内容 | string | 'Not Found' |
 | dropdownMatchSelectWidth | 下拉菜单和选择器同宽 | boolean | true |
-| optionFilterProp | 输入项过滤对应的 option 属性 | string | value |
+| optionFilterProp | 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索 | string | value |
 | combobox | 输入框自动提示模式 | boolean | false |
 | size    | 选择框大小，可选 `large` `small`  | String      |      default      |
 | showSearch | 在下拉中显示搜索框 | boolean | false |

From ca74e17b7be95ac212496d20b46aa32d2ce2c0f8 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 11:30:44 +0800
Subject: [PATCH 02/65] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 69fca49606..5e97f78d1f 100644
--- a/README.md
+++ b/README.md
@@ -10,9 +10,9 @@ An enterprise-class UI design language and React-based implementation.
 
 ## Features
 
-- An enterprise-class graphical design language and framework for financial applications.
+- An enterprise-class design language and high quality UI framework.
 - Rich library of UI components base on [React Component](http://react-component.github.io/badgeboard/).
-- A npm + webpack + babel workflow, supporting ES2015.
+- A npm + webpack + babel + dora [workflow](http://ant-tool.github.io/index.html).
 
 ## Install
 

From 9523ade5429013b1977ce96ef931d2e779bb7eb9 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 11:32:00 +0800
Subject: [PATCH 03/65] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5e97f78d1f..fcc11b03a6 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ An enterprise-class UI design language and React-based implementation.
 
 ## Features
 
-- An enterprise-class design language and high quality UI framework.
+- An enterprise-class design language and high quality UI style.
 - Rich library of UI components base on [React Component](http://react-component.github.io/badgeboard/).
 - A npm + webpack + babel + dora [workflow](http://ant-tool.github.io/index.html).
 

From aa16f6c3984dabee03706ccee424b9e06b394e1c Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 14:36:24 +0800
Subject: [PATCH 04/65] Fix(site): fix icon copy text

---
 components/icon/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/icon/index.md b/components/icon/index.md
index 46b6e5bdad..1140becfe5 100644
--- a/components/icon/index.md
+++ b/components/icon/index.md
@@ -120,7 +120,7 @@ const CopyableIcon = React.createClass({
     });
   },
   render() {
-    const text = '&lt;Icon type="' + this.props.type + '" /&gt;';
+    const text = '<Icon type="' + this.props.type + '" />';
     return (
       <CopyToClipboard text={text} onCopy={this.onCopied}>
         <li className={this.state.justCopied ? 'copied' : ''}>

From 4446e73fda725ccad696d20366b6ea807e2a5a75 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 16:24:07 +0800
Subject: [PATCH 05/65] remove button border-radius fallback

---
 components/button/button.jsx |  5 -----
 components/button/index.md   | 14 --------------
 site/templates/layout.html   |  3 ---
 3 files changed, 22 deletions(-)

diff --git a/components/button/button.jsx b/components/button/button.jsx
index 59111b7605..28c582c2b9 100644
--- a/components/button/button.jsx
+++ b/components/button/button.jsx
@@ -25,11 +25,6 @@ function insertSpace(child) {
 }
 
 export default class Button extends React.Component {
-  componentDidMount() {
-    if (window && window.PIE) {
-      window.PIE.attach(findDOMNode(this));
-    }
-  }
   handleClick(...args) {
     const buttonNode = findDOMNode(this);
     buttonNode.className = buttonNode.className.replace(`${prefix}clicked`, '');
diff --git a/components/button/index.md b/components/button/index.md
index d869c820b7..4f945f586a 100644
--- a/components/button/index.md
+++ b/components/button/index.md
@@ -29,17 +29,3 @@ loading | 设置按钮载入状态 | boolean | false
 onClick | `click` 事件的 handler | function | `function() {}`
 
 - `<Button>Hello world!</Button>` 最终会被渲染为 `<button>Hello world!</button>`，并且除了上表中的属性，其它属性都会直接传到 `<button></button>`
-
-
-### IE8 border radius support
-
-Ant Design 视觉上采用渐进降级的方案，在 IE8 下圆角按钮将降级为直角。
-如果强烈需要圆角按钮，我们提供了 [css3pie](http://css3pie.com/) 的兼容方案。
-
-使用时只需在 html 头部加入以下代码即可。
-
-```html
-<!--[if IE 8]>
-<script src="https://t.alipayobjects.com/images/rmsweb/T1q8JiXftaXXXXXXXX.js"></script>
-<![endif]-->
-```
diff --git a/site/templates/layout.html b/site/templates/layout.html
index b47c4b672a..34337cb21c 100644
--- a/site/templates/layout.html
+++ b/site/templates/layout.html
@@ -13,9 +13,6 @@
     <link rel="shortcut icon" href="https://t.alipayobjects.com/images/T1QUBfXo4fXXXXXXXX.png" type="image/x-icon">
     {% block styles %}{% endblock %}
     <link rel="stylesheet" href="{{static_url('../dist/demo.css')}}?20160114">
-    <!--[if IE 8]>
-    <script src="https://t.alipayobjects.com/images/rmsweb/T1q8JiXftaXXXXXXXX.js"></script>
-    <![endif]-->
     <script src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,es5-shim/4.1.14/es5-shim.min.js,es5-shim/4.1.14/es5-sham.min.js,html5shiv/3.7.2/html5shiv.min.js,media-match/2.0.2/media.match.min.js,jquery/1.11.3/jquery.min.js,bluebird/3.1.1/bluebird.min.js"></script>
     <script>
     (function() {

From 80baae87cd19e31300f16bd9da7f3dde30f5d894 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 16:28:41 +0800
Subject: [PATCH 06/65] Fix Object.assign via spread operator

---
 components/transfer/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/transfer/index.jsx b/components/transfer/index.jsx
index a2f8517ac8..3a739f3af9 100644
--- a/components/transfer/index.jsx
+++ b/components/transfer/index.jsx
@@ -23,7 +23,7 @@ class Transfer extends Component {
   splitDataSource() {
     const { targetKeys, dataSource } = this.props;
 
-    let leftDataSource = Object.assign([], dataSource);
+    let leftDataSource = [...dataSource];
     let rightDataSource = [];
 
     if (targetKeys.length > 0) {

From a33f332ac412a1543e5db8e438a9bf717acd0181 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 16:30:05 +0800
Subject: [PATCH 07/65] Fix site style

---
 docs/react/getting-started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/react/getting-started.md b/docs/react/getting-started.md
index c386264d0e..2041a97814 100644
--- a/docs/react/getting-started.md
+++ b/docs/react/getting-started.md
@@ -102,7 +102,7 @@ Ant Design React 支持所有的现代浏览器和 IE8+。
 
 <style>
 .code-line-highlight {
-  box-shadow: 0px 195px 0px rgba(255, 207, 0, 0.16);
+  box-shadow: 0px 184px 0px rgba(255, 207, 0, 0.16);
   height: 42px;
   margin-top: -42px;
   position: relative;

From caacdc5a9354942ac12c83d39b4ca94213ddc4c6 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Tue, 23 Feb 2016 17:07:43 +0800
Subject: [PATCH 08/65] fix: typo

---
 components/form/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/form/index.md b/components/form/index.md
index 31aa52bebe..55a3635e4d 100644
--- a/components/form/index.md
+++ b/components/form/index.md
@@ -78,8 +78,8 @@ CustomizedForm = Form.create({})(CustomizedForm);
 | validateFieldsAndScroll | 与 `validateFields` 相似，但校验完后，如果校验不通过的菜单域不在可见范围内，则自动滚动进可见范围 | 参考 `validateFields` | | |
 | getFieldError | 获取某个输入控件的 Error | Function(name) | | |
 | isFieldValidating | 判断一个输入控件是否在校验状态 | Function(name) | | |
-| resetFields | 重置一组输入控件的值与状态，如不传入参数，则重置所有组件 | Function([names: string[]]) | | | |
-| getFieldProps 详见下面描述
+| resetFields | 重置一组输入控件的值与状态，如不传入参数，则重置所有组件 | Function([names: string[]]) | | |
+| getFieldProps 详见下面描述 | | | | |
 
 #### this.props.form.getFieldProps(id, options)
 

From b347e6c3840ea153dee3dfffc1b70843c6685d66 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 18:02:02 +0800
Subject: [PATCH 09/65] Fix cascader style bug in Safari and maxthon, close
 #1066

---
 style/components/cascader.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/style/components/cascader.less b/style/components/cascader.less
index f78f026cc8..8617efef05 100644
--- a/style/components/cascader.less
+++ b/style/components/cascader.less
@@ -93,6 +93,7 @@
   }
   &-menu {
     display: inline-block;
+    vertical-align: top;
     min-width: 111px;
     height: 180px;
     list-style: none;

From 4ed16b3d5cf066af345bb7eba73d2aa6bb5b5e9b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 23 Feb 2016 19:39:03 +0800
Subject: [PATCH 10/65] Fix deploy webpack config

---
 webpack.deploy.config.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/webpack.deploy.config.js b/webpack.deploy.config.js
index 595560bb64..0118df97cc 100644
--- a/webpack.deploy.config.js
+++ b/webpack.deploy.config.js
@@ -3,11 +3,20 @@ var config = require('./webpack.config');
 
 delete config.devtool;
 config.entry.demo = [config.entry.demo[0]];
-config.plugins.push(new webpack.optimize.UglifyJsPlugin({
+
+config.plugins = [config.plugins[0], new webpack.optimize.UglifyJsPlugin({
   sourceMap: false,
   output: {
     ascii_only: true
   }
-}));
+})];
+
+config.module.loaders.forEach(function(loader) {
+  if (loader.loader === 'babel') {
+    // remove preset hmre
+    loader.query.presets = loader.query.presets.slice(0, 3);
+  }
+  return loader;
+});
 
 module.exports = config;

From 06591077d3339f58f3256f1187d9d6daa4b5c20f Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 13:57:33 +0800
Subject: [PATCH 11/65] Fix tooltip & popover arrow position

---
 style/components/popover.less | 42 ++++++++++++++++++++---------------
 style/components/tooltip.less | 26 ++++++++++------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/style/components/popover.less b/style/components/popover.less
index 1f90c51502..bd4964481b 100644
--- a/style/components/popover.less
+++ b/style/components/popover.less
@@ -147,8 +147,6 @@
   &-placement-top > &-arrow,
   &-placement-topLeft > &-arrow,
   &-placement-topRight > &-arrow {
-    left: 50%;
-    margin-left: -@popover-arrow-outer-width;
     border-bottom-width: 0;
     border-top-color: @popover-arrow-outer-color;
     bottom: @popover-distance - @popover-arrow-outer-width + 1;
@@ -160,19 +158,20 @@
       border-top-color: @popover-arrow-color;
     }
   }
+  &-placement-top > &-arrow {
+    left: 50%;
+    margin-left: -@popover-arrow-outer-width;
+  }
   &-placement-topLeft > &-arrow {
-    left: 15%;
+    left: 16px;
   }
   &-placement-topRight > &-arrow {
-    left: 85%;
+    right: 16px;
   }
 
-  &-placement-right > &-arrow,
   &-placement-rightTop > &-arrow,
   &-placement-rightBottom > &-arrow {
-    top: 50%;
     left: @popover-distance - @popover-arrow-outer-width + 1;
-    margin-top: -@popover-arrow-outer-width;
     border-left-width: 0;
     border-right-color: @popover-arrow-outer-color;
     &:after {
@@ -183,18 +182,20 @@
       border-right-color: @popover-arrow-color;
     }
   }
+  &-placement-right > &-arrow {
+    top: 50%;
+    margin-top: -@popover-arrow-outer-width;
+  }
   &-placement-rightTop > &-arrow {
-    top: 15%;
+    top: 12px;
   }
   &-placement-rightBottom > &-arrow {
-    top: 85%;
+    bottom: 12px;
   }
 
   &-placement-bottom > &-arrow,
   &-placement-bottomLeft > &-arrow,
   &-placement-bottomRight > &-arrow {
-    left: 50%;
-    margin-left: -@popover-arrow-outer-width;
     border-top-width: 0;
     border-bottom-color: @popover-arrow-outer-color;
     top: @popover-distance - @popover-arrow-outer-width + 1;
@@ -206,19 +207,21 @@
       border-bottom-color: @popover-arrow-color;
     }
   }
+  &-placement-bottom > &-arrow {
+    left: 50%;
+    margin-left: -@popover-arrow-outer-width;
+  }
   &-placement-bottomLeft > &-arrow {
-    left: 15%;
+    left: 16px;
   }
   &-placement-bottomRight > &-arrow {
-    left: 85%;
+    right: 16px;
   }
 
   &-placement-left > &-arrow,
   &-placement-leftTop > &-arrow,
   &-placement-leftBottom > &-arrow {
-    top: 50%;
     right: @popover-distance - @popover-arrow-outer-width + 1;
-    margin-top: -@popover-arrow-outer-width;
     border-right-width: 0;
     border-left-color: @popover-arrow-outer-color;
     &:after {
@@ -229,11 +232,14 @@
       bottom: -@popover-arrow-width;
     }
   }
+  &-placement-left > &-arrow {
+    top: 50%;
+    margin-top: -@popover-arrow-outer-width;
+  }
   &-placement-leftTop > &-arrow {
-    top: 15%;
+    top: 12px;
   }
   &-placement-leftBottom > &-arrow {
-    top: 85%;
+    bottom: 12px;
   }
-
 }
diff --git a/style/components/tooltip.less b/style/components/tooltip.less
index d3f9e56199..e4e61fdc79 100644
--- a/style/components/tooltip.less
+++ b/style/components/tooltip.less
@@ -87,85 +87,83 @@
   &-placement-topLeft &-arrow,
   &-placement-topRight &-arrow {
     bottom: @tooltip-distance - @tooltip-arrow-width;
-    margin-left: -@tooltip-arrow-width;
     border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
     border-top-color: @tooltip-arrow-color;
   }
 
   &-placement-top &-arrow {
     left: 50%;
+    margin-left: -@tooltip-arrow-width;
   }
 
   &-placement-topLeft &-arrow {
-    left: 15%;
+    left: 16px;
   }
 
   &-placement-topRight &-arrow {
-    right: 15%;
+    right: 16px;
   }
 
   &-placement-right &-arrow,
   &-placement-rightTop &-arrow,
   &-placement-rightBottom &-arrow {
     left: @tooltip-distance - @tooltip-arrow-width;
-    margin-top: -@tooltip-arrow-width;
     border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;
     border-right-color: @tooltip-arrow-color;
   }
 
   &-placement-right &-arrow {
     top: 50%;
+    margin-top: -@tooltip-arrow-width;
   }
 
   &-placement-rightTop &-arrow {
-    top: 15%;
-    margin-top: 0;
+    top: 8px;
   }
 
   &-placement-rightBottom &-arrow {
-    bottom: 15%;
+    bottom: 8px;
   }
 
   &-placement-left &-arrow,
   &-placement-leftTop &-arrow,
   &-placement-leftBottom &-arrow {
     right: @tooltip-distance - @tooltip-arrow-width;
-    margin-top: -@tooltip-arrow-width;
     border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;
     border-left-color: @tooltip-arrow-color;
   }
 
   &-placement-left &-arrow {
     top: 50%;
+    margin-top: -@tooltip-arrow-width;
   }
 
   &-placement-leftTop &-arrow {
-    top: 15%;
-    margin-top: 0;
+    top: 8px;
   }
 
   &-placement-leftBottom &-arrow {
-    bottom: 15%;
+    bottom: 8px;
   }
 
   &-placement-bottom &-arrow,
   &-placement-bottomLeft &-arrow,
   &-placement-bottomRight &-arrow {
     top: @tooltip-distance - @tooltip-arrow-width;
-    margin-left: -@tooltip-arrow-width;
     border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
     border-bottom-color: @tooltip-arrow-color;
   }
 
   &-placement-bottom &-arrow {
     left: 50%;
+    margin-left: -@tooltip-arrow-width;
   }
 
   &-placement-bottomLeft &-arrow {
-    left: 15%;
+    left: 16px;
   }
 
   &-placement-bottomRight &-arrow {
-    right: 15%;
+    right: 16px;
   }
 }

From 48900ed7f8ac6863e528f9d9157466202fe4af13 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Wed, 24 Feb 2016 15:11:50 +0800
Subject: [PATCH 12/65] css: add search box style for Select #1067

---
 components/select/demo/search-box.md | 95 ++++++++++++++++++++++++++++
 package.json                         |  2 +
 scripts/demo.js                      |  2 +
 style/components/form.less           |  2 +-
 style/components/select.less         |  8 +++
 5 files changed, 108 insertions(+), 1 deletion(-)
 create mode 100644 components/select/demo/search-box.md

diff --git a/components/select/demo/search-box.md b/components/select/demo/search-box.md
new file mode 100644
index 0000000000..e39db86d51
--- /dev/null
+++ b/components/select/demo/search-box.md
@@ -0,0 +1,95 @@
+# 搜索框
+
+- order: 9
+
+带有搜索按钮。
+
+---
+
+````jsx
+import { Input, Select, Button, Icon } from 'antd';
+import jsonp from 'jsonp';
+import querystring from 'querystring';
+const Option = Select.Option;
+
+let timeout;
+let currentValue;
+
+function fetch(value, callback) {
+  if (timeout) {
+    clearTimeout(timeout);
+    timeout = null;
+  }
+  currentValue = value;
+
+  function fake() {
+    const str = querystring.encode({
+      code: 'utf-8',
+      q: value,
+    });
+    jsonp(`http://suggest.taobao.com/sug?${str}`, (err, d) => {
+      if (currentValue === value) {
+        const result = d.result;
+        const data = [];
+        result.forEach((r) => {
+          data.push({
+            value: r[0],
+            text: r[0],
+          });
+        });
+        callback(data);
+      }
+    });
+  }
+
+  timeout = setTimeout(fake, 300);
+}
+
+const SearchInput = React.createClass({
+  getInitialState() {
+    return {
+      data: [],
+    };
+  },
+
+  handleChange(value) {
+    fetch(value, (data) => {
+      this.setState({
+        data,
+      });
+    });
+  },
+
+  render() {
+    const data = this.state.data;
+    const options = data.map((d) => {
+      return <Option key={d.value}>{d.text}</Option>;
+    });
+    return (
+      <Input.Group className="ant-search-input" style={this.props.style}>
+        <Select
+          combobox
+          searchPlaceholder={this.props.placeholder}
+          notFoundContent=""
+          defaultActiveFirstOption={false}
+          showArrow={false}
+          filterOption={false}
+          onChange={this.handleChange}
+          onFocus={this.handleFocusBlur}
+          onBlur={this.handleFocusBlur}>
+          {options}
+        </Select>
+        <div className="ant-input-group-wrap">
+          <Button className="ant-search-btn">
+            <Icon type="search" />
+          </Button>
+        </div>
+      </Input.Group>
+    );
+  },
+});
+
+ReactDOM.render(
+  <SearchInput placeholder="input search text" style={{ width: 200 }} />
+, mountNode);
+````
diff --git a/package.json b/package.json
index 5ca7c16992..5393e4539a 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,7 @@
     "instantclick": "^3.1.0",
     "jest-cli": "~0.8.0",
     "json-loader": "^0.5.1",
+    "jsonp": "^0.2.0",
     "less": "~2.6.0",
     "less-loader": "^2.2.0",
     "lesshint-antd": "^1.2.1",
@@ -105,6 +106,7 @@
     "nico-jsx": "~0.8.2",
     "postcss-loader": "^0.8.0",
     "pre-commit": "1.x",
+    "querystring": "^0.2.0",
     "rc-scroll-anim": "^0.1.7",
     "rc-tween-one": "^0.1.8",
     "react": "0.14.x",
diff --git a/scripts/demo.js b/scripts/demo.js
index 1c98bb01c0..0b22706fa7 100644
--- a/scripts/demo.js
+++ b/scripts/demo.js
@@ -16,6 +16,8 @@ window.ReactDOM = ReactDOM;
 window['object-assign'] = require('object-assign');
 window['classnames'] = require('classnames');
 window['reqwest'] = require('reqwest');
+window['jsonp'] = require('jsonp');
+window['querystring'] = require('querystring');
 window['Values'] = require('values.js');
 window['InstantClick'] = require('instantclick');
 require('./home')();
diff --git a/style/components/form.less b/style/components/form.less
index 099c3ff6aa..6b9d5fd9eb 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -175,7 +175,7 @@ form {
 }
 
 // Input combined with select
-.@{css-prefix}input-group {
+.@{css-prefix}input-group-wrap {
   .@{select-prefix-cls}-selection {
     border-bottom-left-radius: 0;
     border-top-left-radius: 0;
diff --git a/style/components/select.less b/style/components/select.less
index 8af54f3383..b01c96b46f 100644
--- a/style/components/select.less
+++ b/style/components/select.less
@@ -489,3 +489,11 @@
     }
   }
 }
+
+.ant-search-input .@{select-prefix-cls} {
+  width: 100%;
+
+  & + .ant-input-group-wrap > button {
+    top: -5px;
+  }
+}
\ No newline at end of file

From 353601ca0c3f892921268ef245a95c6c8c1d1098 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Wed, 24 Feb 2016 15:41:53 +0800
Subject: [PATCH 13/65] docs: add demo for valuePropName #1062

---
 components/form/demo/validate-other.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/components/form/demo/validate-other.md b/components/form/demo/validate-other.md
index c82fb3e3fa..1ee64eaa58 100644
--- a/components/form/demo/validate-other.md
+++ b/components/form/demo/validate-other.md
@@ -7,13 +7,21 @@
 ---
 
 ````jsx
-import { Select, Radio, Button, DatePicker, InputNumber, Form, Cascader } from 'antd';
+import { Select, Radio, Checkbox, Button, DatePicker, InputNumber, Form, Cascader } from 'antd';
 const Option = Select.Option;
 const RadioGroup = Radio.Group;
 const createForm = Form.create;
 const FormItem = Form.Item;
 
 let Demo = React.createClass({
+  componentDidMount() {
+    this.props.form.setFieldsValue({
+      eat: true,
+      sleep: true,
+      beat: true,
+    });
+  },
+
   handleReset(e) {
     e.preventDefault();
     this.props.form.resetFields();
@@ -113,6 +121,22 @@ let Demo = React.createClass({
           </RadioGroup>
         </FormItem>
 
+        <FormItem
+          label="兴趣爱好："
+          labelCol={{ span: 7 }}
+          wrapperCol={{ span: 12 }}
+          help="Checkbox 必须设置 `valuePropName`">
+          <Checkbox {...getFieldProps('eat', {
+            valuePropName: 'checked',
+          })} />吃饭饭 &nbsp;
+          <Checkbox {...getFieldProps('sleep', {
+            valuePropName: 'checked',
+          })} />睡觉觉 &nbsp;
+          <Checkbox {...getFieldProps('beat', {
+            valuePropName: 'checked',
+          })} />打豆豆 &nbsp;
+        </FormItem>
+
         <FormItem
           label="生日："
           labelCol={{ span: 7 }}

From 0da08295a472e8bc8b34d33a006c21e77004ae94 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Wed, 24 Feb 2016 16:36:11 +0800
Subject: [PATCH 14/65] chore: update demo's style

---
 components/tag/demo/colorful.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/tag/demo/colorful.md b/components/tag/demo/colorful.md
index 37f622ada5..54c38ca90e 100644
--- a/components/tag/demo/colorful.md
+++ b/components/tag/demo/colorful.md
@@ -1,9 +1,9 @@
 # 各种类型
 
-四种颜色的标签。
-
 - order: 1
 
+四种颜色的标签。
+
 ---
 
 ````jsx
@@ -16,4 +16,3 @@ ReactDOM.render(<div>
   <Tag closable color="red">红色</Tag>
 </div>, mountNode);
 ````
-

From 90ea1cef3f1cc8604798c309c39c7d8fd78db0f8 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 18:03:13 +0800
Subject: [PATCH 15/65] Fix popover and dropdown position

---
 style/components/dropdown.less |  1 -
 style/components/popover.less  | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/style/components/dropdown.less b/style/components/dropdown.less
index 3603f28376..0a5bdc877a 100644
--- a/style/components/dropdown.less
+++ b/style/components/dropdown.less
@@ -10,7 +10,6 @@
   font-size: 12px;
   font-weight: normal;
   line-height: 1.5;
-  padding-top: 4px;
 
   &-wrap {
     position: relative;
diff --git a/style/components/popover.less b/style/components/popover.less
index bd4964481b..a862cfeea0 100644
--- a/style/components/popover.less
+++ b/style/components/popover.less
@@ -18,8 +18,7 @@
 
 //** Popover arrow width
 @popover-arrow-width:                 4px;
-//** Popover distance with trigger
-@popover-distance:                    @popover-arrow-width + 4;
+
 //** Popover arrow color
 @popover-arrow-color:                 @popover-bg;
 
@@ -55,29 +54,25 @@
   &-placement-top,
   &-placement-topLeft,
   &-placement-topRight {
-    margin-top: -@popover-arrow-width;
-    padding-bottom: @popover-distance;
+    padding-bottom: @popover-arrow-width;
   }
 
   &-placement-right,
   &-placement-rightTop,
   &-placement-rightBottom {
-    margin-left: @popover-arrow-width;
-    padding-left: @popover-distance;
+    padding-left: @popover-arrow-width;
   }
 
   &-placement-bottom,
   &-placement-bottomLeft,
   &-placement-bottomRight {
-    margin-top: @popover-arrow-width;
-    padding-top: @popover-distance;
+    padding-top: @popover-arrow-width;
   }
 
   &-placement-left,
   &-placement-leftTop,
   &-placement-leftBottom {
-    margin-left: -@popover-arrow-width;
-    padding-right: @popover-distance;
+    padding-right: @popover-arrow-width;
   }
 
   &-inner {
@@ -149,7 +144,7 @@
   &-placement-topRight > &-arrow {
     border-bottom-width: 0;
     border-top-color: @popover-arrow-outer-color;
-    bottom: @popover-distance - @popover-arrow-outer-width + 1;
+    bottom: 0;
     &:after {
       content: " ";
       bottom: 1px;
@@ -169,9 +164,10 @@
     right: 16px;
   }
 
+  &-placement-right > &-arrow,
   &-placement-rightTop > &-arrow,
   &-placement-rightBottom > &-arrow {
-    left: @popover-distance - @popover-arrow-outer-width + 1;
+    left: 0;
     border-left-width: 0;
     border-right-color: @popover-arrow-outer-color;
     &:after {
@@ -198,7 +194,7 @@
   &-placement-bottomRight > &-arrow {
     border-top-width: 0;
     border-bottom-color: @popover-arrow-outer-color;
-    top: @popover-distance - @popover-arrow-outer-width + 1;
+    top: 0;
     &:after {
       content: " ";
       top: 1px;
@@ -221,7 +217,7 @@
   &-placement-left > &-arrow,
   &-placement-leftTop > &-arrow,
   &-placement-leftBottom > &-arrow {
-    right: @popover-distance - @popover-arrow-outer-width + 1;
+    right: 0;
     border-right-width: 0;
     border-left-color: @popover-arrow-outer-color;
     &:after {

From 8fb56286fbff57e6841d9e749117417fc35dff4b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 18:21:07 +0800
Subject: [PATCH 16/65] use placeholder in select combobox demo

---
 components/select/demo/combobox.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/select/demo/combobox.md b/components/select/demo/combobox.md
index 7ad9c03977..a59a8112c1 100644
--- a/components/select/demo/combobox.md
+++ b/components/select/demo/combobox.md
@@ -36,7 +36,7 @@ const Test = React.createClass({
         style={{ width: 200 }}
         onChange={this.handleChange}
         filterOption={false}
-        searchPlaceholder="请输入账户名">
+        placeholder="请输入账户名">
         {this.state.options}
       </Select>
     );

From 8467ebe7fa5eabaac53c3e120fb677638b5c2202 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 19:55:23 +0800
Subject: [PATCH 17/65] update search box demo

---
 components/select/demo/search-box.md | 37 ++++++++++++++++++----------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/components/select/demo/search-box.md b/components/select/demo/search-box.md
index e39db86d51..ea366082e9 100644
--- a/components/select/demo/search-box.md
+++ b/components/select/demo/search-box.md
@@ -2,7 +2,7 @@
 
 - order: 9
 
-带有搜索按钮。
+带有搜索按钮的自动补全输入框。
 
 ---
 
@@ -10,6 +10,7 @@
 import { Input, Select, Button, Icon } from 'antd';
 import jsonp from 'jsonp';
 import querystring from 'querystring';
+import classNames from 'classnames';
 const Option = Select.Option;
 
 let timeout;
@@ -49,26 +50,36 @@ const SearchInput = React.createClass({
   getInitialState() {
     return {
       data: [],
+      value: '',
+      focus: false,
     };
   },
-
   handleChange(value) {
-    fetch(value, (data) => {
-      this.setState({
-        data,
-      });
+    this.setState({ value });
+    fetch(value, (data) => this.setState({ data }));
+  },
+  handleSubmit() {
+    console.log('输入框内容是: ', this.state.value);
+  },
+  handleFocusBlur(e) {
+    this.setState({
+      focus: e.target === document.activeElement,
     });
   },
-
   render() {
-    const data = this.state.data;
-    const options = data.map((d) => {
-      return <Option key={d.value}>{d.text}</Option>;
+    const btnCls = classNames({
+      'ant-search-btn': true,
+      'ant-search-btn-noempty': !!this.state.value.trim(),
+    });
+    const searchCls = classNames({
+      'ant-search-input': true,
+      'ant-search-input-focus': this.state.focus,
     });
     return (
-      <Input.Group className="ant-search-input" style={this.props.style}>
+      <Input.Group className={searchCls} style={this.props.style}>
         <Select
           combobox
+          value={this.state.value}
           searchPlaceholder={this.props.placeholder}
           notFoundContent=""
           defaultActiveFirstOption={false}
@@ -77,10 +88,10 @@ const SearchInput = React.createClass({
           onChange={this.handleChange}
           onFocus={this.handleFocusBlur}
           onBlur={this.handleFocusBlur}>
-          {options}
+          {this.state.data.map(d => <Option key={d.value}>{d.text}</Option>)}
         </Select>
         <div className="ant-input-group-wrap">
-          <Button className="ant-search-btn">
+          <Button className={btnCls} onClick={this.handleSubmit}>
             <Icon type="search" />
           </Button>
         </div>

From dc0629ca8200dc091542fbc22260a920b9dfd854 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 20:12:01 +0800
Subject: [PATCH 18/65] improve card tabs close hover style

---
 style/components/tabs.less | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/style/components/tabs.less b/style/components/tabs.less
index 1e31756ed5..5b9dbdee07 100644
--- a/style/components/tabs.less
+++ b/style/components/tabs.less
@@ -382,6 +382,7 @@
   }
   &&-card &-tab-inner {
     padding: 7px 16px 6px;
+    transition: all 0.3s @ease-in-out;
   }
   &&-card &-tab-active {
     background: #fff;
@@ -399,6 +400,7 @@
     color: #999;
     transition: all 0.3s @ease-in-out;
     .iconfont-size-under-12px(9px);
+    transform-origin: 100% 50%;
     width: 0;
     text-align: right;
     vertical-align: middle;
@@ -409,6 +411,11 @@
     }
   }
 
+  &&-card &-tab:not(&-tab-active):hover &-tab-inner {
+    padding-left: 8px;
+    padding-right: 8px;
+  }
+
   &&-card &-tab-active .anticon-cross,
   &&-card &-tab:hover .anticon-cross {
     width: 16px;

From 9991e96a9d6a80c77e61de266670f197c69f883b Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 20:15:34 +0800
Subject: [PATCH 19/65] update tooltip style

---
 style/components/tooltip.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/style/components/tooltip.less b/style/components/tooltip.less
index e4e61fdc79..10e03d6e48 100644
--- a/style/components/tooltip.less
+++ b/style/components/tooltip.less
@@ -17,7 +17,7 @@
 //** Tooltip arrow width
 @tooltip-arrow-width: 5px;
 //** Tooltip distance with trigger
-@tooltip-distance: @tooltip-arrow-width + 4;
+@tooltip-distance: @tooltip-arrow-width - 1 + 4;
 //** Tooltip arrow color
 @tooltip-arrow-color: @tooltip-bg;
 

From d84c52fda86093339a668ebe38ed83915930afc9 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 20:24:47 +0800
Subject: [PATCH 20/65] Make Radio label's cursor pointer, close #1076

---
 style/components/radio.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/style/components/radio.less b/style/components/radio.less
index dc295767db..0006d32a94 100644
--- a/style/components/radio.less
+++ b/style/components/radio.less
@@ -18,6 +18,7 @@
   position: relative;
   line-height: 1;
   vertical-align: middle;
+  cursor: pointer;
   &:hover {
     .@{radio-inner-prefix-cls} {
       border-color: #bcbcbc;

From 33dd8b971d0713bba757663522e4394a8f34bc7e Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 21:45:09 +0800
Subject: [PATCH 21/65] update dropdown doc

---
 components/dropdown/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/dropdown/index.md b/components/dropdown/index.md
index b34bcea1ce..13db8872b8 100644
--- a/components/dropdown/index.md
+++ b/components/dropdown/index.md
@@ -18,7 +18,7 @@
 
 | 成员        | 说明             | 类型               | 默认值       |
 |-------------|------------------|--------------------|--------------|
-| trigger     | 触发下拉的行为   | "click" or "hover" | hover        |
+| trigger     | 触发下拉的行为   | ['click'] or ['hover'] | ['hover']        |
 | overlay     | 菜单节点         | [Menu](/components/menu) | 无     |
 
 

From d62c87d03643bc7c32ebf555817922df39b5bdb9 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 24 Feb 2016 21:53:14 +0800
Subject: [PATCH 22/65] update dropdown offset

---
 components/dropdown/dropdown-button.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/dropdown/dropdown-button.jsx b/components/dropdown/dropdown-button.jsx
index df05003e2c..c722d62820 100644
--- a/components/dropdown/dropdown-button.jsx
+++ b/components/dropdown/dropdown-button.jsx
@@ -10,7 +10,7 @@ const align = {
     adjustX: 1,
     adjustY: 1,
   },
-  offset: [0, 3],
+  offset: [0, 4],
   targetOffset: [0, 0],
 };
 

From cdbac65dbcdf66a98b6ed342509402e7d5ffb788 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Thu, 25 Feb 2016 10:36:58 +0800
Subject: [PATCH 23/65] feat: add `showTotal` for Pagination

---
 components/pagination/demo/mini.md  |  6 ++++++
 components/pagination/demo/total.md | 24 ++++++++++++++++++++++++
 components/pagination/index.md      |  1 +
 style/components/pagination.less    | 11 +++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 components/pagination/demo/total.md

diff --git a/components/pagination/demo/mini.md b/components/pagination/demo/mini.md
index 91c290d1ab..a92aca9c39 100644
--- a/components/pagination/demo/mini.md
+++ b/components/pagination/demo/mini.md
@@ -9,9 +9,15 @@
 ````jsx
 import { Pagination } from 'antd';
 
+function showTotal(total) {
+  return `共 ${total} 条`;
+}
+
 ReactDOM.render(<div>
   <Pagination size="small" total={50} />
   <br />
   <Pagination size="small" total={50} showSizeChanger showQuickJumper />
+  <br />
+  <Pagination size="small" total={50} showTotal={showTotal} />
 </div>, mountNode);
 ````
diff --git a/components/pagination/demo/total.md b/components/pagination/demo/total.md
new file mode 100644
index 0000000000..f773e91cc0
--- /dev/null
+++ b/components/pagination/demo/total.md
@@ -0,0 +1,24 @@
+# 总数
+
+- order: 9
+
+通过设置 `showTotal` 展示总共有多少数据。
+
+---
+
+````jsx
+import { Pagination, Select } from 'antd';
+
+function showTotal(total) {
+  return `共 ${total} 条`;
+}
+
+ReactDOM.render(
+  <Pagination
+    selectComponentClass={Select}
+    total={80}
+    showTotal={showTotal}
+    pageSize={20} defaultCurrent={1} />,
+  mountNode
+);
+````
diff --git a/components/pagination/index.md b/components/pagination/index.md
index b9acffad65..5374736a2b 100644
--- a/components/pagination/index.md
+++ b/components/pagination/index.md
@@ -32,3 +32,4 @@
 | showQuickJumper  | 是否可以快速跳转至某页             | Bool          | false                    |
 | size             | 当为「small」时，是小尺寸分页      | String        | ""                       |
 | simple           | 当添加该属性时，显示为简单分页     | Object        | 无                       |
+| showTotal        | 用于显示总共有多少条数据          | Function      | 无                       |
diff --git a/style/components/pagination.less b/style/components/pagination.less
index 2eddb5cf04..25a4b8d466 100644
--- a/style/components/pagination.less
+++ b/style/components/pagination.less
@@ -13,6 +13,13 @@
     visibility: hidden;
   }
 
+  &-total-text {
+    float: left;
+    height: 30px;
+    line-height: 30px;
+    margin-right: 10px;
+  }
+
   &-item {
     cursor: pointer;
     border-radius: @border-radius-base;
@@ -232,6 +239,10 @@
 }
 
 .@{pagination-prefix-cls} {
+  &.mini &-total-text {
+      height: 20px;
+      line-height: 20px;
+  }
 
   &.mini &-item {
     border: 0;

From b3340c6b6b3df2a71823acc907e95ce8bc71c8bb Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 11:49:40 +0800
Subject: [PATCH 24/65] Fix some style

---
 components/form/demo/validate-other.md |  3 +-
 style/components/form.less             |  1 -
 style/components/select.less           | 39 ++++++++------------------
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/components/form/demo/validate-other.md b/components/form/demo/validate-other.md
index 1ee64eaa58..02c0d3b6cd 100644
--- a/components/form/demo/validate-other.md
+++ b/components/form/demo/validate-other.md
@@ -124,8 +124,7 @@ let Demo = React.createClass({
         <FormItem
           label="兴趣爱好："
           labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}
-          help="Checkbox 必须设置 `valuePropName`">
+          wrapperCol={{ span: 12 }}>
           <Checkbox {...getFieldProps('eat', {
             valuePropName: 'checked',
           })} />吃饭饭 &nbsp;
diff --git a/style/components/form.less b/style/components/form.less
index 6b9d5fd9eb..118fa536f7 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -168,7 +168,6 @@ form {
     margin-right: 8px;
   }
 
-  .@{calendar-prefix-cls}-picker,
   .@{select-prefix-cls} {
     width: 100%;
   }
diff --git a/style/components/select.less b/style/components/select.less
index b01c96b46f..c344879865 100644
--- a/style/components/select.less
+++ b/style/components/select.less
@@ -147,9 +147,9 @@
       .ant-select-selection__rendered {
         li {
           height: 24px;
+          line-height: 24px;
           .ant-select-selection__choice__content {
             font-size: 14px;
-            line-height: 24px;
           }
         }
       }
@@ -171,15 +171,7 @@
       .ant-select-selection__rendered {
         li {
           height: 14px;
-          .ant-select-selection__choice__content {
-            line-height: 14px;
-            position: relative;
-            top: -3px;
-          }
-          .ant-select-selection__choice__remove {
-            position: relative;
-            top: -4px;
-          }
+          line-height: 14px;
         }
       }
     }
@@ -200,9 +192,13 @@
 
   &-search__field__placeholder {
     position: absolute;
-    top: 0;
-    left: 3px;
-    color: #aaa;
+    top: 50%;
+    left: 9px;
+    color: #ccc;
+    line-height: 20px;
+    height: 20px;
+    margin-top: -10px;
+    cursor: text;
   }
 
   &-search--inline {
@@ -228,11 +224,6 @@
     min-height: 28px;
     cursor: text;
 
-    .@{select-prefix-cls}-search__field__placeholder {
-      top: 6px;
-      left: 10px;
-    }
-
     .@{select-prefix-cls}-search--inline {
       width: auto;
       .@{select-prefix-cls}-search__field {
@@ -279,7 +270,7 @@
     .@{select-prefix-cls}-selection__choice__remove {
       .iconfont-mixin();
       color: #999;
-      line-height: 20px;
+      line-height: inherit;
       cursor: pointer;
       display: inline-block;
       font-weight: bold;
@@ -318,10 +309,6 @@
       height: 100%;
       float: none;
     }
-    .@{select-prefix-cls}-search__field__placeholder {
-      left: 10px;
-      cursor: text;
-    }
     .@{select-prefix-cls}-search__field__wrap {
       width: 100%;
       height: 100%;
@@ -469,10 +456,6 @@
   .@{select-prefix-cls}-dropdown-search {
     display: block;
     padding: 4px;
-    .@{select-prefix-cls}-search__field__placeholder {
-      left: 7px;
-      top: 5px;
-    }
     .@{select-prefix-cls}-search__field__wrap {
       width: 100%;
     }
@@ -496,4 +479,4 @@
   & + .ant-input-group-wrap > button {
     top: -5px;
   }
-}
\ No newline at end of file
+}

From 38a4436599e5054bbd2d8237e79f0731c204164a Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 11:54:53 +0800
Subject: [PATCH 25/65] update form doc

---
 components/form/index.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/form/index.md b/components/form/index.md
index 55a3635e4d..d680a6de83 100644
--- a/components/form/index.md
+++ b/components/form/index.md
@@ -41,6 +41,8 @@
 
 ### Form
 
+更多示例参考 [rc-form](http://react-component.github.io/form/)。
+
 | 参数      | 说明                                     | 类型       |  可选值 |默认值 |
 |-----------|------------------------------------------|------------|-------|--------|
 |  form | 经 `Form.create()` 包装过的组件会自带 `this.props.form` 属性，直接传给 Form 即可 | object | | 无 |

From 6d7f571c1dc7fd1c63736bb1fc40c2300600cbc6 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 12:04:58 +0800
Subject: [PATCH 26/65] Add allowClear and Fix clear button in disabled mode

---
 components/cascader/index.jsx | 5 +++--
 components/cascader/index.md  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/cascader/index.jsx b/components/cascader/index.jsx
index e5dcced45c..183a68d969 100644
--- a/components/cascader/index.jsx
+++ b/components/cascader/index.jsx
@@ -51,12 +51,12 @@ class AntCascader extends React.Component {
     this.setState({ popupVisible: false });
   }
   render() {
-    const { prefixCls, children, placeholder, size, disabled, className } = this.props;
+    const { prefixCls, children, placeholder, size, disabled, className, allowClear } = this.props;
     const sizeCls = classNames({
       'ant-input-lg': size === 'large',
       'ant-input-sm': size === 'small',
     });
-    const clearIcon = this.state.value.length > 0 ?
+    const clearIcon = (allowClear && !disabled && this.state.value.length > 0) ?
       <Icon type="cross-circle"
         className={`${prefixCls}-picker-clear`}
         onClick={this.clearSelection} /> : null;
@@ -105,6 +105,7 @@ AntCascader.defaultProps = {
     return label.join(' / ');
   },
   disabled: false,
+  allowClear: true,
   onPopupVisibleChange() {},
 };
 
diff --git a/components/cascader/index.md b/components/cascader/index.md
index 03d3cde144..3d5462ecbc 100644
--- a/components/cascader/index.md
+++ b/components/cascader/index.md
@@ -35,3 +35,4 @@
 | placeholder | 输入框占位文本 | string | '请选择' |
 | size | 输入框大小，可选 `large` `default` `small` | string | `default` |
 | disabled | 禁用 | boolean | false |
+| allowClear | 是否支持清除 | boolean | true |

From c61d31f4d199db74dbfb8dce8e89f3a6a8c5bc44 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 12:07:44 +0800
Subject: [PATCH 27/65] Fix disabled cascader cursor

---
 style/components/cascader.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/style/components/cascader.less b/style/components/cascader.less
index 8617efef05..584e1164b0 100644
--- a/style/components/cascader.less
+++ b/style/components/cascader.less
@@ -13,6 +13,10 @@
     cursor: pointer;
     vertical-align: middle;
 
+    &-disabled {
+      cursor: not-allowed;
+    }
+
     &-clear {
       opacity: 0;
       position: absolute;

From ab67c7193965abf1af803635e3edf13dea97eef9 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 12:31:20 +0800
Subject: [PATCH 28/65] update select style

---
 style/components/select.less | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/style/components/select.less b/style/components/select.less
index c344879865..07562e020f 100644
--- a/style/components/select.less
+++ b/style/components/select.less
@@ -148,9 +148,6 @@
         li {
           height: 24px;
           line-height: 24px;
-          .ant-select-selection__choice__content {
-            font-size: 14px;
-          }
         }
       }
     }

From ce11c258b3fa021144fc39c8f1018b65676d9567 Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Thu, 25 Feb 2016 14:34:31 +0800
Subject: [PATCH 29/65] docs: update demos' code style

---
 components/form/demo/validate-basic.md      | 118 ++++++++++---------
 components/form/demo/validate-customized.md |  14 ++-
 components/form/demo/validate-other.md      | 121 +++++++++-----------
 3 files changed, 122 insertions(+), 131 deletions(-)

diff --git a/components/form/demo/validate-basic.md b/components/form/demo/validate-basic.md
index 339cff3e0a..24a21286cf 100644
--- a/components/form/demo/validate-basic.md
+++ b/components/form/demo/validate-basic.md
@@ -78,94 +78,92 @@ class BasicDemo extends React.Component {
 
   render() {
     const { getFieldProps, getFieldError, isFieldValidating } = this.props.form;
-
+    const nameProps = getFieldProps('name', {
+      rules: [
+        { required: true, min: 5, message: '用户名至少为 5 个字符' },
+        { validator: this.userExists },
+      ],
+    });
+    const emailProps = getFieldProps('email', {
+      validate: [{
+        rules: [
+          { required: true },
+        ],
+        trigger: 'onBlur',
+      }, {
+        rules: [
+          { type: 'email', message: '请输入正确的邮箱地址' },
+        ],
+        trigger: ['onBlur', 'onChange'],
+      }]
+    });
+    const passwdProps = getFieldProps('passwd', {
+      rules: [
+        { required: true, whitespace: true, message: '请填写密码' },
+        { validator: this.checkPass.bind(this) },
+      ],
+    });
+    const rePasswdProps = getFieldProps('rePasswd', {
+      rules: [{
+        required: true,
+        whitespace: true,
+        message: '请再次输入密码',
+      }, {
+        validator: this.checkPass2.bind(this),
+      }],
+    });
+    const textareaProps = getFieldProps('textarea', {
+      rules: [
+        { required: true, message: '真的不打算写点什么吗？' },
+      ],
+    });
+    const formItemLayout = {
+      labelCol: { span: 7 },
+      wrapperCol: { span: 12 },
+    };
     return (
       <Form horizontal form={this.props.form}>
         <FormItem
+          {...formItemLayout}
           label="用户名："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}
           hasFeedback
           help={isFieldValidating('name') ? '校验中...' : (getFieldError('name') || []).join(', ')}>
-          <Input placeholder="实时校验，输入 JasonWood 看看"
-            {...getFieldProps('name', {
-              rules: [
-                { required: true, min: 5, message: '用户名至少为 5 个字符' },
-                { validator: this.userExists },
-              ],
-            })} />
+          <Input {...nameProps} placeholder="实时校验，输入 JasonWood 看看" />
         </FormItem>
 
         <FormItem
+          {...formItemLayout}
           label="邮箱："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}
           hasFeedback>
-          <Input type="email" placeholder="onBlur 与 onChange 相结合"
-            {...getFieldProps('email', {
-              validate: [{
-                rules: [
-                  { required: true },
-                ],
-                trigger: 'onBlur',
-              }, {
-                rules: [
-                  { type: 'email', message: '请输入正确的邮箱地址' },
-                ],
-                trigger: ['onBlur', 'onChange'],
-              }]
-            })} />
+          <Input {...emailProps} type="email" placeholder="onBlur 与 onChange 相结合" />
         </FormItem>
 
         <FormItem
+          {...formItemLayout}
           label="密码："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}
           hasFeedback>
-          <Input type="password" autoComplete="off"
-            {...getFieldProps('passwd', {
-              rules: [
-                { required: true, whitespace: true, message: '请填写密码' },
-                { validator: this.checkPass.bind(this) },
-              ],
-            })}
+          <Input {...passwdProps} type="password" autoComplete="off"
             onContextMenu={noop} onPaste={noop} onCopy={noop} onCut={noop} />
         </FormItem>
 
         <FormItem
+          {...formItemLayout}
           label="确认密码："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}
           hasFeedback>
-          <Input type="password" autoComplete="off" placeholder="两次输入密码保持一致"
-            onContextMenu={noop} onPaste={noop} onCopy={noop} onCut={noop}
-            {...getFieldProps('rePasswd', {
-              rules: [{
-                required: true,
-                whitespace: true,
-                message: '请再次输入密码',
-              }, {
-                validator: this.checkPass2.bind(this),
-              }],
-            })} />
+          <Input {...rePasswdProps} type="password" autoComplete="off" placeholder="两次输入密码保持一致"
+            onContextMenu={noop} onPaste={noop} onCopy={noop} onCut={noop} />
         </FormItem>
 
         <FormItem
-          label="备注："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}>
-          <Input type="textarea" placeholder="随便写" id="textarea" name="textarea"
-            {...getFieldProps('textarea', {
-              rules: [
-                { required: true, message: '真的不打算写点什么吗？' },
-              ],
-            })} />
+          {...formItemLayout}
+          label="备注：">
+          <Input {...textareaProps} type="textarea" placeholder="随便写" id="textarea" name="textarea" />
         </FormItem>
 
-        <FormItem wrapperCol={{ span: 12, offset: 7 }} >
-        <Button type="primary" onClick={this.handleSubmit.bind(this)}>确定</Button>
+        <FormItem wrapperCol={{ span: 12, offset: 7 }}>
+          <Button type="primary" onClick={this.handleSubmit.bind(this)}>确定</Button>
           &nbsp;&nbsp;&nbsp;
-        <Button type="ghost" onClick={this.handleReset.bind(this)}>重置</Button>
+          <Button type="ghost" onClick={this.handleReset.bind(this)}>重置</Button>
         </FormItem>
       </Form>
     );
diff --git a/components/form/demo/validate-customized.md b/components/form/demo/validate-customized.md
index 9f5e3e23e9..d93b7b6cf2 100644
--- a/components/form/demo/validate-customized.md
+++ b/components/form/demo/validate-customized.md
@@ -143,6 +143,10 @@ let Demo = React.createClass({
         validator: this.checkPass2,
       }],
     });
+    const formItemLayout = {
+      labelCol: { span: 6 },
+      wrapperCol: { span: 18 },
+    };
     return (
       <div>
         <Button type="primary" onClick={this.showModal}>修改密码</Button>
@@ -151,9 +155,8 @@ let Demo = React.createClass({
             <Row>
               <Col span="18">
                 <FormItem
-                  label="密码："
-                  labelCol={{ span: 6 }}
-                  wrapperCol={{ span: 18 }}>
+                  {...formItemLayout}
+                  label="密码：">
                   <Input {...passProps} type="password"
                     onContextMenu={noop} onPaste={noop} onCopy={noop} onCut={noop}
                     autoComplete="off" id="pass" />
@@ -167,9 +170,8 @@ let Demo = React.createClass({
             <Row>
               <Col span="18">
                 <FormItem
-                  label="确认密码："
-                  labelCol={{ span: 6 }}
-                  wrapperCol={{ span: 18 }}>
+                  {...formItemLayout}
+                  label="确认密码：">
                   <Input {...rePassProps} type="password"
                     onContextMenu={noop} onPaste={noop} onCopy={noop} onCut={noop}
                     autoComplete="off" id="rePass" />
diff --git a/components/form/demo/validate-other.md b/components/form/demo/validate-other.md
index 02c0d3b6cd..68c0240720 100644
--- a/components/form/demo/validate-other.md
+++ b/components/form/demo/validate-other.md
@@ -65,19 +65,48 @@ let Demo = React.createClass({
       }],
     }];
     const { getFieldProps } = this.props.form;
+    const selectProps = getFieldProps('select', {
+      rules: [
+        { required: true, message: '请选择您的国籍' }
+      ],
+    });
+    const multiSelectProps = getFieldProps('multiSelect', {
+      rules: [
+        { required: true, message: '请选择您喜欢的颜色', type: 'array' },
+      ]
+    });
+    const radioProps = getFieldProps('radio', {
+      rules: [
+        { required: true, message: '请选择您的性别' }
+      ]
+    });
+    const birthdayProps = getFieldProps('birthday', {
+      rules: [
+        {
+          required: true,
+          type: 'date',
+          message: '你的生日是什么呢?',
+        }, {
+          validator: this.checkBirthday,
+        }
+      ]
+    });
+    const primeNumberProps = getFieldProps('primeNumber', {
+      rules: [{ validator: this.checkPrime }],
+    });
+    const addressProps = getFieldProps('address', {
+      rules: [{ required: true, type: 'array' }],
+    });
+    const formItemLayout = {
+      labelCol: { span: 7 },
+      wrapperCol: { span: 12 },
+    };
     return (
       <Form horizontal form={this.props.form}>
         <FormItem
-          label="国籍："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}>
-          <Select placeholder="请选择国家" style={{ width: '100%' }}
-            {...getFieldProps('select', {
-              rules: [
-                { required: true, message: '请选择您的国籍' }
-              ],
-            })}
-          >
+          {...formItemLayout}
+          label="国籍：">
+          <Select {...selectProps} placeholder="请选择国家" style={{ width: '100%' }}>
             <Option value="china">中国</Option>
             <Option value="use">美国</Option>
             <Option value="japan">日本</Option>
@@ -87,16 +116,9 @@ let Demo = React.createClass({
         </FormItem>
 
         <FormItem
-          label="喜欢的颜色："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}>
-          <Select multiple placeholder="请选择颜色" style={{ width: '100%' }}
-            {...getFieldProps('multiSelect', {
-              rules: [
-                { required: true, message: '请选择您喜欢的颜色', type: 'array' },
-              ]
-            })}
-          >
+          {...formItemLayout}
+          label="喜欢的颜色：">
+          <Select {...multiSelectProps} multiple placeholder="请选择颜色" style={{ width: '100%' }}>
             <Option value="red">红色</Option>
             <Option value="orange">橙色</Option>
             <Option value="yellow">黄色</Option>
@@ -106,25 +128,17 @@ let Demo = React.createClass({
         </FormItem>
 
         <FormItem
-          label="性别："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}>
-          <RadioGroup
-            {...getFieldProps('radio', {
-              rules: [
-                { required: true, message: '请选择您的性别' }
-              ]
-            })}
-          >
+          {...formItemLayout}
+          label="性别：">
+          <RadioGroup {...radioProps}>
             <Radio value="male">男</Radio>
             <Radio value="female">女</Radio>
           </RadioGroup>
         </FormItem>
 
         <FormItem
-          label="兴趣爱好："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}>
+          {...formItemLayout}
+          label="兴趣爱好：">
           <Checkbox {...getFieldProps('eat', {
             valuePropName: 'checked',
           })} />吃饭饭 &nbsp;
@@ -137,44 +151,21 @@ let Demo = React.createClass({
         </FormItem>
 
         <FormItem
-          label="生日："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}>
-          <DatePicker
-            {...getFieldProps('birthday', {
-              rules: [
-                {
-                  required: true,
-                  type: 'date',
-                  message: '你的生日是什么呢?',
-                }, {
-                  validator: this.checkBirthday,
-                }
-              ]
-            })}
-          />
+          {...formItemLayout}
+          label="生日：">
+          <DatePicker {...birthdayProps} />
         </FormItem>
 
         <FormItem
-          label="8~12间的质数："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}>
-          <InputNumber min={8} max={12}
-            {...getFieldProps('primeNumber', {
-              rules: [{ validator: this.checkPrime }],
-            })}
-          />
+          {...formItemLayout}
+          label="8~12间的质数：">
+          <InputNumber {...primeNumberProps} min={8} max={12} />
         </FormItem>
 
         <FormItem
-          label="选择地址："
-          labelCol={{ span: 7 }}
-          wrapperCol={{ span: 12 }}>
-          <Cascader options={address}
-            {...getFieldProps('address', {
-              rules: [{ required: true, type: 'array' }],
-            })}
-          />
+          {...formItemLayout}
+          label="选择地址：">
+          <Cascader {...addressProps} options={address} />
         </FormItem>
 
         <FormItem

From 85afd74c35cb059923a70d8c3d8a238c0b87a379 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 15:12:17 +0800
Subject: [PATCH 30/65] Update icon.md

---
 components/steps/demo/icon.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/steps/demo/icon.md b/components/steps/demo/icon.md
index 1dfbfdc8f1..427aa03ca7 100644
--- a/components/steps/demo/icon.md
+++ b/components/steps/demo/icon.md
@@ -1,4 +1,4 @@
-# 带ICON图标的步骤条
+# 带图标的步骤条
 
 - order: 2
 

From ed9fc679b850ca0d2247d181dc8d449e47b33879 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 15:32:59 +0800
Subject: [PATCH 31/65] Remove some demos

---
 components/notification/demo/onclose.md | 30 -----------------------
 components/steps/demo/status.md         | 32 -------------------------
 2 files changed, 62 deletions(-)
 delete mode 100644 components/notification/demo/onclose.md
 delete mode 100644 components/steps/demo/status.md

diff --git a/components/notification/demo/onclose.md b/components/notification/demo/onclose.md
deleted file mode 100644
index 9f887d6c98..0000000000
--- a/components/notification/demo/onclose.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# 回调函数
-
-- order: 3
-
-点击关闭按钮时触发回调函数。
-
----
-
-````jsx
-import { Button, notification } from 'antd';
-
-const close = function () {
-  console.log('我被默认的关闭按钮关闭了！');
-};
-
-const openNotification = function () {
-  const args = {
-    message: '这是标题',
-    description: '这是提示框的文案这是提示框示框的文案这是提示是提示框的文案这是提示框的文案',
-    onClose: close
-  };
-  notification.open(args);
-};
-
-ReactDOM.render(
-  <div>
-    <Button type="primary" onClick={openNotification}>打开通知提醒框</Button>
-  </div>,
-mountNode);
-````
diff --git a/components/steps/demo/status.md b/components/steps/demo/status.md
deleted file mode 100644
index e6a99363de..0000000000
--- a/components/steps/demo/status.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# 自定义状态
-
-- order: 10
-
-可以使用 `status` 定义每个步骤的状态。
-
----
-
-````jsx
-import { Steps } from 'antd';
-const Step = Steps.Step;
-
-const steps = [{
-  status: 'finish',
-  title: '已完成',
-  description: '这里是多信息的描述啊'
-}, {
-  status: 'process',
-  title: '进行中',
-  description: '这里是多信息的耶哦耶哦哦耶哦耶'
-}, {
-  status: 'wait',
-  title: '又一个待运行',
-  description: '描述啊描述啊'
-}, {
-  status: 'wait',
-  title: '待运行',
-  description: '这里是多信息的描述啊'
-}].map((s, i) => <Step key={i} title={s.title} description={s.description} />);
-
-ReactDOM.render(<Steps>{steps}</Steps>, mountNode);
-````

From 3ab72afc44c9535f177725769afe4c7f0f1e1a8c Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 15:40:35 +0800
Subject: [PATCH 32/65] Fix pagination size in table

---
 components/table/index.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/table/index.jsx b/components/table/index.jsx
index 7b99c71a29..4f90e94fcf 100644
--- a/components/table/index.jsx
+++ b/components/table/index.jsx
@@ -38,7 +38,9 @@ let AntTable = React.createClass({
       sorter: null,
       radioIndex: null,
       pagination: this.hasPagination() ?
-        objectAssign({}, defaultPagination, this.props.pagination) :
+        objectAssign({
+          size: this.props.size,
+        }, defaultPagination, this.props.pagination) :
         {},
     };
   },

From 5cf7c592e14006f3fbd77e0432e084b203651934 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 17:07:31 +0800
Subject: [PATCH 33/65] typo

---
 components/notification/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/notification/index.md b/components/notification/index.md
index 2fe0aa63fd..0bf81b2e99 100644
--- a/components/notification/index.md
+++ b/components/notification/index.md
@@ -42,7 +42,7 @@ config 参数如下：
 - `notification.config(options)`
 
 ```js
-message.config({
+notification.config({
   top: 100
 });
 ```

From 8fff871a7cb3e0f93032be414f50a6bd1d8093da Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 25 Feb 2016 23:38:56 +0800
Subject: [PATCH 34/65] bump 0.12.5

---
 CHANGELOG.md | 12 ++++++++++++
 package.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8a082cb56..99644ba0e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@
 
 ---
 
+## 0.12.5
+
+`2016-02-25`
+
+- Pagination 支持 `showTotal` 属性。[#1077](https://github.com/ant-design/ant-design/pull/1077)
+- Cascader 添加 `allowClear` 属性，允许隐藏清除按钮。
+- 补充了一个带图标的搜索建议框的例子。[#1067](https://github.com/ant-design/ant-design/issues/1067)
+- 修复 Transfer 在不支持 Object.assign 的浏览器上报错的问题。
+- 修复 Cascader 在 Safari 下错位的问题。[#1066](https://github.com/ant-design/ant-design/issues/1066)
+- 移除对 Button 圆角的降级方案。
+- 修复了部分组件样式的小问题。
+
 ## 0.12.4
 
 `2016-02-22`
diff --git a/package.json b/package.json
index 5393e4539a..c7b705cdf9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",

From 17b9d85f449d3f4dba0c31509fe9552639eac718 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 26 Feb 2016 11:07:50 +0800
Subject: [PATCH 35/65] update demo title

---
 components/table/demo/paging-columns.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/table/demo/paging-columns.md b/components/table/demo/paging-columns.md
index 2fba457418..0ef7a84bfd 100644
--- a/components/table/demo/paging-columns.md
+++ b/components/table/demo/paging-columns.md
@@ -1,4 +1,4 @@
-# 滚屏分页的列
+# 横向滚屏表格
 
 - order: 16
 

From 1e26289da779fc118d2c88330aae2f910ee837f5 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 26 Feb 2016 14:41:14 +0800
Subject: [PATCH 36/65] fix site style

---
 site/static/style.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/static/style.less b/site/static/style.less
index e27355f998..aea3d05ec8 100644
--- a/site/static/style.less
+++ b/site/static/style.less
@@ -415,7 +415,6 @@ footer ul li > a {
   transition: all 0.3s ease;
 }
 
-
 .aside-container li[open=open] h4:after {
   -webkit-transform: scale(0.6) rotate(180deg);
   transform: scale(0.6) rotate(180deg);
@@ -922,6 +921,7 @@ footer ul li > a {
   margin: 0.5em 0;
   padding-right: 25px;
   width: 100%;
+  word-break: break-word;
 }
 
 .code-box .collapse {

From 7ea67b6e372c6475809e71a37e0e253571e0e7ab Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 26 Feb 2016 16:31:33 +0800
Subject: [PATCH 37/65] stable sort in table

http://jsperf.com/chrome-stable-sort
---
 components/table/index.jsx | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/components/table/index.jsx b/components/table/index.jsx
index 4f90e94fcf..b494282082 100644
--- a/components/table/index.jsx
+++ b/components/table/index.jsx
@@ -136,19 +136,18 @@ let AntTable = React.createClass({
       }
     }
     if (typeof column.sorter === 'function') {
-      sorter = function (...args) {
-        let result = column.sorter.apply(this, args);
-        if (sortOrder === 'ascend') {
-          return result;
-        } else if (sortOrder === 'descend') {
-          return -result;
+      sorter = (a, b) => {
+        let result = column.sorter(a, b);
+        if (result !== 0) {
+          return (sortOrder === 'descend') ? -result : result;
         }
+        return a.index - b.index;
       };
     }
     const newState = {
       sortOrder,
       sortColumn,
-      sorter
+      sorter,
     };
     this.setState(newState);
     this.props.onChange.apply(this, this.prepareParamsArguments(
@@ -495,9 +494,7 @@ let AntTable = React.createClass({
   },
 
   findColumn(myKey) {
-    return this.props.columns.filter((c) => {
-      return this.getColumnKey(c) === myKey;
-    })[0];
+    return this.props.columns.filter(c => this.getColumnKey(c) === myKey)[0];
   },
 
   getCurrentPageData(dataSource) {
@@ -530,6 +527,10 @@ let AntTable = React.createClass({
     let data = dataSource || this.props.dataSource;
     // 排序
     if (state.sortOrder && state.sorter) {
+      data = data.slice(0);
+      for (let i = 0; i < data.length; i++) {
+        data[i].index = i;
+      }
       data = data.sort(state.sorter);
     }
     // 筛选

From d2cf85b87bacb661bc98efea9b011f25931d2bf5 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 26 Feb 2016 17:12:56 +0800
Subject: [PATCH 38/65] Fix allowClear of TreeSelect, close #1084

---
 components/tree-select/demo/basic.md |  1 +
 components/tree-select/index.jsx     |  2 -
 style/components/select.less         | 61 +++++++++++++++-------------
 style/components/treeSelect.less     | 16 ++------
 4 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/components/tree-select/demo/basic.md b/components/tree-select/demo/basic.md
index f85d997e68..eafa83d778 100644
--- a/components/tree-select/demo/basic.md
+++ b/components/tree-select/demo/basic.md
@@ -26,6 +26,7 @@ const Demo = React.createClass({
         value={this.state.value}
         dropdownMenuStyle={{ maxHeight: 400, overflow: 'auto' }}
         placeholder="请选择"
+        allowClear
         treeDefaultExpandAll
         onChange={this.onChange}>
         <TreeNode value="parent 1" title="parent 1" key="0-1">
diff --git a/components/tree-select/index.jsx b/components/tree-select/index.jsx
index b98d99e7b9..a7efb1d64a 100644
--- a/components/tree-select/index.jsx
+++ b/components/tree-select/index.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import TreeSelect, { TreeNode } from 'rc-tree-select';
 import classNames from 'classnames';
-// import animation from '../common/openAnimation';
 
 const AntTreeSelect = React.createClass({
   getDefaultProps() {
@@ -10,7 +9,6 @@ const AntTreeSelect = React.createClass({
       transitionName: 'slide-up',
       choiceTransitionName: 'zoom',
       showSearch: false,
-      // openAnimation: animation,
     };
   },
   render() {
diff --git a/style/components/select.less b/style/components/select.less
index 07562e020f..88860d7c64 100644
--- a/style/components/select.less
+++ b/style/components/select.less
@@ -4,6 +4,37 @@
 
 @import "../mixins/iconfont";
 
+.selection__clear() {
+  display: inline-block;
+  font-style: normal;
+  vertical-align: baseline;
+  text-align: center;
+  text-transform: none;
+  text-rendering: auto;
+  opacity: 0;
+  position: absolute;
+  right: 8px;
+  z-index: 1;
+  background: #fff;
+  top: 50%;
+  font-size: 12px;
+  color: #ccc;
+  width: 12px;
+  height: 12px;
+  margin-top: -6px;
+  line-height: 12px;
+  cursor: pointer;
+  transition: color 0.3s ease, opacity 0.15s ease;
+  &:before {
+    display: block;
+    font-family: "anticon" !important;
+    content: "\E631";
+  }
+  &:hover {
+    color: #999;
+  }
+}
+
 .@{select-prefix-cls} {
   box-sizing: border-box;
   display: inline-block;
@@ -53,39 +84,13 @@
     &:hover {
       .hover;
     }
+
     &:active {
       .active;
     }
 
     &__clear {
-      display: inline-block;
-      font-style: normal;
-      vertical-align: baseline;
-      text-align: center;
-      text-transform: none;
-      text-rendering: auto;
-      opacity: 0;
-      position: absolute;
-      right: 8px;
-      z-index: 1;
-      background: #fff;
-      top: 50%;
-      font-size: 12px;
-      color: #ccc;
-      width: 12px;
-      height: 12px;
-      margin-top: -6px;
-      line-height: 12px;
-      cursor: pointer;
-      transition: color 0.3s ease, opacity 0.15s ease;
-      &:before {
-        display: block;
-        font-family: "anticon" !important;
-        content: "\E631";
-      }
-      &:hover {
-        color: #999;
-      }
+      .selection__clear();
     }
 
     &:hover &__clear {
diff --git a/style/components/treeSelect.less b/style/components/treeSelect.less
index 6039862750..93e3d9f5f0 100644
--- a/style/components/treeSelect.less
+++ b/style/components/treeSelect.less
@@ -115,12 +115,6 @@
 @duration: .3s;
 
 @import "../mixins/iconfont";
-//mixin
-.selection__clear() {
-  cursor: pointer;
-  float: right;
-  font-weight: bold;
-}
 
 .@{tree-select-prefix-cls} {
   box-sizing: border-box;
@@ -216,6 +210,10 @@
       .selection__clear();
     }
 
+    &:hover .@{tree-select-prefix-cls}-selection__clear {
+      opacity: 1;
+    }
+
     .@{tree-select-prefix-cls}-selection__placeholder {
       color: #ccc;
     }
@@ -345,12 +343,6 @@
       padding-bottom: 4px;
     }
 
-    .@{tree-select-prefix-cls}-selection__clear {
-      .selection__clear();
-      margin-top: 5px;
-      margin-right: 10px;
-    }
-
     > ul > li {
       margin-top: 4px;
       height: 20px;

From 870b7ade34714e8f799869cb079ebfd212c3bc0f Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 26 Feb 2016 17:15:46 +0800
Subject: [PATCH 39/65] Fix radio group className

---
 components/radio/group.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/radio/group.jsx b/components/radio/group.jsx
index 113b470690..f731af8369 100644
--- a/components/radio/group.jsx
+++ b/components/radio/group.jsx
@@ -17,6 +17,7 @@ export default React.createClass({
     return {
       prefixCls: 'ant-radio-group',
       disabled: false,
+      size: 'default',
       onChange() {
       },
     };

From 052d0ac1220723946159e16eb00c28f8c2e6e5fa Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 26 Feb 2016 18:13:16 +0800
Subject: [PATCH 40/65] Fix tree select size style

---
 components/tree-select/index.jsx |  10 +-
 style/components/treeSelect.less | 504 ++-----------------------------
 2 files changed, 23 insertions(+), 491 deletions(-)

diff --git a/components/tree-select/index.jsx b/components/tree-select/index.jsx
index a7efb1d64a..f261129d82 100644
--- a/components/tree-select/index.jsx
+++ b/components/tree-select/index.jsx
@@ -5,7 +5,7 @@ import classNames from 'classnames';
 const AntTreeSelect = React.createClass({
   getDefaultProps() {
     return {
-      prefixCls: 'ant-tree-select',
+      prefixCls: 'ant-select',
       transitionName: 'slide-up',
       choiceTransitionName: 'zoom',
       showSearch: false,
@@ -14,12 +14,12 @@ const AntTreeSelect = React.createClass({
   render() {
     const props = this.props;
     let {
-      size, className, combobox, notFoundContent
+      size, className, combobox, notFoundContent, prefixCls
     } = this.props;
 
     const cls = classNames({
-      'ant-tree-select-lg': size === 'large',
-      'ant-tree-select-sm': size === 'small',
+      [`${prefixCls}-lg`]: size === 'large',
+      [`${prefixCls}-sm`]: size === 'small',
       [className]: !!className,
     });
 
@@ -29,7 +29,7 @@ const AntTreeSelect = React.createClass({
 
     let checkable = props.treeCheckable;
     if (checkable) {
-      checkable = <span className={`${props.prefixCls}-tree-checkbox-inner`}></span>;
+      checkable = <span className={`${prefixCls}-tree-checkbox-inner`}></span>;
     }
 
     return (
diff --git a/style/components/treeSelect.less b/style/components/treeSelect.less
index 93e3d9f5f0..5574cb14d9 100644
--- a/style/components/treeSelect.less
+++ b/style/components/treeSelect.less
@@ -1,8 +1,9 @@
-@tree-select-tree-prefix-cls: ant-tree-select-tree;
-.antCheckboxFn(@checkbox-prefix-cls: ant-tree-select-tree-checkbox);
+@select-tree-prefix-cls: ant-select-tree;
 @import "../mixins/iconfont";
 
-.@{tree-select-tree-prefix-cls} {
+.antCheckboxFn(@checkbox-prefix-cls: ant-select-tree-checkbox);
+
+.@{select-tree-prefix-cls} {
   margin: 0;
   padding: 8px;
   font-size: 12px;
@@ -35,16 +36,16 @@
       &:hover {
         background-color: tint(@primary-color, 90%);
       }
-      &.@{tree-select-tree-prefix-cls}-node-selected {
+      &.@{select-tree-prefix-cls}-node-selected {
         background-color: tint(@primary-color, 80%);
       }
     }
     span {
-      &.@{tree-select-tree-prefix-cls}-checkbox {
+      &.@{select-tree-prefix-cls}-checkbox {
         margin: 2px 4px 0 0;
       }
-      &.@{tree-select-tree-prefix-cls}-switcher,
-      &.@{tree-select-tree-prefix-cls}-iconEle {
+      &.@{select-tree-prefix-cls}-switcher,
+      &.@{select-tree-prefix-cls}-iconEle {
         margin: 0;
         width: 16px;
         height: 16px;
@@ -55,7 +56,7 @@
         cursor: pointer;
         outline: none;
       }
-      &.@{tree-select-tree-prefix-cls}-icon_loading {
+      &.@{select-tree-prefix-cls}-icon_loading {
         &:after {
           content: '\e6a1';
           display: inline-block;
@@ -65,17 +66,17 @@
           margin-top: 8px;
         }
       }
-      &.@{tree-select-tree-prefix-cls}-switcher {
-        &.@{tree-select-tree-prefix-cls}-roots_open,
-        &.@{tree-select-tree-prefix-cls}-center_open,
-        &.@{tree-select-tree-prefix-cls}-bottom_open,
-        &.@{tree-select-tree-prefix-cls}-noline_open {
+      &.@{select-tree-prefix-cls}-switcher {
+        &.@{select-tree-prefix-cls}-roots_open,
+        &.@{select-tree-prefix-cls}-center_open,
+        &.@{select-tree-prefix-cls}-bottom_open,
+        &.@{select-tree-prefix-cls}-noline_open {
           .antTreeSwitcherIcon();
         }
-        &.@{tree-select-tree-prefix-cls}-roots_close,
-        &.@{tree-select-tree-prefix-cls}-center_close,
-        &.@{tree-select-tree-prefix-cls}-bottom_close,
-        &.@{tree-select-tree-prefix-cls}-noline_close {
+        &.@{select-tree-prefix-cls}-roots_close,
+        &.@{select-tree-prefix-cls}-center_close,
+        &.@{select-tree-prefix-cls}-bottom_close,
+        &.@{select-tree-prefix-cls}-noline_close {
           .antTreeSwitcherIcon();
           .ie-rotate(3);
           &:after {
@@ -108,472 +109,3 @@
     vertical-align: top;
   }
 }
-
-
-@tree-select-prefix-cls: ant-tree-select;
-
-@duration: .3s;
-
-@import "../mixins/iconfont";
-
-.@{tree-select-prefix-cls} {
-  box-sizing: border-box;
-  display: inline-block;
-  margin: 0;
-  position: relative;
-  vertical-align: middle;
-  color: #666;
-  font-size: @font-size-base;
-
-  > ul > li > a {
-    padding: 0;
-    background-color: #fff;
-  }
-
-  // arrow
-  &-arrow {
-    .iconfont-mixin();
-    position: absolute;
-    top: 50%;
-    right: 8px;
-    line-height: 1;
-    margin-top: -5px;
-    .iconfont-size-under-12px(8px);
-
-    * {
-      display: none;
-    }
-
-    &:before {
-      content: '\e603';
-      transition: transform 0.2s ease;
-    }
-  }
-
-  &-selection {
-    outline: none;
-    user-select: none;
-
-    box-sizing: border-box;
-    display: block;
-
-    background-color: #fff;
-    border-radius: @border-radius-base;
-    border: 1px solid @border-color-base;
-    .transition(all .3s @ease-in-out);
-
-    &:hover {
-      .hover;
-    }
-    &:active {
-      .active;
-    }
-  }
-
-  &-disabled {
-    color: #ccc;
-  }
-
-  &-disabled &-selection {
-    background: #f4f4f4;
-    cursor: not-allowed;
-    &:hover,
-    &:active {
-      border-color: @border-color-base;
-    }
-  }
-
-  &-disabled &-selection--multiple &-selection__choice {
-    background: #e9e9e9;
-    color: #999;
-    padding-right: 10px;
-    &__remove {
-      display: none;
-    }
-  }
-
-  &-selection--single {
-    height: 28px;
-    cursor: pointer;
-
-    .@{tree-select-prefix-cls}-selection__rendered {
-      display: block;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      padding-left: 8px;
-      padding-right: 24px;
-      line-height: 26px;
-    }
-
-    .@{tree-select-prefix-cls}-selection__clear {
-      .selection__clear();
-    }
-
-    &:hover .@{tree-select-prefix-cls}-selection__clear {
-      opacity: 1;
-    }
-
-    .@{tree-select-prefix-cls}-selection__placeholder {
-      color: #ccc;
-    }
-  }
-
-  &-lg {
-    .@{tree-select-prefix-cls}-selection--single {
-      height: 32px;
-      .@{tree-select-prefix-cls}-selection__rendered {
-        line-height: 30px;
-      }
-    }
-
-    .@{tree-select-prefix-cls}-selection--multiple {
-      min-height: 32px;
-
-      .@{tree-select-prefix-cls}-search__field__placeholder {
-        left: 10px;
-        margin-top: 4px;
-        font-size: 14px;
-        line-height: 24px;
-        height: 24px;
-      }
-
-      .@{tree-select-prefix-cls}-selection__rendered {
-        li {
-          height: 22px;
-          .@{tree-select-prefix-cls}-selection__choice__content {
-            font-size: 14px;
-            line-height: 22px;
-          }
-        }
-      }
-    }
-  }
-
-  &-sm {
-    .@{tree-select-prefix-cls}-selection {
-      border-radius: @border-radius-sm;
-    }
-    .@{tree-select-prefix-cls}-selection--single {
-      height: 22px;
-      .@{tree-select-prefix-cls}-selection__rendered {
-        line-height: 20px;
-      }
-    }
-    .@{tree-select-prefix-cls}-selection--multiple {
-      min-height: 22px;
-      .@{tree-select-prefix-cls}-selection__rendered {
-        li {
-          height: 14px;
-          .@{tree-select-prefix-cls}-selection__choice__content {
-            line-height: 10px;
-            font-size: 8px;
-            position: relative;
-            top: -3px;
-          }
-          .@{tree-select-prefix-cls}-selection__choice__remove {
-            position: relative;
-            top: -4px;
-          }
-        }
-      }
-    }
-  }
-
-  &-disabled &-selection__choice__remove {
-    color: #ccc;
-    cursor: default;
-    &:hover {
-      color: #ccc;
-    }
-  }
-
-  &-search__field__wrap {
-    display: inline-block;
-    position: relative;
-  }
-
-  &-search__field__placeholder {
-    position: absolute;
-    top: 0;
-    left: 3px;
-    color: #aaa;
-  }
-
-  &-search--inline {
-    float: left;
-
-    .@{tree-select-prefix-cls}-search__field__wrap {
-      width: 100%;
-    }
-
-    .@{tree-select-prefix-cls}-search__field {
-      border: 0;
-      font-size: 100%;
-      background: transparent;
-      outline: 0;
-    }
-    > i {
-      float: right;
-    }
-  }
-
-  &-selection--multiple {
-    min-height: 28px;
-    cursor: text;
-
-    .@{tree-select-prefix-cls}-search__field__placeholder {
-      left: 10px;
-      margin-top: 4px;
-      height: 20px;
-      line-height: 20px;
-    }
-
-    .@{tree-select-prefix-cls}-search--inline {
-      width: auto;
-      .@{tree-select-prefix-cls}-search__field {
-        width: 0.75em;
-      }
-    }
-
-    .@{tree-select-prefix-cls}-selection__rendered {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      padding-left: 6px;
-      padding-bottom: 4px;
-    }
-
-    > ul > li {
-      margin-top: 4px;
-      height: 20px;
-      line-height: 20px;
-    }
-
-    .@{tree-select-prefix-cls}-selection__choice {
-      background-color: #f3f3f3;
-      border-radius: 4px;
-      cursor: default;
-      float: left;
-      padding: 0 15px;
-      margin-right: 4px;
-      max-width: 99%;
-      position: relative;
-      overflow: hidden;
-      transition: padding @duration @ease-in-out;
-      padding: 0 20px 0 10px;
-    }
-
-    .@{tree-select-prefix-cls}-selection__choice__content {
-      display: inline-block;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      max-width: 100%;
-      transition: margin @duration @ease-in-out;
-    }
-
-    .@{tree-select-prefix-cls}-selection__choice__remove {
-      .iconfont-mixin();
-      color: #999;
-      line-height: 20px;
-      cursor: pointer;
-      display: inline-block;
-      font-weight: bold;
-      transition: all 0.3s @ease-in-out;
-      .iconfont-size-under-12px(8px);
-      position: absolute;
-      right: 4px;
-      padding: 0 0 0 8px;
-      &:hover {
-        color: #404040;
-      }
-      &:before {
-        content: "\e62d";
-      }
-    }
-  }
-
-  &-open {
-    .@{tree-select-prefix-cls}-arrow {
-      .ie-rotate(2);
-      -ms-transform: rotate(180deg);
-      &:before {
-        .rotate(180deg);
-      }
-    }
-    .@{tree-select-prefix-cls}-selection {
-      .active();
-    }
-  }
-
-  &-combobox {
-    .@{tree-select-prefix-cls}-arrow {
-      display: none;
-    }
-    .@{tree-select-prefix-cls}-search--inline {
-      height: 100%;
-      float: none;
-    }
-    .@{tree-select-prefix-cls}-search__field__placeholder {
-      left: 10px;
-      cursor: text;
-    }
-    .@{tree-select-prefix-cls}-search__field__wrap {
-      width: 100%;
-      height: 100%;
-    }
-    .@{tree-select-prefix-cls}-search__field {
-      padding: 0 10px;
-      width: 100%;
-      height: 100%;
-      position: relative;
-      z-index: 1;
-    }
-    .@{tree-select-prefix-cls}-selection__rendered {
-      padding: 0;
-      height: 100%;
-    }
-  }
-}
-
-.@{tree-select-prefix-cls}-dropdown {
-  &.slide-up-enter.slide-up-enter-active&-placement-bottomLeft,
-  &.slide-up-appear.slide-up-appear-active&-placement-bottomLeft {
-    animation-name: antSlideUpIn;
-  }
-
-  &.slide-up-enter.slide-up-enter-active&-placement-topLeft,
-  &.slide-up-appear.slide-up-appear-active&-placement-topLeft {
-    animation-name: antSlideDownIn;
-  }
-
-  &.slide-up-leave.slide-up-leave-active&-placement-bottomLeft {
-    animation-name: antSlideUpOut;
-  }
-
-  &.slide-up-leave.slide-up-leave-active&-placement-topLeft {
-    animation-name: antSlideDownOut;
-  }
-
-  &-hidden {
-    display: none;
-  }
-
-  background-color: white;
-  border: 1px solid @border-color-base;
-  box-shadow: @box-shadow-base;
-  border-radius: @border-radius-base;
-  box-sizing: border-box;
-  z-index: 1070;
-  left: -9999px;
-  top: -9999px;
-  position: absolute;
-  outline: none;
-  overflow: hidden;
-  font-size: @font-size-base;
-
-  &-menu {
-    outline: none;
-    margin-bottom: 0;
-    padding-left: 0; // Override default ul/ol
-    list-style: none;
-    max-height: 250px;
-    overflow: auto;
-
-    &-item-group-list {
-      margin: 0;
-      padding: 0;
-
-      > .@{tree-select-prefix-cls}-dropdown-menu-item {
-        padding-left: 24px;
-      }
-    }
-
-    &-item-group-title {
-      color: #999;
-      line-height: 1.5;
-      padding: 8px 15px;
-    }
-
-    &-item {
-      position: relative;
-      display: block;
-      padding: 7px 15px;
-      font-weight: normal;
-      color: #666;
-      white-space: nowrap;
-      cursor: pointer;
-      overflow: hidden;
-      transition: background 0.3s ease;
-
-      &:first-child {
-        border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-      }
-      &:last-child {
-        border-bottom-left-radius: 4px;
-        border-bottom-right-radius: 4px;
-      }
-      &:hover,
-      &-active {
-        background-color: tint(@primary-color, 90%);
-      }
-
-      &-selected {
-        background-color: tint(@primary-color, 80%);
-        &:hover {
-          background-color: tint(@primary-color, 80%);
-        }
-      }
-
-      &-disabled {
-        color: #ccc;
-        cursor: not-allowed;
-
-        &:hover {
-          color: #ccc;
-          background-color: #fff;
-          cursor: not-allowed;
-        }
-      }
-
-      &-divider {
-        height: 1px;
-        margin: 1px 0;
-        overflow: hidden;
-        background-color: #e5e5e5;
-        line-height: 0;
-      }
-    }
-  }
-
-  &-container-open,
-  &-open {
-    .@{tree-select-prefix-cls}-dropdown {
-      display: block;
-    }
-  }
-
-  .@{tree-select-prefix-cls}-dropdown-search {
-    display: block;
-    padding: 4px;
-    .@{tree-select-prefix-cls}-search__field__placeholder {
-      left: 7px;
-      top: 5px;
-    }
-    .@{tree-select-prefix-cls}-search__field__wrap {
-      width: 100%;
-    }
-    .@{tree-select-prefix-cls}-search__field {
-      padding: 4px 7px;
-      width: 100%;
-      box-sizing: border-box;
-      border: 1px solid @border-color-base;
-      border-radius: 4px;
-      outline: none;
-    }
-    &.@{tree-select-prefix-cls}-search--hide {
-      display: none;
-    }
-  }
-}

From 49536539474a0df578e2dce25946abdf8d47e420 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 26 Feb 2016 18:32:52 +0800
Subject: [PATCH 41/65] update doc

---
 docs/react/getting-started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/react/getting-started.md b/docs/react/getting-started.md
index 2041a97814..b9ca914184 100644
--- a/docs/react/getting-started.md
+++ b/docs/react/getting-started.md
@@ -138,7 +138,7 @@ Ant Design React 支持所有的现代浏览器和 IE8+。
 
 ## 自行构建
 
-如果想自己维护工作流，我们推荐使用 [webpack](http://webpack.github.io/) 进行构建和调试，可以参考我们所使用的 [webpack 配置](https://github.com/ant-tool/atool-build/blob/master/src/getWebpackCommonConfig.js)。
+如果想自己维护工作流，我们推荐使用 [webpack](http://webpack.github.io/) 进行构建和调试。理论上你可以利用 React 生态圈中的 [各种脚手架](https://github.com/enaqx/awesome-react#boilerplates) 进行开发，如果遇到问题可参考我们所使用的 [webpack 配置](https://github.com/ant-tool/atool-build/blob/master/src/getWebpackCommonConfig.js) 进行 [定制](http://ant-tool.github.io/webpack-config.htm)。
 
 ### 改变主色系
 

From 86b5c6eeccaf254af14ea6822cad708b898f5833 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sun, 28 Feb 2016 00:16:32 +0800
Subject: [PATCH 42/65] Fix some style

---
 components/radio/group.jsx        | 12 ++++++------
 style/components/inputNumber.less |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/radio/group.jsx b/components/radio/group.jsx
index f731af8369..1ca8021c62 100644
--- a/components/radio/group.jsx
+++ b/components/radio/group.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import classNames from 'classnames';
 
 function getCheckedValue(children) {
   let value = null;
@@ -17,7 +18,6 @@ export default React.createClass({
     return {
       prefixCls: 'ant-radio-group',
       disabled: false,
-      size: 'default',
       onChange() {
       },
     };
@@ -77,10 +77,10 @@ export default React.createClass({
       }
       return radio;
     });
-    return (
-      <div className={`${props.prefixCls} ${props.prefixCls}-${props.size}`}>
-        {children}
-      </div>
-    );
+    const classString = classNames({
+      [props.prefixCls]: true,
+      [`${props.prefixCls}-${props.size}`]: props.size,
+    });
+    return <div className={classString}>{children}</div>;
   },
 });
diff --git a/style/components/inputNumber.less b/style/components/inputNumber.less
index 6b8759550a..5a1c6af2d0 100644
--- a/style/components/inputNumber.less
+++ b/style/components/inputNumber.less
@@ -110,7 +110,6 @@
     input {
       height: 32px;
       line-height: 32px;
-      font-size: 14px;
     }
 
     .@{input-number-prefix-cls}-handler-up-inner {

From 5f8baf1bfd32ce6fe3a6444675d04d06465e92c5 Mon Sep 17 00:00:00 2001
From: ecofe <150641329@qq.com>
Date: Mon, 29 Feb 2016 16:52:53 +0800
Subject: [PATCH 43/65] modify md file (dropdownStyle)

---
 components/tree-select/demo/basic.md    | 2 +-
 components/tree-select/demo/treeData.md | 2 +-
 components/tree-select/index.md         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/tree-select/demo/basic.md b/components/tree-select/demo/basic.md
index eafa83d778..7077395235 100644
--- a/components/tree-select/demo/basic.md
+++ b/components/tree-select/demo/basic.md
@@ -24,7 +24,7 @@ const Demo = React.createClass({
     return (
       <TreeSelect style={{ width: 300 }}
         value={this.state.value}
-        dropdownMenuStyle={{ maxHeight: 400, overflow: 'auto' }}
+        dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
         placeholder="请选择"
         allowClear
         treeDefaultExpandAll
diff --git a/components/tree-select/demo/treeData.md b/components/tree-select/demo/treeData.md
index 495617795a..3fdbf74bb8 100644
--- a/components/tree-select/demo/treeData.md
+++ b/components/tree-select/demo/treeData.md
@@ -42,7 +42,7 @@ const Demo = React.createClass({
     return (
       <TreeSelect style={{ width: 300 }}
         value={this.state.value}
-        dropdownMenuStyle={{ maxHeight: 400, overflow: 'auto' }}
+        dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
         treeData={treeData}
         placeholder="请选择"
         treeDefaultExpandAll
diff --git a/components/tree-select/index.md b/components/tree-select/index.md
index 81897a008c..c5bfe4ef0a 100644
--- a/components/tree-select/index.md
+++ b/components/tree-select/index.md
@@ -28,6 +28,7 @@
 | onSearch | 文本框值变化时回调 | function(value: String) |  |
 | placeholder | 选择框默认文字 | string | 无 |
 | searchPlaceholder | 搜索框默认文字 | string | 无 |
+| dropdownStyle | 下拉菜单的样式 | object | 无 |
 | dropdownMatchSelectWidth | 下拉菜单和选择器同宽 | boolean | true |
 | combobox | 输入框自动提示模式 | boolean | false |
 | size    | 选择框大小，可选 `large` `small`  | String      |      default      |

From 0edd5ada9af1b68f7e6cbb1d8513e857d19d4c42 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Mon, 29 Feb 2016 18:02:05 +0800
Subject: [PATCH 44/65] Fix onClick in dropdown button, close #1097

---
 components/dropdown/demo/dropdown-button.md | 24 +++++++-------
 components/dropdown/dropdown-button.jsx     | 36 +++++++++++----------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/components/dropdown/demo/dropdown-button.md b/components/dropdown/demo/dropdown-button.md
index bd164a7aa6..c4fddb9d7d 100644
--- a/components/dropdown/demo/dropdown-button.md
+++ b/components/dropdown/demo/dropdown-button.md
@@ -10,22 +10,24 @@
 import { Menu, Dropdown } from 'antd';
 const DropdownButton = Dropdown.Button;
 
+function handleButtonClick() {
+  console.log('click button');
+}
+
+function handleMenuClick(e) {
+  console.log('click', e);
+}
+
 const menu = (
-  <Menu>
-    <Menu.Item>
-      <a target="_blank" href="http://www.alipay.com/">第一个菜单项</a>
-    </Menu.Item>
-    <Menu.Item>
-      <a target="_blank" href="http://www.taobao.com/">第二个菜单项</a>
-    </Menu.Item>
-    <Menu.Item>
-      <a target="_blank" href="http://www.tmall.com/">第三个菜单项</a>
-    </Menu.Item>
+  <Menu onClick={handleMenuClick}>
+    <Menu.Item key="1">第一个菜单项</Menu.Item>
+    <Menu.Item key="2">第二个菜单项</Menu.Item>
+    <Menu.Item key="3">第三个菜单项</Menu.Item>
   </Menu>
 );
 
 ReactDOM.render(
-  <DropdownButton overlay={menu} type="primary">
+  <DropdownButton onClick={handleButtonClick} overlay={menu} type="primary">
     某功能按钮
   </DropdownButton>
 , mountNode);
diff --git a/components/dropdown/dropdown-button.jsx b/components/dropdown/dropdown-button.jsx
index c722d62820..675f97c5c9 100644
--- a/components/dropdown/dropdown-button.jsx
+++ b/components/dropdown/dropdown-button.jsx
@@ -3,32 +3,34 @@ import Button from '../button';
 import Icon from '../icon';
 import Dropdown from './dropdown';
 const ButtonGroup = Button.Group;
-
-const align = {
-  points: ['tr', 'br'],
-  overlay: {
-    adjustX: 1,
-    adjustY: 1,
-  },
-  offset: [0, 4],
-  targetOffset: [0, 0],
-};
+import classNames from 'classnames';
 
 export default React.createClass({
   getDefaultProps() {
     return {
-      align,
+      align: {
+        points: ['tr', 'br'],
+        overlay: {
+          adjustX: 1,
+          adjustY: 1,
+        },
+        offset: [0, 4],
+        targetOffset: [0, 0],
+      },
       type: 'default',
     };
   },
   render() {
+    const { type, overlay, trigger, align, children, className, ...restProps } = this.props;
+    const cls = classNames({
+      'ant-dropdown-button': true,
+      className: !!className,
+    });
     return (
-      <ButtonGroup className="ant-dropdown-button">
-        <Button type={this.props.type}>
-          {this.props.children}
-        </Button>
-        <Dropdown {...this.props}>
-          <Button type={this.props.type}>
+      <ButtonGroup {...restProps} className={cls}>
+        <Button type={type}>{children}</Button>
+        <Dropdown align={align} overlay={overlay} trigger={trigger}>
+          <Button type={type}>
             <Icon type="down" />
           </Button>
         </Dropdown>

From 05d38115d898dc0e508efb918601f3f77e210c92 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 1 Mar 2016 13:49:39 +0800
Subject: [PATCH 45/65] upgrade react-slick to 0.11

close #529 & close #1009
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c7b705cdf9..ee8829fe46 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "rc-trigger": "~1.1.1",
     "rc-upload": "~1.8.0",
     "rc-util": "~3.1.2",
-    "react-slick": "^0.10.0",
+    "react-slick": "^0.11.0",
     "velocity-animate": "~1.2.2",
     "warning": "~2.1.0"
   },

From e1a5c20d26e170de94e5070f0aaf2770079545ab Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 1 Mar 2016 16:43:16 +0800
Subject: [PATCH 46/65] Fix tab nav button disabled style

---
 style/components/tabs.less | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/style/components/tabs.less b/style/components/tabs.less
index 5b9dbdee07..fd16c54d47 100644
--- a/style/components/tabs.less
+++ b/style/components/tabs.less
@@ -65,6 +65,12 @@
     background-color: transparent;
     position: absolute;
     text-align: center;
+    color: #999;
+    transition: color 0.3s ease;
+
+    &:hover {
+      color: #666;
+    }
 
     &-icon {
       position: relative;
@@ -87,9 +93,11 @@
   }
 
   &-tab-btn-disabled {
-    cursor: default;
-    color: #ccc;
-    pointer-events: none;
+    cursor: not-allowed;
+    &,
+    &:hover {
+      color: #ccc;
+    }
   }
 
   &-tab-next {

From 7ce38e39b62be41021038f0d50f3000dfccfbdab Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 1 Mar 2016 17:01:03 +0800
Subject: [PATCH 47/65] Fix CheckboxGroup value, close #1101

---
 components/checkbox/Group.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/checkbox/Group.jsx b/components/checkbox/Group.jsx
index e90d13e63b..e9b353856d 100644
--- a/components/checkbox/Group.jsx
+++ b/components/checkbox/Group.jsx
@@ -34,7 +34,7 @@ export default React.createClass({
   },
   toggleOption(option) {
     const optionIndex = this.state.value.indexOf(option);
-    const value = this.state.value;
+    const value = [...this.state.value];
     if (optionIndex === - 1) {
       value.push(option);
     } else {

From ca2fca024abaf7f55c0eca2aa374cf5fa5765225 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 1 Mar 2016 17:52:07 +0800
Subject: [PATCH 48/65] fix child null bug in FormItem

---
 components/form/FormItem.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx
index b48b029f8b..db90cddde3 100644
--- a/components/form/FormItem.jsx
+++ b/components/form/FormItem.jsx
@@ -131,10 +131,9 @@ class FormItem extends React.Component {
   renderChildren() {
     const props = this.props;
     const children = React.Children.map(props.children, (child) => {
-      if (typeof child.type === 'function' && !child.props.size) {
+      if (child && typeof child.type === 'function' && !child.props.size) {
         return React.cloneElement(child, { size: 'large' });
       }
-
       return child;
     });
     return [

From 991eb76953ff4805e3cf44e12e69c2d6df4d8ac9 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 1 Mar 2016 18:07:40 +0800
Subject: [PATCH 49/65] upgrade rc-select ant rc-trigger, improve combobox
 select experience

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ee8829fe46..06236b0086 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "rc-progress": "~1.0.4",
     "rc-queue-anim": "~0.11.2",
     "rc-radio": "~2.0.0",
-    "rc-select": "~5.9.1",
+    "rc-select": "~5.10.0",
     "rc-slider": "~3.3.0",
     "rc-steps": "~1.4.1",
     "rc-switch": "~1.3.2",
@@ -64,7 +64,7 @@
     "rc-tooltip": "~3.3.1",
     "rc-tree": "~1.1.0",
     "rc-tree-select": "~1.1.1",
-    "rc-trigger": "~1.1.1",
+    "rc-trigger": "~1.2.0",
     "rc-upload": "~1.8.0",
     "rc-util": "~3.1.2",
     "react-slick": "^0.11.0",

From 0b2e7a69260f8509efdff44da6ea556bbbe2101a Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 1 Mar 2016 18:19:46 +0800
Subject: [PATCH 50/65] upgrade deps

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 06236b0086..8911a9d9c6 100644
--- a/package.json
+++ b/package.json
@@ -43,9 +43,9 @@
     "rc-cascader": "~0.9.0",
     "rc-checkbox": "~1.3.0",
     "rc-collapse": "~1.4.4",
-    "rc-dialog": "~5.3.1",
+    "rc-dialog": "~5.4.0",
     "rc-dropdown": "~1.4.3",
-    "rc-form": "~0.13.0",
+    "rc-form": "~0.14.0",
     "rc-form-validation": "~2.5.0",
     "rc-input-number": "~2.4.1",
     "rc-menu": "~4.10.2",
@@ -58,7 +58,7 @@
     "rc-slider": "~3.3.0",
     "rc-steps": "~1.4.1",
     "rc-switch": "~1.3.2",
-    "rc-table": "~3.10.1",
+    "rc-table": "~3.11.0",
     "rc-tabs": "~5.7.0",
     "rc-time-picker": "~1.1.0",
     "rc-tooltip": "~3.3.1",

From 4381de2e11d266e379e4b3a727b0b1533c0e3a56 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 11:46:36 +0800
Subject: [PATCH 51/65] update pagination style

---
 style/components/pagination.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/style/components/pagination.less b/style/components/pagination.less
index 25a4b8d466..b9fe5a1936 100644
--- a/style/components/pagination.less
+++ b/style/components/pagination.less
@@ -229,12 +229,12 @@
       width: 30px;
       height: 24px;
       text-align: center;
+      transition: border-color 0.3s ease;
 
       &:hover {
         border-color: @primary-color;
       }
     }
-
   }
 }
 

From 218b7bb39c3ebd537970bf8b7c32196779788f98 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 12:13:26 +0800
Subject: [PATCH 52/65] upgrade deps

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8911a9d9c6..2ed90b84ac 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "rc-input-number": "~2.4.1",
     "rc-menu": "~4.10.2",
     "rc-notification": "~1.3.1",
-    "rc-pagination": "~1.4.0",
+    "rc-pagination": "~1.5.1",
     "rc-progress": "~1.0.4",
     "rc-queue-anim": "~0.11.2",
     "rc-radio": "~2.0.0",
@@ -58,7 +58,7 @@
     "rc-slider": "~3.3.0",
     "rc-steps": "~1.4.1",
     "rc-switch": "~1.3.2",
-    "rc-table": "~3.11.0",
+    "rc-table": "~3.11.1",
     "rc-tabs": "~5.7.0",
     "rc-time-picker": "~1.1.0",
     "rc-tooltip": "~3.3.1",

From e8ce54f864893cb3ad9fe35d5eb194ef071812e3 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 12:16:58 +0800
Subject: [PATCH 53/65] update doc for defaultPageSize

---
 components/pagination/index.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/pagination/index.md b/components/pagination/index.md
index 5374736a2b..06b47a3476 100644
--- a/components/pagination/index.md
+++ b/components/pagination/index.md
@@ -24,7 +24,8 @@
 | current          | 当前页数                           | Number        | 无                       |
 | defaultCurrent   | 默认的当前页数                     | Number        | 1                        |
 | total            | 数据总数                           | Number        | 0                        |
-| pageSize         | 每页条数                           | Number        | 10                       |
+| defaultPageSize  | 初始的每页条数                      | Number        | 10                       |
+| pageSize         | 每页条数                           | Number        |                          |
 | onChange         | 页码改变的回调，参数是改变后的页码 | Function      | noop                     |
 | showSizeChanger  | 是否可以改变 pageSize              | Bool          | false                    |
 | pageSizeOptions  | 指定每页可以显示多少条             | Array<String> | ['10', '20', '30', '40'] |

From 3738eb3b73da3ae21c014f8dba4195ca1b1b8bc0 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 14:47:42 +0800
Subject: [PATCH 54/65] update code style

---
 components/table/demo/expand.md | 12 ++----------
 components/table/index.jsx      | 12 ++++++------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/components/table/demo/expand.md b/components/table/demo/expand.md
index 1ec2559d0c..08465a1e00 100644
--- a/components/table/demo/expand.md
+++ b/components/table/demo/expand.md
@@ -9,19 +9,11 @@
 ````jsx
 import { Table } from 'antd';
 
-function renderAction() {
-  return <a href="#">删除</a>;
-}
-
-function expandedRowRender(record) {
-  return <p>{record.description}</p>;
-}
-
 const columns = [
   { title: '姓名', dataIndex: 'name', key: 'name' },
   { title: '年龄', dataIndex: 'age', key: 'age' },
   { title: '住址', dataIndex: 'address', key: 'address' },
-  { title: '操作', dataIndex: '', key: 'x', render: renderAction }
+  { title: '操作', dataIndex: '', key: 'x', render: () => <a href="#">删除</a> }
 ];
 
 const data = [
@@ -32,7 +24,7 @@ const data = [
 
 ReactDOM.render(
 <Table columns={columns}
-  expandedRowRender={expandedRowRender}
+  expandedRowRender={record => <p>{record.description}</p>}
   dataSource={data}
   className="table" />
 , mountNode);
diff --git a/components/table/index.jsx b/components/table/index.jsx
index b494282082..b14f0dd818 100644
--- a/components/table/index.jsx
+++ b/components/table/index.jsx
@@ -553,12 +553,12 @@ let AntTable = React.createClass({
   },
 
   render() {
-    let data = this.getCurrentPageData();
+    const data = this.getCurrentPageData();
     let columns = this.renderRowSelection();
-    let expandIconAsCell = this.props.expandedRowRender && this.props.expandIconAsCell !== false;
-    let locale = objectAssign({}, defaultLocale, this.props.locale);
+    const expandIconAsCell = this.props.expandedRowRender && this.props.expandIconAsCell !== false;
+    const locale = objectAssign({}, defaultLocale, this.props.locale);
 
-    let classString = classNames({
+    const classString = classNames({
       [`ant-table-${this.props.size}`]: true,
       'ant-table-bordered': this.props.bordered,
       [this.props.className]: !!this.props.className,
@@ -595,10 +595,10 @@ let AntTable = React.createClass({
     if (this.props.loading) {
       // if there is no pagination or no data,
       // the height of spin should decrease by half of pagination
-      let paginationPatchClass = (this.hasPagination() && data && data.length !== 0)
+      const paginationPatchClass = (this.hasPagination() && data && data.length !== 0)
               ? 'ant-table-with-pagination'
               : 'ant-table-without-pagination';
-      let spinClassName = `${paginationPatchClass} ant-table-spin-holder`;
+      const spinClassName = `${paginationPatchClass} ant-table-spin-holder`;
       table = <Spin className={spinClassName}>{table}</Spin>;
     }
     return (

From 82fff19ab84003359273a5ce619a794afd33a7ec Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 15:10:13 +0800
Subject: [PATCH 55/65] Fix some DatePicker style

---
 style/components/datepicker/Calendar.less    |  3 ++-
 style/components/datepicker/RangePicker.less | 11 +++++++----
 style/components/datepicker/TimePicker.less  |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/style/components/datepicker/Calendar.less b/style/components/datepicker/Calendar.less
index 79cc271c8c..78526cc48a 100644
--- a/style/components/datepicker/Calendar.less
+++ b/style/components/datepicker/Calendar.less
@@ -153,7 +153,7 @@
     display: block;
     margin: 0 auto;
     color: #666;
-    border-radius: 4px;
+    border-radius: @border-radius-sm;
     width: 20px;
     height: 20px;
     line-height: 18px;
@@ -167,6 +167,7 @@
       background: tint(@primary-color, 90%);
       cursor: pointer;
     }
+
     &:active {
       color: #fff;
       background: tint(@primary-color, 20%);
diff --git a/style/components/datepicker/RangePicker.less b/style/components/datepicker/RangePicker.less
index dc8e929888..e3ae488238 100644
--- a/style/components/datepicker/RangePicker.less
+++ b/style/components/datepicker/RangePicker.less
@@ -66,11 +66,12 @@
   }
   .@{calendar-prefix-cls}-input {
     border: 1px solid @border-color-base;
-    border-radius: @border-radius-base;
+    border-radius: @border-radius-sm;
   }
   .@{calendar-prefix-cls}-input,
   .@{css-prefix}time-picker-input {
-    padding: 1px 7px;
+    .input;
+    border-radius: @border-radius-sm;
     height: @input-height-sm;
     width: 96px;
   }
@@ -121,9 +122,11 @@
   }
   .@{calendar-prefix-cls}-ok-btn {
     position: static;
-    margin: 7px 9px 9px;
+    height: 22px;
+    margin: 8px;
   }
   .@{calendar-prefix-cls}-today-btn {
-    margin: 9px;
+    margin: 8px 12px;
+    height: 22px;
   }
 }
diff --git a/style/components/datepicker/TimePicker.less b/style/components/datepicker/TimePicker.less
index 5ea3de3e9d..f7a4b15961 100644
--- a/style/components/datepicker/TimePicker.less
+++ b/style/components/datepicker/TimePicker.less
@@ -17,7 +17,8 @@
   .@{calendar-prefix-cls}-input,
   .@{timepicker-prefix-cls}-input {
     .input;
-    height: 22px;
+    border-radius: @border-radius-sm;
+    height: @input-height-sm;
     width: 96px;
     margin-right: 6px;
   }

From f9aed154649c8f046ac25abee12838c7db5fcca0 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 15:20:52 +0800
Subject: [PATCH 56/65] remove inline form-item width 100%

---
 style/components/form.less | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/style/components/form.less b/style/components/form.less
index 118fa536f7..90bbf942d9 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -256,10 +256,6 @@ form {
     vertical-align: middle;
   }
 
-  .@{calendar-prefix-cls}-picker-input {
-    width: 100%!important;
-  }
-
   .@{css-prefix}form-text {
     display: inline-block;
   }

From d618691bc1ecc3a70338f4ae1dfe70fda0c32963 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 15:34:01 +0800
Subject: [PATCH 57/65] update site style

---
 site/static/style.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/static/style.less b/site/static/style.less
index aea3d05ec8..2b7d5d505b 100644
--- a/site/static/style.less
+++ b/site/static/style.less
@@ -1441,9 +1441,9 @@ a.entry-link:hover .anticon-smile {
     float: none;
     width: 100%;
   }
-
   .preview-image-box {
     padding-left: 0;
+    margin: 10px 0;
   }
 }
 

From 8070e05de1d1891d883ffe2cd635ef83ac022a00 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 15:45:37 +0800
Subject: [PATCH 58/65] update demo

---
 components/date-picker/demo/time.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/date-picker/demo/time.md b/components/date-picker/demo/time.md
index 164565ef36..81de2d224c 100644
--- a/components/date-picker/demo/time.md
+++ b/components/date-picker/demo/time.md
@@ -14,6 +14,6 @@ function onChange(value) {
 }
 
 ReactDOM.render(
-<DatePicker showTime format="yyyy-MM-dd HH:mm:ss" onChange={onChange} style={{ width: 160 }} />
+<DatePicker showTime format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间" onChange={onChange} style={{ width: 160 }} />
 , mountNode);
 ````

From 9b09e54df5388adcc3864c7d72cd264a5eab1a60 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 16:01:36 +0800
Subject: [PATCH 59/65] Fix columns[0] undefined bug in Table

---
 components/table/index.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/table/index.jsx b/components/table/index.jsx
index b14f0dd818..29c56dba80 100644
--- a/components/table/index.jsx
+++ b/components/table/index.jsx
@@ -374,8 +374,7 @@ let AntTable = React.createClass({
           className: 'ant-table-selection-column'
         };
       }
-      if (columns[0] &&
-        columns[0].key === 'selection-column') {
+      if (columns[0] && columns[0].key === 'selection-column') {
         columns[0] = selectionColumn;
       } else {
         columns.unshift(selectionColumn);
@@ -587,7 +586,7 @@ let AntTable = React.createClass({
           data={data}
           columns={columns}
           className={classString}
-          expandIconColumnIndex={columns[0].key === 'selection-column' ? 1 : 0}
+          expandIconColumnIndex={(columns[0] && columns[0].key === 'selection-column') ? 1 : 0}
           expandIconAsCell={expandIconAsCell} />
           {emptyText}
       </div>

From a058ebc37256bd8f3d5a6512b6776b371485d9eb Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 17:11:12 +0800
Subject: [PATCH 60/65] Fix Input className, close #1103

---
 components/form/demo/horizontal-form.md | 10 ++++----
 components/input/index.jsx              | 34 ++++++++++---------------
 style/components/form.less              |  3 ---
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/components/form/demo/horizontal-form.md b/components/form/demo/horizontal-form.md
index 7e6bd219ca..2685c7021e 100644
--- a/components/form/demo/horizontal-form.md
+++ b/components/form/demo/horizontal-form.md
@@ -1,4 +1,4 @@
-# 水平排列的表单
+# 典型表单
 
 - order: 2
 
@@ -37,10 +37,10 @@ let Demo = React.createClass({
           label="您的性别："
           labelCol={{ span: 6 }}
           wrapperCol={{ span: 14 }}>
-            <RadioGroup {...getFieldProps('gender', { initialValue: 'female' })}>
-              <Radio value="male">男的</Radio>
-              <Radio value="female">女的</Radio>
-            </RadioGroup>
+          <RadioGroup {...getFieldProps('gender', { initialValue: 'female' })}>
+            <Radio value="male">男的</Radio>
+            <Radio value="female">女的</Radio>
+          </RadioGroup>
         </FormItem>
         <FormItem
           label="备注："
diff --git a/components/input/index.jsx b/components/input/index.jsx
index 1665ca680d..ce007e3462 100644
--- a/components/input/index.jsx
+++ b/components/input/index.jsx
@@ -2,12 +2,6 @@ import React from 'react';
 import assign from 'object-assign';
 import classNames from 'classnames';
 
-function prefixClsFn(prefixCls, ...args) {
-  return args.map((s) => {
-    return `${prefixCls}-${s}`;
-  }).join(' ');
-}
-
 function ieGT9() {
   if (typeof document === undefined) {
     return false;
@@ -44,8 +38,8 @@ Group.propTypes = {
 class Input extends React.Component {
   renderLabledInput(children) {
     const props = this.props;
-    const wrapperClassName = prefixClsFn(props.prefixCls, 'input-group');
-    const addonClassName = prefixClsFn(wrapperClassName, 'addon');
+    const wrapperClassName = `${props.prefixCls}-group`;
+    const addonClassName = `${wrapperClassName}-addon`;
     const addonBefore = props.addonBefore ? (
       <span className={addonClassName}>
         {props.addonBefore}
@@ -59,9 +53,10 @@ class Input extends React.Component {
     ) : null;
 
     const className = classNames({
-      [`${props.prefixCls}-input-wrapper`]: true,
+      [`${props.prefixCls}-wrapper`]: true,
       [wrapperClassName]: (addonBefore || addonAfter),
     });
+
     return (
       <span className={className}>
         {addonBefore}
@@ -74,16 +69,17 @@ class Input extends React.Component {
   renderInput() {
     const props = assign({}, this.props);
     const prefixCls = props.prefixCls;
-    let inputClassName = prefixClsFn(prefixCls, 'input');
     if (!props.type) {
       return props.children;
     }
 
-    switch (props.size) {
-      case 'small': inputClassName = prefixClsFn(prefixCls, 'input', 'input-sm'); break;
-      case 'large': inputClassName = prefixClsFn(prefixCls, 'input', 'input-lg'); break;
-      default:
-    }
+    const inputClassName = classNames({
+      [prefixCls]: true,
+      [`${prefixCls}-sm`]: props.size === 'small',
+      [`${prefixCls}-lg`]: props.size === 'large',
+      [props.className]: !!props.className,
+    });
+
     let placeholder = props.placeholder;
     if (placeholder && ieGT9()) {
       placeholder = null;
@@ -93,12 +89,8 @@ class Input extends React.Component {
     }
     switch (props.type) {
       case 'textarea':
-        return (
-          <textarea {...props} placeholder={placeholder}
-            className={inputClassName} ref="input" />
-        );
+        return <textarea {...props} placeholder={placeholder} className={inputClassName} ref="input" />;
       default:
-        inputClassName = props.className ? props.className : inputClassName;
         return <input {...props} placeholder={placeholder} className={inputClassName} ref="input" />;
     }
   }
@@ -127,7 +119,7 @@ Input.propTypes = {
 Input.defaultProps = {
   defaultValue: '',
   disabled: false,
-  prefixCls: 'ant',
+  prefixCls: 'ant-input',
   type: 'text',
 };
 
diff --git a/style/components/form.less b/style/components/form.less
index 90bbf942d9..858ea14f84 100644
--- a/style/components/form.less
+++ b/style/components/form.less
@@ -21,9 +21,6 @@ label {
 }
 
 // Input styles
-.@{css-prefix}input-wrapper {
-  display: block;
-}
 .@{css-prefix}input {
   .input;
 }

From 2dd781edb3eecb334512570eb1899564c78cab6a Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Wed, 2 Mar 2016 17:31:27 +0800
Subject: [PATCH 61/65] docs: update demo

---
 components/form/demo/horizontal-form.md | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/components/form/demo/horizontal-form.md b/components/form/demo/horizontal-form.md
index 2685c7021e..e304ad5fac 100644
--- a/components/form/demo/horizontal-form.md
+++ b/components/form/demo/horizontal-form.md
@@ -7,7 +7,7 @@
 ---
 
 ````jsx
-import { Form, Input, Button, Checkbox, Radio, Row, Col } from 'antd';
+import { Form, Input, Button, Checkbox, Radio, Row, Col, Tooltip, Icon } from 'antd';
 const FormItem = Form.Item;
 const RadioGroup = Radio.Group;
 
@@ -19,38 +19,39 @@ let Demo = React.createClass({
 
   render() {
     const { getFieldProps } = this.props.form;
+    const formItemLayout = {
+      labelCol: { span: 6 },
+      wrapperCol: { span: 14 },
+    };
     return (
       <Form horizontal onSubmit={this.handleSubmit}>
         <FormItem
-          label="用户名："
-          labelCol={{ span: 6 }}
-          wrapperCol={{ span: 14 }}>
+          {...formItemLayout}
+          label="用户名：">
           <p className="ant-form-text" id="userName" name="userName">大眼萌 minion</p>
         </FormItem>
         <FormItem
-          label="密码："
-          labelCol={{ span: 6 }}
-          wrapperCol={{ span: 14 }}>
+          {...formItemLayout}
+          label="密码：">
           <Input type="password" {...getFieldProps('pass')} placeholder="请输入密码" />
         </FormItem>
         <FormItem
-          label="您的性别："
-          labelCol={{ span: 6 }}
-          wrapperCol={{ span: 14 }}>
+          {...formItemLayout}
+          label="您的性别：">
           <RadioGroup {...getFieldProps('gender', { initialValue: 'female' })}>
             <Radio value="male">男的</Radio>
             <Radio value="female">女的</Radio>
           </RadioGroup>
         </FormItem>
         <FormItem
+          {...formItemLayout}
           label="备注："
-          labelCol={{ span: 6 }}
-          wrapperCol={{ span: 14 }}
           help="随便写点什么">
           <Input type="textarea" placeholder="随便写" {...getFieldProps('remark')} />
         </FormItem>
         <FormItem
-          wrapperCol={{ span: 14, offset: 6 }}>
+          {...formItemLayout}
+          label={<span>卖身华府<Tooltip title="我为秋香"><Icon type="question" /></Tooltip></span>}>
           <label>
             <Checkbox {...getFieldProps('agreement')} />同意
           </label>

From f25ac2feace05d9e96b0a4129c34dcb9c9232d14 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 17:41:29 +0800
Subject: [PATCH 62/65] docs: update demo

---
 components/form/demo/horizontal-form.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/form/demo/horizontal-form.md b/components/form/demo/horizontal-form.md
index e304ad5fac..75c7555022 100644
--- a/components/form/demo/horizontal-form.md
+++ b/components/form/demo/horizontal-form.md
@@ -51,7 +51,7 @@ let Demo = React.createClass({
         </FormItem>
         <FormItem
           {...formItemLayout}
-          label={<span>卖身华府<Tooltip title="我为秋香"><Icon type="question" /></Tooltip></span>}>
+          label={<span>卖身华府 <Tooltip title="我为秋香"><Icon type="question-circle-o" /></Tooltip> ：</span>}>
           <label>
             <Checkbox {...getFieldProps('agreement')} />同意
           </label>

From 79e319908a206231a0558356b97b590cf1be08fb Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 17:47:18 +0800
Subject: [PATCH 63/65] update time-picker demo

---
 components/time-picker/demo/basic.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/time-picker/demo/basic.md b/components/time-picker/demo/basic.md
index c58ed5a02a..45d8826cfc 100644
--- a/components/time-picker/demo/basic.md
+++ b/components/time-picker/demo/basic.md
@@ -11,6 +11,9 @@ import { TimePicker } from 'antd';
 
 function onChange(time) {
   console.log(time);
+  if (time) {
+    console.log(time.toLocaleTimeString('zh-CN', { hour12: false })); // Get time string
+  }
 }
 
 ReactDOM.render(

From 4b0968714a5e9620fb31732e7dec3c452c574dd9 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Wed, 2 Mar 2016 18:00:08 +0800
Subject: [PATCH 64/65] update popconfirm docs for onVisibleChange

---
 components/popconfirm/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/popconfirm/index.md b/components/popconfirm/index.md
index d3eff43d30..491d21135c 100644
--- a/components/popconfirm/index.md
+++ b/components/popconfirm/index.md
@@ -23,5 +23,6 @@
 | title     | 确认框的描述                             | string        | 无     |
 | onConfirm | 点击确认的回调                           | function      | 无     |
 | onCancel  | 卡片内容                                 | function      | 无     |
+| onVisibleChange | 显示隐藏的回调                      | function(visible) | 无     |
 | okText    | 确认按钮文字                              | String        | 确定   |
 | cancelText| 取消按钮文字                              | String        | 取消   |

From 58a32455d3f5e305e760865b344f09f5c83a9f2d Mon Sep 17 00:00:00 2001
From: yiminghe <yiminghe@gmail.com>
Date: Wed, 2 Mar 2016 21:44:38 +0800
Subject: [PATCH 65/65] fix cascader

---
 components/cascader/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/cascader/index.jsx b/components/cascader/index.jsx
index 183a68d969..84507ba128 100644
--- a/components/cascader/index.jsx
+++ b/components/cascader/index.jsx
@@ -51,7 +51,7 @@ class AntCascader extends React.Component {
     this.setState({ popupVisible: false });
   }
   render() {
-    const { prefixCls, children, placeholder, size, disabled, className, allowClear } = this.props;
+    const { prefixCls, children, placeholder, size, disabled, className, style, allowClear } = this.props;
     const sizeCls = classNames({
       'ant-input-lg': size === 'large',
       'ant-input-sm': size === 'small',
@@ -77,7 +77,7 @@ class AntCascader extends React.Component {
         onChange={this.handleChange}>
         {children ||
           <span
-            {...this.props}
+            style={style}
             className={pickerCls}>
             <Input placeholder={placeholder}
               className={`${prefixCls}-input ant-input ${sizeCls}`}