Commit Graph

3493 Commits

Author SHA1 Message Date
leeheejin
8ab36f32a0 리사이즈 2025-10-23 11:25:28 +09:00
kjs
e934cc945b 테이블 컬럼 중복 삽입 안되게 수정 2025-10-23 10:07:55 +09:00
dohyeons
d29d4b596d 화면너비 감지 기능 추가 2025-10-23 10:06:00 +09:00
kjs
0c3ce4d3eb text타입 라벨 표시문제 수정 2025-10-23 09:56:38 +09:00
dohyeons
73e3bf4159 대시보드 화면 감지 기능 추가 2025-10-23 09:56:35 +09:00
dohyeons
298fd11169 대시보드 관리 오류 수정 2025-10-23 09:52:14 +09:00
dohyeons
9bd84f898a 그리드 시스템에 드래그 이동 구현 2025-10-23 09:36:30 +09:00
kjs
2dd96f5a74 화면관리ui수정 2025-10-22 17:19:47 +09:00
e1602613fe Merge pull request 'lhj' (#131) from lhj into main
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/131
2025-10-22 17:09:44 +09:00
leeheejin
5e1d2507da 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 17:07:52 +09:00
leeheejin
13f4d07577 메일관리 2025-10-22 17:07:38 +09:00
dohyeons
41c763c019 그리드 박스 기반 스냅 시스템 구현 2025-10-22 16:58:07 +09:00
dohyeons
7c3a2dff4c 스냅 기능 변경 2025-10-22 16:49:57 +09:00
dohyeons
0a28445abe 12그리드 컬럼 디자인 및 캔버스 변경 2025-10-22 16:45:15 +09:00
dohyeons
9dca73f4c4 12컬럼 그리드로 변경 2025-10-22 16:37:14 +09:00
leeheejin
479b0ba3ed ui 고치기 전 세이브 2025-10-22 16:06:04 +09:00
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
dohyeons
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
dohyeons
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
dohyeons
01ebb2550c 사이드바 방식으로 변경 2025-10-22 13:40:15 +09:00
dohyeons
85987af65e 사이드바 디자인 다듬기 2025-10-22 12:48:17 +09:00
leeheejin
79fef2691d 메일관리 대시보드에 있던 살짝의 오류 수정 2025-10-22 11:33:56 +09:00
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
leeheejin
fc0bc3e5c8 자동스크롤, 다중선택 하고 휠로 위아래 이동 가능 2025-10-22 11:23:38 +09:00
dohyeons
8a421cfced 플레이스홀더 변경 2025-10-22 11:08:36 +09:00
dohyeons
2433658e01 사이드바에 탭 방식 적용 2025-10-22 10:58:21 +09:00
dohyeons
bdf9bd0075 모달 -> 사이드바로 변경 2025-10-22 10:45:10 +09:00
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
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
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