Merge commit 'ed5fa161f56b2d0f34abaa138d7df04292e55f07' into iipbs/wr/form_fuction
iipbs_wr / build (push) Waiting to run

This commit is contained in:
leedj312
2025-05-22 17:45:48 +09:00
15 changed files with 278 additions and 210 deletions
+64 -59
View File
@@ -90,7 +90,7 @@ export const chRowspanTable = (
selectedIds: number[],
handleCellClick: (index: number, headId: string) => void
) => {
let order =0
let order = 0
// rowspan된 셀 렌더링 여부 추적용
const renderedMap = new Map<string, Set<number>>();
return (
@@ -100,68 +100,73 @@ export const chRowspanTable = (
{headList
.map((head) => {
const key = head.id;
const isMerged = head.rowSpan;
const value = row[key];
// 병합 대상이면 중복 렌더링 여부 판단
if (isMerged) {
const renderedSet = renderedMap.get(key) ?? new Set<number>();
if (renderedSet.has(rowIndex)) {
const key = head.id;
const isMerged = head.rowSpan;
const value = row[key];
// 병합 대상이면 중복 렌더링 여부 판단
if (isMerged) {
const renderedSet = renderedMap.get(key) ?? new Set<number>();
if (renderedSet.has(rowIndex)) {
return null; // 이미 렌더링된 셀은 skip
return null; // 이미 렌더링된 셀은 skip
}
const rowspan = row.rowspan ?? 1;
for (let i = 0; i < rowspan; i++) {
renderedSet.add(rowIndex + i);
}
renderedMap.set(key, renderedSet);
return (
<TableCell
key={key}
rowSpan={rowspan}
className="align-middle text-center whitespace-nowrap"
>
{key === "checkBox" ? (
<Checkbox
checked={selectedIds.includes(row.chkgdnPk)}
onCheckedChange={(checked) =>
toggleSelection(row.chkgdnPk, checked === true)
}
></Checkbox>
) : key === "order" ? (
++order
) : (
value
)}
</TableCell>
);
}
const rowspan = row.rowspan ?? 1;
for (let i = 0; i < rowspan; i++) {
renderedSet.add(rowIndex + i);
}
renderedMap.set(key, renderedSet);
// 기본 셀
return (
<TableCell
key={key}
rowSpan={rowspan}
className="align-middle text-center whitespace-nowrap"
className="text-center whitespace-nowrap"
onClick={() => handleCellClick(rowIndex, head.id)}
>
{key === "checkBox" ? (
<Checkbox
checked={selectedIds.includes(row.chkgdnPk)}
onCheckedChange={(checked) =>
toggleSelection(row.chkgdnPk, checked === true)
}
></Checkbox>
) : key === "order" ? (
++order
{head.edit === true ? (
<Input
className={`${head.type === "number" ? "text-right" : "text-center"} !text-xl`}
type={head.type}
onChange={(e) => {
handleChange(rowIndex, head.id, e.target.value);
}}
value={value}
/>
) : (
value
(head.id === "totalSplyUswtrUtztnQnt" || head.id === "totalRuseFcltUtztnQnt" || head.id === "splyUswtrUtztnQnt" || head.id === "ruseFcltUtztnQnt") ? (
<span className="underline text-blue-600 cursor-pointer">
{value}
</span>
) : (
<>{value}</>
)
)}
</TableCell>
);
}
// 기본 셀
return (
<TableCell
key={key}
className="text-center whitespace-nowrap"
onClick={() => handleCellClick(rowIndex, head.id)}
>
{head.edit === true ? (
<Input
className={`${head.type === "number" ? "text-right" : "text-center"} !text-xl`}
type={head.type}
onChange={(e) => {
handleChange(rowIndex, head.id, e.target.value);
}}
value={value}
/>
) : (
`${value}`
)}
</TableCell>
);
})}
})}
</TableRow>
))}
</>
@@ -170,13 +175,13 @@ export const chRowspanTable = (
export const headVisibleChange= (headList: TableUpperProps[] , isEdit :boolean) => {
return headList.forEach(( head) => {
if(head.edit!== undefined)
head.edit=isEdit;
if(head.id==='checkBox' ){
head.visible=false
}
export const headVisibleChange = (headList: TableUpperProps[], isEdit: boolean) => {
return headList.forEach((head) => {
if (head.edit !== undefined)
head.edit = isEdit;
if (head.id === 'checkBox') {
head.visible = false
}
});
});
}
+12 -3
View File
@@ -65,7 +65,7 @@ export const excelDownload = (
fileNm: string,
sampleFile: string,
headerRange = "A1:V3",
writeLine=4
writeLine = 4
) => {
if (excelList.length === 0) return;
fetch(`/${sampleFile}`, {}).then(async (response) => {
@@ -82,7 +82,7 @@ export const excelDownload = (
export const excelArrayDownload = (
fileNm: string,
sampleFile: string,
sheetArray:[typeof sheetParameter]
sheetArray: [typeof sheetParameter]
) => {
if (!sheetArray) return;
fetch(`/${sampleFile}`, {}).then(async (response) => {
@@ -131,4 +131,13 @@ export const getCityOrSgg = (ref: RefObject<ReturnType>) => {
export const safeDate = (value: any): Date | undefined => {
const date = new Date(value);
return isNaN(date.getTime()) ? undefined : date;
};
};
const currentYear = new Date().getFullYear();
export const yearOptions: { val: string; text: string }[] = Array.from(
{ length: currentYear - 1969 },
(_, i) => ({
val: String(1970 + i),
text: `${1970 + i}년`,
})
);