Merge branch master into develop-1.0.0

components/date-picker/RangePicker.jsx

@@ -102,6 +102,7 @@ export default class RangePicker extends React.Component {
 
     return (<span className={props.pickerClass} style={style}>
       <RcDatePicker
+        formatter={props.getFormatter()}
         transitionName={transitionName}
         disabled={disabled}
         calendar={calendar}

components/date-picker/createPicker.jsx

@@ -66,6 +66,7 @@ export default function createPicker(TheCalendar) {
 
       const calendar = (
         <TheCalendar
+          formatter={props.getFormatter()}
           disabledDate={props.disabledDate}
           disabledTime={disabledTime}
           locale={locale.lang}

components/date-picker/index.md

@@ -38,6 +38,21 @@ english: DatePicker
 | onOk         | 点击确定按钮的回调 | function(Date value) | 无 |
 | getCalendarContainer | 定义浮层的容器，默认为 body 上新建 div | function(trigger) | 无 |
 
+### MonthPicker
+
+| 参数         | 说明           | 类型     | 默认值       |
+|--------------|----------------|----------|--------------|
+| value        | 日期           | string or Date   | 无           |
+| defaultValue | 默认日期       | string or Date   | 无           |
+| format       | 展示的日期格式，配置参考 [GregorianCalendarFormat](https://github.com/yiminghe/gregorian-calendar-format) | string   | "yyyy-MM" |
+| onChange     | 时间发生变化的回调，发生在用户选择时间时 | function(Date value) | 无           |
+| disabled     | 禁用           | bool     | false        |
+| style        | 自定义输入框样式     | object     | {}   |
+| popupStyle   | 格外的弹出日历样式   | object     | {}   |
+| size         | 输入框大小，`large` 高度为 32px，`small` 为 22px，默认是 28px | string   | 无  |
+| locale       | 国际化配置 | object   | [默认配置](https://github.com/ant-design/ant-design/issues/424)  |
+| getCalendarContainer | 定义浮层的容器，默认为 body 上新建 div | function(trigger) | 无 |
+
 ### RangePicker
 
 | 参数         | 说明           | 类型     | 默认值       |

components/queue-anim/demo/basic.md

@@ -20,31 +20,32 @@ const Test = React.createClass({
     });
   },
   render() {
+    const list = this.state.show ? [
+      <div className="demo-kp" key="a">
+        <ul>
+          <li></li>
+          <li></li>
+          <li></li>
+        </ul>
+      </div>,
+      <div className="demo-listBox" key="b">
+        <div className="demo-list">
+          <div className="title"></div>
+          <ul>
+            <li></li>
+            <li></li>
+            <li></li>
+          </ul>
+        </div>
+      </div>
+    ] : null;
     return (
       <div>
         <p className="buttons">
           <Button type="primary" onClick={this.onClick}>切换</Button>
         </p>
         <QueueAnim className="demo-content">
-          {this.state.show ? [
-            <div className="demo-kp" key="a">
-              <ul>
-                <li></li>
-                <li></li>
-                <li></li>
-              </ul>
-            </div>,
-            <div className="demo-listBox" key="b">
-              <div className="demo-list">
-                <div className="title"></div>
-                <ul>
-                  <li></li>
-                  <li></li>
-                  <li></li>
-                </ul>
-              </div>
-            </div>
-          ] : null}
+          {list}
         </QueueAnim>
       </div>
     );

components/queue-anim/demo/custom.md

@@ -20,6 +20,25 @@ const Test = React.createClass({
     });
   },
   render() {
+    const list = this.state.show ? [
+      <div className="demo-kp" key="a">
+        <ul>
+          <li></li>
+          <li></li>
+          <li></li>
+        </ul>
+      </div>,
+      <div className="demo-listBox" key="b">
+        <div className="demo-list">
+          <div className="title"></div>
+          <ul>
+            <li></li>
+            <li></li>
+            <li></li>
+          </ul>
+        </div>
+      </div>
+    ] : null;
     return (
       <div>
         <p className="buttons">
@@ -30,25 +49,7 @@ const Test = React.createClass({
             { opacity: [1, 0], translateY: [0, 50] },
             { opacity: [1, 0], translateY: [0, -50] }
           ]}>
-          {this.state.show ? [
-            <div className="demo-kp" key="a">
-              <ul>
-                <li></li>
-                <li></li>
-                <li></li>
-              </ul>
-            </div>,
-            <div className="demo-listBox" key="b">
-              <div className="demo-list">
-                <div className="title"></div>
-                <ul>
-                  <li></li>
-                  <li></li>
-                  <li></li>
-                </ul>
-              </div>
-            </div>
-          ] : null}
+          {list}
         </QueueAnim>
       </div>
     );

components/queue-anim/demo/enter-leave.md

@@ -20,6 +20,25 @@ const Test = React.createClass({
     });
   },
   render() {
+    const list = this.state.show ? [
+      <div className="demo-kp" key="a">
+        <ul>
+          <li></li>
+          <li></li>
+          <li></li>
+        </ul>
+      </div>,
+      <div className="demo-listBox" key="b">
+        <div className="demo-list">
+        <div className="title"></div>
+          <ul>
+            <li></li>
+            <li></li>
+            <li></li>
+          </ul>
+        </div>
+      </div>
+    ] : null;
     return (
       <div>
         <p className="buttons">
@@ -29,25 +48,7 @@ const Test = React.createClass({
           key="demo"
           type={['right', 'left']}
           ease={['easeOutQuart', 'easeInOutQuart']}>
-          {this.state.show ? [
-            <div className="demo-kp" key="a">
-              <ul>
-                <li></li>
-                <li></li>
-                <li></li>
-              </ul>
-            </div>,
-            <div className="demo-listBox" key="b">
-              <div className="demo-list">
-              <div className="title"></div>
-                <ul>
-                  <li></li>
-                  <li></li>
-                  <li></li>
-                </ul>
-              </div>
-            </div>
-          ] : null}
+          {list}
         </QueueAnim>
       </div>
     );

components/queue-anim/demo/page.md

@@ -20,54 +20,53 @@ const Test = React.createClass({
     });
   },
   render() {
-    return (
-      <div>
-        <p className="buttons">
-          <Button type="primary" onClick={this.onClick}>切换</Button>
-        </p>
-        <QueueAnim type={['right', 'left']}>
-        {this.state.show ? [
-          <div className="demo-header" key="header">
-            <div className="logo">
-              <img width="30" src="https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg" />
-              <span>logo</span>
-            </div>
-            <QueueAnim component="ul">
+    const page = this.state.show ? [
+      <div className="demo-header" key="header">
+        <div className="logo">
+          <img width="30" src="https://t.alipayobjects.com/images/rmsweb/T1B9hfXcdvXXXXXXXX.svg" />
+          <span>logo</span>
+        </div>
+        <QueueAnim component="ul">
+          <li key="0"></li>
+          <li key="1"></li>
+          <li key="2"></li>
+          <li key="3"></li>
+          <li key="4"></li>
+        </QueueAnim>
+      </div>,
+      <QueueAnim className="demo-content" key="content" delay={300}>
+        <div className="demo-title" key="title">我是标题</div>
+        <div className="demo-kp" key="b">
+          <QueueAnim component="ul">
+            <li key="0"></li>
+            <li key="1"></li>
+            <li key="2"></li>
+          </QueueAnim>
+        </div>
+        <div className="demo-title" key="title2">我是标题</div>
+        <div className="demo-listBox">
+          <QueueAnim className="demo-list" delay={500}>
+            <div className="title" key="title3"></div>
+            <QueueAnim component="ul" type="bottom" key="li">
               <li key="0"></li>
               <li key="1"></li>
               <li key="2"></li>
               <li key="3"></li>
               <li key="4"></li>
             </QueueAnim>
-          </div>,
-          <QueueAnim className="demo-content" key="content" delay={300}>
-            <div className="demo-title" key="title">我是标题</div>
-            <div className="demo-kp" key="b">
-              <QueueAnim component="ul">
-                <li key="0"></li>
-                <li key="1"></li>
-                <li key="2"></li>
-              </QueueAnim>
-            </div>
-            <div className="demo-title" key="title2">我是标题</div>
-            <div className="demo-listBox">
-              <QueueAnim className="demo-list" delay={500}>
-                <div className="title" key="title3"></div>
-                <QueueAnim component="ul" type="bottom" key="li">
-                  <li key="0"></li>
-                  <li key="1"></li>
-                  <li key="2"></li>
-                  <li key="3"></li>
-                  <li key="4"></li>
-                </QueueAnim>
-              </QueueAnim>
-            </div>
-          </QueueAnim>,
-          <QueueAnim delay={1000} type="bottom" key="footerBox">
-            <div className="demo-footer" key="footer"></div>
           </QueueAnim>
-        ] : null}
-        </QueueAnim>
+        </div>
+      </QueueAnim>,
+      <QueueAnim delay={1000} type="bottom" key="footerBox">
+        <div className="demo-footer" key="footer"></div>
+      </QueueAnim>
+    ] : null;
+    return (
+      <div>
+        <p className="buttons">
+          <Button type="primary" onClick={this.onClick}>切换</Button>
+        </p>
+        <QueueAnim type={['right', 'left']}>{page}</QueueAnim>
       </div>
     );
   }

style/components/menu.less

@@ -69,7 +69,8 @@
     color: @primary-color;
     // fix chrome render bug
     transform: translateZ(0);
-    > a {
+    > a,
+    > a:hover {
       color: @primary-color;
     }
   }
@@ -349,6 +350,10 @@
     background-color: @primary-color;
     color: #fff;
     transform: translateZ(0);
+    > a,
+    > a:hover {
+      color: #fff;
+    }
   }
 
   &-dark &-item-active,