From c5a5b3bde327a400d1cad25a6efafe0d5a9e1a88 Mon Sep 17 00:00:00 2001 From: bicochan Date: Tue, 19 May 2026 14:59:22 +0900 Subject: [PATCH] =?UTF-8?q?[st]=20feat:=20=EA=B2=B0=EC=9E=AC=EC=84=A0=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/as/docs/approval-line-management/SPEC.md | 4 +- .../ui/elapr-tmplt-form-dialog.tsx | 17 ++++--- apps/as/src/shared/lib/use-data-table.tsx | 18 ++++--- .../elapr-apln-grid/lib/use-apln-rows.ts | 23 +++++++-- .../widgets/elapr-apln-grid/lib/validators.ts | 38 ++++++++++++++ .../elapr-apln-grid/ui/elapr-apln-grid.tsx | 50 +++++++++++++++---- 6 files changed, 118 insertions(+), 32 deletions(-) diff --git a/apps/as/docs/approval-line-management/SPEC.md b/apps/as/docs/approval-line-management/SPEC.md index 9af80580b..7bcce5cb5 100644 --- a/apps/as/docs/approval-line-management/SPEC.md +++ b/apps/as/docs/approval-line-management/SPEC.md @@ -249,6 +249,7 @@ END | 필수값 | `atrzSeComCd`, `aprvrUuid`, `atrzSeqNo` | | 순서 중복 | 동일 서식 내 `atrzSeqNo` 중복 시 저장 전 검증·안내 | | 결재구분 코드 | `ATRZSECD` — 예: `ATRZ01` 검토자, `ATRZ02` 승인자, `ATRZ03` 최종승인자 | +| **순서 제약** | `ATRZ01`은 최상단 블록, `ATRZ03`은 최하단 블록. 드래그·결재구분 변경·저장 시 `validateAtrzOrder`로 검증, 위반 시 적용/저장 불가 | | 저장 단위 | 행별 **[저장]** (단건 POST/PUT) 또는 툴바 **[결재선 저장]** (일괄) | #### 행 드래그 정렬 (`@dnd-kit` + `useSortable`) @@ -258,7 +259,8 @@ END | 목적 | 결재 단계 순서를 그리드에서 직접 변경 | | 라이브러리 | `@dnd-kit/core`, `@dnd-kit/sortable` — 테이블 행 POC 후 확정 | | 저장 시점 | 드래그는 클라이언트 상태만 변경 → **[결재선 저장]** 또는 행별 **[저장]** 시 `atrzSeqNo` PUT | -| 편집 중 | `editingRowId != null` 이면 드래그 **불가** | +| 편집 중 | `editingRowKey != null` 이면 드래그 **불가** | +| 순서 제약 | 드래그 종료 시 `validateAtrzOrder` — 실패하면 순서 변경 미적용 + 안내. 결재구분 미선택 행은 드래그 불가 | ### 5-3. 보조 다이얼로그 (검토인력만) diff --git a/apps/as/src/features/elapr-tmplt-dialog/ui/elapr-tmplt-form-dialog.tsx b/apps/as/src/features/elapr-tmplt-dialog/ui/elapr-tmplt-form-dialog.tsx index 79053b026..3e7f36de1 100644 --- a/apps/as/src/features/elapr-tmplt-dialog/ui/elapr-tmplt-form-dialog.tsx +++ b/apps/as/src/features/elapr-tmplt-dialog/ui/elapr-tmplt-form-dialog.tsx @@ -41,13 +41,14 @@ function ElaprTmpltFormDialog({ isSubmitting, onSubmit, }: ElaprTmpltFormDialogProps) { - const { register, handleSubmit, reset, setValue, watch } = useForm({ - defaultValues: { - elaprTmpltNm: "", - docSeComCd: "", - elaprTmpltExpln: "", - }, - }); + const { register, handleSubmit, reset, getValues, setValue, watch } = + useForm({ + defaultValues: { + elaprTmpltNm: "", + docSeComCd: "", + elaprTmpltExpln: "", + }, + }); const docSeComCd = watch("docSeComCd"); @@ -81,7 +82,7 @@ function ElaprTmpltFormDialog({ {mode === "edit" ? (
- +

