From 58d35a2881733c746d4e7fd12400cb84b01c0cf1 Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 4 Aug 2025 15:53:34 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[1218]=20WINDOW=EB=A5=BC=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=ED=95=A0=20=EB=95=8C=20=EC=9E=A1=EB=8A=94=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20-=20=EC=A0=84=EC=B2=B4=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/draggable/WithDraggable.jsx | 2 +- src/styles/_modal.scss | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/common/draggable/WithDraggable.jsx b/src/components/common/draggable/WithDraggable.jsx index 9a51358c..99123e49 100644 --- a/src/components/common/draggable/WithDraggable.jsx +++ b/src/components/common/draggable/WithDraggable.jsx @@ -24,7 +24,7 @@ export default function WithDraggable({ isShow, children, pos = { x: 0, y: 0 }, handleOnDrag(e, data)} - handle={handle === '' ? '.modal-handle' : handle} + handle= ''//{handle === '' ? '.modal-handle' : handle} //전체 handle >
{children} diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss index f62c8592..4465f09a 100644 --- a/src/styles/_modal.scss +++ b/src/styles/_modal.scss @@ -150,7 +150,7 @@ $alert-color: #101010; position: absolute; top: 0; left: 0; - width: 15px; + width: 5px; height: 100%; background-color: #000; cursor: pointer; @@ -159,7 +159,7 @@ $alert-color: #101010; position: absolute; top: 0; right: 0; - width: 15px; + width: 5px; height: 100%; background-color: #000; cursor: pointer; @@ -235,7 +235,7 @@ $alert-color: #101010; .modal-foot{ display: block; width: 100%; - padding: 15px 0; + padding: 5px 0; background-color: #000; cursor: pointer; } From 359c7c458f1637abd9197be49f2c9dd3dda17c2d Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 4 Aug 2025 16:38:24 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=A7=80=EB=B6=95=EB=A9=B4=20=ED=95=A0?= =?UTF-8?q?=EB=8B=B9=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/usePolygon.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/usePolygon.js b/src/hooks/usePolygon.js index f6dbf3ce..a36b0982 100644 --- a/src/hooks/usePolygon.js +++ b/src/hooks/usePolygon.js @@ -846,8 +846,8 @@ export const usePolygon = () => { if (checkLineOverlap(innerLine, polygonLine)) { // innerLine의 type을 polygonLine의 type으로 변경 if (polygonLine.attributes?.type && innerLine.attributes) { - polygonLine.need = false - innerLine.attributes = polygonLine.attributes + // polygonLine.need = false + innerLine.attributes = { ...polygonLine.attributes } innerLine.direction = polygonLine.direction innerLine.attributes.isStart = true } From f11a7d68e79af7ed106bc0b4c4d0353d1a9b810c Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 4 Aug 2025 17:08:47 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[1218]=20WINDOW=EB=A5=BC=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=ED=95=A0=20=EB=95=8C=20=EC=9E=A1=EB=8A=94=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20-=20=EC=A0=84=EC=B2=B4=EC=97=90=EC=84=9C=20input,?= =?UTF-8?q?=20button,=20select,=20textarea,=20[contenteditable]=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/draggable/WithDraggable.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/common/draggable/WithDraggable.jsx b/src/components/common/draggable/WithDraggable.jsx index 99123e49..fe74088c 100644 --- a/src/components/common/draggable/WithDraggable.jsx +++ b/src/components/common/draggable/WithDraggable.jsx @@ -25,6 +25,7 @@ export default function WithDraggable({ isShow, children, pos = { x: 0, y: 0 }, position={{ x: position.x, y: position.y }} onDrag={(e, data) => handleOnDrag(e, data)} handle= ''//{handle === '' ? '.modal-handle' : handle} //전체 handle + cancel="input, button, select, textarea, [contenteditable]" >
{children} From dcd7ace8308a2d49a402e967256998b78f742432 Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 4 Aug 2025 17:27:13 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[1218]=20WINDOW=EB=A5=BC=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=ED=95=A0=20=EB=95=8C=20=EC=9E=A1=EB=8A=94=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20-=20QSelect=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/draggable/WithDraggable.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/draggable/WithDraggable.jsx b/src/components/common/draggable/WithDraggable.jsx index fe74088c..7ebdf067 100644 --- a/src/components/common/draggable/WithDraggable.jsx +++ b/src/components/common/draggable/WithDraggable.jsx @@ -25,7 +25,7 @@ export default function WithDraggable({ isShow, children, pos = { x: 0, y: 0 }, position={{ x: position.x, y: position.y }} onDrag={(e, data) => handleOnDrag(e, data)} handle= ''//{handle === '' ? '.modal-handle' : handle} //전체 handle - cancel="input, button, select, textarea, [contenteditable]" + cancel="input, button, select, textarea, [contenteditable], .sort-select" >
{children}