-
-
-
-
{children}
+
+
+
+ {headerPathname === '/login' || headerPathname === '/join' ? (
+ {children}
+ ) : (
+
+
-
-
-
- )}
-
-
-
-
+
+ )}
+
+
+
+
+
)
}
diff --git a/src/app/management/ManagementProvider.js b/src/app/management/ManagementProvider.js
index 197b30c0..fb57e948 100644
--- a/src/app/management/ManagementProvider.js
+++ b/src/app/management/ManagementProvider.js
@@ -1,20 +1,18 @@
'ues client'
-import { createContext, useEffect, useState } from 'react'
+import { createContext } from 'react'
-export const ManagementContext = createContext({
- managementState: {},
- setManagementState: () => {},
-})
+export const ManagementContext = createContext({})
const ManagementProvider = ({ children }) => {
- const [managementState, setManagementState] = useState({})
+ // const [managementState, setManagementState] = useState({})
- useEffect(() => {
- console.log('🚀 ~ managementState:', managementState)
- }, [managementState])
+ // useEffect(() => {
+ // console.log('🚀 ~ managementState:', managementState)
+ // }, [managementState])
- return
{children}
+ // return
{children}
+ return
{children}
}
export default ManagementProvider
diff --git a/src/components/Playground.jsx b/src/components/Playground.jsx
index fcc5468d..2f3e2ab5 100644
--- a/src/components/Playground.jsx
+++ b/src/components/Playground.jsx
@@ -1,6 +1,6 @@
'use client'
-import { useRef, useState, useEffect } from 'react'
+import { useRef, useState, useEffect, useContext } from 'react'
import { useRecoilState } from 'recoil'
import { v4 as uuidv4 } from 'uuid'
import { FaAnglesUp } from 'react-icons/fa6'
@@ -26,6 +26,7 @@ import QPagination from './common/pagination/QPagination'
import { trestleRequestModels, constructionRequestModels, trestleDetailRequestModels } from '@/models/apiModels'
import QSelectBox from './common/select/QSelectBox'
import SampleReducer from './sample/SampleReducer'
+import { GlobalDataContext } from '@/app/GlobalDataProvider'
export default function Playground() {
const [useCadFile, setUseCadFile] = useRecoilState(useCadFileState)
@@ -52,6 +53,8 @@ export default function Playground() {
const [users, setUsers] = useState([])
+ const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
+
useEffect(() => {
console.log('textInput:', textInput)
}, [textInput])
@@ -508,6 +511,20 @@ export default function Playground() {
+
+
+
+
+
+
+
+
{managementStateLoaded?.objectNo}
+
+
+
+
>
)
diff --git a/src/components/fabric/QLine.js b/src/components/fabric/QLine.js
index 2a0bbca0..65575731 100644
--- a/src/components/fabric/QLine.js
+++ b/src/components/fabric/QLine.js
@@ -35,10 +35,6 @@ export const QLine = fabric.util.createClass(fabric.Line, {
this.startPoint = { x: this.x1, y: this.y1 }
this.endPoint = { x: this.x2, y: this.y2 }
-
- if (canvas) {
- this.canvas = canvas
- }
},
init: function () {
diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index b211b420..34a7b6c4 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -79,7 +79,7 @@ export default function CanvasMenu(props) {
const { floorPlanState, setFloorPlanState } = useContext(FloorPlanContext)
const { restoreModuleInstArea } = useModuleBasicSetting()
- const addedRoofs = useRecoilValue(addedRoofsState)
+ const [addedRoofs, setAddedRoofsState] = useRecoilState(addedRoofsState)
const [basicSetting, setBasicSetting] = useRecoilState(basicSettingState)
const selectedRoofMaterial = useRecoilValue(selectedRoofMaterialSelector)
@@ -118,6 +118,16 @@ export default function CanvasMenu(props) {
const changeSelectedRoofMaterial = (e) => {
setBasicSetting({ ...basicSetting, selectedRoofMaterial: e })
+
+ const newAddedRoofs = addedRoofs.map((roof) => {
+ if (roof.index === e.index) {
+ return { ...roof, selected: true }
+ } else {
+ return { ...roof, selected: false }
+ }
+ })
+
+ setAddedRoofsState(newAddedRoofs)
}
const settingsModalOptions = useRecoilState(settingModalFirstOptionsState)
diff --git a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
index 77d49d5e..7ed4e56e 100644
--- a/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
+++ b/src/components/floor-plan/modal/placementShape/PlacementShapeSetting.jsx
@@ -238,15 +238,17 @@ export default function PlacementShapeSetting({ id, pos = { x: 50, y: 180 }, set
{
return { ...roof, name: globalLocale === 'ko' ? roof.roofMatlNm : roof.roofMatlNmJp }
})}
- value={currentRoofMaterial}
+ value={basicSetting.roofSizeSet === '3' ? null : currentRoofMaterial}
onChange={(e) => handleRoofTypeChange(e.roofMatlCd)}
sourceKey="id"
targetKey="id"
showKey="name"
+ disabled={basicSetting.roofSizeSet === '3'}
/>
{/*
{/*