Commit Graph

963 Commits

Author SHA1 Message Date
dohyeons bdf9bd0075 모달 -> 사이드바로 변경 2025-10-22 10:45:10 +09:00
hjlee 1470bb2e73 Merge pull request 'lhj' (#127) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/127
2025-10-22 10:14:31 +09:00
leeheejin 01f92d6132 그리드 수정 2025-10-22 10:13:59 +09:00
leeheejin e290076708 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.
2025-10-22 10:10:37 +09:00
leeheejin 63553e23b1 드래그해서 위젯 선택 가능 2025-10-22 10:10:21 +09:00
hyeonsu d63e092245 Merge pull request '키보드 구현' (#126) from feat/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/126
2025-10-22 10:08:39 +09:00
dohyeons 0823874ebc 가이드 삭제 2025-10-22 10:07:02 +09:00
dohyeons 774332558b Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard 2025-10-22 09:47:55 +09:00
dohyeons b62f2ffc10 api관리 구현(대시보드쪽) 2025-10-22 09:45:47 +09:00
hjlee 40d8bcfe0f Merge pull request '화면 확대시 스페이스바 누르고 이동 가능하게' (#125) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/125
2025-10-21 17:48:44 +09:00
leeheejin 1d0c4fe503 화면 확대시 스페이스바 누르고 이동 가능하게 2025-10-21 17:48:24 +09:00
dohyeons 7ec60bed6c Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard 2025-10-21 17:42:40 +09:00
dohyeons 76ad3d9c43 키보드를 사용한 복제 및 삭제 구현 2025-10-21 17:42:31 +09:00
hjlee 3033b02634 Merge pull request 'lhj' (#124) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/124
2025-10-21 17:35:20 +09:00
leeheejin 9cb705dba8 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.
2025-10-21 17:33:07 +09:00
leeheejin 10d112bd69 버튼 문제 해결 2025-10-21 17:32:54 +09:00
hyeonsu 3fd325972f Merge pull request '대시보드 관련 기타 수정사항' (#123) from feat/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/123
2025-10-21 17:28:59 +09:00
dohyeons 8c18555305 불필요한 이모지 삭제 2025-10-21 17:18:28 +09:00
dohyeons 2305b8dfae 요소 헤더 배경을 투명하게 변경 2025-10-21 17:16:03 +09:00
dohyeons d3c9a42525 대시보드 위젯 수정사항 반영 2025-10-21 17:14:04 +09:00
dohyeons 8a2aa49910 메인 레이아웃에 헤더만큼 패딩 추가 2025-10-21 16:57:19 +09:00
dohyeons 71111ce072 헤더 및 야드 이름 z-index 수정 2025-10-21 16:45:04 +09:00
dohyeons 55601481d7 대시보드관리 최소높이 재설정 2025-10-21 16:35:45 +09:00
dohyeons ec853fb45d 대시보드 관리 페이지에 페이지네이션 적용 2025-10-21 16:33:34 +09:00
dohyeons eac43cfb31 more 버튼 수정 2025-10-21 16:28:03 +09:00
dohyeons 5ca0a6b6dc 대시보드관리 페이지 레이아웃 통일 2025-10-21 16:23:34 +09:00
dohyeons d57756189f 대시보드 테이블에 회사 코드 컬럼 추가 2025-10-21 15:53:17 +09:00
hyeonsu eadff1a051 Merge pull request '테이블 이력 변경 로그 시스템' (#122) from feat/tableTypeMngHistFeat into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/122
2025-10-21 15:34:19 +09:00
dohyeons 656f1c2ebd 테이블 변경 이력 로그에 ip_address와 변경자 컬럼 기록 추가 2025-10-21 15:25:05 +09:00
leeheejin fa30763ae2 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 2025-10-21 15:15:38 +09:00
dohyeons 7fe246bd93 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/tableTypeMngHistFeat 2025-10-21 15:13:06 +09:00
kjs c6465d3138 Merge pull request 'feature/screen-management' (#121) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/121
2025-10-21 15:11:39 +09:00
kjs 5d260c7716 Merge branch 'main' into feature/screen-management 2025-10-21 15:11:33 +09:00
kjs ec4d8f9b94 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-21 15:11:16 +09:00
kjs 3c0cd6f6dc 버튼 액션 수정 2025-10-21 15:11:15 +09:00
dohyeons 74d287daa9 테이블 변경 이력 로그 시스템 구현 2025-10-21 15:08:41 +09:00
kjs 874cf485a8 Merge pull request 'feature/screen-management' (#120) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/120
2025-10-21 14:42:26 +09:00
kjs a292188ffc Merge branch 'main' into feature/screen-management 2025-10-21 14:42:19 +09:00
kjs e9bd677780 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-21 14:41:58 +09:00
kjs cc84e604b1 인풋 오류 수정 2025-10-21 14:41:56 +09:00
kjs 16333eac06 Merge pull request 'feature/screen-management' (#119) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/119
2025-10-21 14:21:51 +09:00
kjs d43a8c9e18 Merge branch 'main' into feature/screen-management 2025-10-21 14:21:45 +09:00
kjs 74ebb565e6 플로우 로그기능 수정 2025-10-21 14:21:29 +09:00
kjs 93675100da 스타일 가이드 2025-10-21 14:18:02 +09:00
hyeonsu b479eb789a Merge pull request '화면관리 외부 db 선택 기능 추가' (#118) from feat/screenMngConnection into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/118
2025-10-21 13:44:09 +09:00
dohyeons 0108a12b18 화면관리 외부 db 선택 기능 추가 2025-10-21 13:42:57 +09:00
kjs 641a171270 Merge pull request 'feature/screen-management' (#117) from feature/screen-management into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/117
2025-10-21 13:19:35 +09:00
kjs 0d96ea566b 플로우 외부연결 중간커밋 2025-10-21 13:19:18 +09:00
kjs 967f9a9f5b Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-21 13:18:39 +09:00
hyeonsu 45d00e10e7 Merge pull request '대시보드 뷰어에 반응형 적용' (#116) from feat/dashboard into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/116
2025-10-21 13:11:34 +09:00