chpark/vexplor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,861 Commits 2 Branches 0 Tags
bc34cded95a9d09c3e3a9014f04d496db91b901a
Commit Graph

1861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SeongHyun Kim
bc34cded95 merge: origin/main을 ksh로 머지 (UnifiedPropertiesPanel 충돌 해결) 2025-12-02 14:10:33 +09:00
SeongHyun Kim
4787a8b177 feat(repeat-screen-modal): 테이블 영역 독립 저장 기능 구현 
- TableCrudConfig에 allowSave, saveButtonLabel 속성 추가
- CRUD 설정 패널에 저장 스위치 추가
- saveTableAreaData 함수: editable 컬럼 + 조인키만 필터링하여 저장
- 날짜 필드 ISO 8601 -> YYYY-MM-DD 형식 변환
- 백엔드: company_code 자동 주입 로직 추가
- tableManagementService에 hasColumn 메서드 추가
 2025-12-02 14:02:47 +09:00
hjlee
a42db5f15a Merge pull request 'lhj' (#235) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/235
 2025-12-02 13:21:26 +09:00
leeheejin
30e6595bf3 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 2025-12-02 13:21:03 +09:00
leeheejin
2c447fd325 restapi도 가능하게 구현 2025-12-02 13:20:49 +09:00
hjlee
650c5ef722 Merge pull request '공차관련수정사항들' (#234) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/234
 2025-12-02 09:58:05 +09:00
leeheejin
0789eb2e20 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj 2025-12-02 09:53:18 +09:00
leeheejin
8c83db596d 공차관련수정사항들 2025-12-02 09:53:08 +09:00
SeongHyun Kim
2f78c83ef6 feat(repeat-screen-modal): 외부 테이블 조인, 필터링, CRUD 및 실시간 집계 기능 추가 
- 외부 테이블 데이터 소스 설정 (TableDataSourceConfig) 추가
- 다중 테이블 조인 지원 (AdditionalJoinConfig)
- 테이블 필터링 (equals/notEquals) 지원
- 테이블 CRUD (행 추가/수정/삭제) 기능 추가
- 데이터 변경 시 집계 실시간 재계산 (recalculateAggregationsWithExternalData)
- 시각적 수식 빌더 (FormulaBuilder) 컴포넌트 추가
- 테이블 컬럼 순서 변경 기능 추가
- 백엔드: 배열 파라미터 IN 절 변환 로직 추가
 2025-12-01 18:50:26 +09:00
SeongHyun Kim
fb068284db Merge branch 'ksh' 2025-12-01 18:36:06 +09:00
SeongHyun Kim
0281d3722e revert: SelectBasicComponent.tsx 이전 상태로 복원 2025-12-01 18:35:55 +09:00
hjlee
18521339bb Merge pull request 'lhj' (#233) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/233
 2025-12-01 17:05:34 +09:00
leeheejin
7242f08224 공차 등록, 연속추적 기능 2025-12-01 17:04:59 +09:00
leeheejin
fbeb3ec2c9 버튼 과정이 조금 복잡하지만 위도경도 연속추적기능도 넣음 2025-12-01 16:49:02 +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
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