hyeonsu
f5dddc99eb
Merge pull request '사이드바 방식으로 변경' ( #130 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/130
2025-10-22 15:33:51 +09:00
f1d74cfd0e
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-22 15:33:07 +09:00
994d9b70cd
사이드바 방식 변경하면서 생긴 오류 해결
2025-10-22 15:29:57 +09:00
kjs
458e1018b0
Merge pull request 'feature/screen-management' ( #129 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/129
2025-10-22 14:57:17 +09:00
kjs
96df465a7d
에러 수정
2025-10-22 14:56:58 +09:00
kjs
eb1cac4a77
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-22 14:54:50 +09:00
kjs
0198426c46
전체적인 스타일 수정
2025-10-22 14:52:13 +09:00
01ebb2550c
사이드바 방식으로 변경
2025-10-22 13:40:15 +09:00
85987af65e
사이드바 디자인 다듬기
2025-10-22 12:48:17 +09:00
hjlee
45de532b84
Merge pull request '자동스크롤, 다중선택 하고 휠로 위아래 이동 가능' ( #128 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/128
2025-10-22 11:24:01 +09:00
fc0bc3e5c8
자동스크롤, 다중선택 하고 휠로 위아래 이동 가능
2025-10-22 11:23:38 +09:00
8a421cfced
플레이스홀더 변경
2025-10-22 11:08:36 +09:00
2433658e01
사이드바에 탭 방식 적용
2025-10-22 10:58:21 +09:00
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
01f92d6132
그리드 수정
2025-10-22 10:13:59 +09:00
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
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
0823874ebc
가이드 삭제
2025-10-22 10:07:02 +09:00
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
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
1d0c4fe503
화면 확대시 스페이스바 누르고 이동 가능하게
2025-10-21 17:48:24 +09:00
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
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
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
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
8c18555305
불필요한 이모지 삭제
2025-10-21 17:18:28 +09:00
2305b8dfae
요소 헤더 배경을 투명하게 변경
2025-10-21 17:16:03 +09:00
d3c9a42525
대시보드 위젯 수정사항 반영
2025-10-21 17:14:04 +09:00
8a2aa49910
메인 레이아웃에 헤더만큼 패딩 추가
2025-10-21 16:57:19 +09:00
71111ce072
헤더 및 야드 이름 z-index 수정
2025-10-21 16:45:04 +09:00
55601481d7
대시보드관리 최소높이 재설정
2025-10-21 16:35:45 +09:00
ec853fb45d
대시보드 관리 페이지에 페이지네이션 적용
2025-10-21 16:33:34 +09:00
eac43cfb31
more 버튼 수정
2025-10-21 16:28:03 +09:00
5ca0a6b6dc
대시보드관리 페이지 레이아웃 통일
2025-10-21 16:23:34 +09:00
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
656f1c2ebd
테이블 변경 이력 로그에 ip_address와 변경자 컬럼 기록 추가
2025-10-21 15:25:05 +09:00
fa30763ae2
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj
2025-10-21 15:15:38 +09:00
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
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
hyeonsu
dohyeons
kjs
hjlee
leeheejin