Merge pull request #23 from ant-design/1.3.1

1.3.1
ant-design · Oct 31, 2016 · 41990ce · 41990ce
2 parents 5a4ab21 + ead7fdc
commit 41990ce
Show file tree

Hide file tree

Showing 27 changed files with 1,780 additions and 73 deletions.
diff --git a/CNAME b/CNAME
diff --git a/components/queue-anim/index.md b/components/queue-anim/index.md
@@ -48,6 +48,7 @@ ReactDOM.render(<QueueAnim>
 | ease       | string / array | `easeOutQuart` | 动画的缓动函数,[查看详细](http://julian.com/research/velocity/#easing) |
 | animatingClassName | array | `['queue-anim-entering', 'queue-anim-leaving']` | 进出场动画进行中的类名 |
 | component  | string | `div` | QueueAnim 替换的标签名 |
+| onEnd      | func   | null  | 动画结束后回调， callback({ key, type }); type 为 `enter` 或 `leave` |
 
 > 当以上数据类型为 Array 时，`['left', 'top']` 第一个为进场动画属性, 第二个为离场属性。
 
diff --git a/components/tween-one/demo/rotate.md b/components/tween-one/demo/rotate.md
@@ -20,7 +20,7 @@ class Demo extends React.Component {
   render() {
     return (
       <TweenOne
-        animation={{ r: 360, repeat: -1, duration: 1000 }}
+        animation={{ rotate: 360, repeat: -1, duration: 1000 }}
         paused={this.props.paused}
         className="code-box-shape"
       />

diff --git a/components/tween-one/index.md b/components/tween-one/index.md
@@ -111,5 +111,6 @@ TweenOne.plugins.push(SvgMorphPlugin);
 | leave   | object / array / func | { x: 30, opacity: 0 } | 出场时的数据，同上 |
 | onEnd   | func       | -       | 每个动画结束后回调 |
 | animatingClassName | array | `['tween-one-entering', 'tween-one-leaving']` | 进出场的样式，如果是组件形式，需把 className 带到你的组件里 |
+| resetStyleBool | boolean | true | 每次动画时是否强制重置样式 |
 | component | React.Element/String | div | 需要替换的标签 |
 
diff --git a/exhibition/demo/detail-switch.md b/exhibition/demo/detail-switch.md
@@ -1,5 +1,5 @@
 ---
-order: 1
+order: 2
 chinese: 详细说明切换
 english: detailSwitch
 image: https://zos.alipayobjects.com/rmsportal/cvLbMZkjkNvqbVF.png

diff --git a/exhibition/demo/list-anim.md b/exhibition/demo/list-anim.md
@@ -1,8 +1,8 @@
 ---
-order: 0
+order: 3
 chinese: 列表动画
 english: ListAnim
-image: https://zos.alipayobjects.com/rmsportal/wqXXfNZobCkgEcp.png
+image: https://zos.alipayobjects.com/rmsportal/ivfCWzEWHsTPWMW.png
 ---
 
 在页面里，当我们想对区块内容进行动画时，需要解决元素的先后顺序与基本动画的属性。
@@ -195,7 +195,7 @@ ReactDOM.render(
 ````css
 .queue-demo-wrapper {
   position: relative;
-  background: #29659B;
+  background: #CCE9F9;
   overflow: hidden;
   height: 340px;
 }

diff --git a/exhibition/demo/list-sort.md b/exhibition/demo/list-sort.md
@@ -1,8 +1,8 @@
 ---
-order: 2
+order: 1
 chinese: 列表交换位置
 english: ListSort
-image: https://zos.alipayobjects.com/rmsportal/UZklLXfsKMNfnQV.jpg
+image: https://zos.alipayobjects.com/rmsportal/BgYxbsXLrUfkkRT.png
 ---
 
 页面里的 List 拖动来重新排列顺序。