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

dev #275

Merged
ysCha merged 5 commits from dev into prd-deploy 2025-08-04 17:28:22 +09:00
Conversation 0 Commits 5 Files Changed 3 +7 -6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,8 @@ export default function WithDraggable({ isShow, children, pos = { x: 0, y: 0 },
<Draggable <Draggable
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 === '' ? '.modal-handle' : handle} //전체 handle
cancel="input, button, select, textarea, [contenteditable], .sort-select"
> >
<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
} }

6
src/styles/_modal.scss
View File

@ -150,7 +150,7 @@ $alert-color: #101010;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 15px; width: 5px;
height: 100%; height: 100%;
background-color: #000; background-color: #000;
cursor: pointer; cursor: pointer;
@ -159,7 +159,7 @@ $alert-color: #101010;
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
width: 15px; width: 5px;
height: 100%; height: 100%;
background-color: #000; background-color: #000;
cursor: pointer; cursor: pointer;
@ -235,7 +235,7 @@ $alert-color: #101010;
.modal-foot{ .modal-foot{
display: block; display: block;
width: 100%; width: 100%;
padding: 15px 0; padding: 5px 0;
background-color: #000; background-color: #000;
cursor: pointer; cursor: pointer;
} }