diff --git a/.env.development b/.env.development index 797778d9..cfc50e71 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -NEXT_PUBLIC_API_SERVER_PATH="https://dev-api.hanasys.jp" +NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080" NEXT_PUBLIC_HOST_URL="http://1.248.227.176:4000" diff --git a/package.json b/package.json index 84099e97..bf52888e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "serve": "node server.js" }, "dependencies": { - "@nextui-org/react": "^2.4.2", "ag-grid-react": "^32.0.2", "axios": "^1.7.8", "big.js": "^6.2.2", diff --git a/src/app/UIProvider.js b/src/app/UIProvider.js deleted file mode 100644 index 02a21441..00000000 --- a/src/app/UIProvider.js +++ /dev/null @@ -1,5 +0,0 @@ -import { NextUIProvider } from '@nextui-org/react' - -export default function UIProvider({ children }) { - return {children} -} diff --git a/src/components/floor-plan/FloorPlan.jsx b/src/components/floor-plan/FloorPlan.jsx index 775d7678..18f3ea0d 100644 --- a/src/components/floor-plan/FloorPlan.jsx +++ b/src/components/floor-plan/FloorPlan.jsx @@ -18,7 +18,7 @@ export default function FloorPlan({ children }) { const { closeAll } = usePopup() const { selectedMenu, setSelectedMenu } = useCanvasMenu() - const { fetchSettings } = useCanvasSetting(false) + const { fetchSettings } = useCanvasSetting() const resetCurrentMenu = useResetRecoilState(currentMenuState) useEffect(() => { return () => { diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index f9f97833..8d737c2d 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -52,7 +52,7 @@ export default function CircuitTrestleSetting({ id }) { // const [stepUpListData, setStepUpListData] = useRecoilState(stepUpListDataState) const [stepUpListData, setStepUpListData] = useState([]) const [seletedOption, setSeletedOption] = useState(null) - const { setModuleStatisticsData } = useCircuitTrestle() + const { setModuleStatisticsData, resetCircuits } = useCircuitTrestle() const { handleCanvasToPng } = useImgLoader() const passivityCircuitAllocationRef = useRef() @@ -92,6 +92,17 @@ export default function CircuitTrestleSetting({ id }) { // selectedModels, // pcsCheck, // }) + + return () => { + if ( + canvas + .getObjects() + .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE) + .some((surface) => !surface.isComplete) + ) { + resetCircuits() + } + } }, []) // 수동할당 시 모듈 삭제 diff --git a/src/components/floor-plan/modal/module/PanelEdit.jsx b/src/components/floor-plan/modal/module/PanelEdit.jsx index eafe159a..ea671881 100644 --- a/src/components/floor-plan/modal/module/PanelEdit.jsx +++ b/src/components/floor-plan/modal/module/PanelEdit.jsx @@ -9,7 +9,6 @@ import { deepCopyArray } from '@/util/common-utils' import { canvasState } from '@/store/canvasAtom' import * as turf from '@turf/turf' import { POLYGON_TYPE } from '@/common/common' -import { useModal } from '@nextui-org/react' import { useModule } from '@/hooks/module/useModule' import { useSwal } from '@/hooks/useSwal' @@ -34,7 +33,6 @@ export default function PanelEdit(props) { const canvas = useRecoilValue(canvasState) const { swalFire } = useSwal() const { moduleMove, moduleCopy, moduleMultiMove, moduleMultiCopy, moduleMoveAll, moduleCopyAll } = useModule() - useEffect(() => { if (!canvas) { const isSetupModules = canvas.getObjects().filter((obj) => obj.name === 'module') // selectedObj에 없는 객체만 필터링 diff --git a/src/components/ui/ObjectPlacement.jsx b/src/components/ui/ObjectPlacement.jsx index f7a73a5c..d03f2a1e 100644 --- a/src/components/ui/ObjectPlacement.jsx +++ b/src/components/ui/ObjectPlacement.jsx @@ -1,5 +1,4 @@ import React, { useCallback, useEffect, useRef, useState } from 'react' -import { Button, Input } from '@nextui-org/react' import { useRecoilState, useSetRecoilState } from 'recoil' import { modalState } from '@/store/modalAtom' import { fabric } from 'fabric' @@ -19,7 +18,7 @@ const ObjectPlacement = ({ canvas }) => { const [batchType, setBatchType] = useState(BATCH_TYPE.OPENING) // free or dimension 프리 / 치수 - const [inputType, setInputType] = useState(INPUT_TYPE.FREE) + const [inputType, setinputType] = useState(INPUT_TYPE.FREE) const handleSave = () => { setMode(batchType) @@ -38,7 +37,7 @@ const ObjectPlacement = ({ canvas }) => {
- - +
@@ -64,7 +63,7 @@ const ObjectPlacement = ({ canvas }) => {