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 bbb27d327..df7fffd3a 100644
--- a/packages/common/business_components/src/ui/dialog_ui/index.tsx
+++ b/packages/common/business_components/src/ui/dialog_ui/index.tsx
@@ -1,7 +1,7 @@
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader } from "@common/components";
import { cn } from "../../lib/utils";
-type ModalType = {
+type ModalType = {
bodyClass: string;
body: React.ReactNode;
open?: boolean;
@@ -10,43 +10,45 @@ type ModalType = {
noFooterYn?: 'N' | 'Y';
headerTitle?: string;
footerContent?: React.ReactNode;
+ useDirectRender?: boolean;
}
-export function UiModal({
- bodyClass,
- body,
- open,
+export function UiModal({
+ bodyClass,
+ body,
+ open,
onOpenChange,
noHeaderYn = 'N',
noFooterYn = 'N',
headerTitle,
- footerContent
+ footerContent,
+ useDirectRender = false
}: ModalType) {
-
+
return (
<>
-
>
);
}
diff --git a/packages/common/business_components/src/ui/table/index-2.tsx b/packages/common/business_components/src/ui/table/index-2.tsx
index b6a9750b0..9756d2dfa 100644
--- a/packages/common/business_components/src/ui/table/index-2.tsx
+++ b/packages/common/business_components/src/ui/table/index-2.tsx
@@ -110,9 +110,7 @@ export function UiTable2({
? 'text-right'
: head.align === 'center'
? 'text-center'
- : typeof el[head.id] === 'number'
- ? 'text-right'
- : 'text-center'
+ : 'text-center'
}
${cellClick && idx === index ? '!font-[1000] cursor-pointer' :
cellClick ? 'cursor-pointer' : ''}
@@ -141,7 +139,7 @@ export function UiTable2({
{/* 페이지네이션 하단 고정 */}
- { (
+ {(
void )| undefined;
+ cellClick: ((index: number | undefined, headId: string) => void) | undefined;
onPageChange: (page: number) => void;
className?: string;
resetPageNo?: boolean;
children?: React.ReactNode | undefined;
boldArray?: number[];
resetSelection?: boolean;
- index?:number;
+ index?: number;
}
type UiHeadProps = {
id: string;
title: string;
align?: string;
- visible?:boolean;
+ visible?: boolean;
}
-export function UiTable({ tableData, headlist, pageSize, total, headName, children, cellClick, onPageChange, className = '', resetPageNo = false, boldArray = [], resetSelection = false, index=-1 }: UiTableProps) {
+export function UiTable({ tableData, headlist, pageSize, total, headName, children, cellClick, onPageChange, className = '', resetPageNo = false, boldArray = [], resetSelection = false, index = -1 }: UiTableProps) {
const [cur, setCur] = useState(1);
const [idx, setIdx] = useState(index);
const [isCheck, seIsCheck] = useState(false);
@@ -54,77 +54,75 @@ export function UiTable({ tableData, headlist, pageSize, total, headName, childr
onPageChange(page);
}
- const handleCellClick = (index: number,headId:string )=> {
+ const handleCellClick = (index: number, headId: string) => {
if (cellClick) {
- cellClick(index,headId);
+ cellClick(index, headId);
setIdx(index);
}
};
-
+
return (
<>
{headName ?
{headName}
- : <>>}
+ : <>>}
{children ? children : }
- {tableData.length > 0 ? tableData?.map((el: { [key: string]: any}, index) => (
+ {tableData.length > 0 ? tableData?.map((el: { [key: string]: any }, index) => (
{headlist
- .filter((item) => item.visible != false)
- .map((head) => (
- head.id && head.id.length > 1 && (
- boldArray.includes(index)
- ?
- handleCellClick(index, head.id)}
- key={`cell-${head.id}-${index}`}
- >
- {typeof el[head.id] !== 'number'?String(el[head.id] ?? ''): String(el[head.id]).includes('.')
- ? String(el[head.id]).split('.').map((part, index) =>
- index === 0 ? part.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : part
- ).join('.')
- : String(el[head.id] ?? '').replace(/\B(?=(\d{3})+(?!\d))/g, ",")}
-
- :
- handleCellClick(index, head.id)}
- key={`cell-${head.id}-${index}`}
- >
- {typeof el[head.id] === 'boolean'
- ? {
- el[head.id]= checked;
- }}
- >
-
-
- :
- typeof el[head.id] !== 'number'?
- String(el[head.id] ?? ''):
- String(el[head.id]).includes('.')
- ? String(el[head.id]).split('.').map((part, index) =>
- index === 0 ? part.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : part
- ).join('.')
- :
- String(el[head.id] ?? '').replace(/\B(?=(\d{3})+(?!\d))/g, ",")}
-
- )
- ))}
+ .filter((item) => item.visible != false)
+ .map((head) => (
+ head.id && head.id.length > 1 && (
+ boldArray.includes(index)
+ ?
+ handleCellClick(index, head.id)}
+ key={`cell-${head.id}-${index}`}
+ >
+ {typeof el[head.id] !== 'number' ? String(el[head.id] ?? '') : String(el[head.id]).includes('.')
+ ? String(el[head.id]).split('.').map((part, index) =>
+ index === 0 ? part.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : part
+ ).join('.')
+ : String(el[head.id] ?? '').replace(/\B(?=(\d{3})+(?!\d))/g, ",")}
+
+ :
+ handleCellClick(index, head.id)}
+ key={`cell-${head.id}-${index}`}
+ >
+ {typeof el[head.id] === 'boolean'
+ ? {
+ el[head.id] = checked;
+ }}
+ >
+
+
+ :
+ typeof el[head.id] !== 'number' ?
+ String(el[head.id] ?? '') :
+ String(el[head.id]).includes('.')
+ ? String(el[head.id]).split('.').map((part, index) =>
+ index === 0 ? part.replace(/\B(?=(\d{3})+(?!\d))/g, ",") : part
+ ).join('.')
+ :
+ String(el[head.id] ?? '').replace(/\B(?=(\d{3})+(?!\d))/g, ",")}
+
+ )
+ ))}
)) : <>>}