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

Merge branch 'qcast-pub' into dev

Browse Source
This commit is contained in:
minsik 2024-11-11 10:31:04 +09:00
commit 3b3eee6baa
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hooks/roofcover/useRoofAllocationSetting.js
View File

@ -107,18 +107,16 @@ export function useRoofAllocationSetting(id) {
} }
}) })
}) })
if (currentObject) { if (currentObject && currentObject.name && !currentObject.name.toLowerCase().includes('text')) {
console.log(currentObject.name) currentObject.set({
if (currentObject.name.toLowerCase().includes('line')) { strokeWidth: 4,
currentObject.set({ stroke: '#EA10AC',
strokeWidth: 4, })
stroke: '#EA10AC',
})
}
} }
}, [currentObject]) }, [currentObject])
useEffect(() => { useEffect(() => {
// canvas.getObjects().filter((obj) => obj.type === 'QLine')
const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF)
if (roofBases.length === 0) { if (roofBases.length === 0) {
swalFire({ text: '할당할 지붕이 없습니다.' }) swalFire({ text: '할당할 지붕이 없습니다.' })
@ -126,10 +124,6 @@ export function useRoofAllocationSetting(id) {
} }
}, []) }, [])
useEffect(() => {
console.log('editingLines', editingLines)
}, [editingLines])
const onAddRoofMaterial = () => { const onAddRoofMaterial = () => {
setValues([...values, selectedRoofMaterial]) setValues([...values, selectedRoofMaterial])
} }
@ -163,7 +157,7 @@ export function useRoofAllocationSetting(id) {
const checkInnerLines = () => { const checkInnerLines = () => {
const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) // roofPolygon.innerLines const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) // roofPolygon.innerLines
let result = false let result = false
console.log(roofBases)
roofBases.forEach((roof) => { roofBases.forEach((roof) => {
roof.innerLines.forEach((line) => { roof.innerLines.forEach((line) => {
if (!line.attributes.actualSize || line.attributes?.actualSize === 0) { if (!line.attributes.actualSize || line.attributes?.actualSize === 0) {

3
src/hooks/useContextMenu.js
View File

@ -176,6 +176,7 @@ export function useContextMenu() {
{ {
id: 'sizeEdit', id: 'sizeEdit',
name: getMessage('contextmenu.size.edit'), name: getMessage('contextmenu.size.edit'),
component: <SizeSetting id={popupId} target={currentObject} />,
}, },
{ {
id: 'remove', id: 'remove',
@ -211,6 +212,7 @@ export function useContextMenu() {
{ {
id: 'flowDirectionEdit', id: 'flowDirectionEdit',
name: getMessage('contextmenu.flow.direction.edit'), name: getMessage('contextmenu.flow.direction.edit'),
component: <FlowDirectionSetting id={popupId} target={currentObject} />,
}, },
], ],
]) ])
@ -257,7 +259,6 @@ export function useContextMenu() {
}, [currentContextMenu]) }, [currentContextMenu])
useEffect(() => { useEffect(() => {
console.log('currentObject', currentObject)
if (currentObject?.name) { if (currentObject?.name) {
switch (currentObject.name) { switch (currentObject.name) {
case 'triangleDormer': case 'triangleDormer':