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

Compare commits

base: qcast3:69fdaf0ae4bf7b0b51eeb3b696b813f5381f21e0
Branches Tags
qcast3:main
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/pv-btob
qcast3:hotfix/dev_yscha
qcast3:feature/redo-undo
qcast3:feature/jp_0615
qcast3:feature/roofline-edit2
qcast3:feature/roofline-edit
qcast3:hotfix/9999
qcast3:feature/qcast-1512
qcast3:feature/skeleton-dev
qcast3:feature/design-remake
qcast3:qcast-pub
qcast3:feature/sketon_cha
qcast3:feature/batch-angle
qcast3:feature/module-group
qcast3:feature/dev-yj
qcast3:feature/jimp-test
qcast3:feature/chore-env
qcast3:feature/jaeyoung
qcast3:feature/qcast-1052
qcast3:feature/qcast-1053
qcast3:feature/dev-yj-layout
qcast3:feature/qcast-886
qcast3:feature/module-grouping
qcast3:feature/qcast-944
qcast3:feature/qcast-950
qcast3:feature/qcast-947
qcast3:feature/qcast-925
..
compare: qcast3:46c083b982072e9309d856bdc7e9f5a229eb1dd1
Branches Tags
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/pv-btob
qcast3:hotfix/dev_yscha
qcast3:feature/redo-undo
qcast3:feature/jp_0615
qcast3:feature/roofline-edit2
qcast3:feature/roofline-edit
qcast3:hotfix/9999
qcast3:feature/qcast-1512
qcast3:feature/skeleton-dev
qcast3:feature/design-remake
qcast3:qcast-pub
qcast3:feature/sketon_cha
qcast3:feature/batch-angle
qcast3:feature/module-group
qcast3:feature/dev-yj
qcast3:feature/jimp-test
qcast3:feature/chore-env
qcast3:feature/jaeyoung
qcast3:feature/qcast-1052
qcast3:feature/qcast-1053
qcast3:feature/dev-yj-layout
qcast3:feature/qcast-886
qcast3:feature/module-grouping
qcast3:feature/qcast-944
qcast3:feature/qcast-950
qcast3:feature/qcast-947
qcast3:feature/qcast-925
qcast3:main

No commits in common. "69fdaf0ae4bf7b0b51eeb3b696b813f5381f21e0" and "46c083b982072e9309d856bdc7e9f5a229eb1dd1" have entirely different histories.
69fdaf0ae4 ... 46c083b982

4 changed files with 14 additions and 34 deletions
Show Stats Expand all files Collapse all files

12
src/components/floor-plan/modal/eavesGable/type/Eaves.jsx
View File

@ -66,9 +66,7 @@ export default function Eaves({ pitchRef, offsetRef, widthRef, radioTypeRef, pit
</div>
<div className="eaves-keraba-td">
<div className={`eaves-keraba-ico ${type === '1' ? 'act' : ''}`}>
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon01.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon01.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>
@ -81,9 +79,7 @@ export default function Eaves({ pitchRef, offsetRef, widthRef, radioTypeRef, pit
</div>
<div className="eaves-keraba-td">
<div className={`eaves-keraba-ico ${type === '2' ? 'act' : ''}`}>
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon02.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon02.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>
@ -109,9 +105,7 @@ export default function Eaves({ pitchRef, offsetRef, widthRef, radioTypeRef, pit
</div>
<div className="eaves-keraba-td">
<div className="eaves-keraba-ico ">
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon03.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon03.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>

16
src/components/floor-plan/modal/eavesGable/type/Gable.jsx
View File

@ -37,9 +37,7 @@ export default function Gable({ pitchRef, offsetRef, widthRef, radioTypeRef, pit
</div>
<div className="eaves-keraba-td">
<div className={`eaves-keraba-ico ${type === '1' ? 'act' : ''}`}>
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon04.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon04.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>
@ -52,9 +50,7 @@ export default function Gable({ pitchRef, offsetRef, widthRef, radioTypeRef, pit
</div>
<div className="eaves-keraba-td">
<div className={`eaves-keraba-ico ${type === '2' ? 'act' : ''}`}>
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon09.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon09.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>
@ -78,9 +74,7 @@ export default function Gable({ pitchRef, offsetRef, widthRef, radioTypeRef, pit
</div>
<div className="eaves-keraba-td">
<div className="eaves-keraba-ico ">
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon05.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon05.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>
@ -98,9 +92,7 @@ export default function Gable({ pitchRef, offsetRef, widthRef, radioTypeRef, pit
</div>
<div className="eaves-keraba-td">
<div className="eaves-keraba-ico ">
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon10.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon10.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>

12
src/components/floor-plan/modal/eavesGable/type/WallMerge.jsx
View File

@ -23,9 +23,7 @@ export default function WallMerge({ offsetRef, radioTypeRef }) {
</div>
<div className="eaves-keraba-td">
<div className={`eaves-keraba-ico ${type === '1' ? 'act' : ''}`}>
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon06.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon06.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>
@ -38,9 +36,7 @@ export default function WallMerge({ offsetRef, radioTypeRef }) {
</div>
<div className="eaves-keraba-td">
<div className={`eaves-keraba-ico ${type === '2' ? 'act' : ''}`}>
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon07.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon07.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>
@ -58,9 +54,7 @@ export default function WallMerge({ offsetRef, radioTypeRef }) {
</div>
<div className="eaves-keraba-td">
<div className="eaves-keraba-ico ">
<div style={{ width: 30, height: 30, position: 'relative' }}>
<Image src="/static/images/canvas/eaves_icon08.svg" alt="react" fill style={{ objectFit: 'contain' }} />
</div>
<Image src="/static/images/canvas/eaves_icon08.svg" alt="react" width={30} height={30} />
</div>
</div>
</div>

8
src/components/floor-plan/modal/movement/type/FlowLine.jsx
View File

@ -12,12 +12,11 @@ export default function FlowLine({ FLOW_LINE_REF }) {
const { getMessage } = useMessage()
const [type, setType] = useState(FLOW_LINE_TYPE.DOWN_LEFT)
const [filledInput, setFilledInput] = useState('')
const [pointerInput, setPointerInput] = useState('100')
const currentObject = useRecoilValue(currentObjectState)
const handleFocus = () => {
if (currentObject === null) {
setPointerInput('')
setFilledInput('')
FLOW_LINE_REF.POINTER_INPUT_REF.current.value = ''
FLOW_LINE_REF.FILLED_INPUT_REF.current.value = ''
FLOW_LINE_REF.FILLED_INPUT_REF.current.blur()
}
}
@ -36,7 +35,7 @@ export default function FlowLine({ FLOW_LINE_REF }) {
<div className="outline-form">
<span>{getMessage('modal.movement.flow.line.position')}</span>
<div className="input-grid mr5">
<input type="text" className="input-origin block" value={pointerInput} readOnly={true} ref={FLOW_LINE_REF.POINTER_INPUT_REF} />
<input type="text" className="input-origin block" defaultValue={100} readOnly={true} ref={FLOW_LINE_REF.POINTER_INPUT_REF} />
</div>
</div>
<div className="moving-tab-content">
@ -72,6 +71,7 @@ export default function FlowLine({ FLOW_LINE_REF }) {
<input
type="text"
className="input-origin block"
defaultValue={100}
ref={FLOW_LINE_REF.FILLED_INPUT_REF}
value={filledInput}
onFocus={handleFocus}