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

1878 Commits

Author SHA1 Message Date
dohyeons b190e2ba08 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into logistream 2025-12-01 15:52:49 +09:00
hjlee 15d5708b5d Merge pull request 'lhj' (#232) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/232
 2025-12-01 15:46:13 +09:00
leeheejin 7263c9c3ff Merge origin/main into lhj - resolve buttonActions.ts conflict 2025-12-01 15:44:19 +09:00
leeheejin 6545410d49 공차등록 기능 구현 2025-12-01 15:42:40 +09:00
kjs 36132bf07c Merge pull request 'feature/screen-management' (#231) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/231
 2025-12-01 15:30:43 +09:00
kjs aca00b8704 Merge branch 'main' into feature/screen-management 2025-12-01 15:30:38 +09:00
kjs 617655a42a Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-12-01 15:30:26 +09:00
kjs b1b9e4ad93 타입스크립트 에러 수정 2025-12-01 15:30:25 +09:00
leeheejin 8d2ec8e737 공차등록성공 2025-12-01 15:23:07 +09:00
kjs b77cc47791 Merge pull request 'feature/screen-management' (#230) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/230
 2025-12-01 15:22:19 +09:00
kjs 1823415a5b Merge branch 'main' into feature/screen-management 2025-12-01 15:22:07 +09:00
kjs da6ac92391 데이터 수정이 안되는 문제 해결 2025-12-01 15:21:03 +09:00
leeheejin be2550885a 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-12-01 14:45:51 +09:00
leeheejin fd7a1bbf53 출발지도착지 선택 가능하고 교환버튼 작동하게 2025-12-01 12:27:24 +09:00
dohyeons 2ae43c879f MD5 해시로 비밀번호 저장방식 변경 2025-12-01 12:18:56 +09:00
dohyeons 166004e8fd 회원가입 시 COMPANY_13으로 저장 2025-12-01 11:58:31 +09:00
dohyeons 08d4d7dbfc Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into logistream 2025-12-01 11:55:56 +09:00
hyeonsu 655eead3b6 Merge pull request 'common/feat/dashboard-map' (#229) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/229
 2025-12-01 11:51:55 +09:00
dohyeons 848d111975 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-01 11:50:42 +09:00
dohyeons 75bdc19f25 배치 스케쥴러 함수명 오류 및 매핑 조회 누락 수정 2025-12-01 11:34:22 +09:00
kjs 93b92960e7 테이블 상단 여백 제거 2025-12-01 11:20:06 +09:00
dohyeons ad0a84f2c3 feat: 대시보드 목록에 생성자 컬럼 추가 2025-12-01 11:07:35 +09:00
leeheejin d7ee63a857 출발지 목적지 선택 2025-12-01 11:07:16 +09:00
dohyeons 64c11d548c 디지털 트윈 레이아웃 조회 시 최고 관리자 권한 처리 추가 2025-12-01 10:44:56 +09:00
kjs a3d3db5437 검색필터 다중선택 기능 2025-12-01 10:36:57 +09:00
leeheejin c657d6f7a0 출발지 도착지 2025-12-01 10:32:12 +09:00
dohyeons 53eab6ac9c 대시보드 목록/상세 조회 권한을 company_code 기반으로 변경 2025-12-01 10:30:47 +09:00
SeongHyun Kim 9e6fa67215 fix: 셀렉트 드롭다운이 다른 컴포넌트에 가려지는 문제 해결 
- React Portal 적용하여 드롭다운을 document.body에 렌더링
- Stacking Context 탈출로 z-index 충돌 문제 해결
- 모든 셀렉트 타입(code, autocomplete, dropdown, multiselect)에 적용
 2025-12-01 10:29:14 +09:00
kjs 142fb15dc0 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-12-01 10:21:34 +09:00
kjs e4b1f7e4d8 데이터 표시 오류 수정 2025-12-01 10:19:20 +09:00
dohyeons 1462700c83 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-01 10:15:10 +09:00
dohyeons ac01c7586d Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node 2025-12-01 10:14:47 +09:00
dohyeons 1849bf6654 대시보드 조회 시 company_code 기반 접근 권한으로 변경 2025-12-01 10:14:41 +09:00
kjs 1503dd87bb 화면 분할패널 수정모드 수정 2025-12-01 10:09:19 +09:00
SeongHyun Kim 893cd428a0 fix: 셀렉트 드롭다운이 다른 컴포넌트에 가려지는 문제 해결 
- React Portal 적용하여 드롭다운을 document.body에 렌더링
- Stacking Context 탈출로 z-index 충돌 문제 해결
- 모든 셀렉트 타입(code, autocomplete, dropdown, multiselect)에 적용
 2025-12-01 10:01:10 +09:00
hjlee 93174db7c8 Merge pull request '버튼 액션중 위치정보 가져오기, 필드값 변경 추가' (#228) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/228
 2025-11-28 18:46:21 +09:00
leeheejin 9f97a16d6a Merge origin/main and resolve conflicts - add geolocation/update_field actions 2025-11-28 18:45:41 +09:00
kjs 84fee9cc38 Merge pull request 'feature/screen-management' (#227) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/227
 2025-11-28 18:38:28 +09:00
kjs bd4e3e507d Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-11-28 18:38:18 +09:00
kjs 627c5a5173 화면 분할 패널 수정모드 기능 2025-11-28 18:35:34 +09:00
leeheejin 67e6a8008d 버튼 액션중 위치정보 가져오기, 필드값 변경 추가 2025-11-28 18:35:07 +09:00
dohyeons b787b027a6 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into logistream 2025-11-28 18:12:48 +09:00
dohyeons b43bf57ea9 불필요한 기능 주석처리 2025-11-28 17:47:09 +09:00
dohyeons c38153eff1 회원가입 시 vehicles 테이블 연동 및 차량 타입 필드 추가 2025-11-28 17:24:18 +09:00
SeongHyun Kim 07e0b22309 Merge remote-tracking branch 'origin/main' into ksh 2025-11-28 16:03:10 +09:00
SeongHyun Kim 36ab484029 feat(repeat-screen-modal): 자유 레이아웃 구현 및 데이터 전달 버그 수정 
- contentRows 기반 자유 레이아웃 지원 (header/aggregation/table/fields 타입)
- aggregationFields, tableColumns 직접 참조하도록 렌더링 로직 수정
- groupByField 없어도 grouping.enabled면 그룹핑 모드로 처리
- buttonActions에서 selectedRowsData를 모달 이벤트로 전달
- ScreenModal에서 selectedData를 groupedData props로 컴포넌트에 전달
- types.ts에 CardContentRowConfig, AggregationDisplayConfig 인터페이스 추가
 2025-11-28 16:02:29 +09:00
kjs c78ba865b6 카테고리 설정 안풀리는 오류 수정 2025-11-28 15:15:35 +09:00
hjlee f1ff835a45 Merge pull request 'lhj' (#226) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/226
 2025-11-28 15:06:10 +09:00
kjs f15846fd10 화면 분할 패널 기능 2025-11-28 14:56:11 +09:00
leeheejin 552beabdc0 null로 저장되게 성공시킴 2025-11-28 14:45:04 +09:00