kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Commit Graph

  • 0ac83b1551 분할패널에서 수정해도 리스트에서 삭제가 안되던 문제 코드 해결 leeheejin 2026-01-15 12:07:26 +0900
  • 7920928706 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/v2-unified-renewal kjs 2026-01-15 11:04:58 +0900
  • 3f474ecddd 오류수정 kjs 2026-01-15 11:00:30 +0900
  • ddf5ed4006 빌드에러 kjs 2026-01-15 10:52:54 +0900
  • c4ee084a1d 빌드에러 수정 kjs 2026-01-15 10:47:58 +0900
  • 19dbe59e3a 엔티티조인 읽기전용 컬럼 추가 kjs 2026-01-15 10:39:23 +0900
  • 2e02ace388 feat(repeater): 하위 데이터 조회 및 조건부 입력 기능 구현, 테이블 선택 데이터 동기화 개선 Repeater 컴포넌트에 하위 데이터 조회 기능 추가 (재고/단가 조회) 조건부 입력 활성화 및 최대값 제한 기능 구현 필드 정의 순서 변경 기능 추가 (드래그앤드롭, 화살표 버튼) TableListComponent의 DataProvider 클로저 문제 해결 ButtonPrimaryComponent에 modalDataStore fallback 로직 추가 SeongHyun Kim 2026-01-15 10:35:34 +0900
  • 71af4dfc6b 폼 통합 kjs 2026-01-15 09:50:33 +0900
  • 08ea14eed7 충돌수정 kjs 2026-01-15 09:31:25 +0900
  • 45f0c667c2 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/v2-unified-renewal kjs 2026-01-15 09:22:31 +0900
  • 435eb90763 Merge pull request 'feat/multilang' (#357) from feat/multilang into main feat/multilang kjs 2026-01-14 18:28:20 +0900
  • 98870b3348 Merge branch 'feature/v2-renewal' of http://39.117.244.52:3000/kjs/ERP-node into feat/multilang kjs 2026-01-14 17:14:42 +0900
  • b7b750d134 번역현황 표시 kjs 2026-01-14 17:14:27 +0900
  • ac334db0b1 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feat/multilang kjs 2026-01-14 16:33:38 +0900
  • 16c9c71a23 다국어 화면에서 수정기능 구현 kjs 2026-01-14 16:33:22 +0900
  • 059ea6b30a feat: 테이블 설정 모달의 컬럼 저장 로직 개선 DDD1542 2026-01-14 16:09:00 +0900
  • 14f8714ea1 Merge branch 'feature/v2-renewal' of http://39.117.244.52:3000/kjs/ERP-node into feat/multilang kjs 2026-01-14 15:39:04 +0900
  • a27cb85007 코드 정리 및 최적화: InteractiveScreenViewer 컴포넌트의 불필요한 공백 제거 및 Select 컴포넌트의 props 정리 kjs 2026-01-14 15:38:52 +0900
  • b5d2195cd5 Merge branch 'feature/v2-renewal' of http://39.117.244.52:3000/kjs/ERP-node into feat/multilang kjs 2026-01-14 15:38:41 +0900
  • 0a3d42f3ad feat: 테이블 타입 관리 모달 추가 및 기존 테이블 생성 모달 제거 DDD1542 2026-01-14 15:37:29 +0900
  • b5c2e85496 화면 다국어 처리 kjs 2026-01-14 15:33:57 +0900
  • f321aaf7aa feat: 화면 디자이너 모달 및 제어 관리 탭 기능 추가 DDD1542 2026-01-14 14:35:27 +0900
  • 26bb93ab6e 다국어 생성후 매핑 자동저장 kjs 2026-01-14 13:26:41 +0900
  • f9575d7b5f 다국어 버튼 자동매핑 kjs 2026-01-14 13:08:44 +0900
  • c26b346054 다국어설정 모달생성 kjs 2026-01-14 11:51:24 +0900
  • 24315215de 다국어 키 자동생성 로직 kjs 2026-01-14 11:05:57 +0900
  • ca73685bc2 Merge remote-tracking branch 'origin/main' into ksh SeongHyun Kim 2026-01-14 10:22:58 +0900
  • 61a7f585b4 다국어 자동생성 kjs 2026-01-14 10:20:27 +0900
  • cf97db7fbf feat(universal-form-modal): Select 필드 직접 입력(Combobox) 모드 추가 SelectOptionConfig에 allowCustomInput 옵션 추가 FieldDetailSettingsModal에 "직접 입력 허용" Switch UI 추가 CascadingSelectField에 Combobox 모드 구현 (Popover+Command) SelectField에 Combobox 모드 구현 목록 선택과 직접 입력 동시 지원 SeongHyun Kim 2026-01-13 18:44:59 +0900
  • 18b5161398 Merge branch 'feature/v2-renewal' of http://39.117.244.52:3000/kjs/ERP-node into feat/multilang kjs 2026-01-13 18:32:04 +0900
  • b576837f18 다국어 관리 시스템 개선: 카테고리 및 키 자동 생성 기능 추가 kjs 2026-01-13 18:28:11 +0900
  • ef27e0e38f feat(universal-form-modal): 연쇄 드롭다운(Cascading Dropdown) 기능 구현 SeongHyun Kim 2026-01-13 18:26:41 +0900
  • d7d7dabe84 fix: Select 옵션의 참조 테이블 컬럼 자동 로드 추가 SeongHyun Kim 2026-01-13 17:05:16 +0900
  • d22fd078be Merge pull request 'lhj' (#356) from lhj into main hjlee 2026-01-13 15:43:38 +0900
  • 28fe908704 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. leeheejin 2026-01-13 15:43:24 +0900
  • 1b5ae5fe1c 일단 오류 수정 leeheejin 2026-01-13 15:43:04 +0900
  • 905a9f62c3 feat: 프리뷰 모드에서 회사 코드 오버라이드 기능 추가 DDD1542 2026-01-13 13:28:50 +0900
  • 989b7e53a7 Merge pull request 'feature/screen-management' (#355) from feature/screen-management into main kjs 2026-01-13 10:25:20 +0900
  • 20e144af36 Merge branch 'main' into feature/screen-management feature/screen-management kjs 2026-01-13 10:25:08 +0900
  • e2a22bb853 Merge pull request 'lhj' (#354) from lhj into main hjlee 2026-01-13 10:04:41 +0900
  • 0deb466557 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. leeheejin 2026-01-13 10:04:19 +0900
  • f64279d084 카테고리 연속입력 leeheejin 2026-01-13 10:04:05 +0900
  • c74e97d66e chore: update react-is to version 18.3.1 and downgrade recharts to version 3.2.1 in package.json and package-lock.json SeongHyun Kim 2026-01-13 09:35:01 +0900
  • 0beb8b20a3 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-13 09:30:59 +0900
  • 054da65a26 Merge pull request 'lhj' (#353) from lhj into main hjlee 2026-01-13 09:30:27 +0900
  • 75e6c9eb1a 엑셀업로드 제어로직 개선 kjs 2026-01-13 09:30:19 +0900
  • 0f2d0bb053 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. leeheejin 2026-01-13 09:30:11 +0900
  • 306de370f1 탭 값 필터링 leeheejin 2026-01-13 09:29:58 +0900
  • b6fefe2ebd 엑셀 업로드 로직 개선 kjs 2026-01-12 17:43:34 +0900
  • f799402564 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into ksh SeongHyun Kim 2026-01-12 17:28:11 +0900
  • 033f5eaf7e 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. leeheejin 2026-01-12 17:27:28 +0900
  • d094b58ebf Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj leeheejin 2026-01-12 17:27:18 +0900
  • 3fa57ad2ae Merge pull request 'lhj' (#352) from lhj into main hjlee 2026-01-12 17:26:48 +0900
  • 821955cfac fix: 렉 구조 등록 카테고리 데이터 저장 방식 통일 및 중복 체크 수정 RackStructureComponent: context에 카테고리 코드 필드(floorCode, zoneCode 등) 추가 기존 데이터 조회 시 warehouse_id -> warehouse_code 컬럼명 수정 미리보기 생성 시 카테고리 코드로 저장하도록 변경 미리보기 테이블에서 카테고리 코드를 라벨로 변환하여 표시 buttonActions: 중복 체크 API 호출 시 filters -> search 파라미터로 변경 types: RackStructureContext 인터페이스에 카테고리 코드 필드 추가 SeongHyun Kim 2026-01-12 17:25:52 +0900
  • b358a46c33 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. leeheejin 2026-01-12 17:25:29 +0900
  • b2add92abf Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node hjjeong 2026-01-12 17:25:22 +0900
  • c2836a0209 일단 퇴사일 입력하면 필터링 적용되게 수정해놓음 leeheejin 2026-01-12 17:25:12 +0900
  • 472fc8633c 상단마스터정보+하단품목정보 수정시 오류 수정 hjjeong 2026-01-12 17:24:25 +0900
  • 4801ee5ca4 Merge pull request 'feature/screen-management' (#351) from feature/screen-management into main kjs 2026-01-12 17:20:23 +0900
  • 87189c792e 카테고리값 자동감지 kjs 2026-01-12 16:08:02 +0900
  • 9cc5bbbf05 엑셀 업로드 문제 수정 kjs 2026-01-12 13:53:57 +0900
  • 5f991db9c4 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-12 10:33:01 +0900
  • 9e7253a293 카테고리 라벨 보이지 않는 문제 수정 kjs 2026-01-12 10:32:41 +0900
  • 31e87e0bca 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. leeheejin 2026-01-12 09:25:13 +0900
  • 0773989c74 feat: 데이터 흐름 조회 기능 개선 및 프리뷰 모드 추가 DDD1542 2026-01-09 18:26:37 +0900
  • 6732e7d969 Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-09 18:22:51 +0900
  • 35f83c1937 로그 정리 kjs 2026-01-09 18:22:50 +0900
  • 8aa6008351 Merge pull request 'feature/screen-management' (#350) from feature/screen-management into main kjs 2026-01-09 17:57:08 +0900
  • 47b61a9a35 Merge branch 'main' into feature/screen-management kjs 2026-01-09 17:57:01 +0900
  • d22c2ec96e Merge branch 'feature/screen-management' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-09 17:56:49 +0900
  • 3677c77da0 단일테이블 엑셀 업로드 채번 구현 kjs 2026-01-09 17:56:48 +0900
  • c11e80a43c Merge remote-tracking branch 'origin/main' into ksh SeongHyun Kim 2026-01-09 17:46:44 +0900
  • f8fb7d687e fix: SelectedItemsDetailInput 수정 모드에서 다중 레코드 로드 오류 수정 DynamicComponentRenderer에 selected-items-detail-input groupedData 전달 추가 SelectedItemsDetailInput에서 groupedData 우선 사용하도록 변경 ScreenModal editData 배열 처리 시 formData/selectedData 분리 저장 TextInput 수정 모드에서 채번 규칙 스킵 로직 추가 SeongHyun Kim 2026-01-09 17:42:33 +0900
  • a6569909a2 feat: 저장 테이블 제외 조건 추가 및 포커싱 개선 DDD1542 2026-01-09 17:03:00 +0900
  • 5c9dda6826 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. leeheejin 2026-01-09 15:58:26 +0900
  • bcf512d2b5 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj leeheejin 2026-01-09 15:58:16 +0900
  • 4d41cb40b6 Merge pull request '빌드에러 수정' (#349) from feature/screen-management into main kjs 2026-01-09 15:57:15 +0900
  • bf74dd0f92 Merge branch 'main' into feature/screen-management kjs 2026-01-09 15:57:09 +0900
  • 85ae1c1521 빌드에러 수정 kjs 2026-01-09 15:56:56 +0900
  • 38455325dd 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. leeheejin 2026-01-09 15:48:39 +0900
  • f493f8ac80 Merge pull request 'feature/screen-management' (#348) from feature/screen-management into main kjs 2026-01-09 15:46:41 +0900
  • 7fc341bca8 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-09 15:46:24 +0900
  • ba2a281245 엑셀 업로드 제어로직 설정 가능하도록 수정 kjs 2026-01-09 15:46:09 +0900
  • aa0698556e 엑셀 업로드,다운로드 기능 개선 kjs 2026-01-09 15:32:02 +0900
  • c76123a927 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. leeheejin 2026-01-09 15:21:12 +0900
  • ba20a2bf42 피벗 테스트만 하면 됨 기능은 완료 leeheejin 2026-01-09 15:11:30 +0900
  • 23c9604672 Merge origin/main into ksh - resolve conflicts SeongHyun Kim 2026-01-09 14:55:16 +0900
  • 64c6942de3 feat(split-panel-layout): 멀티 테이블 탭 기능 추가 AdditionalTabConfig 타입 정의 (우측 패널과 동일한 설정 구조) 설정 패널에 추가 탭 설정 UI 구현 (테이블, 조인키, 컬럼, 필터, 중복제거, 버튼) 컴포넌트에 탭 상태 관리 및 데이터 로딩 로직 추가 탭 바 UI 및 탭별 컨텐츠 렌더링 구현 기존 기능 유지 (탭 미사용 시 동일 동작) SeongHyun Kim 2026-01-09 14:52:32 +0900
  • f07448ac17 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. leeheejin 2026-01-09 14:41:57 +0900
  • d49883d25f 피벗 추가 leeheejin 2026-01-09 14:41:27 +0900
  • 217e390fe9 Merge pull request 'fix/split-panel-edit-group-records' (#347) from fix/split-panel-edit-group-records into main hjjeong 2026-01-09 14:34:16 +0900
  • 363ef44586 Merge remote-tracking branch 'origin/main' into fix/split-panel-edit-group-records fix/split-panel-edit-group-records hjjeong 2026-01-09 14:33:02 +0900
  • 48aa004a7f fix: SplitPanelLayout 수정 버튼 클릭 시 그룹 레코드 조회 개선 hjjeong 2026-01-09 14:11:51 +0900
  • ee3a648917 삭제버튼 제어 동작하지 않던 오류 수정 kjs 2026-01-09 13:43:14 +0900
  • 819a281df4 fix: 피벗그리드 컴포넌트 레지스트리 등록 누락 수정 leeheejin 2026-01-09 13:34:55 +0900
  • dd1d3bb44d 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. leeheejin 2026-01-09 13:28:40 +0900
  • 52e6824e76 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into lhj leeheejin 2026-01-09 13:28:26 +0900
  • 80cf20e142 Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management kjs 2026-01-09 12:17:27 +0900
  • abddb67a30 Merge pull request 'lhj' (#346) from lhj into main hjlee 2026-01-09 11:52:42 +0900
  • a0a9253d2c 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. leeheejin 2026-01-09 11:51:48 +0900