diff --git a/packages/common/business_components/src/ui/dialog_ui/index.tsx b/packages/common/business_components/src/ui/dialog_ui/index.tsx index 7609e2908..ef611fa40 100644 --- a/packages/common/business_components/src/ui/dialog_ui/index.tsx +++ b/packages/common/business_components/src/ui/dialog_ui/index.tsx @@ -1,50 +1,29 @@ import { Button, Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTrigger } from "@common/components"; +import { useState } from "react"; type ModalType = { bodyClass: string; - butNm: string; - title: string | undefined; body: React.ReactNode; open?: boolean; onOpenChange?: (open: boolean) => void; } -export function UiModal({ bodyClass, butNm, title, body, open, onOpenChange }: ModalType) { - const dialogProps = open !== undefined && onOpenChange !== undefined && title !== undefined - ? { open, onOpenChange, title } - : {}; - +export function UiModal({ bodyClass, body, open, onOpenChange }: ModalType) { + return ( <> - {!open && ( - - - - + + - {body} + {(open && body)} - )} - {open && ( - - - - - - - {body} - - - - - )} ); } diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx index 834db2347..802c59ac0 100644 --- a/packages/common/business_components/src/ui/table/index.tsx +++ b/packages/common/business_components/src/ui/table/index.tsx @@ -9,7 +9,7 @@ type UiTableProps = { pageSize: number; total: number; children: React.ReactNode | undefined; - cellClick : ((index:number|undefined)=>void) | undefined; + cellClick : ((index:number|undefined, headId:string)=>void )| undefined; onPageChange: (page: number) => void; className?: string; } @@ -26,20 +26,17 @@ export function UiTable({ tableData, headlist, pageSize, total, children, headNa setCur(page); onPageChange(page); } - const handleCellClick = (index: number) => { + + + const handleCellClick = (index: number,headId:string )=> { if (cellClick) { - console.log("cellClick", index); - cellClick(index); + cellClick(index,headId); setIdx(index); } + + }; -useEffect(() => { - - console.log("idx", idx); - console.log("idx", idx); - - },[idx]) return ( <> {headName ?
@@ -59,7 +56,7 @@ useEffect(() => { {headlist?.map((head) => ( // handleCellClick(index)} key={head.id + index}>{el[head.id]} - handleCellClick(index)} key={head.id + index}>{el[head.id]} + handleCellClick(index,head.id)} key={head.id + index}>{el[head.id]} ))} ))}