refactor: 코드 정리 및 가독성 향상

- numberingRuleController.ts에서 API 엔드포인트의 코드 스타일을 일관되게 정리하여 가독성을 높였습니다.
- 불필요한 줄바꿈을 제거하고, 코드 블록을 명확하게 정리하여 유지보수성을 개선했습니다.
- tableManagementService.ts와 ButtonConfigPanel.tsx에서 코드 정리를 통해 일관성을 유지하고, 가독성을 향상시켰습니다.
- 전반적으로 코드의 깔끔함을 유지하고, 향후 개발 시 이해하기 쉽게 개선했습니다.
This commit is contained in:
kjs 2026-02-05 17:38:06 +09:00
parent 73d05b991c
commit e31bb970a2
11 changed files with 1570 additions and 1348 deletions

View File

@ -3,14 +3,20 @@
*/ */
import { Router, Response } from "express"; import { Router, Response } from "express";
import { authenticateToken, AuthenticatedRequest } from "../middleware/authMiddleware"; import {
authenticateToken,
AuthenticatedRequest,
} from "../middleware/authMiddleware";
import { numberingRuleService } from "../services/numberingRuleService"; import { numberingRuleService } from "../services/numberingRuleService";
import { logger } from "../utils/logger"; import { logger } from "../utils/logger";
const router = Router(); const router = Router();
// 규칙 목록 조회 (전체) // 규칙 목록 조회 (전체)
router.get("/", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.get(
"/",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
try { try {
@ -20,22 +26,31 @@ router.get("/", authenticateToken, async (req: AuthenticatedRequest, res: Respon
logger.error("규칙 목록 조회 실패", { error: error.message }); logger.error("규칙 목록 조회 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 메뉴별 사용 가능한 규칙 조회 // 메뉴별 사용 가능한 규칙 조회
router.get("/available/:menuObjid?", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.get(
"/available/:menuObjid?",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const menuObjid = req.params.menuObjid ? parseInt(req.params.menuObjid) : undefined; const menuObjid = req.params.menuObjid
? parseInt(req.params.menuObjid)
: undefined;
logger.info("메뉴별 채번 규칙 조회 요청", { menuObjid, companyCode }); logger.info("메뉴별 채번 규칙 조회 요청", { menuObjid, companyCode });
try { try {
const rules = await numberingRuleService.getAvailableRulesForMenu(companyCode, menuObjid); const rules = await numberingRuleService.getAvailableRulesForMenu(
companyCode,
menuObjid
);
logger.info("✅ 메뉴별 채번 규칙 조회 성공 (컨트롤러)", { logger.info("✅ 메뉴별 채번 규칙 조회 성공 (컨트롤러)", {
companyCode, companyCode,
menuObjid, menuObjid,
rulesCount: rules.length rulesCount: rules.length,
}); });
return res.json({ success: true, data: rules }); return res.json({ success: true, data: rules });
@ -49,10 +64,14 @@ router.get("/available/:menuObjid?", authenticateToken, async (req: Authenticate
}); });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 화면용 채번 규칙 조회 (테이블 기반 필터링 - 간소화) // 화면용 채번 규칙 조회 (테이블 기반 필터링 - 간소화)
router.get("/available-for-screen", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.get(
"/available-for-screen",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { tableName } = req.query; const { tableName } = req.query;
@ -87,27 +106,37 @@ router.get("/available-for-screen", authenticateToken, async (req: Authenticated
error: error.message, error: error.message,
}); });
} }
}); }
);
// 특정 규칙 조회 // 특정 규칙 조회
router.get("/:ruleId", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.get(
"/:ruleId",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
try { try {
const rule = await numberingRuleService.getRuleById(ruleId, companyCode); const rule = await numberingRuleService.getRuleById(ruleId, companyCode);
if (!rule) { if (!rule) {
return res.status(404).json({ success: false, error: "규칙을 찾을 수 없습니다" }); return res
.status(404)
.json({ success: false, error: "규칙을 찾을 수 없습니다" });
} }
return res.json({ success: true, data: rule }); return res.json({ success: true, data: rule });
} catch (error: any) { } catch (error: any) {
logger.error("규칙 조회 실패", { error: error.message }); logger.error("규칙 조회 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 규칙 생성 // 규칙 생성
router.post("/", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.post(
"/",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const userId = req.user!.userId; const userId = req.user!.userId;
const ruleConfig = req.body; const ruleConfig = req.body;
@ -125,11 +154,18 @@ router.post("/", authenticateToken, async (req: AuthenticatedRequest, res: Respo
try { try {
if (!ruleConfig.ruleId || !ruleConfig.ruleName) { if (!ruleConfig.ruleId || !ruleConfig.ruleName) {
return res.status(400).json({ success: false, error: "규칙 ID와 규칙명은 필수입니다" }); return res
.status(400)
.json({ success: false, error: "규칙 ID와 규칙명은 필수입니다" });
} }
if (!Array.isArray(ruleConfig.parts) || ruleConfig.parts.length === 0) { if (!Array.isArray(ruleConfig.parts) || ruleConfig.parts.length === 0) {
return res.status(400).json({ success: false, error: "최소 1개 이상의 규칙 파트가 필요합니다" }); return res
.status(400)
.json({
success: false,
error: "최소 1개 이상의 규칙 파트가 필요합니다",
});
} }
// 🆕 scopeType이 'table'인 경우 tableName 필수 체크 // 🆕 scopeType이 'table'인 경우 tableName 필수 체크
@ -142,7 +178,11 @@ router.post("/", authenticateToken, async (req: AuthenticatedRequest, res: Respo
} }
} }
const newRule = await numberingRuleService.createRule(ruleConfig, companyCode, userId); const newRule = await numberingRuleService.createRule(
ruleConfig,
companyCode,
userId
);
logger.info("✅ [POST /numbering-rules] 채번 규칙 생성 성공:", { logger.info("✅ [POST /numbering-rules] 채번 규칙 생성 성공:", {
ruleId: newRule.ruleId, ruleId: newRule.ruleId,
@ -152,7 +192,9 @@ router.post("/", authenticateToken, async (req: AuthenticatedRequest, res: Respo
return res.status(201).json({ success: true, data: newRule }); return res.status(201).json({ success: true, data: newRule });
} catch (error: any) { } catch (error: any) {
if (error.code === "23505") { if (error.code === "23505") {
return res.status(409).json({ success: false, error: "이미 존재하는 규칙 ID입니다" }); return res
.status(409)
.json({ success: false, error: "이미 존재하는 규칙 ID입니다" });
} }
logger.error("❌ [POST /numbering-rules] 규칙 생성 실패:", { logger.error("❌ [POST /numbering-rules] 규칙 생성 실패:", {
error: error.message, error: error.message,
@ -161,10 +203,14 @@ router.post("/", authenticateToken, async (req: AuthenticatedRequest, res: Respo
}); });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 규칙 수정 // 규칙 수정
router.put("/:ruleId", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.put(
"/:ruleId",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
const updates = req.body; const updates = req.body;
@ -172,7 +218,11 @@ router.put("/:ruleId", authenticateToken, async (req: AuthenticatedRequest, res:
logger.info("채번 규칙 수정 요청", { ruleId, companyCode, updates }); logger.info("채번 규칙 수정 요청", { ruleId, companyCode, updates });
try { try {
const updatedRule = await numberingRuleService.updateRule(ruleId, updates, companyCode); const updatedRule = await numberingRuleService.updateRule(
ruleId,
updates,
companyCode
);
logger.info("채번 규칙 수정 성공", { ruleId, companyCode }); logger.info("채번 규칙 수정 성공", { ruleId, companyCode });
return res.json({ success: true, data: updatedRule }); return res.json({ success: true, data: updatedRule });
} catch (error: any) { } catch (error: any) {
@ -180,17 +230,21 @@ router.put("/:ruleId", authenticateToken, async (req: AuthenticatedRequest, res:
ruleId, ruleId,
companyCode, companyCode,
error: error.message, error: error.message,
stack: error.stack stack: error.stack,
}); });
if (error.message.includes("찾을 수 없거나")) { if (error.message.includes("찾을 수 없거나")) {
return res.status(404).json({ success: false, error: error.message }); return res.status(404).json({ success: false, error: error.message });
} }
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 규칙 삭제 // 규칙 삭제
router.delete("/:ruleId", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.delete(
"/:ruleId",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
@ -204,57 +258,97 @@ router.delete("/:ruleId", authenticateToken, async (req: AuthenticatedRequest, r
logger.error("규칙 삭제 실패", { error: error.message }); logger.error("규칙 삭제 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 코드 미리보기 (순번 증가 없음) // 코드 미리보기 (순번 증가 없음)
router.post("/:ruleId/preview", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.post(
"/:ruleId/preview",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
const { formData } = req.body; // 폼 데이터 (카테고리 기반 채번 시 사용) const { formData } = req.body; // 폼 데이터 (카테고리 기반 채번 시 사용)
try { try {
const previewCode = await numberingRuleService.previewCode(ruleId, companyCode, formData); const previewCode = await numberingRuleService.previewCode(
ruleId,
companyCode,
formData
);
return res.json({ success: true, data: { generatedCode: previewCode } }); return res.json({ success: true, data: { generatedCode: previewCode } });
} catch (error: any) { } catch (error: any) {
logger.error("코드 미리보기 실패", { error: error.message }); logger.error("코드 미리보기 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 코드 할당 (저장 시점에 실제 순번 증가) // 코드 할당 (저장 시점에 실제 순번 증가)
router.post("/:ruleId/allocate", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.post(
"/:ruleId/allocate",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
const { formData, userInputCode } = req.body; // 폼 데이터 + 사용자가 편집한 코드 const { formData, userInputCode } = req.body; // 폼 데이터 + 사용자가 편집한 코드
logger.info("코드 할당 요청", { ruleId, companyCode, hasFormData: !!formData, userInputCode }); logger.info("코드 할당 요청", {
ruleId,
companyCode,
hasFormData: !!formData,
userInputCode,
});
try { try {
const allocatedCode = await numberingRuleService.allocateCode(ruleId, companyCode, formData, userInputCode); const allocatedCode = await numberingRuleService.allocateCode(
ruleId,
companyCode,
formData,
userInputCode
);
logger.info("코드 할당 성공", { ruleId, allocatedCode }); logger.info("코드 할당 성공", { ruleId, allocatedCode });
return res.json({ success: true, data: { generatedCode: allocatedCode } }); return res.json({
success: true,
data: { generatedCode: allocatedCode },
});
} catch (error: any) { } catch (error: any) {
logger.error("코드 할당 실패", { ruleId, companyCode, error: error.message }); logger.error("코드 할당 실패", {
ruleId,
companyCode,
error: error.message,
});
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 코드 생성 (기존 호환성 유지, deprecated) // 코드 생성 (기존 호환성 유지, deprecated)
router.post("/:ruleId/generate", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.post(
"/:ruleId/generate",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
try { try {
const generatedCode = await numberingRuleService.generateCode(ruleId, companyCode); const generatedCode = await numberingRuleService.generateCode(
ruleId,
companyCode
);
return res.json({ success: true, data: { generatedCode } }); return res.json({ success: true, data: { generatedCode } });
} catch (error: any) { } catch (error: any) {
logger.error("코드 생성 실패", { error: error.message }); logger.error("코드 생성 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// 시퀀스 초기화 // 시퀀스 초기화
router.post("/:ruleId/reset", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.post(
"/:ruleId/reset",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
@ -265,44 +359,76 @@ router.post("/:ruleId/reset", authenticateToken, async (req: AuthenticatedReques
logger.error("시퀀스 초기화 실패", { error: error.message }); logger.error("시퀀스 초기화 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// ==================== 테스트 테이블용 API ==================== // ==================== 테스트 테이블용 API ====================
// [테스트] 테스트 테이블에서 채번 규칙 목록 조회 // [테스트] 테스트 테이블에서 채번 규칙 목록 조회
router.get("/test/list/:menuObjid?", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.get(
"/test/list/:menuObjid?",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const menuObjid = req.params.menuObjid ? parseInt(req.params.menuObjid) : undefined; const menuObjid = req.params.menuObjid
? parseInt(req.params.menuObjid)
: undefined;
logger.info("[테스트] 채번 규칙 목록 조회 요청", { companyCode, menuObjid }); logger.info("[테스트] 채번 규칙 목록 조회 요청", {
companyCode,
menuObjid,
});
try { try {
const rules = await numberingRuleService.getRulesFromTest(companyCode, menuObjid); const rules = await numberingRuleService.getRulesFromTest(
logger.info("[테스트] 채번 규칙 목록 조회 성공", { companyCode, menuObjid, count: rules.length }); companyCode,
menuObjid
);
logger.info("[테스트] 채번 규칙 목록 조회 성공", {
companyCode,
menuObjid,
count: rules.length,
});
return res.json({ success: true, data: rules }); return res.json({ success: true, data: rules });
} catch (error: any) { } catch (error: any) {
logger.error("[테스트] 채번 규칙 목록 조회 실패", { error: error.message }); logger.error("[테스트] 채번 규칙 목록 조회 실패", {
error: error.message,
});
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// [테스트] 테이블+컬럼 기반 채번 규칙 조회 // [테스트] 테이블+컬럼 기반 채번 규칙 조회
router.get("/test/by-column/:tableName/:columnName", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.get(
"/test/by-column/:tableName/:columnName",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { tableName, columnName } = req.params; const { tableName, columnName } = req.params;
try { try {
const rule = await numberingRuleService.getNumberingRuleByColumn(companyCode, tableName, columnName); const rule = await numberingRuleService.getNumberingRuleByColumn(
companyCode,
tableName,
columnName
);
return res.json({ success: true, data: rule }); return res.json({ success: true, data: rule });
} catch (error: any) { } catch (error: any) {
logger.error("테이블+컬럼 기반 채번 규칙 조회 실패", { error: error.message }); logger.error("테이블+컬럼 기반 채번 규칙 조회 실패", {
error: error.message,
});
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// [테스트] 테스트 테이블에 채번 규칙 저장 // [테스트] 테스트 테이블에 채번 규칙 저장
// 채번 규칙은 독립적으로 생성 가능 (나중에 테이블 타입 관리에서 컬럼에 연결) // 채번 규칙은 독립적으로 생성 가능 (나중에 테이블 타입 관리에서 컬럼에 연결)
router.post("/test/save", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.post(
"/test/save",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const userId = req.user!.userId; const userId = req.user!.userId;
const ruleConfig = req.body; const ruleConfig = req.body;
@ -319,51 +445,74 @@ router.post("/test/save", authenticateToken, async (req: AuthenticatedRequest, r
if (!ruleConfig.ruleName) { if (!ruleConfig.ruleName) {
return res.status(400).json({ return res.status(400).json({
success: false, success: false,
error: "ruleName is required" error: "ruleName is required",
}); });
} }
const savedRule = await numberingRuleService.saveRuleToTest(ruleConfig, companyCode, userId); const savedRule = await numberingRuleService.saveRuleToTest(
ruleConfig,
companyCode,
userId
);
return res.json({ success: true, data: savedRule }); return res.json({ success: true, data: savedRule });
} catch (error: any) { } catch (error: any) {
logger.error("[테스트] 채번 규칙 저장 실패", { error: error.message }); logger.error("[테스트] 채번 규칙 저장 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// [테스트] 테스트 테이블에서 채번 규칙 삭제 // [테스트] 테스트 테이블에서 채번 규칙 삭제
router.delete("/test/:ruleId", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.delete(
"/test/:ruleId",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
try { try {
await numberingRuleService.deleteRuleFromTest(ruleId, companyCode); await numberingRuleService.deleteRuleFromTest(ruleId, companyCode);
return res.json({ success: true, message: "테스트 채번 규칙이 삭제되었습니다" }); return res.json({
success: true,
message: "테스트 채번 규칙이 삭제되었습니다",
});
} catch (error: any) { } catch (error: any) {
logger.error("[테스트] 채번 규칙 삭제 실패", { error: error.message }); logger.error("[테스트] 채번 규칙 삭제 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// [테스트] 코드 미리보기 (테스트 테이블 사용) // [테스트] 코드 미리보기 (테스트 테이블 사용)
router.post("/test/:ruleId/preview", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.post(
"/test/:ruleId/preview",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const companyCode = req.user!.companyCode; const companyCode = req.user!.companyCode;
const { ruleId } = req.params; const { ruleId } = req.params;
const { formData } = req.body; const { formData } = req.body;
try { try {
const previewCode = await numberingRuleService.previewCode(ruleId, companyCode, formData); const previewCode = await numberingRuleService.previewCode(
ruleId,
companyCode,
formData
);
return res.json({ success: true, data: { generatedCode: previewCode } }); return res.json({ success: true, data: { generatedCode: previewCode } });
} catch (error: any) { } catch (error: any) {
logger.error("[테스트] 코드 미리보기 실패", { error: error.message }); logger.error("[테스트] 코드 미리보기 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
// ==================== 회사별 채번규칙 복제 API ==================== // ==================== 회사별 채번규칙 복제 API ====================
// 회사별 채번규칙 복제 // 회사별 채번규칙 복제
router.post("/copy-for-company", authenticateToken, async (req: AuthenticatedRequest, res: Response) => { router.post(
"/copy-for-company",
authenticateToken,
async (req: AuthenticatedRequest, res: Response) => {
const userCompanyCode = req.user!.companyCode; const userCompanyCode = req.user!.companyCode;
const { sourceCompanyCode, targetCompanyCode } = req.body; const { sourceCompanyCode, targetCompanyCode } = req.body;
@ -371,24 +520,28 @@ router.post("/copy-for-company", authenticateToken, async (req: AuthenticatedReq
if (userCompanyCode !== "*") { if (userCompanyCode !== "*") {
return res.status(403).json({ return res.status(403).json({
success: false, success: false,
error: "최고 관리자만 사용할 수 있습니다" error: "최고 관리자만 사용할 수 있습니다",
}); });
} }
if (!sourceCompanyCode || !targetCompanyCode) { if (!sourceCompanyCode || !targetCompanyCode) {
return res.status(400).json({ return res.status(400).json({
success: false, success: false,
error: "sourceCompanyCode와 targetCompanyCode가 필요합니다" error: "sourceCompanyCode와 targetCompanyCode가 필요합니다",
}); });
} }
try { try {
const result = await numberingRuleService.copyRulesForCompany(sourceCompanyCode, targetCompanyCode); const result = await numberingRuleService.copyRulesForCompany(
sourceCompanyCode,
targetCompanyCode
);
return res.json({ success: true, data: result }); return res.json({ success: true, data: result });
} catch (error: any) { } catch (error: any) {
logger.error("회사별 채번규칙 복제 실패", { error: error.message }); logger.error("회사별 채번규칙 복제 실패", { error: error.message });
return res.status(500).json({ success: false, error: error.message }); return res.status(500).json({ success: false, error: error.message });
} }
}); }
);
export default router; export default router;

View File

@ -322,7 +322,9 @@ export class TableManagementService {
}); });
} else { } else {
// menu_objid 컬럼이 없는 경우 - 매핑 없이 진행 // menu_objid 컬럼이 없는 경우 - 매핑 없이 진행
logger.info("⚠️ getColumnList: menu_objid 컬럼이 없음, 카테고리 매핑 스킵"); logger.info(
"⚠️ getColumnList: menu_objid 컬럼이 없음, 카테고리 매핑 스킵"
);
} }
} catch (mappingError: any) { } catch (mappingError: any) {
logger.warn("⚠️ getColumnList: 카테고리 매핑 조회 실패, 스킵", { logger.warn("⚠️ getColumnList: 카테고리 매핑 조회 실패, 스킵", {
@ -488,7 +490,10 @@ export class TableManagementService {
// table_type_columns에 모든 설정 저장 (멀티테넌시 지원) // table_type_columns에 모든 설정 저장 (멀티테넌시 지원)
// detailSettings가 문자열이면 그대로, 객체면 JSON.stringify // detailSettings가 문자열이면 그대로, 객체면 JSON.stringify
let detailSettingsStr = settings.detailSettings; let detailSettingsStr = settings.detailSettings;
if (typeof settings.detailSettings === "object" && settings.detailSettings !== null) { if (
typeof settings.detailSettings === "object" &&
settings.detailSettings !== null
) {
detailSettingsStr = JSON.stringify(settings.detailSettings); detailSettingsStr = JSON.stringify(settings.detailSettings);
} }
@ -749,7 +754,8 @@ export class TableManagementService {
); );
// 웹 타입별 기본 상세 설정 생성 // 웹 타입별 기본 상세 설정 생성
const defaultDetailSettings = this.generateDefaultDetailSettings(finalWebType); const defaultDetailSettings =
this.generateDefaultDetailSettings(finalWebType);
// 사용자 정의 설정과 기본 설정 병합 // 사용자 정의 설정과 기본 설정 병합
const finalDetailSettings = { const finalDetailSettings = {
@ -768,7 +774,12 @@ export class TableManagementService {
input_type = EXCLUDED.input_type, input_type = EXCLUDED.input_type,
detail_settings = EXCLUDED.detail_settings, detail_settings = EXCLUDED.detail_settings,
updated_date = NOW()`, updated_date = NOW()`,
[tableName, columnName, finalWebType, JSON.stringify(finalDetailSettings)] [
tableName,
columnName,
finalWebType,
JSON.stringify(finalDetailSettings),
]
); );
logger.info( logger.info(
`컬럼 입력 타입 설정 완료: ${tableName}.${columnName} = ${finalWebType}` `컬럼 입력 타입 설정 완료: ${tableName}.${columnName} = ${finalWebType}`
@ -1473,7 +1484,11 @@ export class TableManagementService {
columnInfo && columnInfo &&
(columnInfo.webType === "date" || columnInfo.webType === "datetime") (columnInfo.webType === "date" || columnInfo.webType === "datetime")
) { ) {
return this.buildDateRangeCondition(columnName, actualValue, paramIndex); return this.buildDateRangeCondition(
columnName,
actualValue,
paramIndex
);
} }
// 그 외 타입이면 다중선택(IN 조건)으로 처리 // 그 외 타입이면 다중선택(IN 조건)으로 처리

View File

@ -51,11 +51,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
}) => { }) => {
// 🔧 component가 없는 경우 방어 처리 // 🔧 component가 없는 경우 방어 처리
if (!component) { if (!component) {
return ( return <div className="text-muted-foreground p-4 text-sm"> .</div>;
<div className="p-4 text-sm text-muted-foreground">
.
</div>
);
} }
// 🔧 component에서 직접 읽기 (useMemo 제거) // 🔧 component에서 직접 읽기 (useMemo 제거)
@ -122,7 +118,9 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
const [modalActionTargetTable, setModalActionTargetTable] = useState<string | null>(null); const [modalActionTargetTable, setModalActionTargetTable] = useState<string | null>(null);
const [modalActionSourceColumns, setModalActionSourceColumns] = useState<Array<{ name: string; label: string }>>([]); const [modalActionSourceColumns, setModalActionSourceColumns] = useState<Array<{ name: string; label: string }>>([]);
const [modalActionTargetColumns, setModalActionTargetColumns] = useState<Array<{ name: string; label: string }>>([]); const [modalActionTargetColumns, setModalActionTargetColumns] = useState<Array<{ name: string; label: string }>>([]);
const [modalActionFieldMappings, setModalActionFieldMappings] = useState<Array<{ sourceField: string; targetField: string }>>([]); const [modalActionFieldMappings, setModalActionFieldMappings] = useState<
Array<{ sourceField: string; targetField: string }>
>([]);
const [modalFieldMappingSourceOpen, setModalFieldMappingSourceOpen] = useState<Record<number, boolean>>({}); const [modalFieldMappingSourceOpen, setModalFieldMappingSourceOpen] = useState<Record<number, boolean>>({});
const [modalFieldMappingTargetOpen, setModalFieldMappingTargetOpen] = useState<Record<number, boolean>>({}); const [modalFieldMappingTargetOpen, setModalFieldMappingTargetOpen] = useState<Record<number, boolean>>({});
const [modalFieldMappingSourceSearch, setModalFieldMappingSourceSearch] = useState<Record<number, string>>({}); const [modalFieldMappingSourceSearch, setModalFieldMappingSourceSearch] = useState<Record<number, string>>({});
@ -464,7 +462,13 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
loadModalActionMappingData(); loadModalActionMappingData();
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [config.action?.type, config.action?.autoDetectDataSource, config.action?.targetScreenId, currentTableName, allComponents]); }, [
config.action?.type,
config.action?.autoDetectDataSource,
config.action?.targetScreenId,
currentTableName,
allComponents,
]);
// 🆕 현재 테이블 컬럼 로드 (그룹화 컬럼 선택용) // 🆕 현재 테이블 컬럼 로드 (그룹화 컬럼 선택용)
useEffect(() => { useEffect(() => {
@ -985,10 +989,10 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
}} }}
/> />
<div className="flex flex-col"> <div className="flex flex-col">
<Label htmlFor="auto-detect-data-source" className="text-sm cursor-pointer"> <Label htmlFor="auto-detect-data-source" className="cursor-pointer text-sm">
</Label> </Label>
<p className="text-xs text-muted-foreground"> <p className="text-muted-foreground text-xs">
TableList/SplitPanel에서 TableList/SplitPanel에서
</p> </p>
</div> </div>
@ -996,11 +1000,11 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
{/* 🆕 필드 매핑 UI (데이터 전달 활성화 + 테이블이 다른 경우) */} {/* 🆕 필드 매핑 UI (데이터 전달 활성화 + 테이블이 다른 경우) */}
{component.componentConfig?.action?.autoDetectDataSource === true && ( {component.componentConfig?.action?.autoDetectDataSource === true && (
<div className="mt-4 space-y-3 rounded-lg border bg-background p-3"> <div className="bg-background mt-4 space-y-3 rounded-lg border p-3">
{/* 테이블 정보 표시 */} {/* 테이블 정보 표시 */}
<div className="flex items-center justify-between text-xs"> <div className="flex items-center justify-between text-xs">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Database className="h-3 w-3 text-muted-foreground" /> <Database className="text-muted-foreground h-3 w-3" />
<span className="text-muted-foreground">:</span> <span className="text-muted-foreground">:</span>
<span className="font-medium">{modalActionSourceTable || "감지 중..."}</span> <span className="font-medium">{modalActionSourceTable || "감지 중..."}</span>
</div> </div>
@ -1012,14 +1016,18 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
</div> </div>
{/* 테이블이 같으면 자동 매핑 안내 */} {/* 테이블이 같으면 자동 매핑 안내 */}
{modalActionSourceTable && modalActionTargetTable && modalActionSourceTable === modalActionTargetTable && ( {modalActionSourceTable &&
modalActionTargetTable &&
modalActionSourceTable === modalActionTargetTable && (
<div className="rounded-md bg-green-50 p-2 text-xs text-green-700 dark:bg-green-950/30 dark:text-green-400"> <div className="rounded-md bg-green-50 p-2 text-xs text-green-700 dark:bg-green-950/30 dark:text-green-400">
. . . .
</div> </div>
)} )}
{/* 테이블이 다르면 필드 매핑 UI 표시 */} {/* 테이블이 다르면 필드 매핑 UI 표시 */}
{modalActionSourceTable && modalActionTargetTable && modalActionSourceTable !== modalActionTargetTable && ( {modalActionSourceTable &&
modalActionTargetTable &&
modalActionSourceTable !== modalActionTargetTable && (
<div className="space-y-2"> <div className="space-y-2">
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<Label className="text-xs font-medium"> </Label> <Label className="text-xs font-medium"> </Label>
@ -1029,7 +1037,10 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
size="sm" size="sm"
className="h-6 text-xs" className="h-6 text-xs"
onClick={() => { onClick={() => {
const newMappings = [...(component.componentConfig?.action?.fieldMappings || []), { sourceField: "", targetField: "" }]; const newMappings = [
...(component.componentConfig?.action?.fieldMappings || []),
{ sourceField: "", targetField: "" },
];
setModalActionFieldMappings(newMappings); setModalActionFieldMappings(newMappings);
onUpdateProperty("componentConfig.action.fieldMappings", newMappings); onUpdateProperty("componentConfig.action.fieldMappings", newMappings);
}} }}
@ -1040,7 +1051,7 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
</div> </div>
{(component.componentConfig?.action?.fieldMappings || []).length === 0 && ( {(component.componentConfig?.action?.fieldMappings || []).length === 0 && (
<p className="text-xs text-muted-foreground"> <p className="text-muted-foreground text-xs">
. . . .
</p> </p>
)} )}
@ -1050,12 +1061,15 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
{/* 소스 필드 선택 */} {/* 소스 필드 선택 */}
<Popover <Popover
open={modalFieldMappingSourceOpen[index] || false} open={modalFieldMappingSourceOpen[index] || false}
onOpenChange={(open) => setModalFieldMappingSourceOpen((prev) => ({ ...prev, [index]: open }))} onOpenChange={(open) =>
setModalFieldMappingSourceOpen((prev) => ({ ...prev, [index]: open }))
}
> >
<PopoverTrigger asChild> <PopoverTrigger asChild>
<Button variant="outline" size="sm" className="h-7 flex-1 justify-between text-xs"> <Button variant="outline" size="sm" className="h-7 flex-1 justify-between text-xs">
{mapping.sourceField {mapping.sourceField
? modalActionSourceColumns.find((c) => c.name === mapping.sourceField)?.label || mapping.sourceField ? modalActionSourceColumns.find((c) => c.name === mapping.sourceField)?.label ||
mapping.sourceField
: "소스 컬럼 선택"} : "소스 컬럼 선택"}
<ChevronsUpDown className="ml-1 h-3 w-3 opacity-50" /> <ChevronsUpDown className="ml-1 h-3 w-3 opacity-50" />
</Button> </Button>
@ -1065,22 +1079,31 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
<CommandInput <CommandInput
placeholder="컬럼 검색..." placeholder="컬럼 검색..."
value={modalFieldMappingSourceSearch[index] || ""} value={modalFieldMappingSourceSearch[index] || ""}
onValueChange={(val) => setModalFieldMappingSourceSearch((prev) => ({ ...prev, [index]: val }))} onValueChange={(val) =>
setModalFieldMappingSourceSearch((prev) => ({ ...prev, [index]: val }))
}
/> />
<CommandList> <CommandList>
<CommandEmpty> .</CommandEmpty> <CommandEmpty> .</CommandEmpty>
<CommandGroup> <CommandGroup>
{modalActionSourceColumns {modalActionSourceColumns
.filter((col) => .filter(
col.name.toLowerCase().includes((modalFieldMappingSourceSearch[index] || "").toLowerCase()) || (col) =>
col.label.toLowerCase().includes((modalFieldMappingSourceSearch[index] || "").toLowerCase()) col.name
.toLowerCase()
.includes((modalFieldMappingSourceSearch[index] || "").toLowerCase()) ||
col.label
.toLowerCase()
.includes((modalFieldMappingSourceSearch[index] || "").toLowerCase()),
) )
.map((col) => ( .map((col) => (
<CommandItem <CommandItem
key={col.name} key={col.name}
value={col.name} value={col.name}
onSelect={() => { onSelect={() => {
const newMappings = [...(component.componentConfig?.action?.fieldMappings || [])]; const newMappings = [
...(component.componentConfig?.action?.fieldMappings || []),
];
newMappings[index] = { ...newMappings[index], sourceField: col.name }; newMappings[index] = { ...newMappings[index], sourceField: col.name };
setModalActionFieldMappings(newMappings); setModalActionFieldMappings(newMappings);
onUpdateProperty("componentConfig.action.fieldMappings", newMappings); onUpdateProperty("componentConfig.action.fieldMappings", newMappings);
@ -1088,11 +1111,14 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
}} }}
> >
<Check <Check
className={cn("mr-2 h-4 w-4", mapping.sourceField === col.name ? "opacity-100" : "opacity-0")} className={cn(
"mr-2 h-4 w-4",
mapping.sourceField === col.name ? "opacity-100" : "opacity-0",
)}
/> />
<div className="flex flex-col"> <div className="flex flex-col">
<span className="text-xs font-medium">{col.label}</span> <span className="text-xs font-medium">{col.label}</span>
<span className="text-[10px] text-muted-foreground">{col.name}</span> <span className="text-muted-foreground text-[10px]">{col.name}</span>
</div> </div>
</CommandItem> </CommandItem>
))} ))}
@ -1102,17 +1128,20 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
</PopoverContent> </PopoverContent>
</Popover> </Popover>
<span className="text-xs text-muted-foreground"></span> <span className="text-muted-foreground text-xs"></span>
{/* 대상 필드 선택 */} {/* 대상 필드 선택 */}
<Popover <Popover
open={modalFieldMappingTargetOpen[index] || false} open={modalFieldMappingTargetOpen[index] || false}
onOpenChange={(open) => setModalFieldMappingTargetOpen((prev) => ({ ...prev, [index]: open }))} onOpenChange={(open) =>
setModalFieldMappingTargetOpen((prev) => ({ ...prev, [index]: open }))
}
> >
<PopoverTrigger asChild> <PopoverTrigger asChild>
<Button variant="outline" size="sm" className="h-7 flex-1 justify-between text-xs"> <Button variant="outline" size="sm" className="h-7 flex-1 justify-between text-xs">
{mapping.targetField {mapping.targetField
? modalActionTargetColumns.find((c) => c.name === mapping.targetField)?.label || mapping.targetField ? modalActionTargetColumns.find((c) => c.name === mapping.targetField)?.label ||
mapping.targetField
: "대상 컬럼 선택"} : "대상 컬럼 선택"}
<ChevronsUpDown className="ml-1 h-3 w-3 opacity-50" /> <ChevronsUpDown className="ml-1 h-3 w-3 opacity-50" />
</Button> </Button>
@ -1122,22 +1151,31 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
<CommandInput <CommandInput
placeholder="컬럼 검색..." placeholder="컬럼 검색..."
value={modalFieldMappingTargetSearch[index] || ""} value={modalFieldMappingTargetSearch[index] || ""}
onValueChange={(val) => setModalFieldMappingTargetSearch((prev) => ({ ...prev, [index]: val }))} onValueChange={(val) =>
setModalFieldMappingTargetSearch((prev) => ({ ...prev, [index]: val }))
}
/> />
<CommandList> <CommandList>
<CommandEmpty> .</CommandEmpty> <CommandEmpty> .</CommandEmpty>
<CommandGroup> <CommandGroup>
{modalActionTargetColumns {modalActionTargetColumns
.filter((col) => .filter(
col.name.toLowerCase().includes((modalFieldMappingTargetSearch[index] || "").toLowerCase()) || (col) =>
col.label.toLowerCase().includes((modalFieldMappingTargetSearch[index] || "").toLowerCase()) col.name
.toLowerCase()
.includes((modalFieldMappingTargetSearch[index] || "").toLowerCase()) ||
col.label
.toLowerCase()
.includes((modalFieldMappingTargetSearch[index] || "").toLowerCase()),
) )
.map((col) => ( .map((col) => (
<CommandItem <CommandItem
key={col.name} key={col.name}
value={col.name} value={col.name}
onSelect={() => { onSelect={() => {
const newMappings = [...(component.componentConfig?.action?.fieldMappings || [])]; const newMappings = [
...(component.componentConfig?.action?.fieldMappings || []),
];
newMappings[index] = { ...newMappings[index], targetField: col.name }; newMappings[index] = { ...newMappings[index], targetField: col.name };
setModalActionFieldMappings(newMappings); setModalActionFieldMappings(newMappings);
onUpdateProperty("componentConfig.action.fieldMappings", newMappings); onUpdateProperty("componentConfig.action.fieldMappings", newMappings);
@ -1145,11 +1183,14 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
}} }}
> >
<Check <Check
className={cn("mr-2 h-4 w-4", mapping.targetField === col.name ? "opacity-100" : "opacity-0")} className={cn(
"mr-2 h-4 w-4",
mapping.targetField === col.name ? "opacity-100" : "opacity-0",
)}
/> />
<div className="flex flex-col"> <div className="flex flex-col">
<span className="text-xs font-medium">{col.label}</span> <span className="text-xs font-medium">{col.label}</span>
<span className="text-[10px] text-muted-foreground">{col.name}</span> <span className="text-muted-foreground text-[10px]">{col.name}</span>
</div> </div>
</CommandItem> </CommandItem>
))} ))}
@ -1164,9 +1205,11 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
type="button" type="button"
variant="ghost" variant="ghost"
size="sm" size="sm"
className="h-7 w-7 p-0 text-destructive hover:bg-destructive/10" className="text-destructive hover:bg-destructive/10 h-7 w-7 p-0"
onClick={() => { onClick={() => {
const newMappings = (component.componentConfig?.action?.fieldMappings || []).filter((_: any, i: number) => i !== index); const newMappings = (component.componentConfig?.action?.fieldMappings || []).filter(
(_: any, i: number) => i !== index,
);
setModalActionFieldMappings(newMappings); setModalActionFieldMappings(newMappings);
onUpdateProperty("componentConfig.action.fieldMappings", newMappings); onUpdateProperty("componentConfig.action.fieldMappings", newMappings);
}} }}
@ -1185,9 +1228,10 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
{/* 🆕 데이터 전달 + 모달 열기 액션 설정 (deprecated - 하위 호환성 유지) */} {/* 🆕 데이터 전달 + 모달 열기 액션 설정 (deprecated - 하위 호환성 유지) */}
{component.componentConfig?.action?.type === "openModalWithData" && ( {component.componentConfig?.action?.type === "openModalWithData" && (
<div className="mt-4 space-y-4 rounded-lg border bg-amber-50 p-4 dark:bg-amber-950/20"> <div className="mt-4 space-y-4 rounded-lg border bg-amber-50 p-4 dark:bg-amber-950/20">
<h4 className="text-sm font-medium text-foreground"> + </h4> <h4 className="text-foreground text-sm font-medium"> + </h4>
<p className="text-xs text-amber-600 dark:text-amber-400"> <p className="text-xs text-amber-600 dark:text-amber-400">
"모달 열기" . "모달 열기" + "선택된 데이터 전달" . "모달 열기" . "모달 열기" + "선택된 데이터 전달"
.
</p> </p>
{/* 🆕 블록 기반 제목 빌더 */} {/* 🆕 블록 기반 제목 빌더 */}
@ -3546,8 +3590,8 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
<div className="bg-muted/50 mt-4 space-y-4 rounded-lg border p-4"> <div className="bg-muted/50 mt-4 space-y-4 rounded-lg border p-4">
<h4 className="text-foreground text-sm font-medium"> </h4> <h4 className="text-foreground text-sm font-medium"> </h4>
<p className="text-muted-foreground text-xs"> <p className="text-muted-foreground text-xs">
V2 . V2 .
. .
</p> </p>
<div> <div>
@ -3597,11 +3641,13 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
type="number" type="number"
className="h-8 text-xs" className="h-8 text-xs"
placeholder="3" placeholder="3"
value={component.componentConfig?.action?.eventConfig?.eventPayload?.config?.scheduling?.leadTimeDays || 3} value={
component.componentConfig?.action?.eventConfig?.eventPayload?.config?.scheduling?.leadTimeDays || 3
}
onChange={(e) => { onChange={(e) => {
onUpdateProperty( onUpdateProperty(
"componentConfig.action.eventConfig.eventPayload.config.scheduling.leadTimeDays", "componentConfig.action.eventConfig.eventPayload.config.scheduling.leadTimeDays",
parseInt(e.target.value) || 3 parseInt(e.target.value) || 3,
); );
}} }}
/> />
@ -3613,11 +3659,14 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
type="number" type="number"
className="h-8 text-xs" className="h-8 text-xs"
placeholder="100" placeholder="100"
value={component.componentConfig?.action?.eventConfig?.eventPayload?.config?.scheduling?.maxDailyCapacity || 100} value={
component.componentConfig?.action?.eventConfig?.eventPayload?.config?.scheduling
?.maxDailyCapacity || 100
}
onChange={(e) => { onChange={(e) => {
onUpdateProperty( onUpdateProperty(
"componentConfig.action.eventConfig.eventPayload.config.scheduling.maxDailyCapacity", "componentConfig.action.eventConfig.eventPayload.config.scheduling.maxDailyCapacity",
parseInt(e.target.value) || 100 parseInt(e.target.value) || 100,
); );
}} }}
/> />
@ -3625,8 +3674,8 @@ export const ButtonConfigPanel: React.FC<ButtonConfigPanelProps> = ({
<div className="rounded-md bg-blue-50 p-2 dark:bg-blue-950/20"> <div className="rounded-md bg-blue-50 p-2 dark:bg-blue-950/20">
<p className="text-xs text-blue-800 dark:text-blue-200"> <p className="text-xs text-blue-800 dark:text-blue-200">
<strong> :</strong> . <strong> :</strong> .
. .
</p> </p>
</div> </div>
</div> </div>

View File

@ -109,18 +109,23 @@ export function TabsWidget({
for (const tab of visibleTabs) { for (const tab of visibleTabs) {
const extTab = tab as ExtendedTabItem; const extTab = tab as ExtendedTabItem;
// screenId가 있고, 아직 로드하지 않았으며, 인라인 컴포넌트가 없는 경우만 로드 // screenId가 있고, 아직 로드하지 않았으며, 인라인 컴포넌트가 없는 경우만 로드
if (extTab.screenId && !screenLayouts[tab.id] && !screenLoadingStates[tab.id] && (!extTab.components || extTab.components.length === 0)) { if (
setScreenLoadingStates(prev => ({ ...prev, [tab.id]: true })); extTab.screenId &&
!screenLayouts[tab.id] &&
!screenLoadingStates[tab.id] &&
(!extTab.components || extTab.components.length === 0)
) {
setScreenLoadingStates((prev) => ({ ...prev, [tab.id]: true }));
try { try {
const layoutData = await screenApi.getLayout(extTab.screenId); const layoutData = await screenApi.getLayout(extTab.screenId);
if (layoutData && layoutData.components) { if (layoutData && layoutData.components) {
setScreenLayouts(prev => ({ ...prev, [tab.id]: layoutData.components })); setScreenLayouts((prev) => ({ ...prev, [tab.id]: layoutData.components }));
} }
} catch (error) { } catch (error) {
console.error(`탭 "${tab.label}" 화면 로드 실패:`, error); console.error(`탭 "${tab.label}" 화면 로드 실패:`, error);
setScreenErrors(prev => ({ ...prev, [tab.id]: "화면을 불러올 수 없습니다." })); setScreenErrors((prev) => ({ ...prev, [tab.id]: "화면을 불러올 수 없습니다." }));
} finally { } finally {
setScreenLoadingStates(prev => ({ ...prev, [tab.id]: false })); setScreenLoadingStates((prev) => ({ ...prev, [tab.id]: false }));
} }
} }
} }
@ -180,11 +185,7 @@ export function TabsWidget({
const getTabsListClass = () => { const getTabsListClass = () => {
const baseClass = orientation === "vertical" ? "flex-col" : ""; const baseClass = orientation === "vertical" ? "flex-col" : "";
const variantClass = const variantClass =
variant === "pills" variant === "pills" ? "bg-muted p-1 rounded-lg" : variant === "underline" ? "border-b" : "bg-muted p-1";
? "bg-muted p-1 rounded-lg"
: variant === "underline"
? "border-b"
: "bg-muted p-1";
return `${baseClass} ${variantClass}`; return `${baseClass} ${variantClass}`;
}; };
@ -199,8 +200,8 @@ export function TabsWidget({
if (screenLoadingStates[tab.id]) { if (screenLoadingStates[tab.id]) {
return ( return (
<div className="flex h-full w-full items-center justify-center"> <div className="flex h-full w-full items-center justify-center">
<Loader2 className="h-8 w-8 animate-spin text-primary" /> <Loader2 className="text-primary h-8 w-8 animate-spin" />
<span className="ml-2 text-muted-foreground"> ...</span> <span className="text-muted-foreground ml-2"> ...</span>
</div> </div>
); );
} }
@ -208,7 +209,7 @@ export function TabsWidget({
// 에러 발생 // 에러 발생
if (screenErrors[tab.id]) { if (screenErrors[tab.id]) {
return ( return (
<div className="flex h-full w-full items-center justify-center rounded border-2 border-dashed border-destructive/50 bg-destructive/5"> <div className="border-destructive/50 bg-destructive/5 flex h-full w-full items-center justify-center rounded border-2 border-dashed">
<p className="text-destructive text-sm">{screenErrors[tab.id]}</p> <p className="text-destructive text-sm">{screenErrors[tab.id]}</p>
</div> </div>
); );
@ -223,7 +224,7 @@ export function TabsWidget({
// 아직 로드되지 않은 경우 // 아직 로드되지 않은 경우
return ( return (
<div className="flex h-full w-full items-center justify-center"> <div className="flex h-full w-full items-center justify-center">
<Loader2 className="h-8 w-8 animate-spin text-primary" /> <Loader2 className="text-primary h-8 w-8 animate-spin" />
</div> </div>
); );
} }
@ -246,17 +247,12 @@ export function TabsWidget({
// screenId로 로드한 화면 컴포넌트 렌더링 // screenId로 로드한 화면 컴포넌트 렌더링
const renderScreenComponents = (components: ComponentData[]) => { const renderScreenComponents = (components: ComponentData[]) => {
// InteractiveScreenViewerDynamic 동적 로드 // InteractiveScreenViewerDynamic 동적 로드
const InteractiveScreenViewerDynamic = require("@/components/screen/InteractiveScreenViewerDynamic").InteractiveScreenViewerDynamic; const InteractiveScreenViewerDynamic =
require("@/components/screen/InteractiveScreenViewerDynamic").InteractiveScreenViewerDynamic;
// 컴포넌트들의 최대 위치를 계산하여 스크롤 가능한 영역 확보 // 컴포넌트들의 최대 위치를 계산하여 스크롤 가능한 영역 확보
const maxBottom = Math.max( const maxBottom = Math.max(...components.map((c) => (c.position?.y || 0) + (c.size?.height || 100)), 300);
...components.map((c) => (c.position?.y || 0) + (c.size?.height || 100)), const maxRight = Math.max(...components.map((c) => (c.position?.x || 0) + (c.size?.width || 200)), 400);
300
);
const maxRight = Math.max(
...components.map((c) => (c.position?.x || 0) + (c.size?.width || 200)),
400
);
return ( return (
<div <div
@ -295,11 +291,11 @@ export function TabsWidget({
// 컴포넌트들의 최대 위치를 계산하여 스크롤 가능한 영역 확보 // 컴포넌트들의 최대 위치를 계산하여 스크롤 가능한 영역 확보
const maxBottom = Math.max( const maxBottom = Math.max(
...components.map((c) => (c.position?.y || 0) + (c.size?.height || 100)), ...components.map((c) => (c.position?.y || 0) + (c.size?.height || 100)),
300 // 최소 높이 300, // 최소 높이
); );
const maxRight = Math.max( const maxRight = Math.max(
...components.map((c) => (c.position?.x || 0) + (c.size?.width || 200)), ...components.map((c) => (c.position?.x || 0) + (c.size?.width || 200)),
400 // 최소 너비 400, // 최소 너비
); );
return ( return (
@ -319,7 +315,7 @@ export function TabsWidget({
className={cn( className={cn(
"absolute", "absolute",
isDesignMode && "cursor-move", isDesignMode && "cursor-move",
isDesignMode && isSelected && "ring-2 ring-primary ring-offset-2" isDesignMode && isSelected && "ring-primary ring-2 ring-offset-2",
)} )}
style={{ style={{
left: comp.position?.x || 0, left: comp.position?.x || 0,
@ -380,9 +376,7 @@ export function TabsWidget({
<TabsTrigger value={tab.id} disabled={tab.disabled} className="relative pr-8"> <TabsTrigger value={tab.id} disabled={tab.disabled} className="relative pr-8">
{tab.label} {tab.label}
{tab.components && tab.components.length > 0 && ( {tab.components && tab.components.length > 0 && (
<span className="ml-1 text-xs text-muted-foreground"> <span className="text-muted-foreground ml-1 text-xs">({tab.components.length})</span>
({tab.components.length})
</span>
)} )}
</TabsTrigger> </TabsTrigger>
{allowCloseable && ( {allowCloseable && (
@ -390,7 +384,7 @@ export function TabsWidget({
onClick={(e) => handleCloseTab(tab.id, e)} onClick={(e) => handleCloseTab(tab.id, e)}
variant="ghost" variant="ghost"
size="sm" size="sm"
className="absolute right-1 top-1/2 h-5 w-5 -translate-y-1/2 p-0 hover:bg-destructive/10" className="hover:bg-destructive/10 absolute top-1/2 right-1 h-5 w-5 -translate-y-1/2 p-0"
> >
<X className="h-3 w-3" /> <X className="h-3 w-3" />
</Button> </Button>

View File

@ -124,13 +124,16 @@ export const UnifiedRepeater: React.FC<UnifiedRepeaterProps> = ({
// DataProvidable 인터페이스 구현 // DataProvidable 인터페이스 구현
// 다른 컴포넌트에서 이 리피터의 데이터를 가져갈 수 있게 함 // 다른 컴포넌트에서 이 리피터의 데이터를 가져갈 수 있게 함
// ============================================================ // ============================================================
const dataProvider: DataProvidable = useMemo(() => ({ const dataProvider: DataProvidable = useMemo(
() => ({
componentId: parentId || config.fieldName || "unified-repeater", componentId: parentId || config.fieldName || "unified-repeater",
componentType: "unified-repeater", componentType: "unified-repeater",
// 선택된 행 데이터 반환 // 선택된 행 데이터 반환
getSelectedData: () => { getSelectedData: () => {
return Array.from(selectedRows).map((idx) => data[idx]).filter(Boolean); return Array.from(selectedRows)
.map((idx) => data[idx])
.filter(Boolean);
}, },
// 전체 데이터 반환 // 전체 데이터 반환
@ -142,13 +145,16 @@ export const UnifiedRepeater: React.FC<UnifiedRepeaterProps> = ({
clearSelection: () => { clearSelection: () => {
setSelectedRows(new Set()); setSelectedRows(new Set());
}, },
}), [parentId, config.fieldName, data, selectedRows]); }),
[parentId, config.fieldName, data, selectedRows],
);
// ============================================================ // ============================================================
// DataReceivable 인터페이스 구현 // DataReceivable 인터페이스 구현
// 외부에서 이 리피터로 데이터를 전달받을 수 있게 함 // 외부에서 이 리피터로 데이터를 전달받을 수 있게 함
// ============================================================ // ============================================================
const dataReceiver: DataReceivable = useMemo(() => ({ const dataReceiver: DataReceivable = useMemo(
() => ({
componentId: parentId || config.fieldName || "unified-repeater", componentId: parentId || config.fieldName || "unified-repeater",
componentType: "repeater", componentType: "repeater",
@ -200,7 +206,9 @@ export const UnifiedRepeater: React.FC<UnifiedRepeaterProps> = ({
getData: () => { getData: () => {
return [...data]; return [...data];
}, },
}), [parentId, config.fieldName, data, onDataChange]); }),
[parentId, config.fieldName, data, onDataChange],
);
// ============================================================ // ============================================================
// ScreenContext에 DataProvider/DataReceiver 등록 // ScreenContext에 DataProvider/DataReceiver 등록
@ -231,7 +239,9 @@ export const UnifiedRepeater: React.FC<UnifiedRepeaterProps> = ({
componentId: parentId || config.fieldName || "unified-repeater", componentId: parentId || config.fieldName || "unified-repeater",
tableName: config.dataSource?.tableName || "", tableName: config.dataSource?.tableName || "",
data: data, data: data,
selectedData: Array.from(selectedRows).map((idx) => data[idx]).filter(Boolean), selectedData: Array.from(selectedRows)
.map((idx) => data[idx])
.filter(Boolean),
}); });
prevDataLengthRef.current = data.length; prevDataLengthRef.current = data.length;
} }
@ -701,7 +711,8 @@ export const UnifiedRepeater: React.FC<UnifiedRepeaterProps> = ({
// 🆕 채번 API 호출 (비동기) // 🆕 채번 API 호출 (비동기)
// 🆕 수동 입력 부분 지원을 위해 userInputCode 파라미터 추가 // 🆕 수동 입력 부분 지원을 위해 userInputCode 파라미터 추가
const generateNumberingCode = useCallback(async (ruleId: string, userInputCode?: string, formData?: Record<string, any>): Promise<string> => { const generateNumberingCode = useCallback(
async (ruleId: string, userInputCode?: string, formData?: Record<string, any>): Promise<string> => {
try { try {
const result = await allocateNumberingCode(ruleId, userInputCode, formData); const result = await allocateNumberingCode(ruleId, userInputCode, formData);
if (result.success && result.data?.generatedCode) { if (result.success && result.data?.generatedCode) {
@ -713,7 +724,9 @@ export const UnifiedRepeater: React.FC<UnifiedRepeaterProps> = ({
console.error("채번 API 호출 실패:", error); console.error("채번 API 호출 실패:", error);
return ""; return "";
} }
}, []); },
[],
);
// 🆕 행 추가 (inline 모드 또는 모달 열기) - 비동기로 변경 // 🆕 행 추가 (inline 모드 또는 모달 열기) - 비동기로 변경
const handleAddRow = useCallback(async () => { const handleAddRow = useCallback(async () => {

View File

@ -88,9 +88,8 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
// 전역 리피터 등록 // 전역 리피터 등록
// 🆕 useCustomTable이 설정된 경우 mainTableName 사용 (실제 저장될 테이블) // 🆕 useCustomTable이 설정된 경우 mainTableName 사용 (실제 저장될 테이블)
useEffect(() => { useEffect(() => {
const targetTableName = config.useCustomTable && config.mainTableName const targetTableName =
? config.mainTableName config.useCustomTable && config.mainTableName ? config.mainTableName : config.dataSource?.tableName;
: config.dataSource?.tableName;
if (targetTableName) { if (targetTableName) {
if (!window.__v2RepeaterInstances) { if (!window.__v2RepeaterInstances) {
@ -110,9 +109,8 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
useEffect(() => { useEffect(() => {
const handleSaveEvent = async (event: CustomEvent) => { const handleSaveEvent = async (event: CustomEvent) => {
// 🆕 mainTableName이 설정된 경우 우선 사용, 없으면 dataSource.tableName 사용 // 🆕 mainTableName이 설정된 경우 우선 사용, 없으면 dataSource.tableName 사용
const tableName = config.useCustomTable && config.mainTableName const tableName =
? config.mainTableName config.useCustomTable && config.mainTableName ? config.mainTableName : config.dataSource?.tableName;
: config.dataSource?.tableName;
const eventParentId = event.detail?.parentId; const eventParentId = event.detail?.parentId;
const mainFormData = event.detail?.mainFormData; const mainFormData = event.detail?.mainFormData;
@ -196,7 +194,6 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
await apiClient.post(`/table-management/tables/${tableName}/add`, filteredData); await apiClient.post(`/table-management/tables/${tableName}/add`, filteredData);
} }
} catch (error) { } catch (error) {
console.error("❌ V2Repeater 저장 실패:", error); console.error("❌ V2Repeater 저장 실패:", error);
throw error; throw error;
@ -207,14 +204,13 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
const unsubscribe = v2EventBus.subscribe( const unsubscribe = v2EventBus.subscribe(
V2_EVENTS.REPEATER_SAVE, V2_EVENTS.REPEATER_SAVE,
async (payload) => { async (payload) => {
const tableName = config.useCustomTable && config.mainTableName const tableName =
? config.mainTableName config.useCustomTable && config.mainTableName ? config.mainTableName : config.dataSource?.tableName;
: config.dataSource?.tableName;
if (payload.tableName === tableName) { if (payload.tableName === tableName) {
await handleSaveEvent({ detail: payload } as CustomEvent); await handleSaveEvent({ detail: payload } as CustomEvent);
} }
}, },
{ componentId: `v2-repeater-${config.dataSource?.tableName}` } { componentId: `v2-repeater-${config.dataSource?.tableName}` },
); );
// 레거시 이벤트도 계속 지원 (점진적 마이그레이션) // 레거시 이벤트도 계속 지원 (점진적 마이그레이션)
@ -223,7 +219,14 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
unsubscribe(); unsubscribe();
window.removeEventListener("repeaterSave" as any, handleSaveEvent); window.removeEventListener("repeaterSave" as any, handleSaveEvent);
}; };
}, [data, config.dataSource?.tableName, config.useCustomTable, config.mainTableName, config.foreignKeyColumn, parentId]); }, [
data,
config.dataSource?.tableName,
config.useCustomTable,
config.mainTableName,
config.foreignKeyColumn,
parentId,
]);
// 현재 테이블 컬럼 정보 로드 // 현재 테이블 컬럼 정보 로드
useEffect(() => { useEffect(() => {
@ -455,13 +458,12 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
// 🆕 _targetTable 메타데이터 포함하여 전달 (백엔드에서 테이블 분리용) // 🆕 _targetTable 메타데이터 포함하여 전달 (백엔드에서 테이블 분리용)
if (onDataChange) { if (onDataChange) {
const targetTable = config.useCustomTable && config.mainTableName const targetTable =
? config.mainTableName config.useCustomTable && config.mainTableName ? config.mainTableName : config.dataSource?.tableName;
: config.dataSource?.tableName;
if (targetTable) { if (targetTable) {
// 각 행에 _targetTable 추가 // 각 행에 _targetTable 추가
const dataWithTarget = newData.map(row => ({ const dataWithTarget = newData.map((row) => ({
...row, ...row,
_targetTable: targetTable, _targetTable: targetTable,
})); }));
@ -486,12 +488,11 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
// 🆕 _targetTable 메타데이터 포함 // 🆕 _targetTable 메타데이터 포함
if (onDataChange) { if (onDataChange) {
const targetTable = config.useCustomTable && config.mainTableName const targetTable =
? config.mainTableName config.useCustomTable && config.mainTableName ? config.mainTableName : config.dataSource?.tableName;
: config.dataSource?.tableName;
if (targetTable) { if (targetTable) {
const dataWithTarget = newData.map(row => ({ const dataWithTarget = newData.map((row) => ({
...row, ...row,
_targetTable: targetTable, _targetTable: targetTable,
})); }));
@ -568,7 +569,8 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
// 🆕 채번 API 호출 (비동기) // 🆕 채번 API 호출 (비동기)
// 🆕 수동 입력 부분 지원을 위해 userInputCode 파라미터 추가 // 🆕 수동 입력 부분 지원을 위해 userInputCode 파라미터 추가
const generateNumberingCode = useCallback(async (ruleId: string, userInputCode?: string, formData?: Record<string, any>): Promise<string> => { const generateNumberingCode = useCallback(
async (ruleId: string, userInputCode?: string, formData?: Record<string, any>): Promise<string> => {
try { try {
const result = await allocateNumberingCode(ruleId, userInputCode, formData); const result = await allocateNumberingCode(ruleId, userInputCode, formData);
if (result.success && result.data?.generatedCode) { if (result.success && result.data?.generatedCode) {
@ -580,7 +582,9 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
console.error("채번 API 호출 실패:", error); console.error("채번 API 호출 실패:", error);
return ""; return "";
} }
}, []); },
[],
);
// 🆕 행 추가 (inline 모드 또는 모달 열기) - 비동기로 변경 // 🆕 행 추가 (inline 모드 또는 모달 열기) - 비동기로 변경
const handleAddRow = useCallback(async () => { const handleAddRow = useCallback(async () => {
@ -616,7 +620,7 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
// 채번이 필요한 컬럼 찾기 // 채번이 필요한 컬럼 찾기
const numberingColumns = config.columns.filter( const numberingColumns = config.columns.filter(
(col) => !col.isSourceDisplay && col.autoFill?.type === "numbering" && col.autoFill.numberingRuleId (col) => !col.isSourceDisplay && col.autoFill?.type === "numbering" && col.autoFill.numberingRuleId,
); );
const newRows = await Promise.all( const newRows = await Promise.all(
@ -649,14 +653,22 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
} }
return row; return row;
}) }),
); );
const newData = [...data, ...newRows]; const newData = [...data, ...newRows];
handleDataChange(newData); handleDataChange(newData);
setModalOpen(false); setModalOpen(false);
}, },
[config.dataSource?.foreignKey, resolvedReferenceKey, config.columns, data, handleDataChange, generateAutoFillValueSync, generateNumberingCode], [
config.dataSource?.foreignKey,
resolvedReferenceKey,
config.columns,
data,
handleDataChange,
generateAutoFillValueSync,
generateNumberingCode,
],
); );
// 소스 컬럼 목록 (모달용) - 🆕 columns 배열에서 isSourceDisplay인 것만 필터링 // 소스 컬럼 목록 (모달용) - 🆕 columns 배열에서 isSourceDisplay인 것만 필터링
@ -726,7 +738,7 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
} as CustomEvent; } as CustomEvent;
await handleBeforeFormSave(fakeEvent); await handleBeforeFormSave(fakeEvent);
}, },
{ componentId: `v2-repeater-${config.dataSource?.tableName}` } { componentId: `v2-repeater-${config.dataSource?.tableName}` },
); );
// 레거시 이벤트도 계속 지원 (점진적 마이그레이션) // 레거시 이벤트도 계속 지원 (점진적 마이그레이션)
@ -831,7 +843,7 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
} as CustomEvent; } as CustomEvent;
handleComponentDataTransfer(fakeEvent); handleComponentDataTransfer(fakeEvent);
}, },
{ componentId: `v2-repeater-${config.dataSource?.tableName}` } { componentId: `v2-repeater-${config.dataSource?.tableName}` },
); );
const unsubscribeSplitPanel = v2EventBus.subscribe( const unsubscribeSplitPanel = v2EventBus.subscribe(
@ -846,7 +858,7 @@ export const V2Repeater: React.FC<V2RepeaterProps> = ({
} as CustomEvent; } as CustomEvent;
handleSplitPanelDataTransfer(fakeEvent); handleSplitPanelDataTransfer(fakeEvent);
}, },
{ componentId: `v2-repeater-${config.dataSource?.tableName}` } { componentId: `v2-repeater-${config.dataSource?.tableName}` },
); );
// 레거시 이벤트도 계속 지원 (점진적 마이그레이션) // 레거시 이벤트도 계속 지원 (점진적 마이그레이션)
@ -928,11 +940,7 @@ V2Repeater.displayName = "V2Repeater";
// V2ErrorBoundary로 래핑된 안전한 버전 export // V2ErrorBoundary로 래핑된 안전한 버전 export
export const SafeV2Repeater: React.FC<V2RepeaterProps> = (props) => { export const SafeV2Repeater: React.FC<V2RepeaterProps> = (props) => {
return ( return (
<V2ErrorBoundary <V2ErrorBoundary componentId={props.parentId || "v2-repeater"} componentType="V2Repeater" fallbackStyle="compact">
componentId={props.parentId || "v2-repeater"}
componentType="V2Repeater"
fallbackStyle="compact"
>
<V2Repeater {...props} /> <V2Repeater {...props} />
</V2ErrorBoundary> </V2ErrorBoundary>
); );

View File

@ -26,13 +26,9 @@ export async function getNumberingRules(): Promise<ApiResponse<NumberingRuleConf
* @param menuObjid objid () * @param menuObjid objid ()
* @returns * @returns
*/ */
export async function getAvailableNumberingRules( export async function getAvailableNumberingRules(menuObjid?: number): Promise<ApiResponse<NumberingRuleConfig[]>> {
menuObjid?: number
): Promise<ApiResponse<NumberingRuleConfig[]>> {
try { try {
const url = menuObjid const url = menuObjid ? `/numbering-rules/available/${menuObjid}` : "/numbering-rules/available";
? `/numbering-rules/available/${menuObjid}`
: "/numbering-rules/available";
const response = await apiClient.get(url); const response = await apiClient.get(url);
return response.data; return response.data;
} catch (error: any) { } catch (error: any) {
@ -46,7 +42,7 @@ export async function getAvailableNumberingRules(
* @returns * @returns
*/ */
export async function getAvailableNumberingRulesForScreen( export async function getAvailableNumberingRulesForScreen(
tableName: string tableName: string,
): Promise<ApiResponse<NumberingRuleConfig[]>> { ): Promise<ApiResponse<NumberingRuleConfig[]>> {
try { try {
const response = await apiClient.get("/numbering-rules/available-for-screen", { const response = await apiClient.get("/numbering-rules/available-for-screen", {
@ -70,9 +66,7 @@ export async function getNumberingRuleById(ruleId: string): Promise<ApiResponse<
} }
} }
export async function createNumberingRule( export async function createNumberingRule(config: NumberingRuleConfig): Promise<ApiResponse<NumberingRuleConfig>> {
config: NumberingRuleConfig
): Promise<ApiResponse<NumberingRuleConfig>> {
try { try {
const response = await apiClient.post("/numbering-rules", config); const response = await apiClient.post("/numbering-rules", config);
return response.data; return response.data;
@ -83,7 +77,7 @@ export async function createNumberingRule(
export async function updateNumberingRule( export async function updateNumberingRule(
ruleId: string, ruleId: string,
config: Partial<NumberingRuleConfig> config: Partial<NumberingRuleConfig>,
): Promise<ApiResponse<NumberingRuleConfig>> { ): Promise<ApiResponse<NumberingRuleConfig>> {
try { try {
const response = await apiClient.put(`/numbering-rules/${ruleId}`, config); const response = await apiClient.put(`/numbering-rules/${ruleId}`, config);
@ -110,7 +104,7 @@ export async function deleteNumberingRule(ruleId: string): Promise<ApiResponse<v
*/ */
export async function previewNumberingCode( export async function previewNumberingCode(
ruleId: string, ruleId: string,
formData?: Record<string, unknown> formData?: Record<string, unknown>,
): Promise<ApiResponse<{ generatedCode: string }>> { ): Promise<ApiResponse<{ generatedCode: string }>> {
// ruleId 유효성 검사 // ruleId 유효성 검사
if (!ruleId || ruleId === "undefined" || ruleId === "null") { if (!ruleId || ruleId === "undefined" || ruleId === "null") {
@ -128,10 +122,7 @@ export async function previewNumberingCode(
} catch (error: unknown) { } catch (error: unknown) {
const err = error as { response?: { data?: { error?: string; message?: string } }; message?: string }; const err = error as { response?: { data?: { error?: string; message?: string } }; message?: string };
const errorMessage = const errorMessage =
err.response?.data?.error || err.response?.data?.error || err.response?.data?.message || err.message || "코드 미리보기 실패";
err.response?.data?.message ||
err.message ||
"코드 미리보기 실패";
return { success: false, error: errorMessage }; return { success: false, error: errorMessage };
} }
} }
@ -146,7 +137,7 @@ export async function previewNumberingCode(
export async function allocateNumberingCode( export async function allocateNumberingCode(
ruleId: string, ruleId: string,
userInputCode?: string, userInputCode?: string,
formData?: Record<string, any> formData?: Record<string, any>,
): Promise<ApiResponse<{ generatedCode: string }>> { ): Promise<ApiResponse<{ generatedCode: string }>> {
try { try {
const response = await apiClient.post(`/numbering-rules/${ruleId}/allocate`, { const response = await apiClient.post(`/numbering-rules/${ruleId}/allocate`, {
@ -162,9 +153,7 @@ export async function allocateNumberingCode(
/** /**
* @deprecated generateNumberingCode는 previewNumberingCode를 * @deprecated generateNumberingCode는 previewNumberingCode를
*/ */
export async function generateNumberingCode( export async function generateNumberingCode(ruleId: string): Promise<ApiResponse<{ generatedCode: string }>> {
ruleId: string
): Promise<ApiResponse<{ generatedCode: string }>> {
console.warn("generateNumberingCode는 deprecated. previewNumberingCode 사용 권장"); console.warn("generateNumberingCode는 deprecated. previewNumberingCode 사용 권장");
return previewNumberingCode(ruleId); return previewNumberingCode(ruleId);
} }
@ -188,13 +177,9 @@ export async function resetSequence(ruleId: string): Promise<ApiResponse<void>>
* numbering_rules * numbering_rules
* @param menuObjid OBJID () - * @param menuObjid OBJID () -
*/ */
export async function getNumberingRulesFromTest( export async function getNumberingRulesFromTest(menuObjid?: number): Promise<ApiResponse<NumberingRuleConfig[]>> {
menuObjid?: number
): Promise<ApiResponse<NumberingRuleConfig[]>> {
try { try {
const url = menuObjid const url = menuObjid ? `/numbering-rules/test/list/${menuObjid}` : "/numbering-rules/test/list";
? `/numbering-rules/test/list/${menuObjid}`
: "/numbering-rules/test/list";
const response = await apiClient.get(url); const response = await apiClient.get(url);
return response.data; return response.data;
} catch (error: any) { } catch (error: any) {
@ -211,7 +196,7 @@ export async function getNumberingRulesFromTest(
*/ */
export async function getNumberingRuleByColumn( export async function getNumberingRuleByColumn(
tableName: string, tableName: string,
columnName: string columnName: string,
): Promise<ApiResponse<NumberingRuleConfig>> { ): Promise<ApiResponse<NumberingRuleConfig>> {
try { try {
const response = await apiClient.get("/numbering-rules/test/by-column", { const response = await apiClient.get("/numbering-rules/test/by-column", {
@ -230,9 +215,7 @@ export async function getNumberingRuleByColumn(
* [] * []
* numbering_rules * numbering_rules
*/ */
export async function saveNumberingRuleToTest( export async function saveNumberingRuleToTest(config: NumberingRuleConfig): Promise<ApiResponse<NumberingRuleConfig>> {
config: NumberingRuleConfig
): Promise<ApiResponse<NumberingRuleConfig>> {
try { try {
const response = await apiClient.post("/numbering-rules/test/save", config); const response = await apiClient.post("/numbering-rules/test/save", config);
return response.data; return response.data;
@ -248,9 +231,7 @@ export async function saveNumberingRuleToTest(
* [] * []
* numbering_rules * numbering_rules
*/ */
export async function deleteNumberingRuleFromTest( export async function deleteNumberingRuleFromTest(ruleId: string): Promise<ApiResponse<void>> {
ruleId: string
): Promise<ApiResponse<void>> {
try { try {
const response = await apiClient.delete(`/numbering-rules/test/${ruleId}`); const response = await apiClient.delete(`/numbering-rules/test/${ruleId}`);
return response.data; return response.data;
@ -270,7 +251,7 @@ export async function getNumberingRuleByColumnWithCategory(
tableName: string, tableName: string,
columnName: string, columnName: string,
categoryColumn?: string, categoryColumn?: string,
categoryValueId?: number categoryValueId?: number,
): Promise<ApiResponse<NumberingRuleConfig>> { ): Promise<ApiResponse<NumberingRuleConfig>> {
try { try {
const response = await apiClient.get("/numbering-rules/test/by-column-with-category", { const response = await apiClient.get("/numbering-rules/test/by-column-with-category", {
@ -290,7 +271,7 @@ export async function getNumberingRuleByColumnWithCategory(
*/ */
export async function getRulesByTableColumn( export async function getRulesByTableColumn(
tableName: string, tableName: string,
columnName: string columnName: string,
): Promise<ApiResponse<NumberingRuleConfig[]>> { ): Promise<ApiResponse<NumberingRuleConfig[]>> {
try { try {
const response = await apiClient.get("/numbering-rules/test/rules-by-table-column", { const response = await apiClient.get("/numbering-rules/test/rules-by-table-column", {
@ -304,4 +285,3 @@ export async function getRulesByTableColumn(
}; };
} }
} }

View File

@ -115,14 +115,14 @@ const CascadingSelectField: React.FC<CascadingSelectFieldProps> = ({
type="button" type="button"
variant="ghost" variant="ghost"
size="sm" size="sm"
className="absolute right-0 top-0 h-full px-2 hover:bg-transparent" className="absolute top-0 right-0 h-full px-2 hover:bg-transparent"
onClick={() => !isDisabled && setOpen(!open)} onClick={() => !isDisabled && setOpen(!open)}
disabled={isDisabled} disabled={isDisabled}
> >
{loading ? ( {loading ? (
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" /> <Loader2 className="text-muted-foreground h-4 w-4 animate-spin" />
) : ( ) : (
<ChevronsUpDown className="h-4 w-4 text-muted-foreground" /> <ChevronsUpDown className="text-muted-foreground h-4 w-4" />
)} )}
</Button> </Button>
</div> </div>
@ -149,12 +149,7 @@ const CascadingSelectField: React.FC<CascadingSelectFieldProps> = ({
setOpen(false); setOpen(false);
}} }}
> >
<Check <Check className={cn("mr-2 h-4 w-4", value === option.value ? "opacity-100" : "opacity-0")} />
className={cn(
"mr-2 h-4 w-4",
value === option.value ? "opacity-100" : "opacity-0"
)}
/>
{option.label} {option.label}
</CommandItem> </CommandItem>
))} ))}
@ -948,13 +943,17 @@ export function UniversalFormModalComponent({
// 각 테이블 섹션별로 별도의 키에 원본 데이터 저장 (groupedDataInitializedRef와 무관하게 항상 저장) // 각 테이블 섹션별로 별도의 키에 원본 데이터 저장 (groupedDataInitializedRef와 무관하게 항상 저장)
const originalTableSectionKey = `_originalTableSectionData_${section.id}`; const originalTableSectionKey = `_originalTableSectionData_${section.id}`;
newFormData[originalTableSectionKey] = JSON.parse(JSON.stringify(items)); newFormData[originalTableSectionKey] = JSON.parse(JSON.stringify(items));
console.log(`[initializeForm] 테이블 섹션 ${section.id}: formData[${originalTableSectionKey}]에 원본 ${items.length}건 저장`); console.log(
`[initializeForm] 테이블 섹션 ${section.id}: formData[${originalTableSectionKey}]에 원본 ${items.length}건 저장`,
);
// 기존 originalGroupedData에도 추가 (하위 호환성) // 기존 originalGroupedData에도 추가 (하위 호환성)
if (!groupedDataInitializedRef.current) { if (!groupedDataInitializedRef.current) {
setOriginalGroupedData((prev) => { setOriginalGroupedData((prev) => {
const newOriginal = [...prev, ...JSON.parse(JSON.stringify(items))]; const newOriginal = [...prev, ...JSON.parse(JSON.stringify(items))];
console.log(`[initializeForm] 테이블 섹션 ${section.id}: originalGroupedData에 ${items.length}건 추가 (총 ${newOriginal.length}건)`); console.log(
`[initializeForm] 테이블 섹션 ${section.id}: originalGroupedData에 ${items.length}건 추가 (총 ${newOriginal.length}건)`,
);
return newOriginal; return newOriginal;
}); });
} }
@ -2433,14 +2432,14 @@ function SelectField({ fieldId, value, onChange, optionConfig, placeholder, disa
type="button" type="button"
variant="ghost" variant="ghost"
size="sm" size="sm"
className="absolute right-0 top-0 h-full px-2 hover:bg-transparent" className="absolute top-0 right-0 h-full px-2 hover:bg-transparent"
onClick={() => !disabled && !loading && setOpen(!open)} onClick={() => !disabled && !loading && setOpen(!open)}
disabled={disabled || loading} disabled={disabled || loading}
> >
{loading ? ( {loading ? (
<Loader2 className="h-4 w-4 animate-spin text-muted-foreground" /> <Loader2 className="text-muted-foreground h-4 w-4 animate-spin" />
) : ( ) : (
<ChevronsUpDown className="h-4 w-4 text-muted-foreground" /> <ChevronsUpDown className="text-muted-foreground h-4 w-4" />
)} )}
</Button> </Button>
</div> </div>
@ -2463,12 +2462,7 @@ function SelectField({ fieldId, value, onChange, optionConfig, placeholder, disa
setOpen(false); setOpen(false);
}} }}
> >
<Check <Check className={cn("mr-2 h-4 w-4", value === option.value ? "opacity-100" : "opacity-0")} />
className={cn(
"mr-2 h-4 w-4",
value === option.value ? "opacity-100" : "opacity-0"
)}
/>
{option.label} {option.label}
</CommandItem> </CommandItem>
))} ))}

View File

@ -47,7 +47,7 @@ export class V2InputRenderer extends AutoRegisteringComponentRenderer {
const style = component.style || {}; const style = component.style || {};
const labelDisplay = style.labelDisplay ?? (component as any).labelDisplay; const labelDisplay = style.labelDisplay ?? (component as any).labelDisplay;
// labelDisplay: true → 라벨 표시, false → 숨김, undefined → 기존 동작 유지(숨김) // labelDisplay: true → 라벨 표시, false → 숨김, undefined → 기존 동작 유지(숨김)
const effectiveLabel = labelDisplay === true ? (style.labelText || component.label) : undefined; const effectiveLabel = labelDisplay === true ? style.labelText || component.label : undefined;
return ( return (
<V2Input <V2Input

View File

@ -1626,7 +1626,9 @@ export class ButtonActionExecutor {
// saveResult.data.data.data = 실제 폼 데이터 { sabun, user_name... } // saveResult.data.data.data = 실제 폼 데이터 { sabun, user_name... }
const savedRecord = saveResult?.data?.data || saveResult?.data || {}; const savedRecord = saveResult?.data?.data || saveResult?.data || {};
const actualFormData = savedRecord?.data || savedRecord; const actualFormData = savedRecord?.data || savedRecord;
const formData: Record<string, any> = (Object.keys(actualFormData).length > 0 ? actualFormData : context.formData || {}) as Record<string, any>; const formData: Record<string, any> = (
Object.keys(actualFormData).length > 0 ? actualFormData : context.formData || {}
) as Record<string, any>;
console.log("📦 [executeAfterSaveControl] savedRecord 구조:", Object.keys(savedRecord)); console.log("📦 [executeAfterSaveControl] savedRecord 구조:", Object.keys(savedRecord));
console.log("📦 [executeAfterSaveControl] actualFormData 추출:", Object.keys(formData)); console.log("📦 [executeAfterSaveControl] actualFormData 추출:", Object.keys(formData));
console.log("📦 [executeAfterSaveControl] formData.sabun:", formData.sabun); console.log("📦 [executeAfterSaveControl] formData.sabun:", formData.sabun);
@ -2924,8 +2926,7 @@ export class ButtonActionExecutor {
if (v2ListComponent) { if (v2ListComponent) {
dataSourceId = dataSourceId =
v2ListComponent.componentConfig.dataSource?.table || v2ListComponent.componentConfig.dataSource?.table || v2ListComponent.componentConfig.tableName;
v2ListComponent.componentConfig.tableName;
console.log("✨ V2List 자동 감지:", { console.log("✨ V2List 자동 감지:", {
componentId: v2ListComponent.id, componentId: v2ListComponent.id,
tableName: dataSourceId, tableName: dataSourceId,