Merge pull request #969 from followfire/master

fix: 修复Table中show-summary、fixed同时存在，且max-height设置的比实际高度高的时候，合计被顶出去的问题

src/components/table/table.vue

@@ -497,7 +497,9 @@
                 let style = {};
                 if (this.bodyHeight !== 0) {
                     let height = this.bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0);
-                    style.height = this.showHorizontalScrollBar ? `${height}px` : `${height - 1}px`;
+                    const bodyHeight = this.showHorizontalScrollBar ? `${height}px` : `${height - 1}px`;
+                    if (this.height) style.height = bodyHeight;
+                    else if (this.maxHeight) style.maxHeight = bodyHeight;
                 }
                 return style;
             },