kjs
8d1f0e7098
제어관리 개선판
2025-10-24 14:11:12 +09:00
kjs
96252270d7
캔버스 드래그 오류 수정
2025-10-24 10:40:12 +09:00
kjs
dc17988466
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-24 10:37:03 +09:00
kjs
d22369a050
버튼 자동정렬기능 구현
2025-10-24 10:37:02 +09:00
kjs
f84c06a7a7
Merge branch 'main' into feature/screen-management
2025-10-23 18:23:19 +09:00
kjs
d9088816a7
플로우 단계별 버튼 표시 설정
2025-10-23 18:23:01 +09:00
ea9ed488e8
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node
2025-10-23 18:11:45 +09:00
9c10ddedc1
api수정
2025-10-23 18:11:44 +09:00
hjlee
998e6a8596
Merge pull request 'lhj' ( #143 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/143
2025-10-23 18:06:13 +09:00
bee5d37ab0
Merge branch 'lhj' of http://39.117.244.52:3000/kjs/ERP-node into lhj
2025-10-23 18:04:36 +09:00
0b8bc258f3
메인받음
2025-10-23 18:04:25 +09:00
ce07ca3c00
프로덕션 환경 수정
2025-10-23 18:03:11 +09:00
c4fdec35ac
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 18:01:42 +09:00
5f703b5ae8
검색기능 추가
2025-10-23 18:01:26 +09:00
kjs
23be8a0eee
Merge pull request 'feature/screen-management' ( #142 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/142
2025-10-23 17:55:46 +09:00
kjs
2f51b9632d
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-23 17:55:33 +09:00
kjs
43654f7516
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-23 17:55:24 +09:00
kjs
c228ddb498
삭제버튼 동작
2025-10-23 17:55:04 +09:00
67e838dc03
package-lock 파일 재생성
2025-10-23 17:44:12 +09:00
hyeonsu
4ca4ea3b3c
Merge pull request '차트 간 공유 기능 구현' ( #141 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/141
2025-10-23 17:33:59 +09:00
bb926b1c58
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-23 17:27:10 +09:00
kjs
b242a85801
Merge pull request 'feature/screen-management' ( #140 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/140
2025-10-23 17:26:43 +09:00
kjs
4f2dd0710e
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-23 17:26:29 +09:00
kjs
b402602b69
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-23 17:26:17 +09:00
kjs
f9c6ef70db
플로우 위젯 컴포넌트와 버튼의 연동
2025-10-23 17:26:14 +09:00
5fa335a83e
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-23 17:23:42 +09:00
eebf80e028
차트 간 공유 기능 구현
2025-10-23 17:23:30 +09:00
hjlee
a6ad975ced
Merge pull request '스크롤과 설정한 해상도 크기와 실제화면 크기가 다른 문제 해결' ( #139 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/139
2025-10-23 17:13:16 +09:00
901fae9814
스크롤과 설정한 해상도 크기와 실제화면 크기가 다른 문제 해결
2025-10-23 17:12:55 +09:00
kjs
eb49594161
Merge pull request '테이블 리스트 수정' ( #138 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/138
2025-10-23 17:02:03 +09:00
kjs
5203d0fa50
Merge branch 'main' into feature/screen-management
2025-10-23 17:01:54 +09:00
kjs
8c89b9cf86
테이블 리스트 수정
2025-10-23 16:50:41 +09:00
hjlee
b3afd923c9
Merge pull request 'lhj' ( #137 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/137
2025-10-23 15:17:14 +09:00
kjs
ee77a46168
Merge pull request 'feature/screen-management' ( #136 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/136
2025-10-23 15:15:06 +09:00
kjs
8179946cd8
Merge branch 'main' into feature/screen-management
2025-10-23 15:14:59 +09:00
6a5cf839a7
Merge branch 'main' into lhj
...
충돌 해결:
- CanvasElement.tsx: CustomMetricWidget(main) + 통합 TaskWidget(lhj) 모두 유지
- DashboardTopMenu.tsx: lhj의 '일정관리 위젯' 유지
- DashboardSidebar.tsx: main의 삭제 수락
2025-10-23 15:14:47 +09:00
kjs
3172f772ba
컴포넌트가 화면 벗어나는 문제 수정
2025-10-23 15:14:45 +09:00
aa3cd95a36
날씨 랑 todo/긴급위젯이랑 정비일정 위젯 합치기 완료
2025-10-23 15:11:10 +09:00
kjs
70d2c96c80
컴포넌트 잘림현상 수정
2025-10-23 15:06:00 +09:00
hyeonsu
d668814e03
Merge pull request '사용자 커스텀 카드' ( #135 ) from feat/dashboard into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/135
2025-10-23 14:37:06 +09:00
84ce175d95
rest api 작동 구현
2025-10-23 14:36:14 +09:00
64658d5d5d
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard
2025-10-23 14:28:52 +09:00
afe4074d37
제목 및 헤더 설정 기능 추가
2025-10-23 14:27:27 +09:00
6422dac2a4
사용자 커스텀 카드 위젯 구현
2025-10-23 14:24:41 +09:00
60ef6a6a95
문서 및 불필요한 컴포넌트 삭제
2025-10-23 13:30:13 +09:00
kjs
b104cd94f2
텍스트 설정 초기화 되는 오류 수정
2025-10-23 13:24:37 +09:00
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
kjs
23f7b89cc5
Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-10-23 13:15:53 +09:00
kjs
4996dd5562
버튼 액션 안되는 버그 수정
2025-10-23 13:15:52 +09:00
kjs
dohyeons
hjlee
leeheejin
hyeonsu