Commit Graph

481 Commits

Author SHA1 Message Date
dohyeons ede881f8ff 리포트관리 설계 2025-10-01 11:10:54 +09:00
hyeonsu f39d86a269 Merge pull request '공통코드관리 수정 시 에러 해결' (#80) from fix/commcode into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/80
2025-09-30 16:48:32 +09:00
dohyeons 51d9c45d9e 공통코드관리 수정 시 에러 해결 2025-09-30 16:48:07 +09:00
hyeonsu 38f0f865df Merge pull request '프로필 이미지 삭제 직후 렌더링이 안되는 문제 해결' (#79) from fix/profileImage into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/79
2025-09-30 15:46:04 +09:00
dohyeons 6da8d14845 프로필 이미지 삭제 직후 렌더링이 안되는 문제 해결 2025-09-30 15:45:21 +09:00
hyeonsu 318436475a Merge pull request '코드 활성/비활성화 해결' (#78) from fix/commcode into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/78
2025-09-30 14:29:02 +09:00
dohyeons 142f6a1a90 코드 활성/비활성화 해결 2025-09-30 14:28:40 +09:00
leeheejin 0b787b4c4c Fix modal label display issues and DOM node removal errors
- Hide rounded background labels in modal (계약구분, 국내/해외, 기본 버튼)
- Add try-catch blocks for DOM operations to prevent removeChild errors
- Fix event listener registration/removal in RealtimePreview, FileUpload, FileComponentConfigPanel
- Improve error handling for CustomEvent dispatching
2025-09-29 19:33:38 +09:00
hyeonsu d0d37d9e29 Merge pull request '에러 해결' (#77) from fix/error into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/77
2025-09-29 18:44:48 +09:00
dohyeons 6e3d5b40d2 에러 해결 2025-09-29 18:44:16 +09:00
hjlee 66395c9cc5 Merge pull request 'image' (#76) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/76
2025-09-29 18:14:31 +09:00
leeheejin da429e7f24 image 2025-09-29 18:14:03 +09:00
kjs 78d49ee936 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node 2025-09-29 18:04:57 +09:00
kjs 126b3e1175 에러수정 2025-09-29 18:04:56 +09:00
hyeonsu 55f4c7fa26 Merge pull request 'fix/429error' (#75) from fix/429error into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/75
2025-09-29 17:47:16 +09:00
dohyeons e74deb7c34 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into fix/429error 2025-09-29 17:30:44 +09:00
dohyeons 6e8f529cd3 추가 감소 2025-09-29 17:29:58 +09:00
hjlee 467c5598ab Merge pull request 'dev' (#74) from dev into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/74
2025-09-29 17:24:24 +09:00
dohyeons 808a317ed0 38개로 감소 2025-09-29 17:24:06 +09:00
hjlee 5a5af8d258 Merge pull request 'lhj' (#73) from lhj into dev
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/73
2025-09-29 17:22:49 +09:00
leeheejin a5bf6601a0 ui, 파일업로드 관련 손보기 2025-09-29 17:21:47 +09:00
hjjeong 153fb18288 Merge pull request 'feature/batch-testing-updates' (#72) from feature/batch-testing-updates into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/72
2025-09-29 17:09:13 +09:00
hjjeong c2a4a4a61e Merge remote-tracking branch 'origin/main' into feature/batch-testing-updates 2025-09-29 17:04:52 +09:00
dohyeons 6ce5fc84a8 Revert React Query changes 2025-09-29 16:55:39 +09:00
hjjeong 1be8771e01 rest api get 파라미터 설정 개발중 2025-09-29 16:55:37 +09:00
kjs dbb049cb28 Merge pull request '버튼에 제어 달기' (#71) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/71
2025-09-29 15:21:48 +09:00
kjs 62cb06c7d9 Merge branch 'main' into feature/screen-management 2025-09-29 15:21:42 +09:00
kjs 3c26f24179 버튼에 제어 달기 2025-09-29 15:21:14 +09:00
hjjeong 9dfd0cb40f Merge branch 'main' into feature/batch-testing-updates 2025-09-29 14:17:22 +09:00
hjjeong 9680991962 feat: 배치 관리 시스템 테스트 및 업데이트 기능 개선
- 배치 스케줄러 서비스 안정성 향상
- 외부 DB 연결 서비스 개선
- 배치 컨트롤러 및 관리 컨트롤러 업데이트
- 프론트엔드 배치 관리 페이지 개선
- Prisma 스키마 업데이트
2025-09-29 13:48:59 +09:00
kjs 43d8676f09 Merge pull request 'feature/screen-management' (#66) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/66
2025-09-29 13:39:55 +09:00
kjs e057c4d960 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-09-29 13:37:35 +09:00
leeheejin bff7416cd1 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 2025-09-29 13:33:24 +09:00
kjs 0fca8cd90b get요청 db 저장기능 2025-09-29 13:32:59 +09:00
leeheejin e0143e9cba 문서뷰어기능구현 2025-09-29 13:29:03 +09:00
kjs c9afdec09f restapi 버튼 동작 2025-09-29 12:17:10 +09:00
kjs cedb5e3ec3 에러 수정 2025-09-29 10:23:21 +09:00
hjjeong 2448f26bc3 Merge branch 'feature/rest-api-integration' of http://39.117.244.52:3000/kjs/ERP-node 2025-09-26 20:04:07 +09:00
hjjeong cdd345a777 에러수정2 2025-09-26 18:51:27 +09:00
hjjeong 52d1e0acad 주의 2025-09-26 17:55:38 +09:00
kjs e0777d0fc3 데이터 매핑 설정 중간커밋 2025-09-26 17:52:11 +09:00
hjjeong 3333429928 배치관리시스템 (DB, RestAPI) 2025-09-26 17:29:20 +09:00
kjs bf7fc6cfb8 에러수정 2025-09-26 17:24:59 +09:00
kjs 9de0b4158c Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node 2025-09-26 17:17:53 +09:00
kjs f59fcb56b0 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node 2025-09-26 17:17:03 +09:00
hjlee 58248db457 Merge pull request 'dev' (#68) from dev into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/68
2025-09-26 17:13:16 +09:00
hjlee 5876f80265 Merge pull request 'lhj' (#67) from lhj into dev
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/67
2025-09-26 17:12:59 +09:00
leeheejin 3600621554 화면관리 쪽 파일첨부 수정 2025-09-26 17:12:03 +09:00
kjs 11b71b788a 외부호출 기능(rest API) 2025-09-26 17:11:18 +09:00
kjs 9454e3a81f 제어관리 데이터 저장기능 2025-09-26 13:52:32 +09:00