From e1b78d602e57d7090b4e66f47dc8f235a44bd259 Mon Sep 17 00:00:00 2001
From: WuYongJie <wuyongjie@users.noreply.git.1080p.hk>
Date: Fri, 12 Jun 2026 18:40:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20intake=20=E6=89=80=E6=9C=89=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8C=BA=E8=A1=A8=E6=A0=BC=E8=A1=A8=E5=A4=B4=20sticky?=
 =?UTF-8?q?=20=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 所有 workspace 表格 thead 添加 sticky top-0 z-10，滚动时表头固定
- 外层容器 overflow-hidden 改为 overflow-auto，配合滚动生效
- 基础信息 SKU 表格合并双层 div 为单层，添加 max-h-[60vh] 高度约束
- BOM 表格同步添加 sticky thead
---
 .../workspaces/FinishedSampleShipmentWorkspace.tsx          | 6 +++---
 .../non-integrated/workspaces/FirstQualityWorkspace.tsx     | 6 +++---
 .../non-integrated/workspaces/ProductLimitWorkspace.tsx     | 6 +++---
 .../non-integrated/workspaces/ProductPricingWorkspace.tsx   | 6 +++---
 .../workspaces/SampleMeasurementWorkspace.tsx               | 6 +++---
 .../workspaces/basic-info/ComponentSkuTable.tsx             | 6 ++----
 .../workspaces/basic-info/SkuInfoTableShell.tsx             | 6 ++----
 .../non-integrated/workspaces/bom/BomRowsTableShell.tsx     | 2 +-
 .../workspaces/product-factory/ProductFactoryInfoTable.tsx  | 4 ++--
 .../product-factory/ProductFactorySkuInfoTable.tsx          | 4 ++--
 .../workspaces/product-factory/ProductFactoryWorkspace.tsx  | 2 +-
 11 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/FinishedSampleShipmentWorkspace.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/FinishedSampleShipmentWorkspace.tsx
