ec1669d9ca
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-23 13:17:35 +09:00
331261bc80
날씨
2025-10-23 13:17:21 +09:00
hyeonsu
16d0c1eda8
Merge pull request '대시보드 수정사항 적용' ( #134 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/134
2025-10-23 13:13:03 +09:00
c439596cbf
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-23 13:12:53 +09:00
ce7f02409c
컬럼 설정 요소 드래거블 속성 범위 변경
2025-10-23 12:59:45 +09:00
a4473eee33
적용 버튼 눌렀을 때 초기 위치, 초기 크기로 되돌아가는 에러 해결
2025-10-23 12:54:46 +09:00
1b6d63bf74
리스트 행 줄무늬 재구현
2025-10-23 12:50:38 +09:00
753c170839
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-23 12:31:27 +09:00
8ec54b4e7d
날씨 진행 중 세이브
2025-10-23 12:31:14 +09:00
hyeonsu
745e540d40
Merge pull request '대시보드 캔버스 변경' ( #133 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/133
2025-10-23 12:30:48 +09:00
cb5ed105ab
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-23 12:23:09 +09:00
kjs
d60473f96f
Merge pull request 'feature/screen-management' ( #132 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/132
2025-10-23 11:31:54 +09:00
kjs
184adffdcb
Merge branch 'main' into feature/screen-management
2025-10-23 11:31:48 +09:00
kjs
b66b7c66f0
제어관리 로그 노드 제거
2025-10-23 11:31:31 +09:00
900ac4b76e
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-23 11:25:42 +09:00
8ab36f32a0
리사이즈
2025-10-23 11:25:28 +09:00
kjs
e934cc945b
테이블 컬럼 중복 삽입 안되게 수정
2025-10-23 10:07:55 +09:00
d29d4b596d
화면너비 감지 기능 추가
2025-10-23 10:06:00 +09:00
kjs
0c3ce4d3eb
text타입 라벨 표시문제 수정
2025-10-23 09:56:38 +09:00
73e3bf4159
대시보드 화면 감지 기능 추가
2025-10-23 09:56:35 +09:00
298fd11169
대시보드 관리 오류 수정
2025-10-23 09:52:14 +09:00
9bd84f898a
그리드 시스템에 드래그 이동 구현
2025-10-23 09:36:30 +09:00
kjs
2dd96f5a74
화면관리ui수정
2025-10-22 17:19:47 +09:00
hjlee
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
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
13f4d07577
메일관리
2025-10-22 17:07:38 +09:00
41c763c019
그리드 박스 기반 스냅 시스템 구현
2025-10-22 16:58:07 +09:00
7c3a2dff4c
스냅 기능 변경
2025-10-22 16:49:57 +09:00
0a28445abe
12그리드 컬럼 디자인 및 캔버스 변경
2025-10-22 16:45:15 +09:00
9dca73f4c4
12컬럼 그리드로 변경
2025-10-22 16:37:14 +09:00
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
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
79fef2691d
메일관리 대시보드에 있던 살짝의 오류 수정
2025-10-22 11:33:56 +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
leeheejin
hyeonsu
dohyeons
kjs
hjlee