{getValues("elaprTmpltId")}

) : null}
diff --git a/apps/as/src/shared/lib/use-data-table.tsx b/apps/as/src/shared/lib/use-data-table.tsx index dbac9e43c..54caf68c7 100644 --- a/apps/as/src/shared/lib/use-data-table.tsx +++ b/apps/as/src/shared/lib/use-data-table.tsx @@ -1,10 +1,11 @@ import type { HTMLAttributes } from "react"; + import type { UseQueryResult } from "@tanstack/react-query"; -import { useReactTable, type TableOptions } from "@tanstack/react-table"; -import { DataTable } from "@common/components"; +import { type TableOptions, useReactTable } from "@tanstack/react-table"; import type { PageResponse } from "@/shared/model"; import { NoData } from "@/shared/ui/no-data"; +import { DataTable, Skeleton } from "@common/components"; import { matchQueryStatus } from "./match-query-status"; @@ -21,11 +22,7 @@ interface UseDataTableOptions { dataTableOptions?: DataTableOptions; } -export function useDataTable({ - query, - tableOptions, - dataTableOptions, -}: UseDataTableOptions) { +export function useDataTable({ query, tableOptions, dataTableOptions }: UseDataTableOptions) { const table = useReactTable({ ...tableOptions, data: query.data?.content ?? [], @@ -34,7 +31,12 @@ export function useDataTable({ return { tableComponent: matchQueryStatus(query, { - Pending:

로딩 중…

, + Pending: ( +
+ + +
+ ), Empty: , Success: () => , }), diff --git a/apps/as/src/widgets/elapr-apln-grid/lib/use-apln-rows.ts b/apps/as/src/widgets/elapr-apln-grid/lib/use-apln-rows.ts index 719d5f907..3fb74797c 100644 --- a/apps/as/src/widgets/elapr-apln-grid/lib/use-apln-rows.ts +++ b/apps/as/src/widgets/elapr-apln-grid/lib/use-apln-rows.ts @@ -8,6 +8,8 @@ import type { ElaprApln } from "@/entities/elapr"; import type { ElaprAplnRow } from "../model/types"; +import { validateAtrzOrder } from "./validators"; + function toRow(item: ElaprApln): ElaprAplnRow { return { ...item, rowKey: item.aplnId, isNew: false, isDirty: false }; } @@ -110,10 +112,14 @@ export function useAplnRows({ elaprTmpltId, serverRows }: UseAplnRowsOptions) { }, []); const reorderRows = useCallback( - (activeKey: string, overKey: string): ElaprAplnRow[] => { - if (isEditingLocked) return []; + ( + activeKey: string, + overKey: string, + ): { payloadRows?: ElaprAplnRow[]; orderError?: string | null } => { + if (isEditingLocked) return {}; - let newRows: ElaprAplnRow[] = []; + let payloadRows: ElaprAplnRow[] = []; + let orderError: string | null = null; setRows((prev) => { const oldIndex = prev.findIndex((r) => r.rowKey === activeKey); @@ -125,11 +131,18 @@ export function useAplnRows({ elaprTmpltId, serverRows }: UseAplnRowsOptions) { atrzSeqNo: idx + 1, isDirty: true, })); - newRows = moved; + + const error = validateAtrzOrder(moved); + if (error) { + orderError = error; + return prev; + } + + payloadRows = moved; return moved; }); - return newRows; + return { payloadRows, orderError }; }, [isEditingLocked], ); diff --git a/apps/as/src/widgets/elapr-apln-grid/lib/validators.ts b/apps/as/src/widgets/elapr-apln-grid/lib/validators.ts index 7618c3754..874085677 100644 --- a/apps/as/src/widgets/elapr-apln-grid/lib/validators.ts +++ b/apps/as/src/widgets/elapr-apln-grid/lib/validators.ts @@ -1,5 +1,43 @@ import type { ElaprAplnRow } from "../model/types"; +export const ATRZ_REVIEWER_CD = "ATRZ01"; +export const ATRZ_FINAL_CD = "ATRZ03"; + +/** 검토자 최상단 · 최종승인자 최하단 순서 검증 */ +export function validateAtrzOrder(rows: ElaprAplnRow[]): string | null { + const reviewerIndices = rows + .map((row, index) => (row.atrzSeComCd === ATRZ_REVIEWER_CD ? index : -1)) + .filter((index) => index >= 0); + + if (reviewerIndices.length > 0) { + const lastReviewerIndex = Math.max(...reviewerIndices); + const hasNonReviewerAbove = rows + .slice(0, lastReviewerIndex) + .some((row) => row.atrzSeComCd && row.atrzSeComCd !== ATRZ_REVIEWER_CD); + + if (hasNonReviewerAbove) { + return "검토자는 결재선 최상단에만 배치할 수 있습니다."; + } + } + + const finalIndices = rows + .map((row, index) => (row.atrzSeComCd === ATRZ_FINAL_CD ? index : -1)) + .filter((index) => index >= 0); + + if (finalIndices.length > 0) { + const firstFinalIndex = Math.min(...finalIndices); + const hasNonFinalBelow = rows + .slice(firstFinalIndex + 1) + .some((row) => row.atrzSeComCd && row.atrzSeComCd !== ATRZ_FINAL_CD); + + if (hasNonFinalBelow) { + return "최종승인자는 결재선 최하단에만 배치할 수 있습니다."; + } + } + + return null; +} + export function validateAplnRow(row: ElaprAplnRow): string | null { if (row.atrzSeqNo == null || Number.isNaN(row.atrzSeqNo)) { return "결재순서번호를 입력해 주세요."; diff --git a/apps/as/src/widgets/elapr-apln-grid/ui/elapr-apln-grid.tsx b/apps/as/src/widgets/elapr-apln-grid/ui/elapr-apln-grid.tsx index f8c7d1571..9224f06cf 100644 --- a/apps/as/src/widgets/elapr-apln-grid/ui/elapr-apln-grid.tsx +++ b/apps/as/src/widgets/elapr-apln-grid/ui/elapr-apln-grid.tsx @@ -15,7 +15,7 @@ import { import { AprvrPickerDialog, type ReviewerOption } from "@/features/aprvr-picker"; import { Button, - LoadingWithAnimation, + Skeleton, Table, TableBody, TableHead, @@ -25,7 +25,7 @@ import { import { useAplnRows } from "../lib/use-apln-rows"; import { useDndSensors } from "../lib/use-dnd-sensors"; -import { validateAplnRow, validateUniqueSeqNo } from "../lib/validators"; +import { validateAplnRow, validateAtrzOrder, validateUniqueSeqNo } from "../lib/validators"; import type { ElaprAplnRow } from "../model/types"; import { SortableAplnRow } from "./sortable-apln-row"; @@ -73,7 +73,27 @@ function ElaprAplnGrid({ elaprTmpltId }: ElaprAplnGridProps) { const handleDragEnd = (event: DragEndEvent) => { const { active, over } = event; if (!over || active.id === over.id) return; - reorderRows(String(active.id), String(over.id)); + + const { payloadRows, orderError } = reorderRows(String(active.id), String(over.id)); + if (orderError) { + alert(orderError); + return; + } + if (payloadRows) { + // TODO: 결재선 순서 변경 API 호출 + } + }; + + const handleRowChange = (row: ElaprAplnRow, patch: Partial) => { + const nextRows = rows.map((r) => + r.rowKey === row.rowKey ? { ...r, ...patch, isDirty: true } : r, + ); + const orderError = validateAtrzOrder(nextRows); + if (orderError) { + alert(orderError); + return; + } + updateRow(row.rowKey, patch); }; const handleRowSave = async (row: ElaprAplnRow) => { @@ -82,11 +102,17 @@ function ElaprAplnGrid({ elaprTmpltId }: ElaprAplnGridProps) { alert(fieldError); return; } - const dupError = validateUniqueSeqNo(rows.map((r) => (r.rowKey === row.rowKey ? row : r))); + const nextRows = rows.map((r) => (r.rowKey === row.rowKey ? row : r)); + const dupError = validateUniqueSeqNo(nextRows); if (dupError) { alert(dupError); return; } + const orderError = validateAtrzOrder(nextRows); + if (orderError) { + alert(orderError); + return; + } if (!elaprTmpltId) return; @@ -135,6 +161,11 @@ function ElaprAplnGrid({ elaprTmpltId }: ElaprAplnGridProps) { alert(dupError); return; } + const orderError = validateAtrzOrder(rows); + if (orderError) { + alert(orderError); + return; + } const dirtyRows = rows.filter((r) => r.isDirty || r.isNew); @@ -198,10 +229,9 @@ function ElaprAplnGrid({ elaprTmpltId }: ElaprAplnGridProps) {
{aplnQuery.isPending && elaprTmpltId ? ( -
-
- -
+
+ +
) : !elaprTmpltId ? (

@@ -236,12 +266,12 @@ function ElaprAplnGrid({ elaprTmpltId }: ElaprAplnGridProps) { row={row} isEditing={editingRowKey === row.rowKey} isLocked={isEditingLocked} - dragDisabled={isEditingLocked} + dragDisabled={isEditingLocked || !row.atrzSeComCd} onStartEdit={() => startEdit(row.rowKey)} onSave={() => handleRowSave(row)} onCancel={cancelEdit} onDelete={() => handleRowDelete(row)} - onChange={(patch) => updateRow(row.rowKey, patch)} + onChange={(patch) => handleRowChange(row, patch)} onPickAprvr={() => { setPickingRowKey(row.rowKey); setPickerOpen(true);