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

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

Browse Source 
Reviewed-on: #253
This commit is contained in:
ysCha 2025-07-30 10:18:05 +09:00
commit f95c414b31
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hooks/roofcover/useOuterLineWall.js
View File

@ -30,7 +30,6 @@ import { calculateAngle } from '@/util/qpolygon-utils'
import { fabric } from 'fabric' import { fabric } from 'fabric'
import { outlineDisplaySelector } from '@/store/settingAtom' import { outlineDisplaySelector } from '@/store/settingAtom'
import { usePopup } from '@/hooks/usePopup' import { usePopup } from '@/hooks/usePopup'
import PropertiesSetting from '@/components/floor-plan/modal/outerlinesetting/PropertiesSetting'
import Big from 'big.js' import Big from 'big.js'
import RoofShapeSetting from '@/components/floor-plan/modal/roofShape/RoofShapeSetting' import RoofShapeSetting from '@/components/floor-plan/modal/roofShape/RoofShapeSetting'
import { useObject } from '@/hooks/useObject' import { useObject } from '@/hooks/useObject'
@ -147,7 +146,7 @@ export function useOuterLineWall(id, propertiesId) {
const mouseDown = (e) => { const mouseDown = (e) => {
let pointer = getIntersectMousePoint(e) let pointer = getIntersectMousePoint(e)
pointer = { x: Big(pointer.x).round(1).toNumber(), y: Big(pointer.y).round(1).toNumber() } pointer = { x: Big(pointer.x).toNumber(), y: Big(pointer.y).toNumber() }
if (points.length === 0) { if (points.length === 0) {
setPoints((prev) => [...prev, pointer]) setPoints((prev) => [...prev, pointer])

2
src/hooks/usePolygon.js
View File

@ -1164,6 +1164,8 @@ export const usePolygon = () => {
if (startFlag && endFlag) { if (startFlag && endFlag) {
if (!representLines.includes(line) && line.attributes.type === LINE_TYPE.WALLLINE.EAVES) { if (!representLines.includes(line) && line.attributes.type === LINE_TYPE.WALLLINE.EAVES) {
representLines.push(line) representLines.push(line)
} else if (!representLines.includes(line) && line.attributes.type === LINE_TYPE.WALLLINE.HIPANDGABLE) {
representLines.push(line)
} }
} }
}) })