58adc0a100
Merge pull request 'lhj' (#370) from lhj into main
hjlee2026-01-16 18:15:42 +09:00
0382c94d73
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj ; Please enter a commit message to explain why this merge is necessary, ; especially if it merges an updated upstream into a topic branch. ; ; Lines starting with ';' will be ignored, and an empty message aborts ; the commit.
leeheejin
2026-01-16 18:15:21 +09:00
df8065503d
feat: 메뉴 삭제 및 동기화 기능 개선
DDD1542
2026-01-16 17:41:19 +09:00
0a85146564
Merge pull request 'lhj' (#369) from lhj into main
hjlee2026-01-16 17:40:11 +09:00
ad3b853d04
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj ; Please enter a commit message to explain why this merge is necessary, ; especially if it merges an updated upstream into a topic branch. ; ; Lines starting with ';' will be ignored, and an empty message aborts ; the commit.
leeheejin
2026-01-16 17:39:55 +09:00
2a3cc7ba00
배포다시 되게 고쳐놓음
leeheejin
2026-01-16 17:39:35 +09:00
ee273c5103
Merge pull request 'lhj' (#368) from lhj into main
hjlee2026-01-16 16:51:03 +09:00
50a25cb9de
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj ; Please enter a commit message to explain why this merge is necessary, ; especially if it merges an updated upstream into a topic branch. ; ; Lines starting with ';' will be ignored, and an empty message aborts ; the commit.
leeheejin
2026-01-16 16:50:34 +09:00
d1631d15ff
안닫히게 수정 2
leeheejin
2026-01-16 16:49:59 +09:00
a020985630
Merge pull request 'lhj' (#367) from lhj into main
hjlee2026-01-16 16:25:12 +09:00
351ecbb35d
배포에서 오류 안나게 수정
leeheejin
2026-01-16 16:24:43 +09:00
d32e933c03
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj ; Please enter a commit message to explain why this merge is necessary, ; especially if it merges an updated upstream into a topic branch. ; ; Lines starting with ';' will be ignored, and an empty message aborts ; the commit.
leeheejin
2026-01-16 16:12:09 +09:00
160ad87395
Merge pull request 'lhj' (#364) from lhj into main
hjlee2026-01-16 15:18:32 +09:00
4972f26cee
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj ; Please enter a commit message to explain why this merge is necessary, ; especially if it merges an updated upstream into a topic branch. ; ; Lines starting with ';' will be ignored, and an empty message aborts ; the commit.
leeheejin
2026-01-16 15:18:09 +09:00
ac0f461832
Merge pull request 'lhj' (#362) from lhj into main
hjlee2026-01-16 10:19:35 +09:00
c2256de8ec
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj ; Please enter a commit message to explain why this merge is necessary, ; especially if it merges an updated upstream into a topic branch. ; ; Lines starting with ';' will be ignored, and an empty message aborts ; the commit.
leeheejin
2026-01-16 10:19:05 +09:00
efa95af4b9
refactor: 코드 정리 및 불필요한 주석 제거
DDD1542
2026-01-15 17:36:38 +09:00
e8bdcbb95c
fix: 발주/입고관리 그룹 편집 시 단건만 저장되던 문제 수정 EditModal.tsx: conditional-container 존재 시 onSave 미전달 로직 수정 ModalRepeaterTableComponent.tsx: groupedData prop 우선 사용하도록 변경
SeongHyun Kim
2026-01-15 14:36:00 +09:00
a36802ab10
fix: RepeaterFieldGroup 저장 경로에 채번 규칙 할당 로직 추가
SeongHyun Kim
2026-01-15 16:54:02 +09:00
98c489ee22
Merge pull request '코드로 보이던 문제 최소한의 코드만 고침' (#360) from lhj into main
hjlee2026-01-15 16:53:40 +09:00
c77c6290d3
코드로 보이던 문제 최소한의 코드만 고침
leeheejin
2026-01-15 16:53:27 +09:00
9dc549be09
Merge pull request 'feat: 화면 관리 기능 개선 (복제/삭제/그룹 관리)' (#359) from feature/v2-renewal into main
gbpark
2026-01-15 14:59:21 +09:00
40a226ca30
Merge branch 'main' into feature/v2-renewal
gbpark
2026-01-15 14:59:12 +09:00
5d89b69451
feat: 화면 관리 기능 개선 (복제/삭제/그룹 관리)
DDD1542
2026-01-15 14:58:12 +09:00
7fd3364aef
Merge branch 'ksh'
SeongHyun Kim
2026-01-15 13:27:01 +09:00
2326c3548b
Merge pull request 'lhj' (#358) from lhj into main
hjlee2026-01-15 12:08:46 +09:00
220ce57be1
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj ; Please enter a commit message to explain why this merge is necessary, ; especially if it merges an updated upstream into a topic branch. ; ; Lines starting with ';' will be ignored, and an empty message aborts ; the commit.
leeheejin
2026-01-15 12:07:51 +09:00
0ac83b1551
분할패널에서 수정해도 리스트에서 삭제가 안되던 문제 코드 해결
leeheejin
2026-01-15 12:07:26 +09:00
2e02ace388
feat(repeater): 하위 데이터 조회 및 조건부 입력 기능 구현, 테이블 선택 데이터 동기화 개선 Repeater 컴포넌트에 하위 데이터 조회 기능 추가 (재고/단가 조회) 조건부 입력 활성화 및 최대값 제한 기능 구현 필드 정의 순서 변경 기능 추가 (드래그앤드롭, 화살표 버튼) TableListComponent의 DataProvider 클로저 문제 해결 ButtonPrimaryComponent에 modalDataStore fallback 로직 추가
SeongHyun Kim
2026-01-15 10:35:34 +09:00
435eb90763
Merge pull request 'feat/multilang' (#357) from feat/multilang into main
kjs
2026-01-14 18:28:20 +09:00
cf97db7fbf
feat(universal-form-modal): Select 필드 직접 입력(Combobox) 모드 추가 SelectOptionConfig에 allowCustomInput 옵션 추가 FieldDetailSettingsModal에 "직접 입력 허용" Switch UI 추가 CascadingSelectField에 Combobox 모드 구현 (Popover+Command) SelectField에 Combobox 모드 구현 목록 선택과 직접 입력 동시 지원
SeongHyun Kim
2026-01-13 18:44:59 +09:00
b576837f18
다국어 관리 시스템 개선: 카테고리 및 키 자동 생성 기능 추가
kjs
2026-01-13 18:28:11 +09:00
ef27e0e38f
feat(universal-form-modal): 연쇄 드롭다운(Cascading Dropdown) 기능 구현
SeongHyun Kim
2026-01-13 18:26:41 +09:00
d7d7dabe84
fix: Select 옵션의 참조 테이블 컬럼 자동 로드 추가
SeongHyun Kim
2026-01-13 17:05:16 +09:00
d22fd078be
Merge pull request 'lhj' (#356) from lhj into main
hjlee2026-01-13 15:43:38 +09:00
28fe908704
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj ; Please enter a commit message to explain why this merge is necessary, ; especially if it merges an updated upstream into a topic branch. ; ; Lines starting with ';' will be ignored, and an empty message aborts ; the commit.
leeheejin
2026-01-13 15:43:24 +09:00
1b5ae5fe1c
일단 오류 수정
leeheejin
2026-01-13 15:43:04 +09:00
905a9f62c3
feat: 프리뷰 모드에서 회사 코드 오버라이드 기능 추가
DDD1542
2026-01-13 13:28:50 +09:00
kjs
hjlee