chore: Merge master

soluvas · Dec 30, 2019 · 530db65 · 530db65
2 parents f2fdf49 + bcb71b8
commit 530db65
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -15,6 +15,16 @@ timeline: true
 
 ---
 
+## 3.26.5
+
+`2019-12-29`
+
+- Table
+  - 🐞 Revert the logic of return fisrt page by default after sort. [#20507](https://github.com/ant-design/ant-design/pull/20507)
+  - 🐞 Fix header wrong text align when `colspan=1`. [#20463](https://github.com/ant-design/ant-design/pull/20463)
+- 🐞 Fix Tabs ink bar disappearing when `animated` prop is false. [#20417](https://github.com/ant-design/ant-design/pull/20417) [@xrkffgg](https://github.com/xrkffgg)
+- 🐞 Fix Tree wrong indent. [#20456](https://github.com/ant-design/ant-design/pull/20456)
+
 ## 3.26.4
 
 `2019-12-22`

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -15,6 +15,16 @@ timeline: true
 
 ---
 
+## 3.26.5
+
+`2019-12-29`
+
+- Table
+  - 🐞 回滚排序后默认回到第一页的逻辑。[#20507](https://github.com/ant-design/ant-design/pull/20507)
+  - 🐞 修复分组列头在 `colspan=1` 时文本没有对齐的问题。[#20463](https://github.com/ant-design/ant-design/pull/20463)
+- 🐞 修复 Tabs 的 `animated` 属性为 false 时，高亮条消失的问题。[#20417](https://github.com/ant-design/ant-design/pull/20417) [@xrkffgg](https://github.com/xrkffgg)
+- 🐞 修复 Tree 节点缩进不正确的问题。[#20456](https://github.com/ant-design/ant-design/pull/20456)
+
 ## 3.26.4
 
 `2019-12-22`

diff --git a/components/radio/style/index.less b/components/radio/style/index.less
@@ -11,7 +11,6 @@
   .reset-component;
 
   display: inline-block;
-  line-height: unset;
 }
 
 // 一般状态

diff --git a/components/table/Table.tsx b/components/table/Table.tsx
@@ -199,7 +199,7 @@ function Table<RecordType extends object = any>(props: TableProps<RecordType>) {
         sorter,
         sorterStates,
       },
-      true,
+      false,
     );
   };
 

diff --git a/components/table/__tests__/Table.sorter.test.js b/components/table/__tests__/Table.sorter.test.js
@@ -546,15 +546,16 @@ describe('Table.sorter', () => {
       createTable({
         pagination: {
           pageSize: 2,
+          defaultCurrent: 2,
           onChange: onPageChange,
         },
         onChange,
       }),
     );
 
     wrapper.find('.ant-table-column-sorters').simulate('click');
-    expect(onChange.mock.calls[0][0].current).toBe(1);
-    expect(onPageChange.mock.calls[0][0]).toBe(1);
+    expect(onChange.mock.calls[0][0].current).toBe(2);
+    expect(onPageChange).not.toHaveBeenCalled();
   });
 
   it('should support onHeaderCell in sort column', () => {

diff --git a/site/theme/template/Content/ComponentDoc.jsx b/site/theme/template/Content/ComponentDoc.jsx
@@ -12,7 +12,7 @@ import { ping, getMetaDescription } from '../utils';
 class ComponentDoc extends React.Component {
   state = {
     expandAll: false,
-    visibleAll: false,
+    visibleAll: process.env.NODE_ENV !== 'production',
     showRiddleButton: false,
   };
-Original file line number
+Diff line change
@@ Expand Up @@
             sorter,
             sorterStates,
           },
-          true,
+          false,
         );
       };
@@ Expand Down @@