-
+
+
+
+
Hwp SDK Wasm Sample
+
+
+
+
+
+
+
+
+
-
-
-
-
- 구성 중 ... 0%
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/apps/as/src/entities/elapr/api/elapr-dmnd-service.ts b/apps/as/src/entities/elapr/api/elapr-dmnd-service.ts
index 368600110..b366afb60 100644
--- a/apps/as/src/entities/elapr/api/elapr-dmnd-service.ts
+++ b/apps/as/src/entities/elapr/api/elapr-dmnd-service.ts
@@ -49,9 +49,13 @@ async function remove(elaprDmndId: string): Promise
{
await client.delete(`${BASE}/${elaprDmndId}`);
}
-async function findDocPrgrsByDocNo(elaprDocNo: string): Promise {
+async function findDocPrgrsByDocNo(
+ elaprDocNo: string,
+ elaprCycl?: number,
+): Promise {
const response = await client.get(
`${BASE}/sanc/docprgrs/${elaprDocNo}`,
+ { params: elaprCycl != null ? { elaprCycl } : undefined },
);
return response.data;
}
diff --git a/apps/as/src/entities/elapr/api/queries.ts b/apps/as/src/entities/elapr/api/queries.ts
index 734c6cdf4..9908ef44f 100644
--- a/apps/as/src/entities/elapr/api/queries.ts
+++ b/apps/as/src/entities/elapr/api/queries.ts
@@ -185,11 +185,16 @@ export function useElaprDmnd(elaprDmndId: string | null | undefined) {
});
}
-export function useElaprDocPrgrsByDocNo(elaprDocNo: string | null | undefined) {
+export function useElaprDocPrgrsByDocNo(
+ elaprDocNo: string | null | undefined,
+ options?: { elaprCycl?: number; enabled?: boolean; structuralSharing?: boolean },
+) {
+ const elaprCycl = options?.elaprCycl;
return useQuery({
- queryKey: [...elaprDmndBaseKey, "findDocPrgrsByDocNo", elaprDocNo],
- queryFn: () => elaprDmndService.findDocPrgrsByDocNo(elaprDocNo!),
- enabled: Boolean(elaprDocNo),
+ queryKey: [...elaprDmndBaseKey, "findDocPrgrsByDocNo", elaprDocNo, elaprCycl],
+ queryFn: () => elaprDmndService.findDocPrgrsByDocNo(elaprDocNo!, elaprCycl),
+ enabled: Boolean(elaprDocNo) && (options?.enabled ?? true),
+ structuralSharing: options?.structuralSharing ?? true,
});
}
@@ -284,13 +289,8 @@ export function useProcessElaprPrgrsStts() {
const queryClient = useQueryClient();
return useMutation({
- mutationFn: ({
- elaprPrgrsId,
- body,
- }: {
- elaprPrgrsId: string;
- body: ElaprProcessRequestDto;
- }) => elaprPrgrsSttsService.process(elaprPrgrsId, body),
+ mutationFn: ({ elaprPrgrsId, body }: { elaprPrgrsId: string; body: ElaprProcessRequestDto }) =>
+ elaprPrgrsSttsService.process(elaprPrgrsId, body),
onSuccess: () => {
invalidateElaprPrgrsSttsQueries(queryClient);
},
diff --git a/apps/as/src/entities/elapr/index.ts b/apps/as/src/entities/elapr/index.ts
index 4805fecc3..777245649 100644
--- a/apps/as/src/entities/elapr/index.ts
+++ b/apps/as/src/entities/elapr/index.ts
@@ -57,6 +57,7 @@ export {
buildElaprPrgrsSttsListFromApln,
buildElaprPrgrsSttsListFromAplnRows,
} from "./lib/dmnd-save-utils";
+export { mapDocPrgrsToAplnRows } from "./lib/doc-prgrs-to-apln-rows";
export type { ElaprPrgrsSttsRow } from "./lib/prgrs-stts-save-utils";
export {
assignPrgrsSttsAtrzSeqNumbers,
@@ -113,6 +114,10 @@ export type { ReviewerOption } from "./model/reviewer-option";
export { AprvrPickerDialog } from "./ui/aprvr-picker-dialog";
export { ElaprAplnPickerGrid } from "./ui/elapr-apln-picker-grid";
export { ElaprApprovalDialog } from "./ui/elapr-approval-dialog";
+export {
+ type ElaprDocPrgrsPickerConfirmPayload,
+ ElaprDocPrgrsPickerDialog,
+} from "./ui/elapr-doc-prgrs-picker-dialog";
export { ElaprDocPrgrsStatus } from "./ui/elapr-doc-prgrs-status";
export {
type ElaprTmpltPickerConfirmPayload,
diff --git a/apps/as/src/entities/elapr/lib/doc-prgrs-to-apln-rows.ts b/apps/as/src/entities/elapr/lib/doc-prgrs-to-apln-rows.ts
new file mode 100644
index 000000000..a4cf562d2
--- /dev/null
+++ b/apps/as/src/entities/elapr/lib/doc-prgrs-to-apln-rows.ts
@@ -0,0 +1,21 @@
+import type { ElaprDocPrgrsClientResponseDto } from "@/shared/model";
+
+import type { ElaprApln } from "../model/elapr-apln-interface";
+
+/** 문서 결재진행 → 결재선 그리드 시드 (ElaprApln 호환) */
+export function mapDocPrgrsToAplnRows(
+ list: ElaprDocPrgrsClientResponseDto[] | undefined,
+): ElaprApln[] {
+ if (!list?.length) return [];
+
+ return list.map((item, index) => ({
+ aplnId: item.elaprPrgrsId ?? `prgrs-${item.atrzSeqNo ?? index}`,
+ elaprTmpltId: "",
+ atrzSeqNo: item.atrzSeqNo,
+ atrzSeComCd: item.atrzSeComCd,
+ atrzSeComNm: item.atrzSeComNm,
+ aprvrUuid: item.aprvrUuid,
+ aprvrNm: item.aprvrNm,
+ aprvrUserId: item.aprvrUserId,
+ }));
+}
diff --git a/apps/as/src/entities/elapr/lib/use-apln-rows.ts b/apps/as/src/entities/elapr/lib/use-apln-rows.ts
index 384c8ffc1..dfa731d07 100644
--- a/apps/as/src/entities/elapr/lib/use-apln-rows.ts
+++ b/apps/as/src/entities/elapr/lib/use-apln-rows.ts
@@ -22,33 +22,35 @@ function toRow(item: ElaprApln): ElaprAplnRow {
}
interface UseAplnRowsOptions {
- elaprTmpltId: string | null;
+ seedKey: string | null;
serverRows: ElaprApln[] | undefined;
+ elaprTmpltId?: string;
}
export function createDraftRowKey(): string {
return `draft-${Date.now()}`;
}
-export function useAplnRows({ elaprTmpltId, serverRows }: UseAplnRowsOptions) {
+export function useAplnRows({ seedKey, serverRows, elaprTmpltId = "" }: UseAplnRowsOptions) {
const [rows, setRows] = useState([]);
const [editingRowKey, setEditingRowKey] = useState(null);
useEffect(() => {
- if (!elaprTmpltId) {
+ if (!seedKey) {
setRows([]);
setEditingRowKey(null);
return;
}
setRows((serverRows ?? []).map(toRow));
setEditingRowKey(null);
- }, [elaprTmpltId, serverRows]);
+ }, [seedKey, serverRows]);
const isEditingLocked = editingRowKey != null;
const visibleRows = getVisibleRows(rows);
+ const canAdd = Boolean(seedKey) && !isEditingLocked;
const addRow = useCallback(() => {
- if (!elaprTmpltId || isEditingLocked) return;
+ if (!canAdd) return;
const rowKey = createDraftRowKey();
@@ -66,7 +68,7 @@ export function useAplnRows({ elaprTmpltId, serverRows }: UseAplnRowsOptions) {
},
]);
setEditingRowKey(rowKey);
- }, [elaprTmpltId, isEditingLocked]);
+ }, [canAdd, elaprTmpltId]);
const startEdit = useCallback(
(rowKey: string) => {
diff --git a/apps/as/src/entities/elapr/model/elapr-dmnd-interface.ts b/apps/as/src/entities/elapr/model/elapr-dmnd-interface.ts
index 264f45db7..5d05fd04b 100644
--- a/apps/as/src/entities/elapr/model/elapr-dmnd-interface.ts
+++ b/apps/as/src/entities/elapr/model/elapr-dmnd-interface.ts
@@ -45,5 +45,5 @@ export interface ElaprDmndService {
update(elaprDmndId: string, body: ElaprDmndSaveRequestDto): Promise;
updateStatus(elaprDmndId: string, atrzSttsComCd: string): Promise;
remove(elaprDmndId: string): Promise;
- findDocPrgrsByDocNo(elaprDocNo: string): Promise;
+ findDocPrgrsByDocNo(elaprDocNo: string, elaprCycl?: number): Promise;
}
diff --git a/apps/as/src/entities/elapr/ui/elapr-apln-picker-grid.tsx b/apps/as/src/entities/elapr/ui/elapr-apln-picker-grid.tsx
index 92c3d58c5..7f7a88911 100644
--- a/apps/as/src/entities/elapr/ui/elapr-apln-picker-grid.tsx
+++ b/apps/as/src/entities/elapr/ui/elapr-apln-picker-grid.tsx
@@ -20,6 +20,7 @@ import { useElaprAplnPage } from "../api/queries";
import { validateAplnRow } from "../lib/apln-validators";
import { useAplnRows } from "../lib/use-apln-rows";
import { useDndSensors } from "../lib/use-dnd-sensors";
+import type { ElaprApln } from "../model/elapr-apln-interface";
import type { ElaprAplnRow } from "../model/elapr-apln-row-types";
import type { ReviewerOption } from "../model/reviewer-option";
@@ -27,13 +28,17 @@ import { AprvrPickerDialog } from "./aprvr-picker-dialog";
import { SortableAplnPickerRow } from "./sortable-apln-picker-row";
interface ElaprAplnPickerGridProps {
- elaprTmpltId: string | null;
+ elaprTmpltId?: string | null;
+ externalServerRows?: ElaprApln[];
+ isExternalLoading?: boolean;
onRowsChange?: (rows: ElaprAplnRow[]) => void;
onEditingLockedChange?: (locked: boolean) => void;
}
function ElaprAplnPickerGrid({
- elaprTmpltId,
+ elaprTmpltId = null,
+ externalServerRows,
+ isExternalLoading = false,
onRowsChange,
onEditingLockedChange,
}: ElaprAplnPickerGridProps) {
@@ -41,14 +46,18 @@ function ElaprAplnPickerGrid({
const [pickingRowKey, setPickingRowKey] = useState(null);
const alert = useAlertStore((state) => state.setMessage);
+ const isExternalMode = externalServerRows != null;
const aplnQuery = useElaprAplnPage({
- elaprTmpltId: elaprTmpltId ?? undefined,
+ elaprTmpltId: !isExternalMode ? (elaprTmpltId ?? undefined) : undefined,
page: 0,
size: 200,
sort: "atrzSeqNo,asc",
});
+ const seedKey = isExternalMode ? "external-doc-prgrs" : elaprTmpltId;
+ const serverRows = isExternalMode ? externalServerRows : aplnQuery.data?.content;
+
const {
rows,
visibleRows,
@@ -62,8 +71,9 @@ function ElaprAplnPickerGrid({
markDeleted,
reorderRows,
} = useAplnRows({
- elaprTmpltId,
- serverRows: aplnQuery.data?.content,
+ seedKey,
+ serverRows,
+ elaprTmpltId: elaprTmpltId ?? "",
});
useEffect(() => {
@@ -75,7 +85,10 @@ function ElaprAplnPickerGrid({
}, [isEditingLocked, onEditingLockedChange]);
const sensors = useDndSensors();
- const isDisabled = !elaprTmpltId;
+ const isReady = isExternalMode || Boolean(elaprTmpltId);
+ const isLoading = isExternalMode
+ ? isExternalLoading
+ : aplnQuery.isPending && Boolean(elaprTmpltId);
const pickingRow = pickingRowKey ? rows.find((r) => r.rowKey === pickingRowKey) : undefined;
function handleDragEnd(event: DragEndEvent) {
@@ -121,7 +134,7 @@ function ElaprAplnPickerGrid({
size="sm"
type="button"
color="green"
- disabled={isDisabled || isEditingLocked}
+ disabled={!isReady || isEditingLocked}
onClick={addRow}
>
결재선 추가
@@ -129,15 +142,15 @@ function ElaprAplnPickerGrid({
결재서식을 선택하세요.
) : visibleRows.length === 0 ? (
-
등록된 결재선이 없습니다. [결재선 추가]로 결재자를 등록하세요.
) : (
diff --git a/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx b/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx
index ad9abfa3e..ed8a5de01 100644
--- a/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx
+++ b/apps/as/src/entities/elapr/ui/elapr-approval-dialog.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useState } from "react";
+import { useMemo, useState } from "react";
import { closestCenter, DndContext, type DragEndEvent } from "@dnd-kit/core";
import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
@@ -48,6 +48,7 @@ interface ElaprApprovalDialogProps {
onOpenChange: (open: boolean) => void;
elaprDocNo: string;
currentUserUuid: string;
+ elaprCycl?: number;
onSuccess: () => void;
}
@@ -58,6 +59,7 @@ function ElaprApprovalDialog({
onOpenChange,
elaprDocNo,
currentUserUuid,
+ elaprCycl,
onSuccess,
}: ElaprApprovalDialogProps) {
const queryClient = useQueryClient();
@@ -67,9 +69,16 @@ function ElaprApprovalDialog({
const [pickerOpen, setPickerOpen] = useState(false);
const [pickingRowKey, setPickingRowKey] = useState