Compare commits

..

20 Commits

Author SHA1 Message Date
46f9385163 enterCheck 전부 추가 2025-05-16 10:37:30 +09:00
59a55e4c88 961 : 외벽선 그리기 및 배치면 그리기에 대해서 外壁線を描く・配置面の描画について
1. "외벽선 그리기", "배치면 그리기"에서 선을 그을때 우클릭으로 "undo" 할 수 있도록 해주세요.
2. 마찬가지로 "외벽선 그리기", "배치면 그리기"로 지붕면을 확정할 때 Enter Key로 지붕면을 확정할 수 있도록 해주시기 바랍니다.
2025-05-16 10:31:23 +09:00
aa49e4c075 Merge pull request 'feature/ysCha' (#42) from feature/ysCha into dev
Reviewed-on: #42
2025-05-15 16:51:42 +09:00
96e989aa40 Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-15 16:15:22 +09:00
00ed6f250b Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-14 15:20:00 +09:00
80bf9263fd ?? => ? 변경 2025-05-14 15:16:28 +09:00
5c03e631ae Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-14 14:08:06 +09:00
8a49f7169b [948] - 견적서 양단케이블 selectbox 추가 케이블 체크 가능. 단어 추가 2025-05-14 14:00:29 +09:00
6dcf9b6836 Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-14 12:58:20 +09:00
55d37af144 Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-14 10:41:59 +09:00
c9e0650e6a Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-13 16:28:23 +09:00
01dda7e43e Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-13 16:12:16 +09:00
555671ade7 Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-13 13:03:59 +09:00
8b80277884 Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-12 16:02:00 +09:00
fb297b9a0a Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-12 09:04:59 +09:00
aa85de5280 Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-09 15:30:47 +09:00
9b6c6cdfae Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-09 09:07:15 +09:00
ae789672b4 Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-08 16:03:44 +09:00
105158e298 Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into feature/ysCha 2025-05-08 13:33:35 +09:00
772f465f9d Merge pull request 'dev' (#35) from dev into dev-deploy
Reviewed-on: #35
2025-05-08 12:37:05 +09:00
2 changed files with 31 additions and 4 deletions

View File

@ -96,6 +96,10 @@ export function useOuterLineWall(id, propertiesId) {
}
addCanvasMouseEventListener('mouse:down', mouseDown)
addDocumentEventListener('contextmenu', document, (e) => {
handleRollback()
})
clear()
return () => {
initEvent()
@ -690,6 +694,7 @@ export function useOuterLineWall(id, propertiesId) {
if (points.length === 0) {
return
}
enterCheck(e)
// 포커스가 length1에 있지 않으면 length1에 포커스를 줌
const activeElem = document.activeElement
if (activeElem !== length1Ref.current) {
@ -754,6 +759,7 @@ export function useOuterLineWall(id, propertiesId) {
if (points.length === 0) {
return
}
enterCheck(e)
const key = e.key
const activeElem = document.activeElement
@ -787,6 +793,7 @@ export function useOuterLineWall(id, propertiesId) {
if (points.length === 0) {
return
}
enterCheck(e)
const key = e.key
switch (key) {
case 'Down': // IE/Edge에서 사용되는 값
@ -812,6 +819,7 @@ export function useOuterLineWall(id, propertiesId) {
if (points.length === 0) {
return
}
enterCheck(e)
const key = e.key
switch (key) {
case 'Enter': {
@ -836,7 +844,7 @@ export function useOuterLineWall(id, propertiesId) {
if (points.length === 0) {
return
}
enterCheck(e)
const key = e.key
switch (key) {
case 'Down': // IE/Edge에서 사용되는 값
@ -902,6 +910,12 @@ export function useOuterLineWall(id, propertiesId) {
isFix.current = true
}
const enterCheck = (e) => {
if (e.key === 'Enter') {
handleFix()
}
}
return {
points,
setPoints,

View File

@ -92,6 +92,9 @@ export function usePlacementShapeDrawing(id) {
}
addCanvasMouseEventListener('mouse:down', mouseDown)
addDocumentEventListener('contextmenu', document, (e) => {
handleRollback()
})
clear()
}, [verticalHorizontalMode, points, adsorptionPointAddMode, adsorptionPointMode, adsorptionRange, interval, tempGridMode])
@ -175,7 +178,7 @@ export function usePlacementShapeDrawing(id) {
}
}
/*
/*
mouseMove
*/
const roofs = canvas?.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
@ -184,7 +187,7 @@ mouseMove
const { getAdsorptionPoints } = useAdsorptionPoint()
const mouseMove = (e) => {
removeMouseLine();
removeMouseLine()
const pointer = canvas.getPointer(e.e)
const roofsPoints = roofs.map((roof) => roof.points).flat()
roofAdsorptionPoints.current = [...roofsPoints]
@ -246,7 +249,6 @@ mouseMove
})
canvas?.add(horizontalLine, verticalLine)
canvas?.renderAll()
}
useEffect(() => {
@ -768,6 +770,7 @@ mouseMove
if (points.length === 0) {
return
}
enterCheck(e)
// 포커스가 length1에 있지 않으면 length1에 포커스를 줌
const activeElem = document.activeElement
@ -833,6 +836,7 @@ mouseMove
if (points.length === 0) {
return
}
enterCheck(e)
const key = e.key
const activeElem = document.activeElement
@ -866,6 +870,7 @@ mouseMove
if (points.length === 0) {
return
}
enterCheck(e)
const key = e.key
switch (key) {
case 'Down': // IE/Edge에서 사용되는 값
@ -891,6 +896,7 @@ mouseMove
if (points.length === 0) {
return
}
enterCheck(e)
const key = e.key
switch (key) {
case 'Enter': {
@ -915,6 +921,7 @@ mouseMove
if (points.length === 0) {
return
}
enterCheck(e)
const key = e.key
switch (key) {
@ -979,6 +986,12 @@ mouseMove
isFix.current = true
}
const enterCheck = (e) => {
if (e.key === 'Enter') {
handleFix()
}
}
return {
points,
setPoints,