bkui-vue 2.0.1-beta.57.table.1 → 2.0.1-beta.57.table.2

package/lib/index.js

@@ -4,5 +4,5 @@ export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
 export * as plugins from './plugins';
-export const version = "2.0.1-beta.57.table.1";
+export const version = "2.0.1-beta.57.table.2";
 window.__bkui_vue_version__ = version;

package/lib/table/hooks/use-layout.d.ts

@@ -6,6 +6,7 @@ declare const _default: (props: TablePropTypes, ctx: any) => {
     renderBody: (list: any, childrend?: any, fixedRows?: any) => JSX.Element;
     renderFooter: (childrend?: any) => JSX.Element;
     renderFixedBottom: () => JSX.Element;
+    getBodyHeight: (height: any) => number;
     setBodyHeight: (height: number, withHeadFoot?: boolean) => void;
     setVirtualBodyHeight: (height: number) => void;
     setFootHeight: (height: number) => void;

package/lib/table/index.js

@@ -21356,10 +21356,13 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
     }
     return null;
   });
+  var getBodyHeight = function getBodyHeight(height) {
+    return height - headHeight.value - fixedBottomHeight.value - footHeight.value;
+  };
   var setBodyHeight = function setBodyHeight(height) {
     var withHeadFoot = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (withHeadFoot) {
-      bodyHeight.value = height - headHeight.value - fixedBottomHeight.value - footHeight.value;
+      bodyHeight.value = getBodyHeight(height);
       return;
     }
     bodyHeight.value = height;
@@ -21503,6 +21506,7 @@ function use_layout_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
     renderBody: renderBody,
     renderFooter: renderFooter,
     renderFixedBottom: renderFixedBottom,
+    getBodyHeight: getBodyHeight,
     setBodyHeight: setBodyHeight,
     setVirtualBodyHeight: setVirtualBodyHeight,
     setFootHeight: setFootHeight,
@@ -24442,6 +24446,7 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       setOffsetRight = _useLayout.setOffsetRight,
       setHeaderRowCount = _useLayout.setHeaderRowCount,
       setLineHeight = _useLayout.setLineHeight,
+      getBodyHeight = _useLayout.getBodyHeight,
       refBody = _useLayout.refBody,
       refRoot = _useLayout.refRoot;
     var scrollTo = function scrollTo() {
@@ -24613,8 +24618,17 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
       });
     });
     var setRowsBodyHeight = function setRowsBodyHeight() {
-      if (props.height === '100%') {
-        setBodyHeight(rows.getCurrentPageRowsHeight(), false);
+      if (props.height === '100%' || props.height === 'auto') {
+        var rowsHeight = rows.getCurrentPageRowsHeight();
+        var bodyHeight = rowsHeight;
+        if (/^\d+\.?\d*(px)?$/.test("".concat(props.maxHeight))) {
+          var maxHeight = getBodyHeight(Number("".concat(props.maxHeight).replace('px', '')));
+          if (bodyHeight > maxHeight) {
+            setBodyHeight(maxHeight, false);
+            return;
+          }
+        }
+        setBodyHeight(bodyHeight, false);
       }
     };
     (0,external_vue_namespaceObject.watch)(function () {
@@ -24678,12 +24692,15 @@ var useSettings = function useSettings(props, ctx, columns, afterSetting) {
     }, {
       immediate: true
     });
-    (0,external_vue_namespaceObject.watch)(function () {
-      return [rows.pageRowList.length];
-    }, function () {
-      var _refBody$value2, _refBody$value2$updat;
-      scrollTo(undefined, 0);
-      refBody === null || refBody === void 0 || (_refBody$value2 = refBody.value) === null || _refBody$value2 === void 0 || (_refBody$value2$updat = _refBody$value2.updateScroll) === null || _refBody$value2$updat === void 0 || _refBody$value2$updat.call(_refBody$value2);
+    var pageListLength = (0,external_vue_namespaceObject.computed)(function () {
+      return rows.pageRowList.length;
+    });
+    (0,external_vue_namespaceObject.watch)(pageListLength, function (val, old) {
+      if (val < old) {
+        var _refBody$value2, _refBody$value2$updat;
+        refBody === null || refBody === void 0 || (_refBody$value2 = refBody.value) === null || _refBody$value2 === void 0 || (_refBody$value2$updat = _refBody$value2.updateScroll) === null || _refBody$value2$updat === void 0 || _refBody$value2$updat.call(_refBody$value2);
+        scrollTo(undefined, 0);
+      }
     });
     ctx.expose({
       setRowExpand: rows.setRowExpand,

package/lib/virtual-render/index.js

@@ -17624,16 +17624,18 @@ var virtualRenderProps = _objectSpread({
     });
   };
   var scrollTo = function scrollTo(x, y) {
-    instance.scrollTo({
+    var _instance;
+    (_instance = instance) === null || _instance === void 0 || _instance.scrollTo({
       x: x,
       y: y
     });
   };
   var updateScrollHeight = function updateScrollHeight(height) {
-    var _instance;
-    if ((_instance = instance) !== null && _instance !== void 0 && _instance.element) {
-      instance.element.scrollHeight = height;
-      instance.update();
+    var _instance2;
+    if ((_instance2 = instance) !== null && _instance2 !== void 0 && _instance2.element) {
+      var _instance3, _instance4;
+      ((_instance3 = instance) === null || _instance3 === void 0 ? void 0 : _instance3.element).scrollHeight = height;
+      (_instance4 = instance) === null || _instance4 === void 0 || _instance4.update();
     }
   };
   return {
@@ -17641,8 +17643,8 @@ var virtualRenderProps = _objectSpread({
     instance: instance,
     scrollTo: scrollTo,
     update: function update() {
-      var _instance2;
-      return (_instance2 = instance) === null || _instance2 === void 0 ? void 0 : _instance2.update();
+      var _instance5;
+      return (_instance5 = instance) === null || _instance5 === void 0 ? void 0 : _instance5.update();
     },
     updateScrollHeight: updateScrollHeight
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.1-beta.57.table.1",
+  "version": "2.0.1-beta.57.table.2",
   "workspaces": [
     "packages/**",
     "scripts/cli",