diff --git a/src/components/common/draggable/withDraggable.jsx b/src/components/common/draggable/withDraggable.jsx index 2e83e530..23195fbe 100644 --- a/src/components/common/draggable/withDraggable.jsx +++ b/src/components/common/draggable/withDraggable.jsx @@ -8,13 +8,19 @@ export default function WithDraggable({ isShow, children, pos }) { const handleOnDrag = (e, data) => { e.stopPropagation() - console.log('pos', data) setPosition({ x: data.x, y: data.y }) } - useEffect(() => { setPosition({ ...pos }) }, []) - return <>{isShow && handleOnDrag(e, data)}>{children}} + return ( + <> + {isShow && ( + handleOnDrag(e, data)}> + {children} + + )} + + ) } diff --git a/src/components/floor-plan/FloorPlan.jsx b/src/components/floor-plan/FloorPlan.jsx index 3306dba5..6ffd4f8b 100644 --- a/src/components/floor-plan/FloorPlan.jsx +++ b/src/components/floor-plan/FloorPlan.jsx @@ -1,20 +1,22 @@ 'use client' +import { useEffect, useState } from 'react' +import '@/styles/contents.scss' import CanvasMenu from '@/components/floor-plan/CanvasMenu' import SettingModal01 from '@/components/floor-plan/modal/setting01/SettingModal01' import CanvasLayout from '@/components/floor-plan/CanvasLayout' -import '@/styles/contents.scss' import OuterLineWall from '@/components/floor-plan/modal/outerlinesetting/OuterLineWall' -import { useEffect, useState } from 'react' +import DotLineGrid from '@/components/floor-plan/modal/grid/DotLineGrid' export default function FloorPlan() { const [showCanvasSettingModal, setShowCanvasSettingModal] = useState(false) const [showOutlineModal, setShowOutlineModal] = useState(false) - const [showDotLineGridModal, setShowDotLineGridModal] = useState(false) + const [showDotLineGridModal, setShowDotLineGridModal] = useState(true) const [showGridCopyModal, setShowGridCopyModal] = useState(false) const [showGridMoveModal, setShowGridMoveModal] = useState(false) const canvasSettingProps = { setShowCanvasSettingModal, + setShowDotLineGridModal, } const outlineProps = { diff --git a/src/components/floor-plan/MenuDepth01.jsx b/src/components/floor-plan/MenuDepth01.jsx index 2432395e..63c85952 100644 --- a/src/components/floor-plan/MenuDepth01.jsx +++ b/src/components/floor-plan/MenuDepth01.jsx @@ -10,6 +10,7 @@ export default function MenuDepth01(props) { const [activeMenu, setActiveMenu] = useState() const onClickMenu = (menuNum) => { setActiveMenu(menuNum) + console.log(menuNum) if (type === 'outline') { setShowOutlineModal(menuNum === 0) } diff --git a/src/components/floor-plan/modal/grid/DotLineGrid.jsx b/src/components/floor-plan/modal/grid/DotLineGrid.jsx index e39aa864..aaab09d9 100644 --- a/src/components/floor-plan/modal/grid/DotLineGrid.jsx +++ b/src/components/floor-plan/modal/grid/DotLineGrid.jsx @@ -1,27 +1,37 @@ import WithDraggable from '@/components/common/draggable/withDraggable' import QSelectBox from '@/components/common/select/QSelectBox' import { useState } from 'react' +import { useMessage } from '@/hooks/useMessage' export default function DotLineGrid(props) { // const [modalOption, setModalOption] = useRecoilState(modalState); //modal 열림닫힘 state const [close, setClose] = useState(false) - - const SelectOption = [{ name: 'オンライン保証シ' }, { name: 'ステム' }] + const { setShowDotLineGridModal } = props + const { getMessage } = useMessage() + const SelectOption = [ + { id: 1, name: getMessage('modal.canvas.setting.grid.dot.line.setting.line.origin') }, + { id: 2, name: '1/2' }, + { + id: 3, + name: '1/4', + }, + { id: 4, name: '1/10' }, + ] const HandleClickClose = () => { - setClose(true) - setTimeout(() => { - setModalOption({ ...modalOption, gridoption: false }) - setClose(false) - }, 180) + // setClose(true) + // setTimeout(() => { + // setModalOption({ ...modalOption, gridoption: false }) + // setClose(false) + // }, 180) } return ( - -
+ +
{/*
*/}
-

ドット・ライングリッドの設定

-
@@ -29,11 +39,11 @@ export default function DotLineGrid(props) {
- +
- +
@@ -43,14 +53,14 @@ export default function DotLineGrid(props) {
- 横間隔 + {getMessage('modal.canvas.setting.grid.dot.line.setting.horizon')}
mm
- 横間隔 + {getMessage('modal.canvas.setting.grid.dot.line.setting.vertical')}
@@ -63,20 +73,20 @@ export default function DotLineGrid(props) {
- 横間隔 + {getMessage('modal.canvas.setting.grid.dot.line.setting.ratio')}
mm
- +
- - + +
diff --git a/src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx b/src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx index c8a61e11..ce635c87 100644 --- a/src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx +++ b/src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx @@ -347,8 +347,8 @@ export default function OuterLineWall(props) { }) } return ( - -
+ +

{getMessage('modal.cover.outline.drawing')}

diff --git a/src/locales/ja.json b/src/locales/ja.json index 8aaa0aad..bcc6c7ad 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -60,6 +60,15 @@ "modal.canvas.setting.grid": "그리드(JA)", "modal.canvas.setting.grid.optional.line": "ランダムグリッド", "modal.canvas.setting.grid.dot.line": "ドット・ライングリッド", + "modal.canvas.setting.grid.dot.line.setting": "ドット・ライングリッドの設定", + "modal.canvas.setting.grid.dot.line.setting.dot.display": "点グリッド表示", + "modal.canvas.setting.grid.dot.line.setting.line.display": "ライングリッドの表示", + "modal.canvas.setting.grid.dot.line.setting.line.origin": "原寸", + "modal.canvas.setting.grid.dot.line.setting.horizon": "横間隔", + "modal.canvas.setting.grid.dot.line.setting.vertical": "縦間隔", + "modal.canvas.setting.grid.dot.line.setting.ratio": "比間隔", + "modal.canvas.setting.grid.dot.line.setting.reset": "初期化", + "modal.canvas.setting.grid.dot.line.setting.save": "保存", "modal.canvas.setting.grid.absorption.add": "吸着点を追加", "modal.canvas.setting.grid.color.setting": "グリッド色の設定", "modal.canvas.setting.font.plan.edit": "フォントとサイズの変更", diff --git a/src/locales/ko.json b/src/locales/ko.json index 89f93d23..068dd262 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -57,6 +57,15 @@ "modal.canvas.setting.grid": "그리드", "modal.canvas.setting.grid.optional.line": "임의 그리드", "modal.canvas.setting.grid.dot.line": "점·선 그리드", + "modal.canvas.setting.grid.dot.line.setting": "점·선 그리드 설정", + "modal.canvas.setting.grid.dot.line.setting.dot.display": "점 그리드 표시", + "modal.canvas.setting.grid.dot.line.setting.line.display": "선 그리드 표시", + "modal.canvas.setting.grid.dot.line.setting.line.origin": "원치수", + "modal.canvas.setting.grid.dot.line.setting.horizon": "가로간격", + "modal.canvas.setting.grid.dot.line.setting.vertical": "세로간격", + "modal.canvas.setting.grid.dot.line.setting.ratio": "비율간격", + "modal.canvas.setting.grid.dot.line.setting.reset": "초기화", + "modal.canvas.setting.grid.dot.line.setting.save": "저장", "modal.canvas.setting.grid.absorption.add": "흡착점 추가", "modal.canvas.setting.grid.color.setting": "그리드 색 설정", "modal.canvas.setting.font.plan.edit": "글꼴 및 크기 변경",