Merge branch 'master' into develop-0.12.0

CHANGELOG.md

@@ -101,6 +101,12 @@
 
 > [0.11 升级指南](http://ant.design/docs/upgrade-notes#0-10-gt-0-11)
 
+---
+
+## 0.10.5 `2016-01-04`
+
+- 修复 Table 更新 dataSource 后，选中项没有置空的问题。[#793](https://github.com/ant-design/ant-design/issues/793)
+
 ## 0.10.4 `2015-11-30`
 
 - 将 media-match 加入默认的 polyfill 文件中。[5626974](https://github.com/ant-design/ant-design/commit/562697423b1139eb324c1dceb051c143f4870ed7)
@@ -209,6 +215,7 @@
 > - [计划和推进 issue](https://github.com/ant-design/ant-design/issues/276)
 > - [0.10 升级指南](http://ant.design/docs/upgrade-notes#0-0-gt-0-10)
 
+---
 
 ## 0.9.3 ~ 0.9.5 `2015-11-04`
 

components/table/index.md

@@ -42,7 +42,7 @@ const columns = [{
 }, {
   title: '住址',
   dataIndex: 'address',
-  key: 'age',
+  key: 'address',
 }];
 
 <Table dataSource={dataSource} columns={columns} />

components/tree/index.md

@@ -25,7 +25,7 @@
 |checkedKeys | 设置选中复选框的树节点 | String[] | - |
 |selectedKeys | 设置选中的树节点 | String[] | - |
 |onCheck | 点击树节点或复选框触发 | function(e:{checked:bool,node,checkedKeys,event}) | - |
-|onSelect | 点击树节点触发 | function(e:{checked:bool,node,checkedKeys,event}) | - |
+|onSelect | 点击树节点触发 | function(e:{selected:bool,node,selectedKeys,event}) | - |
 |onDataLoaded | 异步加载数据 | function(node)| - |
 
 ### TreeNode props

site/templates/demos.html

@@ -10,16 +10,6 @@
   </a>
   {%- endif %}
 </h2>
-<ul class="demos-anchor">
-  {%- for item in items %}
-  {%- set post = item.meta.filepath|parsePost %}
-  <li>
-    <a title="{{ post.title }}" href="#{{post.meta.id|removeCodeBoxIdPrefix}}">
-      <span>{{ post.title }}</span>
-    </a>
-  </li>
-  {%- endfor %}
-</ul>
 <div class="code-boxes">
   {%- if post.meta.cols == 1 %}
     <div class="code-boxes-col-1-1">
@@ -43,4 +33,14 @@
   </div>
   {%- endif %}
 </div>
+<ul class="demos-anchor">
+  {%- for item in items %}
+  {%- set post = item.meta.filepath|parsePost %}
+  <li>
+    <a title="{{ post.title }}" href="#{{post.meta.id|removeCodeBoxIdPrefix}}">
+      <span>{{ post.title }}</span>
+    </a>
+  </li>
+  {%- endfor %}
+</ul>
 {%- endif %}

site/templates/footer.html

@@ -14,7 +14,7 @@
       <h2>联系我们</h2>
       <a target="_blank" href="{{ config.site.issues }}">反馈和建议</a>
       <a target="_blank" href="https://gitter.im/ant-design/ant-design">讨论</a>
-      <a target="_blank" href="http://dwz.cn/2dJ2mg">报告 Bug</a>
+      <a target="_blank" href="http://t.cn/R4XEpoQ">报告 Bug</a>
     </li>
     <li>
       <h3>©2015 蚂蚁金服体验技术部出品</h3>

spec/tools.md

@@ -17,18 +17,18 @@
 
 <a target="_blank" href="" class="download-link disabled">
   <img src="https://os.alipayobjects.com/rmsportal/gdYSqrQMvHHrOoC.svg" width="32">
-  Components in Sketch
+  Sketch
 </a>
 
 ### 图标
 
 <a target="_blank" href="" class="download-link disabled">
   <img src="https://os.alipayobjects.com/rmsportal/gdYSqrQMvHHrOoC.svg" width="32">
-  Icon in AI
+  AI
 </a>
 <a target="_blank" href="https://github.com/ant-design/ant-design/files/57840/iconfont.zip" class="download-link">
   <img src="https://os.alipayobjects.com/rmsportal/ytqOwOOWgYrDPfT.svg" width="32">
-  Iconfont for web
+  Web font
 </a>
 
 <style>