Merge pull request #872 from sheinsight/fix-3.5.5-beta

`Table` 空数据状态下，右侧有固定列时，横向滚动时右侧可能有内容露底显示问题
sheinsight · Dec 16, 2024 · 9201dfd · 9201dfd
2 parents 32c4ff7 + 1584e1c
commit 9201dfd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sheinx",
   "private": true,
-  "version": "3.5.5-beta.2",
+  "version": "3.5.5-beta.3",
   "description": "A react library developed with sheinx",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/base/src/table/table.tsx b/packages/base/src/table/table.tsx
@@ -41,10 +41,6 @@ const virtualScrollerStyle = {
   width: '100%',
 };
 
-const emptyStyle = {
-  ...virtualScrollerStyle,
-  height: 0,
-};
 const scrollWrapperStyle = { flex: 1, minHeight: 0, minWidth: 0, display: 'flex' };
 
 const emptyRef = { current: null };
@@ -64,6 +60,17 @@ export default <Item, Value>(props: TableProps<Item, Value>) => {
 
   const browserScrollbarWidth = useScrollbarWidth();
 
+  const emptyStyle = {
+    ...virtualScrollerStyle,
+    overflow: 'auto hidden',
+    position: 'absolute',
+    zIndex: 1,
+    bottom: 0,
+    left: 0,
+    right: 0,
+    height: browserScrollbarWidth,
+  };
+
   if (props.fixed) {
     devUseWarning.deprecated('fixed', 'virtual', 'Table');
   }

diff --git a/packages/base/src/tabs/tabs-panel.tsx b/packages/base/src/tabs/tabs-panel.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useEffect, useLayoutEffect, useRef } from 'react';
+import { useLayoutEffect, useRef } from 'react';
 import { TabsClasses } from './tabs.type';
 import { useTabsContext } from '@sheinx/hooks';
 import { TabsPanelProps } from './tabs-panel.type';
@@ -10,7 +10,7 @@ const TabsPanel = (props: TabsPanelProps) => {
 
   const panelStyle = jssStyle?.tabs?.() || ({} as TabsClasses);
 
-  const { active, lazy, setTabs, tabs, color } = useTabsContext<TabData>();
+  const { active, lazy, setTabs, color } = useTabsContext<TabData>();
   const isActive = active === id;
   const keekAlive = useRef(false);
 
@@ -37,7 +37,6 @@ const TabsPanel = (props: TabsPanelProps) => {
     return () => {
       // Panel卸载了通知父组件，去销毁相应的TabsHeader
       setTabs(prev => {
-        const index = prev.findIndex(item => item.id === id)
         return prev.filter(item => item.id !== id)
       })
     }

diff --git a/packages/shineout/src/table/__doc__/changelog.cn.md b/packages/shineout/src/table/__doc__/changelog.cn.md
@@ -1,3 +1,12 @@
+## 3.5.5-beta.3
+2024-12-16
+
+### 🐞 BugFix
+- `Table` 空数据状态下，右侧有固定列时，横向滚动时右侧可能有内容露底显示问题 ([#872](https://github.com/sheinsight/shineout-next/pull/872))
+
+### 💎 Enhancement
+- `Table` 空数据状态下，tbody区域可展示横向滚动条 ([#872](https://github.com/sheinsight/shineout-next/pull/872))
+
 ## 3.5.4
 2024-12-12