kjs
94bb68e9fc
Merge remote-tracking branch 'upstream/main'
Build and Push Images / build-and-push (push) Successful in 9m37s
2026-01-08 14:59:38 +09:00
kjs
9821afe9cd
Merge pull request 'feature/screen-management' ( #341 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/341
2026-01-08 14:49:45 +09:00
kjs
38599a1bef
Merge branch 'main' into feature/screen-management
2026-01-08 14:49:39 +09:00
kjs
11e25694b9
엔티티타입 입력 셀렉트박스 다중선택 기능
2026-01-08 14:49:24 +09:00
kjs
3f81c449ad
코드병합기능 개선
2026-01-08 14:24:07 +09:00
00006bf2e2
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node
2026-01-08 14:15:53 +09:00
3e9bf29bcf
fix: SplitPanelLayout 그룹 삭제 시 groupByColumns 기준 삭제 및 멀티테넌시 보호 추가(영업관리_거래처별 품목 등록 등에서,,)
2026-01-08 14:13:19 +09:00
SeongHyun Kim
34ac1b0c42
Merge remote-tracking branch 'origin/main' into ksh
2026-01-08 14:06:07 +09:00
kjs
dcf3a63d9b
Merge pull request 'feature/screen-management' ( #340 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/340
2026-01-08 12:33:15 +09:00
kjs
a3c83c834e
드래그핸들 기능 수정
2026-01-08 12:32:50 +09:00
kjs
980c929d83
리도,언도기능
2026-01-08 12:28:48 +09:00
kjs
a146667615
드래그 핸들 수정
2026-01-08 12:25:52 +09:00
SeongHyun Kim
2645d627da
fix: 수주관리 수정 모달 저장 오류 수정 - UPDATE 폴백 로직 추가, 데이터 병합 순서 수정, 삭제 파라미터 순서 수정, id 타입 비교 통일
2026-01-08 12:25:35 +09:00
kjs
f33d989202
복사된 셀 표시
2026-01-08 12:23:00 +09:00
kjs
6a1343b847
복사 붙여넣기 기능
2026-01-08 12:14:04 +09:00
kjs
b61cb17aea
자동 채우기 핸들
2026-01-08 12:04:31 +09:00
kjs
83eb92cb27
엑셀 업로드 단계 통합
2026-01-08 11:51:02 +09:00
kjs
5321ea5b80
엑셀 업로드 템플릿 기능 구현
2026-01-08 11:45:39 +09:00
kjs
d90a403ed9
엑셀 업로드 카테고리 타입 자동 감지
2026-01-08 11:09:40 +09:00
kjs
c181385f11
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2026-01-08 10:40:01 +09:00
kjs
23ebae95d6
검색필터 틀고정기능 오류 수정
2026-01-08 10:39:48 +09:00
SeongHyun Kim
17498b1b2b
refactor: UniversalFormModalComponent 자체 저장 기능 제거
...
saveSingleRow, saveWithCustomApi, handleSave, handleReset 함수 삭제
saving 상태 및 저장/초기화 버튼 UI 삭제
설정 패널에서 저장 버튼 관련 설정 UI 삭제
ModalConfig 타입에서 버튼 관련 속성 삭제
저장 처리는 button-primary (action: save)로 위임
약 468줄 코드 삭제
2026-01-08 10:04:05 +09:00
SeongHyun Kim
384106dd95
Merge remote-tracking branch 'origin/main' into ksh
2026-01-07 18:27:00 +09:00
SeongHyun Kim
6f4c9b7fdd
ix: 부모-자식 모달 데이터 전달 문제 해결 및 미사용 multiRowSave 기능 제거
...
InteractiveScreenViewerDynamic: 생성 모드에서 formData를 initialData로 전달하도록 수정
UniversalFormModal: saveMultipleRows 함수 및 multiRowSave 관련 코드 전체 제거
types/config: MultiRowSaveConfig 인터페이스 및 기본값 제거
FieldDetailSettingsModal: receiveFromParent UI 옵션 제거
SaveSettingsModal: 저장 모드 설명 개선
DB: multiRowSave.enabled=true인 화면 3개 설정 수정
2026-01-07 17:42:40 +09:00
kjs
12a891a8cb
Merge remote-tracking branch 'upstream/main'
Build and Push Images / build-and-push (push) Successful in 12m36s
2026-01-07 16:11:34 +09:00
kjs
26c61ee5b6
Merge pull request 'feature/screen-management' ( #339 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/339
2026-01-07 16:11:15 +09:00
kjs
d8ff49d1db
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2026-01-07 16:11:02 +09:00
kjs
8c525673ab
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2026-01-07 16:10:12 +09:00
kjs
47ac9ecd8a
범용폼모달 외부소스 지원
2026-01-07 16:10:11 +09:00
1b633e55d2
Merge pull request 'lhj' ( #338 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/338
2026-01-07 16:07:50 +09:00
leeheejin
62226918a7
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.
2026-01-07 14:32:23 +09:00
leeheejin
df70538027
pop화면
2026-01-07 14:31:04 +09:00
kjs
45d5e78bce
Merge remote-tracking branch 'upstream/main'
Build and Push Images / build-and-push (push) Successful in 12m17s
2026-01-07 13:31:31 +09:00
kjs
26020a29a0
Merge pull request 'feature/screen-management' ( #337 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/337
2026-01-07 13:31:14 +09:00
kjs
52df163fbb
Merge branch 'main' into feature/screen-management
2026-01-07 13:31:07 +09:00
kjs
777429af48
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2026-01-07 13:30:57 +09:00
kjs
856db80a36
빌드 에러수정
2026-01-07 13:30:57 +09:00
kjs
eaae692b87
Merge remote-tracking branch 'upstream/main'
Build and Push Images / build-and-push (push) Failing after 2m33s
2026-01-07 13:28:36 +09:00
kjs
cd7adce874
Merge pull request '테이블에 존재하는지 확인하는 제어 추가' ( #336 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/336
2026-01-07 11:55:53 +09:00
kjs
ca260aa260
Merge branch 'main' into feature/screen-management
2026-01-07 11:55:45 +09:00
SeongHyun Kim
42d1a3fc5e
Merge remote-tracking branch 'origin/main' into ksh
2026-01-07 10:28:47 +09:00
SeongHyun Kim
7c165a724e
feat: 출고관리 수정 모달 저장 기능 개선 및 그룹화 컬럼 설정 UI 추가
...
ButtonConfigPanel: 수정 액션에 그룹화 컬럼 선택 드롭다운 추가 (영문/한글 검색 지원)
ScreenSplitPanel/EmbeddedScreen: groupedData prop 전달 경로 추가
buttonActions: RepeaterFieldGroup 저장 시 공통 필드 우선 적용되도록 병합 순서 변경
2026-01-07 10:24:01 +09:00
0ce0860dcc
Merge pull request '입고 처리 시 재고 테이블 저장 및 재고이력 stock_id 전달 수정' ( #335 ) from feature/inbound-inventory-fix into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/335
2026-01-07 10:06:37 +09:00
c6ff839e54
입고 처리 시 재고 테이블 저장 및 재고이력 stock_id 전달 수정
2026-01-07 10:05:32 +09:00
kjs
e308fd0ccc
테이블에 존재하는지 확인하는 제어 추가
2026-01-07 09:55:19 +09:00
f2cb7d14ca
Merge pull request 'lhj' ( #334 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/334
2026-01-07 09:48:46 +09:00
leeheejin
b5b229122b
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.
2026-01-07 09:37:16 +09:00
leeheejin
126da9b46f
하이큐마그 점검항목 추가 후 주기명/점검방법명 오류 해결
2026-01-07 09:37:02 +09:00
SeongHyun Kim
c365f06ed7
Merge remote-tracking branch 'origin/main' into ksh
2026-01-07 09:06:29 +09:00
563081fa1c
Merge pull request 'lhj' ( #333 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/333
2026-01-06 17:57:31 +09:00
