From 1abc6645fbb280f5961c255438f5d8c444ac4b1e Mon Sep 17 00:00:00 2001 From: SeongHyun Kim Date: Tue, 7 Apr 2026 17:01:11 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=B1=84=EB=B2=88=EA=B7=9C=EC=B9=99=20?= =?UTF-8?q?=EC=85=80=EB=A0=89=ED=8A=B8=20=E2=80=94=20camelCase=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EA=B5=AC=EC=A1=B0=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/screenMng/popSettingsMng/page.tsx | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/frontend/app/(main)/admin/screenMng/popSettingsMng/page.tsx b/frontend/app/(main)/admin/screenMng/popSettingsMng/page.tsx index 1b5ee89d..aa42b1a1 100644 --- a/frontend/app/(main)/admin/screenMng/popSettingsMng/page.tsx +++ b/frontend/app/(main)/admin/screenMng/popSettingsMng/page.tsx @@ -281,24 +281,23 @@ function NumberingRuleSelect({ const companyCode = user?.companyCode || "COMPANY_7"; const res = await apiClient.get(`/numbering-rules?company_code=${companyCode}`); const data = res.data?.data || res.data || []; - const allRules = Array.isArray(data) ? data : (data.rules || []); + const allRules: any[] = Array.isArray(data) ? data : (data.rules || []); // tableFilter로 필터링 (inbound/outbound 등) const filtered = field.tableFilter - ? allRules.filter((r: any) => - (r.table_name || "").toLowerCase().includes(field.tableFilter!) || - (r.rule_name || r.column_name || "").toLowerCase().includes(field.tableFilter!) - ) + ? allRules.filter((r: any) => { + const t = (r.tableName || "").toLowerCase(); + const c = (r.columnName || "").toLowerCase(); + const n = (r.ruleName || "").toLowerCase(); + const f = field.tableFilter!.toLowerCase(); + return t.includes(f) || c.includes(f) || n.includes(f); + }) : allRules; + const finalRules = filtered.length > 0 ? filtered : allRules; setRules( - filtered.length > 0 - ? filtered.map((r: any) => ({ - value: r.id || r.rule_id, - label: `${r.rule_name || r.table_name + "." + r.column_name} (${r.prefix || ""}${r.separator || ""}...)`, - })) - : allRules.map((r: any) => ({ - value: r.id || r.rule_id, - label: `${r.rule_name || r.table_name + "." + r.column_name}`, - })) + finalRules.map((r: any) => ({ + value: r.ruleId, + label: `${r.ruleName || r.tableName + "." + r.columnName}`, + })) ); } catch { setRules([]);