Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev-ck
This commit is contained in:
commit
66d96e53d9
@ -34,6 +34,7 @@ import { useMasterController } from '@/hooks/common/useMasterController'
|
|||||||
import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementShape/PlacementShapeSetting'
|
import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementShape/PlacementShapeSetting'
|
||||||
import { useCanvasMenu } from '../common/useCanvasMenu'
|
import { useCanvasMenu } from '../common/useCanvasMenu'
|
||||||
import { menuTypeState } from '@/store/menuAtom'
|
import { menuTypeState } from '@/store/menuAtom'
|
||||||
|
import { usePopup } from '../usePopup'
|
||||||
|
|
||||||
const defaultDotLineGridSetting = {
|
const defaultDotLineGridSetting = {
|
||||||
INTERVAL: {
|
INTERVAL: {
|
||||||
@ -116,6 +117,8 @@ export function useCanvasSetting() {
|
|||||||
|
|
||||||
const selectedRoofMaterial = useRecoilValue(selectedRoofMaterialSelector)
|
const selectedRoofMaterial = useRecoilValue(selectedRoofMaterialSelector)
|
||||||
|
|
||||||
|
const { closeAll } = usePopup()
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setFetchRoofMaterials(!fetchRoofMaterials)
|
setFetchRoofMaterials(!fetchRoofMaterials)
|
||||||
if (fetchRoofMaterials) {
|
if (fetchRoofMaterials) {
|
||||||
@ -426,6 +429,7 @@ export function useCanvasSetting() {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
swalFire({ text: error.message, icon: 'error' })
|
swalFire({ text: error.message, icon: 'error' })
|
||||||
}
|
}
|
||||||
|
closeAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
// CanvasSetting 조회 및 초기화
|
// CanvasSetting 조회 및 초기화
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user