Commit Graph

897 Commits

Author SHA1 Message Date
kjs 289e396406 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-13 18:38:24 +09:00
hyeonsu f88bedc0ab Merge pull request 'gridUtils 되돌리기' (#93) from feature/report into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/93
2025-10-13 18:37:42 +09:00
dohyeons a53940cff9 gridUtils 되돌리기 2025-10-13 18:37:18 +09:00
kjs 216e19e25d Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-13 18:28:05 +09:00
kjs e8123932ba 화면관리 12컬럼 중간 커밋 2025-10-13 18:28:03 +09:00
hyeonsu cabaada5b8 Merge pull request '대시보드 그리드 스냅 적용' (#92) from feature/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/92
2025-10-13 18:14:20 +09:00
dohyeons c9e5e2ee72 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/dashboard 2025-10-13 18:12:14 +09:00
dohyeons faf201dfc6 위젯을 아래로 배치하도록 설정 2025-10-13 18:10:58 +09:00
dohyeons 3672bbd997 캔버스 크기 조절 2025-10-13 18:09:20 +09:00
kjs 534d174234 Merge pull request 'feature/screen-management' (#91) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/91
2025-10-13 17:48:52 +09:00
kjs c99936cef0 Merge branch 'main' into feature/screen-management 2025-10-13 17:48:44 +09:00
kjs 0dc4d53876 제어관리 노드 작동 방식 수정 2025-10-13 17:47:24 +09:00
dohyeons 39e3aa14cb 우측 사이드바 너비 조정 2025-10-13 17:21:24 +09:00
dohyeons 3d48c0f7cb 12 그리드 스냅 시스템 적용 2025-10-13 17:16:44 +09:00
dohyeons f73229eeeb 캔버스 하단에도 그리드 보이도록 수정 2025-10-13 17:09:45 +09:00
dohyeons cf909cded6 대시보드에 12그리드 스냅 시스템 적용 2025-10-13 17:05:14 +09:00
dohyeons fbb42dd83c mail-templates도 수정 2025-10-13 16:18:54 +09:00
dohyeons b6eaaed85e mail-attachment 로직 수정 2025-10-13 16:11:51 +09:00
dohyeons 7a10b2652c mail 백엔드 로직 수정 2025-10-13 16:04:13 +09:00
dohyeons 2dea3cfaa0 실서버 도커 파일 수정 2025-10-13 15:48:17 +09:00
leeheejin 51dea84bc5 Merge branch 'lhj' 2025-10-13 15:19:59 +09:00
hyeonsu df64841c1e Merge pull request '리포트 관리 중간 병합' (#90) from feature/report into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/90
2025-10-13 15:19:01 +09:00
leeheejin 95c98cbda3 메일관리 기능 구현 완료 2025-10-13 15:17:34 +09:00
dohyeons 25cf0b77a1 프론트엔드에서 백엔드가 기대하는 형식으로 변환해서 보내도록 수정 2025-10-13 15:15:59 +09:00
dohyeons b6f93e686d Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/report 2025-10-13 15:08:54 +09:00
dohyeons d1b2e6c010 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/report 2025-10-13 15:08:43 +09:00
dohyeons 32024a6d70 레포트관리에 그리드 시스템 1차 적용(2차적인 개선 필요) 2025-10-13 15:08:31 +09:00
kjs 9d5ac1716d 메뉴추가 기본값 제거 2025-10-13 15:06:48 +09:00
kjs 6e41fdf039 메뉴관리 추가 안되는 버그 수정 2025-10-13 15:01:37 +09:00
kjs 8046c2a2e0 되돌리기 기능 추가 2025-10-13 13:28:20 +09:00
kjs 2849f7e116 Merge pull request '배치목록 카드형으로 변경' (#89) from feature/batch-testing-updates into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/89
2025-10-13 13:15:26 +09:00
kjs ec35ca303f Merge branch 'main' into feature/batch-testing-updates 2025-10-13 13:15:13 +09:00
kjs 3ec2fe7ca6 Merge pull request 'feature/screen-management' (#88) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/88
2025-10-13 12:10:33 +09:00
kjs 2d8f5a184d 배치관리 쿼리수정 2025-10-13 12:09:33 +09:00
kjs 0a134d85c2 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-13 12:01:11 +09:00
kjs 1315cfedc4 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-13 12:00:42 +09:00
kjs 1274f58c3c rest api 액션노드 기능변경 2025-10-13 12:00:41 +09:00
dohyeons 71eb308bba 폰트 크기 조절 2025-10-13 10:41:39 +09:00
dohyeons f456ab89e8 서명 만들기 기능 구현 2025-10-13 10:32:46 +09:00
dohyeons 7828b5e073 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/report 2025-10-13 09:44:09 +09:00
kjs 43476ae376 Merge pull request 'Fix: DataConnectionDesigner.tsx 문법 오류 수정 - 손상된 파일 복구' (#87) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/87
2025-10-08 10:57:15 +09:00
kjs f2e66766c9 Merge branch 'main' into feature/screen-management 2025-10-08 10:57:06 +09:00
kjs 68308efd22 Fix: DataConnectionDesigner.tsx 문법 오류 수정 - 손상된 파일 복구 2025-10-08 10:55:29 +09:00
dohyeons 559c3fc98f fix: DataConnectionDesigner 손상된 파일로 원상복구 2025-10-08 10:42:23 +09:00
dohyeons 25c54fae68 fix: DataConnectionDesigner 손상된 파일 복구 2025-10-08 10:39:17 +09:00
dohyeons f7b9a5db1c 타입 단언 사용 2025-10-08 10:34:16 +09:00
dohyeons 8efdb93a1c md파일 생성 2025-10-08 10:32:24 +09:00
kjs 1eff6730b4 Merge pull request 'feature/screen-management' (#86) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/86
2025-10-08 09:46:19 +09:00
kjs 1760703150 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-08 09:45:59 +09:00
kjs e48cc4decc 노드 수정 2025-10-08 09:39:13 +09:00