dohyeons
a6e59dfd8b
commit11
2025-10-24 15:41:27 +09:00
kjs
9a9133bbfd
Merge pull request 'feature/screen-management' ( #146 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/146
2025-10-24 15:40:43 +09:00
kjs
ff4646d816
Merge branch 'main' into feature/screen-management
2025-10-24 15:40:35 +09:00
kjs
7d6281d289
플로우 페이지네이션 안보임
2025-10-24 15:40:08 +09:00
dohyeons
cd97d33334
commit10
2025-10-24 15:31:37 +09:00
kjs
0a57a2cef1
성능개선
2025-10-24 14:24:18 +09:00
kjs
8d1f0e7098
제어관리 개선판
2025-10-24 14:11:12 +09:00
9f9c1e933f
Merge pull request '리스트 위젯 업데이트' ( #145 ) from lhj into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/145
2025-10-24 12:21:14 +09:00
leeheejin
4f8d6fe875
Merge main into lhj: 그룹별 카드 + 일반 지표 독립 데이터 소스 기능 + getApiUrl 통합
2025-10-24 12:18:13 +09:00
leeheejin
7c701c4a0f
리스트 위젯 업데이트
2025-10-24 12:14:56 +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
dohyeons
9a4affd78d
commit9
2025-10-24 10:17:17 +09:00
dohyeons
8941301ef6
commit8
2025-10-24 10:15:56 +09:00
dohyeons
03039ab743
로그인 되어있을 시 /main 으로 이동
2025-10-24 10:09:19 +09:00
dohyeons
bc8587f688
패딩 삭제
2025-10-24 10:02:34 +09:00
dohyeons
0b3a224af8
commit7
2025-10-24 09:53:19 +09:00
dohyeons
759665978b
절대 경로로 수정
2025-10-24 09:52:51 +09:00
dohyeons
118c911d02
commit6
2025-10-24 09:37:44 +09:00
dohyeons
5f4d78640b
동적 URL 감지 함수를 추가
2025-10-24 09:37:12 +09:00
dohyeons
1dd34df493
commit6
2025-10-24 09:28:19 +09:00
kjs
6fe49721db
Merge pull request '플로우 단계별 버튼 표시 설정' ( #144 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/144
2025-10-23 18:23:28 +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
dohyeons
3e0d042ddb
commit5
2025-10-23 18:12:07 +09:00
dohyeons
ea9ed488e8
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node
2025-10-23 18:11:45 +09:00
dohyeons
9c10ddedc1
api수정
2025-10-23 18:11:44 +09:00
dohyeons
8dbd5d4199
commit4
2025-10-23 18:10:08 +09:00
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
leeheejin
bee5d37ab0
Merge branch 'lhj' of http://39.117.244.52:3000/kjs/ERP-node into lhj
2025-10-23 18:04:36 +09:00
leeheejin
0b8bc258f3
메인받음
2025-10-23 18:04:25 +09:00
dohyeons
c536cfd1a0
commit3
2025-10-23 18:03:40 +09:00
dohyeons
ce07ca3c00
프로덕션 환경 수정
2025-10-23 18:03:11 +09:00
leeheejin
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
leeheejin
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
dohyeons
f637700477
commit2
2025-10-23 17:46:23 +09:00
dohyeons
a5766b1aa1
commit
2025-10-23 17:46:00 +09:00
dohyeons
67e838dc03
package-lock 파일 재생성
2025-10-23 17:44:12 +09:00
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
dohyeons
0889ddf9ad
commit
2025-10-23 17:32:30 +09:00
dohyeons
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
