firstcommit

packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx

@@ -0,0 +1,41 @@
+import { TableHead, TableRow } from "@common/components/ui";
+
+interface TableUpperProps {
+  id: string;
+  title: string;
+  upName?: string;  
+  upSequnce?: number;
+  row? : number;
+  rowSpan?: number;
+  colSpan?: number;
+}
+
+const HeadMakeColSpan = ({ upHeadList }: { upHeadList: TableUpperProps[] }) => {
+  const maxRow = upHeadList.reduce((max, head) => Math.max(max, head.row || 0), 0);
+  return (
+    <>
+      {Array.from({ length: maxRow + 1 }, (_, rowIndex) => (
+        <TableRow key={rowIndex+ " headerRow"} className="bg-gray-50">
+          {upHeadList.map((head: TableUpperProps) => {
+            if (head.row === rowIndex) {
+              return (
+                <TableHead 
+                  key={head.id} 
+                  colSpan={head.colSpan || 1} 
+                  rowSpan={head.rowSpan || 1} 
+                  style={{ whiteSpace: 'pre-line' }} 
+                  className="bg-gray-50"
+                >
+                  {head.title}
+                </TableHead>
+              );
+            }
+            return null;
+          })}
+        </TableRow>
+      ))}
+    </>
+  );
+}
+
+export { HeadMakeColSpan };

packages/common/business_components/src/ui/table/index.tsx

@@ -1,6 +1,7 @@
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@common/components";
 import { useEffect, useState } from "react";
 import UiPageNations from "./uiPageNations";
+import { HeadMakeColSpan } from "./HeadMakeColSpan";
 
 type UiTableProps = {
   headName: React.ReactNode | undefined;
@@ -52,30 +53,28 @@ export function UiTable({ tableData, headlist, pageSize, total, children, headNa
       <div className={`card !m-[1.2rem] !p-0r ${className}`}>
         <Table variant="secondary">
           <TableHeader className="font-bold">
-          {children ? <>{children}</> : <TableRow>
-            {headlist?.map((head) => (
-              <TableHead key={head.id}>{head.title}</TableHead>
+            <HeadMakeColSpan upHeadList={headlist} />
+          </TableHeader>
+          <TableBody className='text-center'>
+            {tableData?.map((el: { [key: string]: string | number | boolean | object}, index) => (
+              console.log(index),
+              <TableRow key={index +" "+headName}>
+                {headlist?.map((head) => (
+                  head.id&&head.id.length == 1 ? <></> :
+                  <TableCell 
+                    className={`${head.align === 'right' ? 'text-right' : head.align === 'center' ? 'text-center' : typeof el[head.id] === 'number' ? 'text-right' : 'text-center'} ${
+                      cellClick && idx === index ? '!font-[1000] cursor-pointer' : 
+                      cellClick ? 'cursor-pointer' : ''
+                    }`}
+                    onClick={() => handleCellClick(index, head.id)}
+                    key={head.id + index}
+                  >
+                    {typeof el[head.id] === 'number' ? String(el[head.id]).replace(/\B(?=(\d{3})+(?!\d))/g, ",") : String(el[head.id] ?? '')}
+                  </TableCell>
+                ))}
+              </TableRow>
             ))}
-          </TableRow>}
-        </TableHeader>
-        <TableBody className='text-center'>
-          {tableData?.map((el: { [key: string]: string | number | boolean | object}, index) => (
-            <TableRow key={index + "row"}>
-              {headlist?.map((head) => (
-                <TableCell 
-                  className={`${head.align === 'right' ? 'text-right' : head.align === 'center' ? 'text-center' : typeof el[head.id] === 'number' ? 'text-right' : 'text-center'} ${
-                    cellClick && idx === index ? '!font-[1000] cursor-pointer' : 
-                    cellClick ? 'cursor-pointer' : ''
-                  }`}
-                  onClick={() => handleCellClick(index, head.id)}
-                  key={head.id + index}
-                >
-                  {typeof el[head.id] === 'number' ? String(el[head.id]).replace(/\B(?=(\d{3})+(?!\d))/g, ",") : String(el[head.id] ?? '')}
-                </TableCell>
-              ))}
-            </TableRow>
-          ))}
-        </TableBody>
+          </TableBody>
         </Table>
         {total <= 0 ? <></> : <UiPageNations total={total} cur={cur} pageSize={pageSize} onPageChange={handlePageChange} />}
       </div>