chpark/vexplor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,625 Commits 4 Branches 0 Tags
45d5e78bce6a220ac516147809f0e22baa1560c2
Commit Graph

2625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kjs
45d5e78bce Merge remote-tracking branch 'upstream/main'
All checks were successful
Build and Push Images / build-and-push (push) Successful in 12m17s
Details
2026-01-07 13:31:31 +09:00
kjs
26020a29a0 Merge pull request 'feature/screen-management' (#337) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/337
 2026-01-07 13:31:14 +09:00
kjs
52df163fbb Merge branch 'main' into feature/screen-management 2026-01-07 13:31:07 +09:00
kjs
777429af48 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2026-01-07 13:30:57 +09:00
kjs
856db80a36 빌드 에러수정 2026-01-07 13:30:57 +09:00
kjs
eaae692b87 Merge remote-tracking branch 'upstream/main'
Some checks failed
Build and Push Images / build-and-push (push) Failing after 2m33s
Details
2026-01-07 13:28:36 +09:00
kjs
cd7adce874 Merge pull request '테이블에 존재하는지 확인하는 제어 추가' (#336) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/336
 2026-01-07 11:55:53 +09:00
kjs
ca260aa260 Merge branch 'main' into feature/screen-management 2026-01-07 11:55:45 +09:00
SeongHyun Kim
42d1a3fc5e Merge remote-tracking branch 'origin/main' into ksh 2026-01-07 10:28:47 +09:00
SeongHyun Kim
7c165a724e feat: 출고관리 수정 모달 저장 기능 개선 및 그룹화 컬럼 설정 UI 추가 
ButtonConfigPanel: 수정 액션에 그룹화 컬럼 선택 드롭다운 추가 (영문/한글 검색 지원)
ScreenSplitPanel/EmbeddedScreen: groupedData prop 전달 경로 추가
buttonActions: RepeaterFieldGroup 저장 시 공통 필드 우선 적용되도록 병합 순서 변경
 2026-01-07 10:24:01 +09:00
hjjeong
0ce0860dcc Merge pull request '입고 처리 시 재고 테이블 저장 및 재고이력 stock_id 전달 수정' (#335) from feature/inbound-inventory-fix into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/335
 2026-01-07 10:06:37 +09:00
hjjeong
c6ff839e54 입고 처리 시 재고 테이블 저장 및 재고이력 stock_id 전달 수정 2026-01-07 10:05:32 +09:00
kjs
e308fd0ccc 테이블에 존재하는지 확인하는 제어 추가 2026-01-07 09:55:19 +09:00
hjlee
f2cb7d14ca Merge pull request 'lhj' (#334) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/334
 2026-01-07 09:48:46 +09:00
leeheejin
b5b229122b 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.
 2026-01-07 09:37:16 +09:00
leeheejin
126da9b46f 하이큐마그 점검항목 추가 후 주기명/점검방법명 오류 해결 2026-01-07 09:37:02 +09:00
SeongHyun Kim
c365f06ed7 Merge remote-tracking branch 'origin/main' into ksh 2026-01-07 09:06:29 +09:00
hjlee
563081fa1c Merge pull request 'lhj' (#333) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/333
 2026-01-06 17:57:31 +09:00
leeheejin
24331687d4 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.
 2026-01-06 17:57:05 +09:00
leeheejin
ea848b97ee 검색필터 업데이트 2026-01-06 17:56:31 +09:00
hjlee
15fc166683 Merge pull request 'lhj' (#332) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/332
 2026-01-06 17:40:25 +09:00
leeheejin
26fdab5b4e 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.
 2026-01-06 17:39:53 +09:00
leeheejin
12d3419b7f 구분 필터링 업데이트 2026-01-06 17:39:36 +09:00
SeongHyun Kim
a2b701a4bf feat: 조건부 컨테이너 initialData 전달 체계 구현 
InteractiveScreenViewerDynamic: originalData를 initialData로 추가 전달
DynamicComponentRenderer: initialData 우선순위 로직 추가
ConditionalContainerComponent: initialData props 추가 및 하위 전달
ConditionalSectionViewer: initialData props 추가 및 하위 전달
types.ts: initialData 타입 정의 추가
수정 모드에서 조건부 컨테이너 내부 컴포넌트 초기값 표시 지원
 2026-01-06 17:29:41 +09:00
kjs
2213ad51b2 Merge pull request '수정' (#331) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/331
 2026-01-06 17:02:54 +09:00
kjs
7120d5edc3 수정 2026-01-06 17:02:42 +09:00
kjs
a94d3f78de Merge remote-tracking branch 'upstream/main'
All checks were successful
Build and Push Images / build-and-push (push) Successful in 13m51s
Details
2026-01-06 15:34:23 +09:00
kjs
0eb005ce35 Merge pull request '창고코드 같이 올라가게 수정' (#330) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/330
 2026-01-06 15:34:02 +09:00
kjs
4828488c72 Merge branch 'main' into feature/screen-management 2026-01-06 15:33:55 +09:00
kjs
c1425be57f 창고코드 같이 올라가게 수정 2026-01-06 15:33:44 +09:00
SeongHyun Kim
25b7e637de feat: 테이블 데이터 저장 시 존재하지 않는 컬럼 자동 필터링 
- tableManagementService.addTableData: 테이블 스키마 기반 컬럼 필터링 로직 추가
- 무시된 컬럼 정보를 API 응답에 포함 (skippedColumns, savedColumns)
- 프론트엔드 콘솔에 무시된 컬럼 경고 출력
- conditional-container의 UI 제어용 필드(condition) 등으로 인한 저장 에러 방지
 2026-01-06 15:29:26 +09:00
SeongHyun Kim
ad39374e54 Merge remote-tracking branch 'origin/main' into ksh 2026-01-06 15:04:36 +09:00
SeongHyun Kim
77bb917248 feat: RepeaterFieldGroup 상위 폼 필드 전달 방식 개선 
- 하드코딩된 masterDetailFields 배열을 규칙 기반 필터링으로 변경
- 제외 규칙: comp_ 접두사, _numberingRuleId 접미사, 배열/객체 타입, 빈 값 등
- 새 필드 추가 시 코드 수정 불필요하도록 개선
- 에러 로깅 상세 정보 추가 (status, data, message, fullError)
 2026-01-06 15:03:22 +09:00
hjjeong
6bf914d9b1 Merge pull request '거래처 품목정보 거래처품번/단가 입력 없이 저장되도록' (#329) from fix/daejin-bugs into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/329
 2026-01-06 15:02:38 +09:00
hjjeong
e08c50c771 거래처 품목정보 거래처품번/단가 입력 없이 저장되도록 2026-01-06 15:01:50 +09:00
hjlee
0f027f2382 Merge pull request 'lhj' (#328) from lhj into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/328
 2026-01-06 14:45:07 +09:00
leeheejin
09d574fb8a 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.
 2026-01-06 14:44:23 +09:00
leeheejin
6ae0778b4c 필터의 라벨도 코드말고 설정한걸로 나오게 수정 2026-01-06 14:43:57 +09:00
kjs
58b0e1b79b Merge pull request '범용 폼모달 라벨로 뜨게 수정' (#327) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/327
 2026-01-06 14:24:52 +09:00
kjs
f0322a49ad 범용 폼모달 라벨로 뜨게 수정 2026-01-06 14:24:30 +09:00
kjs
642a16fbb3 Merge remote-tracking branch 'upstream/main'
All checks were successful
Build and Push Images / build-and-push (push) Successful in 13m20s
Details
2026-01-06 13:46:34 +09:00
kjs
5e27d21257 Merge pull request 'feature/screen-management' (#326) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/326
 2026-01-06 13:46:00 +09:00
kjs
efc9175fec Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management 2026-01-06 13:45:48 +09:00
kjs
eb61506acd 분할패널 수정동작 수정 2026-01-06 13:43:47 +09:00
SeongHyun Kim
75b5530d04 Merge remote-tracking branch 'origin/main' into ksh 2026-01-06 13:23:00 +09:00
kjs
cded99d644 로그 제거 2026-01-06 13:08:33 +09:00
SeongHyun Kim
40fd5f9055 feat: 채번규칙 editable 옵션 수동 모드 감지 기능 구현 
모달 오픈 시 채번 미리보기 원본값 저장 (numberingOriginalValues)
handleFieldChange에서 원본값 비교하여 수동/자동 모드 전환
사용자 수정 시 ruleId 제거하여 저장 시 채번 스킵
원본값 복구 시 ruleId 복구하여 자동 모드 복원
handleSave에서 채번 할당 조건 분기 처리
 2026-01-06 13:06:28 +09:00
kjs
0709b8df25 Merge pull request '범용 폼 모달 사전필터 기능 수정' (#325) from feature/screen-management into main 
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/325
 2026-01-06 11:43:38 +09:00
kjs
6bfc1a97a3 범용 폼 모달 사전필터 기능 수정 2026-01-06 11:43:26 +09:00
kjs
d799e1334e Merge remote-tracking branch 'upstream/main'
All checks were successful
Build and Push Images / build-and-push (push) Successful in 14m50s
Details
2026-01-06 10:29:09 +09:00