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
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
kjs
dohyeons
hjlee
leeheejin
hyeonsu