3h1-ui 2.10.0 → 2.10.2

package/es/index.js

@@ -13527,7 +13527,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
         paginationHeight += 24;
       }
     } else {
-      paginationHeight = -8;
+      paginationHeight = 0;
     }
     let footerHeight = 0;
     if (!isBoolean(pagination)) {
@@ -13564,8 +13564,8 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
       bottomIncludeBody = getViewportOffset(headEl).bottomIncludeBody;
     }
     let height = bottomIncludeBody - (resizeHeightOffset || 0) - paddingHeight - paginationHeight - footerHeight - headerHeight;
-    height = (height > maxHeight ? maxHeight : height) ?? height;
-    height = Math.ceil(height);
+    height = height > maxHeight ? maxHeight : height;
+    height = Math.floor(height);
     setHeight(height);
     bodyEl.style.height = `${height}px`;
   }
@@ -13596,10 +13596,11 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     }
     const table2 = unref(tableElRef);
     const tableWidth = ((_a2 = table2 == null ? void 0 : table2.$el) == null ? void 0 : _a2.offsetWidth) ?? 0;
+    unref(getDataSourceRef);
     return tableWidth > width ? "100%" : width;
   });
   const getScrollRef = computed(() => {
-    const tableHeight = unref(tableHeightRef);
+    const tableHeight = tableHeightRef.value;
     const { canResize, scroll } = unref(propsRef);
     return {
       x: unref(getScrollX),
@@ -16038,7 +16039,7 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
           emptyText: withCtx(() => [
             createElementVNode("div", {
               class: "flex justify-center items-center",
-              style: normalizeStyle({ height: `${_ctx.getHeight.y - 40}px` })
+              style: normalizeStyle({ height: `${_ctx.getHeight.y - 41}px` })
             }, [
               createVNode(_component_Empty)
             ], 4)

package/es/style.css

@@ -25666,6 +25666,30 @@ span.iconify {
 .shy-basic-table .ant-table-container {
   border-bottom: 1px solid #f0f0f0;
   border-right: 1px solid #f0f0f0;
+}
+.shy-basic-table .hide-scrollbar-x .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-content .ant-table-scroll .ant-table-hide-scrollbar {
+  overflow-x: auto !important;
+}
+.shy-basic-table .hide-scrollbar-x .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-content .ant-table-scroll .ant-table-body {
+  overflow: auto !important;
+}
+.shy-basic-table .hide-scrollbar-x .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-content .ant-table-fixed-right .ant-table-body-outer .ant-table-body-inner {
+  overflow-x: auto !important;
+}
+.shy-basic-table .hide-scrollbar-x .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-content .ant-table-fixed-left .ant-table-body-outer .ant-table-body-inner {
+  overflow-x: auto !important;
+}
+.hide-scrollbar-y .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-content .ant-table-scroll .ant-table-hide-scrollbar {
+  overflow-y: auto !important;
+}
+.hide-scrollbar-y .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-content .ant-table-scroll .ant-table-body {
+  overflow-y: auto !important;
+}
+.hide-scrollbar-y .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-content .ant-table-fixed-right .ant-table-body-outer .ant-table-body-inner {
+  overflow-y: auto !important;
+}
+.hide-scrollbar-y .ant-spin-nested-loading .ant-spin-container .ant-table .ant-table-content .ant-table-fixed-left .ant-table-body-outer .ant-table-body-inner {
+  overflow-y: auto !important;
 }.wrapper[data-v-dbd84c9c] {
   display: flex;
 }

package/es/ui/src/Table/src/hooks/useTableScroll.d.ts

@@ -3,7 +3,7 @@ import { Ref, ComputedRef } from 'vue';
 export declare function useTableScroll(propsRef: ComputedRef<BasicTableProps>, tableElRef: Ref<ComponentRef>, columnsRef: ComputedRef<BasicColumn[]>, rowSelectionRef: ComputedRef<TableRowSelection | null>, getDataSourceRef: ComputedRef<Recordable[]>, wrapRef: Ref<HTMLElement | null>, formRef: Ref<ComponentRef>): {
     getScrollRef: ComputedRef<{
         x: string | number | true;
-        y: string | number;
+        y: number;
         scrollToFirstRowOnChange: boolean;
     }>;
     redoHeight: () => void;

package/lib/index.js

@@ -13529,7 +13529,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
         paginationHeight += 24;
       }
     } else {
-      paginationHeight = -8;
+      paginationHeight = 0;
     }
     let footerHeight = 0;
     if (!utils.isBoolean(pagination)) {
@@ -13566,8 +13566,8 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
       bottomIncludeBody = utils.getViewportOffset(headEl).bottomIncludeBody;
     }
     let height = bottomIncludeBody - (resizeHeightOffset || 0) - paddingHeight - paginationHeight - footerHeight - headerHeight;
-    height = (height > maxHeight ? maxHeight : height) ?? height;
-    height = Math.ceil(height);
+    height = height > maxHeight ? maxHeight : height;
+    height = Math.floor(height);
     setHeight(height);
     bodyEl.style.height = `${height}px`;
   }
@@ -13598,10 +13598,11 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     }
     const table2 = vue.unref(tableElRef);
     const tableWidth = ((_a2 = table2 == null ? void 0 : table2.$el) == null ? void 0 : _a2.offsetWidth) ?? 0;
+    vue.unref(getDataSourceRef);
     return tableWidth > width ? "100%" : width;
   });
   const getScrollRef = vue.computed(() => {
-    const tableHeight = vue.unref(tableHeightRef);
+    const tableHeight = tableHeightRef.value;
     const { canResize, scroll } = vue.unref(propsRef);
     return {
       x: vue.unref(getScrollX),
@@ -16040,7 +16041,7 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
           emptyText: vue.withCtx(() => [
             vue.createElementVNode("div", {
               class: "flex justify-center items-center",
-              style: vue.normalizeStyle({ height: `${_ctx.getHeight.y - 40}px` })
+              style: vue.normalizeStyle({ height: `${_ctx.getHeight.y - 41}px` })
             }, [
               vue.createVNode(_component_Empty)
             ], 4)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.10.0",
+  "version": "2.10.2",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",