4abf5b31c0
배치관리 중간커밋
2025-09-24 10:46:55 +09:00
kjs
d9270e6307
Merge pull request 'feature/screen-management' ( #49 ) from feature/screen-management into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/49
2025-09-23 15:38:41 +09:00
kjs
699efd25a2
Merge origin/dev - 충돌 해결
...
- JWT_SECRET 환경변수 충돌 해결
- origin/dev의 더 안전한 JWT 키 값 채택
- 데이터베이스 커넥터 관련 새로운 기능들과 병합
2025-09-23 15:36:03 +09:00
kjs
f15c1fa114
검색필터 수정사항
2025-09-23 15:31:27 +09:00
kjs
c557fc5d56
전체 화면 영역 배경색을 흰색으로 통일
...
- 화면 이외 영역의 회색 배경(bg-gray-50)을 흰색(bg-white)으로 변경
- AppLayout의 전체 배경색을 흰색으로 변경
- 빈 화면일 때의 배경색도 흰색으로 통일
- 화면 전체가 일관된 흰색 배경으로 표시되도록 개선
2025-09-23 15:30:02 +09:00
kjs
f0a9c50ca1
ResponsiveScreenContainer 컨테이너 완전 제거
...
- 화면 표시에서 ResponsiveScreenContainer 제거
- 직접 화면 컴포넌트들을 렌더링하도록 변경
- 컨테이너로 인한 크기 제한 및 스크롤 문제 해결
- 설계한 화면 크기 그대로 표시되도록 개선
2025-09-23 15:25:55 +09:00
kjs
1f67576d5d
화면 자동맞춤 기능 제거 및 전체 화면 표시 개선
...
- ResponsiveScreenContainer에서 자동맞춤 모드들(fit, scale, fullwidth) 제거
- 기본값을 original 모드로 변경하여 설계한 크기 그대로 표시
- 화면 컨테이너가 전체 높이를 사용하도록 레이아웃 수정
- 스크롤 문제 해결을 위해 overflow 설정 최적화
2025-09-23 15:21:50 +09:00
kjs
da9985cd24
검색 필터기능 수정사항
2025-09-23 14:26:18 +09:00
hjlee
7297db1730
Merge pull request 'lhj' ( #48 ) from lhj into dev
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/48
2025-09-23 12:37:28 +09:00
3083ffc0a3
외부커넥션관리 수정시 연결테스트 문제 해결과 프론트 약간 수정한 내용
2025-09-23 12:34:34 +09:00
f160a33b94
스크롤 기능 포함
2025-09-23 10:45:53 +09:00
kjs
e653effac0
테이블 추가기능 수정사항
2025-09-23 10:40:21 +09:00
kjs
37ded5a543
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node
2025-09-23 09:27:15 +09:00
kjs
2d83bf9329
Merge branch 'main' of http://39.117.244.52:3000/kjs/ERP-node
2025-09-22 18:29:03 +09:00
kjs
cc4398afbf
Merge pull request 'dev' ( #47 ) from dev into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/47
2025-09-22 18:28:31 +09:00
kjs
3556f55986
Merge branch 'main' into dev
2025-09-22 18:28:12 +09:00
kjs
d7c512772e
도커 db설정
2025-09-22 18:27:50 +09:00
kjs
0e2889afc1
Resolve merge conflict: Keep working multilangController.ts version
...
- Use version with all required export functions
- Ensure TypeScript compilation succeeds
- Maintain API route compatibility
2025-09-22 18:24:51 +09:00
kjs
7fa6fd6093
Fix: Restore multilangController.ts with all required exports
...
- Revert to working dev branch version to fix TypeScript compilation errors
- Main branch version was missing required export functions
- Routes depend on these exported functions for proper API functionality
2025-09-22 18:24:21 +09:00
kjs
0257254036
Fix: Restore multilangController.ts with all required exports
...
- Revert to dev branch version to fix TypeScript compilation errors
- Main branch version was missing required export functions
- Routes depend on these exported functions for proper API functionality
2025-09-22 18:24:00 +09:00
kjs
6c0e0db897
Merge pull request 'dev' ( #46 ) from dev into main
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/46
2025-09-22 18:17:23 +09:00
kjs
0031291828
Merge branch 'main' into dev
2025-09-22 18:17:07 +09:00
kjs
c78f152f68
Resolve merge conflicts: Use main branch versions for conflicting files
...
- Update multilangController.ts to main branch version
- Add Windows development environment files from main
- Include batch files for Windows development support
2025-09-22 18:16:24 +09:00
chpark
26ede5830c
윈도우용 실행파일 커밋
2025-09-22 17:46:23 +09:00
kjs
474cc33aee
Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-09-22 17:36:43 +09:00
hjlee
e7f9320a78
Merge pull request 'feature connection' ( #45 ) from feature/connection into dev
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/45
2025-09-22 17:34:46 +09:00
1ae16bb690
feature connection
2025-09-22 17:28:31 +09:00
kjs
1436c908a6
Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-09-22 17:02:52 +09:00
kjs
dfda1bcc24
테이블 및 컬럼 생성기능 추가
2025-09-22 17:00:59 +09:00
hyeonsu
3a96f9dc81
Merge pull request 'external-connections' ( #44 ) from external-connections into dev
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/44
2025-09-22 15:05:19 +09:00
kjs
0258c2a76c
라벨표시 수정
2025-09-22 14:13:05 +09:00
hyeonsu
0bad11686e
web_type에 따른 input 변화 구현
2025-09-21 12:31:37 +09:00
hyeonsu
c3cb1a0033
entity 수정
2025-09-21 11:39:34 +09:00
hyeonsu
28bd0d55cd
Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into external-connections
2025-09-21 11:10:31 +09:00
hyeonsu
44ed594dd7
insert 매핑 시 날짜 기본값 설정
2025-09-21 11:10:18 +09:00
hyeonsu
33600ce667
webtype 엔티티 수정
2025-09-21 10:28:15 +09:00
hyeonsu
43e335d271
전체실행조건 웹 타입별 조건분기
2025-09-21 09:53:05 +09:00
kjs
4b28530fec
타입 관리 개선 및 화면 비율조정 중간커밋
2025-09-19 18:43:55 +09:00
hyeonsu
81d760532b
제어 관리 저장 액션에 논리연산자 추가
2025-09-19 16:42:33 +09:00
hyeonsu
61aac5c5c3
관계도 저장 시 모달 및 이름 중복 안내 구현
2025-09-19 15:47:35 +09:00
kjs
a108fa0cc8
Merge pull request 'feature/screen-management' ( #43 ) from feature/screen-management into dev
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/43
2025-09-19 15:24:06 +09:00
kjs
baa656dee5
Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-09-19 15:23:35 +09:00
kjs
84d4d49bd5
메뉴생성시 화면할당기능 구현
2025-09-19 15:22:25 +09:00
hyeonsu
11b1743f6b
연결 테스트 추가
2025-09-19 14:55:53 +09:00
kjs
d1e1c7964b
테스트 프로젝트 테이블 생성 및 오류들 수정
2025-09-19 12:19:34 +09:00
hyeonsu
f61a18efa3
Merge pull request '외부 커넥션 테스트까지' ( #42 ) from external-connections into dev
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/42
2025-09-19 12:17:25 +09:00
hyeonsu
b27edae0f3
Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into external-connections
2025-09-19 12:15:30 +09:00
hyeonsu
efb08b0103
외부 커넥션 관리 ~ 테스트
2025-09-19 12:15:14 +09:00
kjs
eb6fa71cf4
Merge branch 'dev' of http://39.117.244.52:3000/kjs/ERP-node into feature/screen-management
2025-09-19 11:29:38 +09:00
hyeonsu
77a9e239a0
Merge pull request '필드 연결 설정 모달 매핑 설정 변경' ( #41 ) from dataflowMng into dev
...
Reviewed-on: http://39.117.244.52:3000/kjs/ERP-node/pulls/41
2025-09-19 11:28:57 +09:00
hjjeong
kjs
hjlee
leeheejin
chpark
hyeonsu