index 34be8212..593745f5 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/FinishedSampleShipmentWorkspace.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/FinishedSampleShipmentWorkspace.tsx
@@ -124,7 +124,7 @@ export function FinishedSampleShipmentWorkspace({
         </div>
       </div>
 
-      <div className="min-h-0 min-w-0 flex-1 overflow-hidden p-3">
+      <div className="min-h-0 min-w-0 flex-1 overflow-auto p-3">
         {allRows.length === 0 ? (
           <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
             当前还没有 SKU 信息，先维护 SKU 后再进行成品寄样。
@@ -134,9 +134,9 @@ export function FinishedSampleShipmentWorkspace({
             当前批次还没有 SKU 信息。
           </div>
         ) : (
-          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator">
+          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator" style={{ overflowY: 'visible' }}>
             <table className="min-w-[1760px] w-full border-collapse text-xs">
-              <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
+              <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
                 <tr>
                   {[
                     "寄样",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/FirstQualityWorkspace.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/FirstQualityWorkspace.tsx
index 4adb5c66..d023fc53 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/FirstQualityWorkspace.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/FirstQualityWorkspace.tsx
@@ -89,7 +89,7 @@ export function FirstQualityWorkspace({
         </div>
       </div>
 
-      <div className="min-h-0 min-w-0 flex-1 overflow-hidden p-3">
+      <div className="min-h-0 min-w-0 flex-1 overflow-auto p-3">
         {allRows.length === 0 ? (
           <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
             当前还没有 SKU 信息，先维护 SKU 后再进行首批质检。
@@ -99,9 +99,9 @@ export function FirstQualityWorkspace({
             当前批次还没有 SKU 信息。
           </div>
         ) : (
-          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator">
+          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator" style={{ overflowY: 'visible' }}>
             <table className="min-w-[2120px] w-full border-collapse text-xs">
-              <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
+              <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
                 <tr>
                   {[
                     "批次",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/ProductLimitWorkspace.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/ProductLimitWorkspace.tsx
index 2663c83b..5749de0a 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/ProductLimitWorkspace.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/ProductLimitWorkspace.tsx
@@ -96,7 +96,7 @@ export function ProductLimitWorkspace({
         </div>
       </div>
 
-      <div className="min-h-0 min-w-0 flex-1 overflow-hidden p-3">
+      <div className="min-h-0 min-w-0 flex-1 overflow-auto p-3">
         {allRows.length === 0 ? (
           <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
             当前还没有 SKU 信息，先维护 SKU 后再填写产品限价。
@@ -106,9 +106,9 @@ export function ProductLimitWorkspace({
             当前批次还没有 SKU 信息。
           </div>
         ) : (
-          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator">
+          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator" style={{ overflowY: 'visible' }}>
             <table className="min-w-[1480px] w-full border-collapse text-xs">
-              <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
+              <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
                 <tr>
                   {[
                     "产品图片",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/ProductPricingWorkspace.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/ProductPricingWorkspace.tsx
index df5330c9..7a1c1c01 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/ProductPricingWorkspace.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/ProductPricingWorkspace.tsx
@@ -113,7 +113,7 @@ export function ProductPricingWorkspace({
         </div>
       </div>
 
-      <div className="min-h-0 min-w-0 flex-1 overflow-hidden p-3">
+      <div className="min-h-0 min-w-0 flex-1 overflow-auto p-3">
         {allRows.length === 0 ? (
           <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
             当前还没有 SKU 信息，先维护 SKU 后再核价。
@@ -123,9 +123,9 @@ export function ProductPricingWorkspace({
             当前批次还没有 SKU 信息。
           </div>
         ) : (
-          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator">
+          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator" style={{ overflowY: 'visible' }}>
             <table className="min-w-[1280px] w-full border-collapse text-xs">
-              <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
+              <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
                 <tr>
                   {[
                     "型号",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/SampleMeasurementWorkspace.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/SampleMeasurementWorkspace.tsx
index 3dd7821e..e596999d 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/SampleMeasurementWorkspace.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/SampleMeasurementWorkspace.tsx
@@ -85,7 +85,7 @@ export function SampleMeasurementWorkspace({
         </div>
       </div>
 
-      <div className="min-h-0 min-w-0 flex-1 overflow-hidden p-3">
+      <div className="min-h-0 min-w-0 flex-1 overflow-auto p-3">
         {allRows.length === 0 ? (
           <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
             当前还没有 SKU 信息，先维护 SKU 后再进行样包测量。
@@ -95,9 +95,9 @@ export function SampleMeasurementWorkspace({
             当前批次还没有 SKU 信息。
           </div>
         ) : (
-          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator">
+          <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator" style={{ overflowY: 'visible' }}>
             <table className="min-w-[2120px] w-full border-collapse text-xs">
-              <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
+              <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
                 <tr>
                   {[
                     "型号",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/ComponentSkuTable.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/ComponentSkuTable.tsx
index 47d3525e..41db02eb 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/ComponentSkuTable.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/ComponentSkuTable.tsx
@@ -67,10 +67,9 @@ export function ComponentSkuTable({
   onSelectComponentCode: (code: string) => void;
 }) {
   return (
-    <div className="overflow-hidden rounded-apple-lg border border-apple-separator">
-      <div className="non-integrated-table-scroll overflow-x-auto">
+    <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll max-h-[60vh] max-w-full rounded-apple-lg border border-apple-separator">
         <table className="min-w-[1660px] w-full text-left text-xs">
-          <thead className="bg-apple-bg-secondary/60 text-apple-label-secondary">
+          <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
             <tr>
               {COMPONENT_SKU_TABLE_HEADERS.map((label) => (
                 <th
@@ -165,7 +164,6 @@ export function ComponentSkuTable({
             )}
           </tbody>
         </table>
-      </div>
     </div>
   );
 }
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/SkuInfoTableShell.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/SkuInfoTableShell.tsx
index 0dc637d1..0c28bd25 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/SkuInfoTableShell.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/basic-info/SkuInfoTableShell.tsx
@@ -50,14 +50,13 @@ export function SkuInfoTableShell({
     (showActionColumn ? 1 : 0);
 
   return (
-    <div className="overflow-hidden rounded-apple-lg border border-apple-separator">
-      <div className="non-integrated-table-scroll overflow-x-auto">
+    <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll max-h-[60vh] max-w-full rounded-apple-lg border border-apple-separator">
         <table
           className={`${
             isSeriesComponentDetailProduct ? "min-w-[2260px]" : "min-w-[2180px]"
           } w-full text-left text-xs`}
         >
-          <thead className="bg-apple-bg-secondary/60 text-apple-label-secondary">
+          <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
             <tr>
               {headers.map((label) => (
                 <th
@@ -83,7 +82,6 @@ export function SkuInfoTableShell({
             {children}
           </tbody>
         </table>
-      </div>
     </div>
   );
 }
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/bom/BomRowsTableShell.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/bom/BomRowsTableShell.tsx
index d21cba17..a9ea7611 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/bom/BomRowsTableShell.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/bom/BomRowsTableShell.tsx
@@ -28,7 +28,7 @@ export function BomRowsTableShell({
         className="w-full min-w-full text-left text-xs"
         style={{ minWidth: `${tableMinWidth}px` }}
       >
-        <thead className="bg-apple-bg-secondary/60 text-apple-label-secondary">
+        <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
           <tr>
             {columns.map((column) => (
               <th
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryInfoTable.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryInfoTable.tsx
index 04cea71a..86be723e 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryInfoTable.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryInfoTable.tsx
@@ -96,9 +96,9 @@ export function ProductFactoryInfoTable({
   };
 
   return (
-    <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator">
+    <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator" style={{ overflowY: 'visible' }}>
       <table className="min-w-[2160px] w-full border-collapse text-xs">
-        <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
+        <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
           <tr>
             {[
               "定厂",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactorySkuInfoTable.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactorySkuInfoTable.tsx
index f47aa5f4..7502a136 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactorySkuInfoTable.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactorySkuInfoTable.tsx
@@ -8,9 +8,9 @@ export function ProductFactorySkuInfoTable({
   rows: NonIntegratedFactoryRow[];
 }) {
   return (
-    <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator">
+    <div className="non-integrated-table-scroll non-integrated-workspace-table-scroll h-full max-w-full rounded-apple-lg border border-apple-separator" style={{ overflowY: 'visible' }}>
       <table className="min-w-[980px] w-full border-collapse text-xs">
-        <thead className="bg-apple-bg-secondary/40 text-apple-label-secondary">
+        <thead className="sticky top-0 z-10 bg-apple-bg-primary text-apple-label-secondary">
           <tr>
             {[
               "定厂",
diff --git a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryWorkspace.tsx b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryWorkspace.tsx
index d21bab4f..4a185372 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryWorkspace.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/workspaces/product-factory/ProductFactoryWorkspace.tsx
@@ -91,7 +91,7 @@ export function ProductFactoryWorkspace({
         />
       </div>
 
-      <div className="min-h-0 min-w-0 flex-1 overflow-hidden p-3">
+      <div className="min-h-0 min-w-0 flex-1 overflow-auto p-3">
         {allRows.length === 0 ? (
           <div className="flex min-h-[260px] items-center justify-center rounded-apple-xl border border-dashed border-apple-separator text-sm text-apple-label-secondary">
             当前还没有 SKU 信息，先维护 SKU 后再定厂。