Merge branch 'qcast-pub' into dev

# Conflicts:
#	src/hooks/option/useCanvasSetting.js
This commit is contained in:
김민식 2025-02-24 18:59:34 +09:00
commit 229fef9d2f
14 changed files with 105 additions and 119 deletions

View File

@ -87,7 +87,7 @@ export default function Estimate({}) {
const { getMessage } = useMessage() const { getMessage } = useMessage()
const { closeAll } = usePopup() const { closeAll } = usePopup()
const { setMenuNumber } = useCanvasMenu() const { setSelectedMenu } = useCanvasMenu()
// props // props
const fileUploadProps = { const fileUploadProps = {
uploadFiles: files, uploadFiles: files,
@ -142,7 +142,7 @@ export default function Estimate({}) {
}, [selectedPlan]) }, [selectedPlan])
useEffect(() => { useEffect(() => {
setMenuNumber(5) setSelectedMenu('estimate')
initEstimate() initEstimate()
}, []) }, [])

View File

@ -14,7 +14,7 @@ import { globalLocaleStore } from '@/store/localeAtom'
export default function CanvasLayout({ children }) { export default function CanvasLayout({ children }) {
// const { menuNumber } = props // const { menuNumber } = props
const pathname = usePathname() const pathname = usePathname()
const { menuNumber } = useCanvasMenu() const { selectedMenu } = useCanvasMenu()
const { session } = useContext(SessionContext) const { session } = useContext(SessionContext)
const { floorPlanState } = useContext(FloorPlanContext) const { floorPlanState } = useContext(FloorPlanContext)
const { objectNo, pid } = floorPlanState const { objectNo, pid } = floorPlanState
@ -30,7 +30,7 @@ export default function CanvasLayout({ children }) {
return ( return (
<div className="canvas-layout"> <div className="canvas-layout">
<div className={`canvas-page-list ${menuNumber === 2 || menuNumber === 3 || menuNumber === 4 ? 'active' : ''}`}> <div className={`canvas-page-list ${['outline', 'surface', 'module'].includes(selectedMenu) ? 'active' : ''}`}>
<div className="canvas-plane-wrap"> <div className="canvas-plane-wrap">
{plans.map((plan, index) => ( {plans.map((plan, index) => (
<button <button

View File

@ -38,7 +38,7 @@ import {
} from '@/store/settingAtom' } from '@/store/settingAtom'
import { placementShapeDrawingPointsState } from '@/store/placementShapeDrawingAtom' import { placementShapeDrawingPointsState } from '@/store/placementShapeDrawingAtom'
import { commonUtilsState } from '@/store/commonUtilsAtom' import { commonUtilsState } from '@/store/commonUtilsAtom'
import { menusState, menuTypeState } from '@/store/menuAtom' import { menusState } from '@/store/menuAtom'
import { estimateState, floorPlanObjectState } from '@/store/floorPlanObjectAtom' import { estimateState, floorPlanObjectState } from '@/store/floorPlanObjectAtom'
import { pwrGnrSimTypeState } from '@/store/simulatorAtom' import { pwrGnrSimTypeState } from '@/store/simulatorAtom'
import { isObjectNotEmpty } from '@/util/common-utils' import { isObjectNotEmpty } from '@/util/common-utils'
@ -51,12 +51,11 @@ import { QcastContext } from '@/app/QcastProvider'
import { useRoofFn } from '@/hooks/common/useRoofFn' import { useRoofFn } from '@/hooks/common/useRoofFn'
import { usePolygon } from '@/hooks/usePolygon' import { usePolygon } from '@/hooks/usePolygon'
export default function CanvasMenu(props) { export default function CanvasMenu(props) {
const { menuNumber, setMenuNumber } = props const { selectedMenu, setSelectedMenu } = props
const pathname = usePathname() const pathname = usePathname()
const router = useRouter() const router = useRouter()
const { addPopup } = usePopup() const { addPopup } = usePopup()
const canvasMenus = useRecoilValue(menusState) const canvasMenus = useRecoilValue(menusState)
const [type, setType] = useRecoilState(menuTypeState)
const [verticalHorizontalMode, setVerticalHorizontalMode] = useRecoilState(verticalHorizontalModeState) const [verticalHorizontalMode, setVerticalHorizontalMode] = useRecoilState(verticalHorizontalModeState)
const setAppMessageState = useSetRecoilState(appMessageStore) const setAppMessageState = useSetRecoilState(appMessageStore)
const setCurrentMenu = useSetRecoilState(currentMenuState) const setCurrentMenu = useSetRecoilState(currentMenuState)
@ -165,8 +164,8 @@ export default function CanvasMenu(props) {
} }
const onClickNav = async (menu) => { const onClickNav = async (menu) => {
switch (menu.index) { switch (menu.type) {
case 0: case 'drawing':
swalFire({ swalFire({
text: getMessage('stuff.detail.move.confirmMsg'), text: getMessage('stuff.detail.move.confirmMsg'),
type: 'confirm', type: 'confirm',
@ -176,17 +175,15 @@ export default function CanvasMenu(props) {
}, },
}) })
break break
case 1: case 'placement':
setType('placementShape')
onClickPlacementInitialMenu() onClickPlacementInitialMenu()
await reloadCanvasStatus(objectNo, pid) await reloadCanvasStatus(objectNo, pid)
break break
case 2: case 'outline':
setType('outline')
await reloadCanvasStatus(objectNo, pid) await reloadCanvasStatus(objectNo, pid)
break break
case 3: case 'surface':
if (menuNumber > menu.index) { if (selectedMenu > menu.index) {
const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE) const modules = canvas.getObjects().filter((module) => module.name === POLYGON_TYPE.MODULE)
if (modules.length > 0) { if (modules.length > 0) {
@ -212,7 +209,6 @@ export default function CanvasMenu(props) {
canvas.renderAll() canvas.renderAll()
onClickNav(menu) onClickNav(menu)
} }
setType('surface')
}, },
denyFn: () => { denyFn: () => {
return return
@ -220,24 +216,23 @@ export default function CanvasMenu(props) {
}) })
return return
} else { } else {
setType('surface')
} }
} else { } else {
setType('surface') setSelectedMenu(menu.type)
} }
await reloadCanvasStatus(objectNo, pid) await reloadCanvasStatus(objectNo, pid)
break break
case 4: case 4:
if (menuNumber < menu.index) { if (selectedMenu < menu.index) {
if (!checkMenuAndCanvasState()) { if (!checkMenuAndCanvasState()) {
swalFire({ text: getMessage('menu.validation.canvas.roof') }) swalFire({ text: getMessage('menu.validation.canvas.roof') })
return return
} else { } else {
setType('module') setSelectedMenu('module')
} }
} else { } else {
router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
setType('module') setSelectedMenu('module')
} }
await reloadCanvasStatus(objectNo, pid) await reloadCanvasStatus(objectNo, pid)
break break
@ -247,11 +242,11 @@ export default function CanvasMenu(props) {
if (res.status === 200) { if (res.status === 200) {
const estimateDetail = res.data const estimateDetail = res.data
if (estimateDetail.estimateDate !== null) { if (estimateDetail.estimateDate !== null) {
setMenuNumber(menu.index) setSelectedMenu(menu.type)
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
setFloorPlanObjectNo({ floorPlanObjectNo: objectNo }) setFloorPlanObjectNo({ floorPlanObjectNo: objectNo })
setIsGlobalLoading(false) setIsGlobalLoading(false)
router.push(`/floor-plan/estimate/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) router.push(`/floor-plan/estimate/${menu.type}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
if (pathname === '/floor-plan/estimate/5') { if (pathname === '/floor-plan/estimate/5') {
setIsGlobalLoading(false) setIsGlobalLoading(false)
} }
@ -268,7 +263,7 @@ export default function CanvasMenu(props) {
if (res.status === 200) { if (res.status === 200) {
const estimateDetail = res.data const estimateDetail = res.data
if (estimateDetail.estimateDate !== null && estimateDetail.docNo) { if (estimateDetail.estimateDate !== null && estimateDetail.docNo) {
setMenuNumber(menu.index) setSelectedMenu(menu.type)
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`) router.push(`/floor-plan/simulator/${menu.index}?pid=${selectedPlan.planNo}&objectNo=${objectNo}`)
if (pathname === '/floor-plan/simulator/6') { if (pathname === '/floor-plan/simulator/6') {
@ -283,14 +278,14 @@ export default function CanvasMenu(props) {
break break
} }
if (menu.index !== 6 && menu.index !== 0 && menu.index !== 5) { if (menu.type !== 'simulation' && menu.type !== 'estimate' && menu.type !== 'drawing') {
setMenuNumber(menu.index) setSelectedMenu(menu.type)
setCurrentMenu(menu.title) setCurrentMenu(menu.title)
} }
if (pathname !== '/floor-plan') { if (pathname !== '/floor-plan') {
// if (menu.index !== 0 ) { // if (menu.index !== 0 ) {
// or .. // or ..
if (menu.index !== 0 && menu.index !== 5 && menu.index !== 6) { if (menu.type !== 'drawing' && menu.type !== 'estimate' && menu.type !== 'simulation') {
router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`) router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
} }
} }
@ -313,10 +308,10 @@ export default function CanvasMenu(props) {
const settingsModalOptions = useRecoilState(settingModalFirstOptionsState) const settingsModalOptions = useRecoilState(settingModalFirstOptionsState)
useEffect(() => { useEffect(() => {
if (menuNumber === 1) { if (selectedMenu === 'placement') {
onClickPlacementInitialMenu() onClickPlacementInitialMenu()
} }
if (menuNumber === 3) { if (selectedMenu === 'surface') {
const moduleSurfacesArray = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) const moduleSurfacesArray = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
if (moduleSurfacesArray.length > 0) { if (moduleSurfacesArray.length > 0) {
initRoofs() initRoofs()
@ -327,7 +322,7 @@ export default function CanvasMenu(props) {
canvas.renderAll() canvas.renderAll()
} }
} }
}, [menuNumber, type]) }, [selectedMenu])
// (btn08) // (btn08)
const handleSaveCanvas = async () => { const handleSaveCanvas = async () => {
@ -424,26 +419,13 @@ export default function CanvasMenu(props) {
} else { } else {
setAppMessageState(JA) setAppMessageState(JA)
} }
}, [type, globalLocale]) }, [globalLocale])
/*useEffect(() => {
if (menuNumber === 1) {
return
}
setMenuNumber(1)
// if ([2, 3].some((num) => num === canvasSetting?.roofSizeSet)) {
// setMenuNumber(3)
// setType('surface')
// setCurrentMenu(MENU.BATCH_CANVAS.BATCH_DRAWING)
// } else {
// setMenuNumber(2)
// setType('outline')
// setCurrentMenu(MENU.ROOF_COVERING.EXTERIOR_WALL_LINE)
// }
}, [basicSetting])*/
const checkMenuState = (menu) => { const checkMenuState = (menu) => {
return (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) || (menuNumber === 4 && [1, 2].includes(menu.index)) return (
(['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'surface') ||
(selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type))
)
} }
/** /**
@ -552,17 +534,17 @@ export default function CanvasMenu(props) {
} }
return ( return (
<div className={`canvas-menu-wrap ${[2, 3, 4].some((num) => num === menuNumber) ? 'active' : ''}`}> <div className={`canvas-menu-wrap ${['outline', 'surface', 'module'].some((num) => num === selectedMenu) ? 'active' : ''}`}>
<div className="canvas-menu-inner"> <div className="canvas-menu-inner">
<ul className="canvas-menu-list"> <ul className="canvas-menu-list">
{canvasMenus.map((menu) => { {canvasMenus.map((menu) => {
return ( return (
<li <li
key={`canvas-menu-${menu.index}`} key={`canvas-menu-${menu.type}`}
className={`canvas-menu-item ${menuNumber === menu.index ? 'active' : ''}`} className={`canvas-menu-item ${selectedMenu === menu.type ? 'active' : ''}`}
onClick={async () => { onClick={async () => {
if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) return if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.type === 'surface') return
if (menuNumber === 4 && [1, 2].includes(menu.index)) return if (selectedMenu === 'module' && ['drawing', 'placement'].includes(menu.type)) return
await onClickNav(menu) await onClickNav(menu)
}} }}
> >
@ -575,7 +557,7 @@ export default function CanvasMenu(props) {
})} })}
</ul> </ul>
<div className="canvas-side-btn-wrap"> <div className="canvas-side-btn-wrap">
{![5, 6].some((num) => num === menuNumber) && ( {!['estimate', 'simulation'].some((num) => num === selectedMenu) && (
<> <>
{ {
<div className={`vertical-horizontal ${verticalHorizontalMode ? 'on' : ''}`}> <div className={`vertical-horizontal ${verticalHorizontalMode ? 'on' : ''}`}>
@ -646,7 +628,7 @@ export default function CanvasMenu(props) {
</> </>
)} )}
{menuNumber === 5 && ( {selectedMenu === 'estimate' && (
<> <>
<div className="ico-btn-from"> <div className="ico-btn-from">
<button <button
@ -708,7 +690,7 @@ export default function CanvasMenu(props) {
</div> </div>
</> </>
)} )}
{menuNumber === 6 && ( {selectedMenu === 'simulation' && (
<> <>
<div className="ico-btn-from"> <div className="ico-btn-from">
<button type="button" className="btn-frame gray ico-flx" onClick={() => handleExcelPdfFileDown('EXCEL', '2')}> <button type="button" className="btn-frame gray ico-flx" onClick={() => handleExcelPdfFileDown('EXCEL', '2')}>
@ -724,8 +706,8 @@ export default function CanvasMenu(props) {
)} )}
</div> </div>
</div> </div>
<div className={`canvas-depth2-wrap ${[2, 3, 4].some((num) => num === menuNumber) ? 'active' : ''}`}> <div className={`canvas-depth2-wrap ${['outline', 'surface', 'module'].some((num) => num === selectedMenu) ? 'active' : ''}`}>
{[2, 3, 4].some((num) => num === menuNumber) && <MenuDepth01 />} {['outline', 'surface', 'module'].some((num) => num === selectedMenu) && <MenuDepth01 />}
</div> </div>
{/* 견적서(menuNumber=== 5) 상세화면인경우 문서다운로드 팝업 */} {/* 견적서(menuNumber=== 5) 상세화면인경우 문서다운로드 팝업 */}
{estimatePopupOpen && ( {estimatePopupOpen && (

View File

@ -18,7 +18,7 @@ export default function FloorPlan({ children }) {
const pid = searchParams.get('pid') const pid = searchParams.get('pid')
const { closeAll } = usePopup() const { closeAll } = usePopup()
const { menuNumber, setMenuNumber } = useCanvasMenu() const { selectedMenu, setSelectedMenu } = useCanvasMenu()
const { fetchSettings } = useCanvasSetting() const { fetchSettings } = useCanvasSetting()
const resetCurrentMenu = useResetRecoilState(currentMenuState) const resetCurrentMenu = useResetRecoilState(currentMenuState)
useEffect(() => { useEffect(() => {
@ -54,15 +54,17 @@ export default function FloorPlan({ children }) {
}, [correntObjectNo]) }, [correntObjectNo])
const modalProps = { const modalProps = {
menuNumber, selectedMenu,
setMenuNumber, setSelectedMenu,
} }
return ( return (
<> <>
<div className="canvas-wrap"> <div className="canvas-wrap">
<CanvasMenu {...modalProps} /> <CanvasMenu {...modalProps} />
<div className={`canvas-content ${menuNumber === 2 || menuNumber === 3 || menuNumber === 4 ? 'active' : ''}`}>{children}</div> <div className={`canvas-content ${selectedMenu === 'outline' || selectedMenu === 'surface' || selectedMenu === 'module' ? 'active' : ''}`}>
{children}
</div>
</div> </div>
</> </>
) )

View File

@ -6,32 +6,37 @@ import { useMessage } from '@/hooks/useMessage'
import useMenu from '@/hooks/common/useMenu' import useMenu from '@/hooks/common/useMenu'
import { canvasState, currentMenuState } from '@/store/canvasAtom' import { canvasState, currentMenuState } from '@/store/canvasAtom'
import { useRecoilState, useRecoilValue } from 'recoil' import { useRecoilState, useRecoilValue } from 'recoil'
import { menuTypeState, subMenusState } from '@/store/menuAtom' import { subMenusState } from '@/store/menuAtom'
import { useCanvasMenu } from '@/hooks/common/useCanvasMenu'
export default function MenuDepth01() { export default function MenuDepth01() {
const type = useRecoilValue(menuTypeState)
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
const { getMessage } = useMessage() const { getMessage } = useMessage()
const { handleMenu } = useMenu() const { handleMenu } = useMenu()
const { selectedMenu, setSelectedMenu } = useCanvasMenu()
const [currentMenu, setCurrentMenu] = useRecoilState(currentMenuState) const [currentMenu, setCurrentMenu] = useRecoilState(currentMenuState)
const subMenus = useRecoilValue(subMenusState) const subMenus = useRecoilValue(subMenusState)
const onClickMenu = ({ id, menu }) => { const onClickMenu = ({ id, menu }) => {
if (menu === currentMenu) { if (menu === currentMenu) {
handleMenu(type) handleMenu(selectedMenu)
} else { } else {
setCurrentMenu(menu) setCurrentMenu(menu)
} }
} }
useEffect(() => { useEffect(() => {
handleMenu(type) console.log(subMenus[selectedMenu])
}, [selectedMenu])
useEffect(() => {
handleMenu(selectedMenu)
canvas?.discardActiveObject() canvas?.discardActiveObject()
}, [currentMenu]) }, [currentMenu])
return ( return (
<div className="canvas-depth2-inner"> <div className="canvas-depth2-inner">
<ul className="canvas-depth2-list"> <ul className="canvas-depth2-list">
{subMenus[type]?.map((menu) => { {subMenus[selectedMenu]?.map((menu) => {
return ( return (
<li key={menu.id} className={`canvas-depth2-item ${menu.menu === currentMenu ? 'active' : ''}`}> <li key={menu.id} className={`canvas-depth2-item ${menu.menu === currentMenu ? 'active' : ''}`}>
<button onClick={() => onClickMenu(menu)}>{getMessage(menu.name)}</button> <button onClick={() => onClickMenu(menu)}>{getMessage(menu.name)}</button>

View File

@ -220,8 +220,8 @@ export default function PassivityCircuitAllocation(props) {
goodsNo: model.goodsNo, goodsNo: model.goodsNo,
serQtyList: [ serQtyList: [
{ {
serQty: result[index + 1].maxValue, serQty: result[(index + 1).toString()].maxValue,
paralQty: result[index + 1].count, paralQty: result[(index + 1).toString()].count,
rmdYn: 'Y', rmdYn: 'Y',
usePossYn: 'Y', usePossYn: 'Y',
roofSurfaceList: roofSurfaceList, roofSurfaceList: roofSurfaceList,

View File

@ -38,7 +38,7 @@ export default function StuffDetail() {
const [showButton, setShowButton] = useState('') //, , const [showButton, setShowButton] = useState('') //, ,
const { setMenuNumber } = useCanvasMenu() const { setSelectedMenu } = useCanvasMenu()
// //
const { commonCode, findCommonCode } = useCommonCode() const { commonCode, findCommonCode } = useCommonCode()
@ -308,7 +308,7 @@ export default function StuffDetail() {
onClick={() => { onClick={() => {
setFloorPlanObjectNo({ floorPlanObjectNo: params.data.objectNo }) setFloorPlanObjectNo({ floorPlanObjectNo: params.data.objectNo })
setIsGlobalLoading(true) setIsGlobalLoading(true)
setMenuNumber(5) setSelectedMenu('estimate')
router.push(`/floor-plan/estimate/5?pid=${params.data.planNo}&objectNo=${params.data.objectNo}`) router.push(`/floor-plan/estimate/5?pid=${params.data.planNo}&objectNo=${params.data.objectNo}`)
}} }}
> >
@ -1653,7 +1653,7 @@ export default function StuffDetail() {
pid: planNo, pid: planNo,
objectNo: objectNo, objectNo: objectNo,
} }
setMenuNumber(null) setSelectedMenu(null)
const url = `/floor-plan?${queryStringFormatter(param)}` const url = `/floor-plan?${queryStringFormatter(param)}`
router.push(url) router.push(url)
} }

View File

@ -27,7 +27,7 @@ export default function StuffSubHeader({ type }) {
const [buttonStyle, setButtonStyle] = useState('') const [buttonStyle, setButtonStyle] = useState('')
const { setMenuNumber } = useCanvasMenu() const { setSelectedMenu } = useCanvasMenu()
useEffect(() => { useEffect(() => {
window.scrollTo(0, 0) window.scrollTo(0, 0)
@ -55,7 +55,7 @@ export default function StuffSubHeader({ type }) {
objectNo: objectNo, objectNo: objectNo,
} }
setMenuNumber(null) setSelectedMenu(null)
const url = `/floor-plan?${queryStringFormatter(param)}` const url = `/floor-plan?${queryStringFormatter(param)}`
router.push(url) router.push(url)

View File

@ -1,4 +1,4 @@
import { menuNumberState } from '@/store/menuAtom' import { selectedMenuState } from '@/store/menuAtom'
import { useRecoilState, useRecoilValue } from 'recoil' import { useRecoilState, useRecoilValue } from 'recoil'
import { useEffect } from 'react' import { useEffect } from 'react'
import { canvasState } from '@/store/canvasAtom' import { canvasState } from '@/store/canvasAtom'
@ -6,28 +6,12 @@ import { usePolygon } from '@/hooks/usePolygon'
import { POLYGON_TYPE } from '@/common/common' import { POLYGON_TYPE } from '@/common/common'
export const useCanvasMenu = () => { export const useCanvasMenu = () => {
const [menuNumber, setMenuNumber] = useRecoilState(menuNumberState) const [selectedMenu, setSelectedMenu] = useRecoilState(selectedMenuState)
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
const { drawDirectionArrow } = usePolygon() const { drawDirectionArrow } = usePolygon()
/*useEffect(() => {
/!*
* 모듈,회로 구성을 벗어나면 방향 표시 초기화 필요
* *!/
if (!canvas) return
if (![4, 5].includes(menuNumber)) {
canvas
.getObjects()
.filter((obj) => obj.name === POLYGON_TYPE.ROOF)
.forEach((obj) => {
obj.set('moduleCompass', null)
// drawDirectionArrow(obj)
})
}
}, [menuNumber])*/
return { return {
menuNumber, selectedMenu,
setMenuNumber, setSelectedMenu,
} }
} }

View File

@ -33,7 +33,6 @@ import { useColor } from 'react-color-palette'
import { useMasterController } from '@/hooks/common/useMasterController' import { useMasterController } from '@/hooks/common/useMasterController'
import PlacementShapeSetting, { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementShape/PlacementShapeSetting' import PlacementShapeSetting, { 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 { usePopup } from '../usePopup' import { usePopup } from '../usePopup'
import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider' import { FloorPlanContext } from '@/app/floor-plan/FloorPlanProvider'
import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions' import { moduleSelectionDataState, selectedModuleState } from '@/store/selectedModuleOptions'
@ -86,7 +85,7 @@ export function useCanvasSetting() {
) )
const [gridColor, setGridColor] = useRecoilState(gridColorState) const [gridColor, setGridColor] = useRecoilState(gridColorState)
const [color, setColor] = useColor(gridColor ?? '#FF0000') const [color, setColor] = useColor(gridColor ?? '#FF0000')
const { menuNumber, setMenuNumber } = useCanvasMenu() const { selectedMenu, setSelectedMenu } = useCanvasMenu()
const [settingsData, setSettingsData] = useState({ const [settingsData, setSettingsData] = useState({
...settingModalFirstOptions, ...settingModalFirstOptions,
@ -114,7 +113,6 @@ export function useCanvasSetting() {
const [roofMaterials, setRoofMaterials] = useRecoilState(roofMaterialsAtom) const [roofMaterials, setRoofMaterials] = useRecoilState(roofMaterialsAtom)
const [addedRoofs, setAddedRoofs] = useRecoilState(addedRoofsState) const [addedRoofs, setAddedRoofs] = useRecoilState(addedRoofsState)
const [fetchRoofMaterials, setFetchRoofMaterials] = useRecoilState(fetchRoofMaterialsState) const [fetchRoofMaterials, setFetchRoofMaterials] = useRecoilState(fetchRoofMaterialsState)
const [type, setType] = useRecoilState(menuTypeState)
const setCurrentMenu = useSetRecoilState(currentMenuState) const setCurrentMenu = useSetRecoilState(currentMenuState)
const resetModuleSelectionData = useResetRecoilState(moduleSelectionDataState) /* 다음으로 넘어가는 최종 데이터 */ const resetModuleSelectionData = useResetRecoilState(moduleSelectionDataState) /* 다음으로 넘어가는 최종 데이터 */
@ -341,10 +339,9 @@ export function useCanvasSetting() {
} }
}) })
/** 데이터 존재 시 화면 닫기(메뉴/저장 클릭 시 제외) */ /* 데이터 존재 시 화면 닫기(메뉴/저장 클릭 시 제외) */
if (openPoint !== 'canvasMenus' && openPoint !== 'basicSettingSave') { if (openPoint !== 'canvasMenus' && openPoint !== 'basicSettingSave') {
//closePopup(popupId) closePopup(popupId)
closeAll()
} }
} else { } else {
roofsRow = [ roofsRow = [
@ -447,12 +444,10 @@ export function useCanvasSetting() {
*/ */
const setMenuByRoofSize = (roofSizeSet) => { const setMenuByRoofSize = (roofSizeSet) => {
if (['2', '3'].includes(String(roofSizeSet))) { if (['2', '3'].includes(String(roofSizeSet))) {
setMenuNumber(3) setSelectedMenu('surface')
setType('surface')
setCurrentMenu(MENU.BATCH_CANVAS.BATCH_DRAWING) setCurrentMenu(MENU.BATCH_CANVAS.BATCH_DRAWING)
} else { } else {
setMenuNumber(2) setSelectedMenu('outline')
setType('outline')
setCurrentMenu(MENU.ROOF_COVERING.EXTERIOR_WALL_LINE) setCurrentMenu(MENU.ROOF_COVERING.EXTERIOR_WALL_LINE)
} }
} }

View File

@ -19,7 +19,6 @@ import ActualSizeSetting from '@/components/floor-plan/modal/roofAllocation/Actu
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import useMenu from '@/hooks/common/useMenu' import useMenu from '@/hooks/common/useMenu'
import { useCanvasMenu } from '@/hooks/common/useCanvasMenu' import { useCanvasMenu } from '@/hooks/common/useCanvasMenu'
import { menuTypeState } from '@/store/menuAtom'
import { useRoofFn } from '@/hooks/common/useRoofFn' import { useRoofFn } from '@/hooks/common/useRoofFn'
import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementShape/PlacementShapeSetting' import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementShape/PlacementShapeSetting'
import { globalLocaleStore } from '@/store/localeAtom' import { globalLocaleStore } from '@/store/localeAtom'
@ -37,8 +36,7 @@ export function useRoofAllocationSetting(id) {
const [popupId, setPopupId] = useState(uuidv4()) const [popupId, setPopupId] = useState(uuidv4())
const { addPopup, closePopup, closeAll } = usePopup() const { addPopup, closePopup, closeAll } = usePopup()
const currentObject = useRecoilValue(currentObjectState) const currentObject = useRecoilValue(currentObjectState)
const { setMenuNumber } = useCanvasMenu() const { setSelectedMenu } = useCanvasMenu()
const setMenuType = useSetRecoilState(menuTypeState)
const roofMaterials = useRecoilValue(roofMaterialsSelector) const roofMaterials = useRecoilValue(roofMaterialsSelector)
const selectedRoofMaterial = useRecoilValue(selectedRoofMaterialSelector) const selectedRoofMaterial = useRecoilValue(selectedRoofMaterialSelector)
const [basicSetting, setBasicSetting] = useRecoilState(basicSettingState) const [basicSetting, setBasicSetting] = useRecoilState(basicSettingState)
@ -387,8 +385,7 @@ export function useRoofAllocationSetting(id) {
}) })
setEditingLines([]) setEditingLines([])
closeAll() closeAll()
setMenuNumber(3) setSelectedMenu('surface')
setMenuType('surface')
modifyModuleSelectionData() modifyModuleSelectionData()
} }

View File

@ -140,7 +140,7 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
} }
} }
} else { } else {
imageRotate = (rotate + 4) % 4 imageRotate = (rotate + 360) % 360
} }
obj.set({ angle: imageRotate }) obj.set({ angle: imageRotate })
obj.setCoords() //좌표 변경 적용 obj.setCoords() //좌표 변경 적용

View File

@ -6,32 +6,33 @@ export const menuNumberState = atom({
default: null, default: null,
}) })
export const menuTypeState = atom({ export const selectedMenuState = atom({
key: 'menuTypeState', key: 'selectedMenuState',
default: null, default: null,
}) })
export const menusState = atom({ export const menusState = atom({
key: 'menusState', key: 'menusState',
default: [ default: [
{ index: 0, name: 'plan.menu.plan.drawing', icon: 'con00', title: MENU.PLAN_DRAWING }, { type: 'drawing', name: 'plan.menu.plan.drawing', icon: 'con00', title: MENU.PLAN_DRAWING }, //. 도면 작성
{ {
index: 1, type: 'placement', // 배치면 초기설정
name: 'plan.menu.placement.surface.initial.setting', name: 'plan.menu.placement.surface.initial.setting',
icon: 'con01', icon: 'con01',
title: MENU.INITIAL_CANVAS_SETTING, title: MENU.INITIAL_CANVAS_SETTING,
}, },
{ index: 2, name: 'plan.menu.roof.cover', icon: 'con02', title: MENU.ROOF_COVERING.DEFAULT }, { type: 'outline', name: 'plan.menu.roof.cover', icon: 'con02', title: MENU.ROOF_COVERING.DEFAULT },
{ index: 3, name: 'plan.menu.placement.surface', icon: 'con03', title: MENU.BATCH_CANVAS.DEFAULT }, { type: 'surface', name: 'plan.menu.placement.surface', icon: 'con03', title: MENU.BATCH_CANVAS.DEFAULT },
{ index: 4, name: 'plan.menu.module.circuit.setting', icon: 'con04', title: MENU.MODULE_CIRCUIT_SETTING.DEFAULT }, { type: 'module', name: 'plan.menu.module.circuit.setting', icon: 'con04', title: MENU.MODULE_CIRCUIT_SETTING.DEFAULT },
{ index: 5, name: 'plan.menu.estimate', icon: 'con06', title: MENU.ESTIMATE.DEFAULT }, { type: 'estimate', name: 'plan.menu.estimate', icon: 'con06', title: MENU.ESTIMATE.DEFAULT },
{ index: 6, name: 'plan.menu.simulation', icon: 'con05', title: MENU.POWER_GENERATION_SIMULATION.DEFAULT }, { type: 'simulation', name: 'plan.menu.simulation', icon: 'con05', title: MENU.POWER_GENERATION_SIMULATION.DEFAULT },
], ],
}) })
export const subMenusState = atom({ export const subMenusState = atom({
key: 'subMenusState', key: 'subMenusState',
default: { default: {
placement: [], // 배치면 초기 설정
outline: [ outline: [
// 지붕덮개 // 지붕덮개
{ id: 0, name: 'plan.menu.roof.cover.outline.drawing', menu: MENU.ROOF_COVERING.EXTERIOR_WALL_LINE }, { id: 0, name: 'plan.menu.roof.cover.outline.drawing', menu: MENU.ROOF_COVERING.EXTERIOR_WALL_LINE },

View File

@ -995,6 +995,26 @@ $alert-color: #101010;
} }
} }
} }
&:disabled{
color: $pop-color;
border: 1px solid #646464;
background-color: transparent;
opacity: 0.5;
&.act,
&:hover{
color: $pop-color;
border: 1px solid #646464;
background-color: transparent;
i{
&.allocation01{
background-image: url(../../public/static/images/canvas/allocation_icon01_white.svg);
}
&.allocation02{
background-image: url(../../public/static/images/canvas/allocation_icon02_white.svg);
}
}
}
}
} }
} }