1850 Commits

Author SHA1 Message Date
yjnoh
e960ff5412 Merge branch 'dev' into dev-yj 2024-11-28 17:45:43 +09:00
yjnoh
05f187fda4 모듈 자동기능 작업진행중 2024-11-28 17:45:33 +09:00
7a7c34de4d 견적서 수정 2024-11-28 16:50:53 +09:00
yjnoh
d01756c029 Merge branch 'dev' into dev-yj 2024-11-28 15:28:30 +09:00
Daseul Kim
7b40f48144 fix: 포커싱 기준 수정, plan 참조 변수 대상 수정 2024-11-28 15:09:22 +09:00
f2ae403265
Merge Q-CAST-III-MR-402: 첨부파일수 정 2024-11-28 05:22:34 +00:00
52d76419c9 첨부파일수 정 2024-11-28 14:21:58 +09:00
24f06d119d
Merge Q-CAST-III-MR-401: no message 2024-11-28 05:18:39 +00:00
2aed71fa00 no message 2024-11-28 14:17:52 +09:00
minsik
be2de96fbb Merge remote-tracking branch 'origin/qcast-pub' into dev 2024-11-28 14:06:38 +09:00
minsik
9199accb24 - 그리드 padding 추가
- 그리드 이동, 복사, 삭제, 전체 삭제 기능 추가
2024-11-28 14:05:26 +09:00
4489a1c428 견적서 상세 2024-11-28 14:01:06 +09:00
96c51af6f8 견적서 2024-11-28 13:19:41 +09:00
f2ce118431 견적서 첨부파일 2024-11-28 12:12:54 +09:00
0d6f0079de 견적서 수정 2024-11-28 11:49:09 +09:00
yjnoh
dc717b051a 자동 설치 작업중 2024-11-28 10:18:41 +09:00
9c1caae229 견적서수정 2024-11-27 18:54:42 +09:00
cf6e5da7a0 견적서 수정 2024-11-27 18:46:02 +09:00
44323266e5 견적서 2024-11-27 18:38:52 +09:00
4fccfbb621 견적서 2024-11-27 18:12:02 +09:00
minsik
c7188da100 Merge remote-tracking branch 'origin/qcast-pub' into dev 2024-11-27 17:17:07 +09:00
minsik
d5eb0c71ae A, B 패턴 지붕면 할당 기능 추가 2024-11-27 17:16:24 +09:00
minsik
f603a5defa useContext -> useEvent 원복 2024-11-27 17:16:07 +09:00
a9fc8b0f30 return 주석 2024-11-27 16:06:18 +09:00
1b3accc7bc 견적서 2024-11-27 15:40:07 +09:00
minsik
6eacc36f46 Merge remote-tracking branch 'origin/qcast-pub' into dev
# Conflicts:
#	src/hooks/module/useModuleBasicSetting.js
2024-11-27 14:50:59 +09:00
minsik
b6d6ee7cac useContext -> useEvent 원복 2024-11-27 14:02:29 +09:00
minsik
c92065b825 Revert "useContext -> useEvent 원복"
This reverts commit a084b5dbf3483b4884bdeb59bb422ef27bc85bba.
2024-11-27 13:57:49 +09:00
minsik
a084b5dbf3 useContext -> useEvent 원복 2024-11-27 13:56:46 +09:00
yjnoh
5ef7394bbe Merge branch 'dev' into dev-yj 2024-11-27 13:24:55 +09:00
yjnoh
04a45c1bc9 처마면 모듈 자동설치 작업중 2024-11-27 13:24:40 +09:00
Jaeyoung Lee
416beb1eb1 Merge branch 'dev' into feature/test-jy 2024-11-27 13:21:07 +09:00
Jaeyoung Lee
19220bc3cc 박공지붕 오류 수정 2024-11-27 13:20:47 +09:00
b728be3786 견적서 2024-11-27 12:13:07 +09:00
19ed919cc1 견적서 2024-11-27 11:50:41 +09:00
b6873f4d27 견적서 2024-11-27 11:24:26 +09:00
5c3e4d76cf 견적서 2024-11-27 10:48:00 +09:00
minsik
5fc9779490 폰트 관련 기능 수정 2024-11-27 10:03:48 +09:00
f4a4ac8e36 물건상세 & 견적서 상세 2024-11-26 18:29:34 +09:00
changkyu choi
cd1a32eaf9 Canvas 설정 글꼴 null 처리 수정 2024-11-26 18:01:53 +09:00
Daseul Kim
2f18a3d560 fix: plan 참조 변수 대상 수정 2024-11-26 17:42:04 +09:00
Daseul Kim
6c75a2feb0 refactor: plan의 표출 name 변경 2024-11-26 16:30:49 +09:00
yoosangwook
db70b0aba3 fix: useEvent context 변경
- useContext로 전역으로 옮김
2024-11-26 15:47:02 +09:00
e6b8c1a5ed 견적서 2024-11-26 15:37:12 +09:00
8e47b69266 견적서 2024-11-26 15:05:50 +09:00
Jaeyoung Lee
d5d6cda1f0 Merge branch 'dev' into feature/test-jy 2024-11-26 13:16:46 +09:00
Jaeyoung Lee
3cbc99552a 외벽선등 색깔 정리 2024-11-26 13:16:25 +09:00
0d87b68bfa return 주석처리 2024-11-26 09:35:26 +09:00
140df034e4 견적서 상세 2024-11-26 09:27:08 +09:00
changkyu choi
a5e49e6b23 Canvas 설정 수정 2024-11-25 18:16:09 +09:00