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

Merge branch 'dev' into feature/yj-layoutSetup

Browse Source
This commit is contained in:
yjnoh 2025-04-09 17:39:13 +09:00
commit 76693640cf
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hooks/module/useTrestle.js
View File

@ -1049,9 +1049,7 @@ export const useTrestle = () => {
if (!rackInfos) { if (!rackInfos) {
const maxRows = surface.trestleDetail.moduleMaxRows const maxRows = surface.trestleDetail.moduleMaxRows
const maxCols = surface.trestleDetail.moduleMaxCols const maxCols = surface.trestleDetail.moduleMaxCols
const msg = `選択した家で設置可能 const msg = `段数の上限は${maxRows}段です。 上限より上の段には設置できません`
モジュールの最大段数は${maxRows}、最大列数は${maxCols}です。
上限より上部に取り付けたモジュールを削除してください。`
swalFire({ title: msg, type: 'alert' }) swalFire({ title: msg, type: 'alert' })
throw new Error('rackInfos is null') throw new Error('rackInfos is null')
} }

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

@ -32,6 +32,7 @@ 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 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'
//외벽선 그리기 //외벽선 그리기
export function useOuterLineWall(id, propertiesId) { export function useOuterLineWall(id, propertiesId) {
@ -256,7 +257,7 @@ export function useOuterLineWall(id, propertiesId) {
canvas?.renderAll() canvas?.renderAll()
setOuterLineFix(true) setOuterLineFix(true)
closePopup(id) closePopup(id)
addPopup(propertiesId, 1, <PropertiesSetting id={propertiesId} pos={{ x: 50, y: 230 }} />) addPopup(propertiesId, 1, <RoofShapeSetting id={propertiesId} pos={{ x: 50, y: 230 }} />)
} }
if (points.length < 3) { if (points.length < 3) {