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

2086 Commits

Author SHA1 Message Date
dohyeons ab9ddaa190 외부 DB 연결 끊김 오류 해결 2025-12-11 15:25:48 +09:00
dohyeons b03132595c 패키지 다운그레이드 2025-12-11 14:38:57 +09:00
dohyeons e67b5f76a8 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node 2025-12-11 14:34:48 +09:00
dohyeons 1d97bcaa9f 배포 오류 해결 2025-12-11 14:34:42 +09:00
kjs d3b4c4c42e Merge pull request 'feature/screen-management' (#278) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/278
 2025-12-11 14:32:34 +09:00
kjs f2b0ac8fd5 Merge branch 'main' into feature/screen-management 2025-12-11 14:32:27 +09:00
kjs a4cf11264d 테이블리스트컴포넌트 합산기능 2025-12-11 14:32:15 +09:00
kjs 215242b676 검색필터 분할패널 데이터 합산기능 추가 2025-12-11 14:25:28 +09:00
hjlee 4247c3bb70 Merge pull request 'lhj' (#277) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/277
 2025-12-11 13:53:52 +09:00
leeheejin 99fd8336a5 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-11 13:48:57 +09:00
leeheejin c486a31787 파일업로드 로직 중간저장(다듬기하면됨) 2025-12-11 13:48:34 +09:00
hyeonsu 1bb6448b1f Merge pull request 'common/feat/dashboard-map' (#276) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/276
 2025-12-11 13:15:56 +09:00
dohyeons 011f0556d2 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-11 13:15:19 +09:00
dohyeons f6e0e02ddf 회사 관리자 메뉴 권한 필터링 적용 2025-12-11 13:15:09 +09:00
SeongHyun Kim 84095ace3b feat(button-actions): 저장 후 노드 플로우 실행 기능 추가 및 RepeatScreenModal props 수신 개선 
- dataflowConfig.flowConfig 설정 시 저장 완료 후 노드 플로우 자동 실행
- executeNodeFlow API 동적 import로 번들 최적화
- RepeatScreenModal에서 _groupedData props 수신 지원 추가
- tiptap 라이브러리 버전 업그레이드 (2.11.5 → 2.27.1)
 2025-12-11 13:05:12 +09:00
kjs fc5ffb03b2 엔티티 조인컬럼 표시문제 수정 2025-12-11 12:01:00 +09:00
SeongHyun Kim 0e60f11084 Merge remote-tracking branch 'origin/main' into ksh 2025-12-11 11:47:43 +09:00
kjs 2327dbe35c Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-12-11 11:41:39 +09:00
kjs b9ee860e71 분할 패널 수정,삭제버튼 on,off기능 2025-12-11 11:41:38 +09:00
kjs fcdaa68ddc Merge pull request '소스필드 못찾는 버그 수정' (#275) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/275
 2025-12-11 11:37:58 +09:00
kjs 91f9bb9d12 Merge branch 'main' into feature/screen-management 2025-12-11 11:37:52 +09:00
kjs 2b747a1030 소스필드 못찾는 버그 수정 2025-12-11 11:37:40 +09:00
hyeonsu 6735142db4 Merge pull request '모바일 환경 세션 타임아웃 연장 (30분 → 24시간)' (#274) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/274
 2025-12-11 11:18:47 +09:00
dohyeons c4e81dd740 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-11 11:18:30 +09:00
dohyeons 7725cd1e87 모바일 환경 세션 타임아웃 연장 (30분 → 24시간) 2025-12-11 11:17:52 +09:00
hyeonsu d729d299a9 Merge pull request 'common/feat/dashboard-map' (#273) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/273
 2025-12-11 10:50:02 +09:00
dohyeons d6c5b3418d Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-11 10:49:12 +09:00
dohyeons bccb8a6330 리스트 위젯 REST API 기능 개선 2025-12-11 10:48:48 +09:00
kjs 288e553221 Merge pull request 'feature/screen-management' (#272) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/272
 2025-12-11 10:44:16 +09:00
kjs 5bbbd37553 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2025-12-11 10:43:09 +09:00
kjs f272f0c4c7 제어관리 회사코드 저장 안되는 문제 수정 2025-12-11 10:41:28 +09:00
SeongHyun Kim 1a68ae792e fix(repeat-screen-modal): 외부 테이블 행 삭제를 즉시 DELETE API 호출 방식으로 변경 
- 기존 소프트 삭제(_isDeleted 플래그) 방식에서 즉시 삭제로 변경
- DB에 저장된 기존 행: DELETE API 즉시 호출 후 UI에서 제거
- 새로 추가된 행: UI에서만 제거 (DB에 없음)
- _originalData.id 존재 여부로 DB 데이터 판단
- 삭제 후 집계 재계산 정상 작동
 2025-12-11 09:30:37 +09:00
SeongHyun Kim 512e1e30d1 feat(repeat-screen-modal): 연동 저장, 자동 채번, SUM_EXT 참조 제한 기능 추가 
- SyncSaveConfig: 모달 저장 시 다른 테이블에 집계 값 동기화 기능
- RowNumberingConfig: 행 추가 시 채번 규칙 적용하여 자동 번호 생성
- externalTableRefs: SUM_EXT 함수가 참조할 외부 테이블 제한 기능
- triggerRepeatScreenModalSave: 외부에서 저장 트리거 가능한 이벤트 리스너
- TableColumnConfig.hidden: 테이블 컬럼 숨김 기능 (데이터는 유지, 화면만 숨김)
- beforeFormSave: FK 자동 채우기 및 _isNew 행 포함 로직 개선
 2025-12-11 09:24:47 +09:00
SeongHyun Kim ae6f022f88 feat(repeat-screen-modal): 복수 외부 테이블 집계 지원 및 집계 설정 모달 UI 추가 
- 여러 외부 테이블 데이터를 합산하여 집계 계산 지원
- 집계 설정 전용 모달(AggregationSettingsModal) 추가
- AggregationConfig에 hidden 속성 추가 (연산에만 사용, 표시 제외)
- 채번 규칙 API 에러 처리 개선 (조용히 무시, 로그 최소화)
 2025-12-11 09:17:57 +09:00
leeheejin d09c8e0787 파일업로드 수정 2025-12-10 18:38:16 +09:00
kjs 088596480f 수식 노드 구현 2025-12-10 18:28:27 +09:00
leeheejin fa6c00b6be 모달 잘리는거 해결 2025-12-10 17:41:41 +09:00
hjlee e84764dc2b Merge pull request 'lhj' (#271) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/271
 2025-12-10 16:49:21 +09:00
leeheejin bc10f2101a 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-10 16:48:19 +09:00
leeheejin 65c1855eba 기본정보 눌렀을때 뜨는 오류해결 2025-12-10 16:47:48 +09:00
hyeonsu d0801e2ccc Merge pull request 'common/feat/dashboard-map' (#270) from common/feat/dashboard-map into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/270
 2025-12-10 16:25:51 +09:00
kjs 3188bc0513 입고테이블 생성날짜 저장에러ㅏ 수정 2025-12-10 16:06:47 +09:00
kjs 08575c296e 연쇄 통합관리 2025-12-10 15:59:04 +09:00
dohyeons 48300146e6 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into common/feat/dashboard-map 2025-12-10 15:54:09 +09:00
hjlee 5cd3bc52e3 Merge pull request 'lhj' (#269) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/269
 2025-12-10 15:53:33 +09:00
leeheejin 6707e2afd2 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-10 15:53:11 +09:00
dohyeons 90db4756e8 3D 야드 자재 개수 표시 버그 수정 및 빈 Location 표시 추가 2025-12-10 15:41:43 +09:00
dohyeons e6b8212d39 외부 커넥션 모달에 스크롤 생성 2025-12-10 15:40:33 +09:00
leeheejin d1c9aeca18 리스트위젯 조금 더 개선된 버전 2025-12-10 15:29:23 +09:00
leeheejin f75c3e43ed 리스트 위젯 업그레이드 2025-12-10 15:15:06 +09:00