kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,313 Commits 35 Branches 0 Tags 170 MiB
Commit Graph

1313 Commits

Author SHA1 Message Date
kjs 0dab71edfe Merge branch 'main' into feature/screen-management 2025-10-29 11:26:18 +09:00
kjs efdef36cda 모달창 올리기 2025-10-29 11:26:00 +09:00
hjlee ca2904dfc4 Merge pull request '쿼리문 덜복잡해도 작성되게 수정' (#161) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/161
 2025-10-29 10:22:40 +09:00
leeheejin ce508fb48a 쿼리문 덜복잡해도 작성되게 수정 2025-10-29 10:22:21 +09:00
hjlee 3371c4c954 Merge pull request '쿼리문 작성대로 보이도록 통계카드 수정' (#160) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/160
 2025-10-29 10:07:50 +09:00
leeheejin 9bff4c77e3 쿼리문 작성대로 보이도록 통계카드 수정 2025-10-29 10:07:33 +09:00
hjlee e826648778 Merge pull request 'lhj' (#159) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/159
 2025-10-29 09:33:23 +09:00
leeheejin 3198684f27 구버전 위젯도 보이게 2025-10-29 09:32:10 +09:00
leeheejin e880083600 구버전신버전 모두 보이게 처리완료 2025-10-29 09:32:03 +09:00
hjlee eed28ba0a9 Merge pull request 'lhj' (#158) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/158
 2025-10-29 09:22:06 +09:00
leeheejin 50aeacd9ea 차트를 제외하고 나머지 기능은 구현됨 2025-10-29 09:21:04 +09:00
leeheejin d21764ba51 Merge: 충돌 해결 - CustomMetricWidget 실제 코드 유지 2025-10-28 19:00:24 +09:00
leeheejin 88d71da1a9 다중데이터베이스 연결 가능하게 함, 차트 위젯은 테스트 용도입니다. 2025-10-28 18:58:40 +09:00
hyeonsu 7a0fee15d4 Merge pull request '요소 클릭하면 카메라 시야 변경하도록 구현' (#157) from feat/dashboard into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/157
 2025-10-28 18:56:02 +09:00
dohyeons fd4215ca9c Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/dashboard 2025-10-28 18:55:53 +09:00
dohyeons 83034cff02 요소 클릭하면 카메라 시야 변경하도록 구현 2025-10-28 18:55:30 +09:00
kjs eeae338cd4 패널 정리중 2025-10-28 18:41:45 +09:00
leeheejin 0fe2fa9db1 원본승격 완료, 차트 위젯은 보류 2025-10-28 18:21:00 +09:00
hyeonsu bf809e729b Merge pull request '대시보드 기타 수정사항' (#156) from feat/dashboard into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/156
 2025-10-28 17:57:17 +09:00
dohyeons 86f561c484 위젯 크기 초과 시 숨기기 2025-10-28 17:51:59 +09:00
dohyeons 7c3db548bc 위젯을 처음 추가할 때 사이드바 열리도록 설정 2025-10-28 17:48:56 +09:00
leeheejin 81458549af 테스트 위젯 원본 승격 전 세이브 2025-10-28 17:40:48 +09:00
kjs 743ae6dbf1 패널 정리 중간 커밋 2025-10-28 17:33:03 +09:00
kjs b5605d93da 테이블 컬럼 검색 기능 2025-10-28 16:26:55 +09:00
kjs 711e051b1c 속성창 줄이기 2025-10-28 16:16:00 +09:00
dohyeons dcb32f26b0 쿼리를 새로 실행하면 기존 컬럼 설정이 초기화 2025-10-28 15:42:53 +09:00
kjs 775fbf8903 화면 바로 들어가지게 함 2025-10-28 15:39:22 +09:00
dohyeons e1c40b23fb 커스텀 카드 배치 설정 2025-10-28 15:36:37 +09:00
dohyeons 3f3779c25e 위젯 헤더 스타일 변경 2025-10-28 15:09:29 +09:00
dohyeons 28ecc31128 위젯의 최소 크기를 1x1 로 변경 2025-10-28 15:02:37 +09:00
kjs 53a0fa5c6a 검색기능 동작 2025-10-28 15:00:08 +09:00
kjs 2a968ab3cf 플로우 위젯 검색 리스트 2025-10-28 14:55:41 +09:00
dohyeons 71beae8e24 문제 해결 2025-10-28 13:42:23 +09:00
leeheejin fb73ee2878 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-28 13:40:37 +09:00
leeheejin 1291f9287c 이희진 진행사항 중간세이브 2025-10-28 13:40:17 +09:00
kjs 9eed3eb710 Merge pull request 'feature/screen-management' (#154) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/154
 2025-10-28 13:39:49 +09:00
kjs d13422f7ac Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-28 13:39:41 +09:00
kjs 025fe04192 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-28 13:39:40 +09:00
hyeonsu 63db466504 Merge pull request '지도에 마커 기능 추가' (#155) from feat/rest-api into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/155
 2025-10-28 13:39:17 +09:00
dohyeons 2c30d40623 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/rest-api 2025-10-28 13:39:07 +09:00
dohyeons e6c11a0e04 지도에 마커 기능 추가 2025-10-28 13:38:22 +09:00
kjs f0cae99c8d Merge branch 'main' into feature/screen-management 2025-10-28 13:38:11 +09:00
kjs 57f7c48cd9 빌드 오류 수정: 불완전한 백업 파일 삭제 2025-10-28 13:34:46 +09:00
kjs 7c45b3e254 플로우 위젝 라벨표시 및 , 배치관리 회사별 분리 2025-10-28 12:06:54 +09:00
kjs c0f2fbbd88 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-10-28 11:54:44 +09:00
kjs c333a9fd9d 공통코드,REST API 회사별 분리 2025-10-28 11:54:44 +09:00
leeheejin d5e72ce901 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-28 10:08:40 +09:00
kjs c48eec78ac Merge pull request '회사별 메뉴 분리 및 권한 관리' (#153) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/153
 2025-10-28 10:07:32 +09:00
kjs 561d9cb855 Merge branch 'main' into feature/screen-management 2025-10-28 10:07:24 +09:00
kjs 25f6217433 회사별 메뉴 분리 및 권한 관리 2025-10-28 10:07:07 +09:00