fantasy-ngzorro 2.1.17 → 2.1.18

package/README.md

@@ -342,7 +342,7 @@ tableCols: HdTableColumn[] = [{
 | showSelected | boolean | false | 勾选列 |
 | selectField | string | billNumber | 勾选主键字段 |
 | showOperateColWarpButton | boolean | false | 展开/缩略显示换行列 |
-| virtualScroll | boolean | true | 虚拟滚动（需 `nzScroll.y`；仅渲染可视区行） |
+| virtualScroll | boolean | true | 虚拟滚动；行数少时自动缩小表格高度，行数多时不超过视口 |
 | virtualItemSize | number | — | 虚拟滚动行高（px）；**不传则首屏自动测量** |
 | showTableTotal | boolean | false | 底部合计行 |
 | tableTotalOption | HdTableTotalOption[] | — | 合计配置 |

package/bundles/fantasy-ngzorro.umd.js

@@ -7197,6 +7197,7 @@
                     changes["tableData"]["currentValue"]["pageNumber"] !==
                         changes["tableData"]["previousValue"]["pageNumber"]) {
                     if (this.virtualScroll) {
+                        this.dealScroll();
                         this.refreshVirtualScrollViewport();
                     }
                     return;
@@ -7206,6 +7207,7 @@
                 }
             }
             if (changes["tableData"] && this.virtualScroll) {
+                this.dealScroll();
                 this.refreshVirtualScrollViewport();
             }
             if (changes["tableCols"] &&
@@ -7390,6 +7392,7 @@
                 /** @type {?} */
                 var measured = _this.measureVirtualItemSize(forceMeasure);
                 if (measured) {
+                    _this.dealScroll();
                     _this.cdr.markForCheck();
                     viewport.checkViewportSize();
                     setTimeout((/**
@@ -7397,6 +7400,7 @@
                      */
                     function () {
                         _this.measureVirtualItemSize(forceMeasure);
+                        _this.dealScroll();
                         viewport.checkViewportSize();
                     }));
                 }
@@ -7991,6 +7995,37 @@
             }
             return !!btn.showConfirm;
         };
+        /** 虚拟滚动：当前页行数不足时缩小视口，避免大片空白 */
+        /**
+         * 虚拟滚动：当前页行数不足时缩小视口，避免大片空白
+         * @private
+         * @param {?} maxOffset
+         * @return {?}
+         */
+        HdTableComponent.prototype.getVirtualScrollY = /**
+         * 虚拟滚动：当前页行数不足时缩小视口，避免大片空白
+         * @private
+         * @param {?} maxOffset
+         * @return {?}
+         */
+        function (maxOffset) {
+            /** @type {?} */
+            var maxCss = "calc(100vh - " + maxOffset + "px)";
+            /** @type {?} */
+            var rowCount = this.tableData && this.tableData.content
+                ? this.tableData.content.length
+                : 0;
+            if (rowCount <= 0) {
+                return maxCss;
+            }
+            /** @type {?} */
+            var contentHeight = rowCount * this.effectiveVirtualItemSize;
+            if (typeof window !== "undefined" &&
+                contentHeight < window.innerHeight - maxOffset) {
+                return contentHeight + "px";
+            }
+            return maxCss;
+        };
         /**
          * @return {?}
          */
@@ -8017,9 +8052,11 @@
                 }
             }));
             /** @type {?} */
-            var scrollY = this.tableTotal
-                ? "calc(100vh - 180px)"
-                : "calc(100vh - 140px)";
+            var maxOffset = this.tableTotal ? 180 : 140;
+            /** @type {?} */
+            var scrollY = this.virtualScroll
+                ? this.getVirtualScrollY(maxOffset)
+                : "calc(100vh - " + maxOffset + "px)";
             /** @type {?} */
             var scrollX = this.virtualScroll && colWidth > 0 ? colWidth + "px" : "1px";
             this.scroll = {