723 Commits

Author SHA1 Message Date
Jaeyoung Lee
170ede663b Merge branch 'dev' into feature/test-jy 2024-09-27 16:23:26 +09:00
Jaeyoung Lee
112ebea1c1 변별 속성 작업중 2024-09-27 16:23:04 +09:00
yoosangwook
f47fbbe7bd refactor: Update toast functionality to use Swal 2024-09-27 16:10:36 +09:00
yoosangwook
8779444b9b refactor: Update toast functionality to use Swal 2024-09-27 15:50:59 +09:00
yoosangwook
cba28de088 refactor: Update toast functionality to use Swal 2024-09-27 15:40:30 +09:00
nalpari
8f36a5a170 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev 2024-09-27 15:11:35 +09:00
nalpari
febc257199 feat: Add LINE_TYPE constants for wall lines and sublines 2024-09-27 15:11:29 +09:00
bae554a8ce deleteObject 추가 2024-09-27 12:49:31 +09:00
592c076555 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev 2024-09-27 10:11:48 +09:00
40a0af8e9b 이벤트 분리 및 임의그리드 기능 추가 2024-09-27 10:11:34 +09:00
yoosangwook
84cb9aea60 feat: Add Swal hook 2024-09-27 10:06:11 +09:00
Daseul Kim
5ec615051d Merge branch 'dev-ds' into dev 2024-09-26 17:46:44 +09:00
Daseul Kim
4d4af3c1b5 refactor: modify canvas status api handling
- get 함수명 수정
- post/put 응답 toast 메세지 수정
2024-09-26 17:45:15 +09:00
changkyu choi
64d4b7e472 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev-ck 2024-09-26 15:50:10 +09:00
changkyu choi
b26f7a07ee Canvas 설정 컬럼 변경에 따른 수정 2024-09-26 15:49:37 +09:00
Daseul Kim
48f5d8194d Merge branch 'dev' into dev-ds 2024-09-26 15:08:18 +09:00
yoosangwook
e9009ffdd5 fix: Add Sync SessionStore at userSession
세션 스토어와 유저 세션을 동기화 하는 로직추가 / layout 컴포넌트 코드 수정
2024-09-26 14:58:32 +09:00
14faacf985 점.선 그리드 설정 기능 추가 2024-09-26 12:57:32 +09:00
minsik
5c0e3bbf4b Merge remote-tracking branch 'origin/qcast-pub' into dev 2024-09-26 10:29:02 +09:00
minsik
32c6bb5d7f - 메뉴 추가 및 변경 2024-09-26 10:28:30 +09:00
Daseul Kim
decd9f2215 Merge branch 'dev' into dev-ds 2024-09-26 10:25:45 +09:00
Daseul Kim
7c39bb811f refactor: canvas status 조회 로직 함수로 분리, canvas data 포맷 함수 추가 2024-09-26 10:24:18 +09:00
yjnoh
5fe7ec26ba 수동셀 추가 2024-09-26 10:05:45 +09:00
minsik
bf40d6f8f0 Merge remote-tracking branch 'origin/qcast-pub' into dev
# Conflicts:
#	src/store/settingAtom.js
2024-09-25 17:13:56 +09:00
minsik
4283ff9dcf - html 수정 2024-09-25 17:11:26 +09:00
minsik
e8fff6c190 - 점.선 그리드 모달 위치 변경
- 주석 제거
2024-09-25 17:10:33 +09:00
minsik
0c97f9d4a8 - Canvas Setting 메뉴 변경 2024-09-25 17:10:00 +09:00
minsik
99633bda4a - Grid Copy, Move 다국어 적용 및 Modal 위치 수정 2024-09-25 17:08:00 +09:00
Daseul Kim
d2203cd8f8 Merge branch 'dev' into dev-ds 2024-09-25 17:00:36 +09:00
yjnoh
f703f68c4b 자동셀, 수동셀 작업중 2024-09-25 16:36:02 +09:00
yoosangwook
2992e4bc40 refactor: modify canvas cleanup func 2024-09-25 16:16:00 +09:00
yoosangwook
05a2d6abd0 refactor: Add init value in QselectBox 2024-09-25 15:34:29 +09:00
Daseul Kim
08ef5a63ca feat: Add canvas plan load and save 2024-09-25 14:10:40 +09:00
1c2d3b7968 흡착점 추가 2024-09-25 13:29:25 +09:00
minsik
c6801960b5 - Toast Css import layout -> style.scss로 변경 2024-09-25 13:19:45 +09:00
minsik
92d2b5a4e4 - 흡착점 버튼 추가 2024-09-25 13:19:04 +09:00
minsik
7435b45360 - 점.선 그리드 모달 추가 2024-09-25 12:52:05 +09:00
minsik
8d64524585 Merge remote-tracking branch 'origin/qcast-pub' into dev
# Conflicts:
#	src/components/floor-plan/CanvasMenu.jsx
#	src/components/floor-plan/FloorPlan.jsx
#	src/components/floor-plan/MenuDepth01.jsx
2024-09-25 12:41:18 +09:00
minsik
cec4c90443 - 점.선 그리드 모달 추가 2024-09-25 11:16:46 +09:00
minsik
658776ea6d - icon 추가 및 css 변경 2024-09-25 11:16:03 +09:00
Minsiki
91f8f7fb03 모달 추가 2024-09-24 18:19:44 +09:00
changkyu choi
1a4145cb4a 저장 시 toast 메시지 처리 적용 2024-09-24 17:41:08 +09:00
changkyu choi
e078940a5b floor-plan 실행시 Canvas 설정 정보 조회 처리 2024-09-24 11:31:40 +09:00
changkyu choi
1c7e5d537b Canvas 설정 소스 단순화 및 오류 수정 2024-09-23 18:27:24 +09:00
d5a5778adc Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev
# Conflicts:
#	src/components/floor-plan/CanvasMenu.jsx
2024-09-23 17:53:27 +09:00
a412de9de2 feat: Add canvas zoom clear and onlyNumberInput Func 2024-09-23 17:51:31 +09:00
yoosangwook
512f75c399 refactor: 소스코드 임포트 순서 & 변수 선언 순서 수정
되도록 지켜 주세용
2024-09-23 17:20:05 +09:00
yoosangwook
14fa4cab3b feat: Add sessionStore 2024-09-23 17:09:14 +09:00
7d909e1197 Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev 2024-09-23 15:36:47 +09:00
95eb29b1b1 object id 추가 및 useLine, usePolygon 수정 2024-09-23 15:36:35 +09:00