qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#273) from dev into dev-deploy

Browse Source 
Reviewed-on: #273
This commit is contained in:
ysCha 2025-08-04 17:10:02 +09:00
commit 9b0d5697a5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/common/draggable/WithDraggable.jsx
View File

@ -25,6 +25,7 @@ export default function WithDraggable({ isShow, children, pos = { x: 0, y: 0 },
position={{ x: position.x, y: position.y }} position={{ x: position.x, y: position.y }}
onDrag={(e, data) => handleOnDrag(e, data)} onDrag={(e, data) => handleOnDrag(e, data)}
handle= ''//{handle === '' ? '.modal-handle' : handle} //전체 handle handle= ''//{handle === '' ? '.modal-handle' : handle} //전체 handle
cancel="input, button, select, textarea, [contenteditable]"
> >
<div className={`modal-pop-wrap ${className}`} style={{ visibility: isHidden ? 'hidden' : 'visible' }}> <div className={`modal-pop-wrap ${className}`} style={{ visibility: isHidden ? 'hidden' : 'visible' }}>
{children} {children}

4
src/hooks/usePolygon.js
View File

@ -846,8 +846,8 @@ export const usePolygon = () => {
if (checkLineOverlap(innerLine, polygonLine)) { if (checkLineOverlap(innerLine, polygonLine)) {
// innerLine의 type을 polygonLine의 type으로 변경 // innerLine의 type을 polygonLine의 type으로 변경
if (polygonLine.attributes?.type && innerLine.attributes) { if (polygonLine.attributes?.type && innerLine.attributes) {
polygonLine.need = false // polygonLine.need = false
innerLine.attributes = polygonLine.attributes innerLine.attributes = { ...polygonLine.attributes }
innerLine.direction = polygonLine.direction innerLine.direction = polygonLine.direction
innerLine.attributes.isStart = true innerLine.attributes.isStart = true
} }