diff --git a/src/components/common/font/FontSetting.jsx b/src/components/common/font/FontSetting.jsx index 0e4754b0..d4896ab3 100644 --- a/src/components/common/font/FontSetting.jsx +++ b/src/components/common/font/FontSetting.jsx @@ -2,6 +2,7 @@ import WithDraggable from '@/components/common/draggable/withDraggable' import QSelectBox from '@/components/common/select/QSelectBox' import { usePopup } from '@/hooks/usePopup' import { useState } from 'react' +import { useMessage } from '@/hooks/useMessage' const fonts = [ { name: 'MS PGothic', value: 'MS PGothic' }, @@ -42,7 +43,8 @@ const fontColors = [ { name: '남색', value: 'darkblue' }, ] export default function FontSetting(props) { - const { id, setIsShow, font, setFont, fontSize, setFontSize } = props + const { id, setIsShow, font, setFont, fontSize, setFontSize, pos = { x: 455, y: 180 } } = props + const { getMessage } = useMessage() const { closePopup } = usePopup() const [originFont, setOriginFont] = useState(font) const [originFontSize, setOriginFontSize] = useState(fontSize) @@ -50,10 +52,10 @@ export default function FontSetting(props) { const [selectedFontSize, setSelectedFontSize] = useState(fontSize ? fontSize : fontSizes[0]) const [selectedFontColor, setSelectedFontColor] = useState(null) return ( - -
+ +
-

フォント

+

{getMessage('modal.font')}

diff --git a/src/components/floor-plan/modal/grid/DotLineGrid.jsx b/src/components/floor-plan/modal/grid/DotLineGrid.jsx index eacb1b34..06a911f6 100644 --- a/src/components/floor-plan/modal/grid/DotLineGrid.jsx +++ b/src/components/floor-plan/modal/grid/DotLineGrid.jsx @@ -21,7 +21,7 @@ export default function DotLineGrid(props) { // const [modalOption, setModalOption] = useRecoilState(modalState); //modal 열림닫힘 state const [objectNo, setObjectNo] = useState('test123240912001') // 이후 삭제 필요 const [close, setClose] = useState(false) - const { id, setShowDotLineGridModal } = props + const { id, setIsShow, pos = { x: 840, y: -815 } } = props const setSettingModalGridOptions = useSetRecoilState(settingModalGridOptionsState) const gridColor = useRecoilValue(gridColorState) const canvas = useRecoilValue(canvasState) @@ -315,14 +315,14 @@ export default function DotLineGrid(props) { } return ( - +

{getMessage('modal.canvas.setting.grid.dot.line.setting')}

- +
+
+
+
+ {getMessage('common.horizon')} +
+ setOriginHorizon(Number(e.target.value))} /> +
+ mm +
+
+ {getMessage('common.vertical')} +
+ setOriginVertical(Number(e.target.value))} + /> +
+ mm +
+
+
+ +
+
+
+
+ ) +} diff --git a/src/hooks/usePopup.js b/src/hooks/usePopup.js index f62fd6c5..ed056958 100644 --- a/src/hooks/usePopup.js +++ b/src/hooks/usePopup.js @@ -14,9 +14,14 @@ export function usePopup() { } const closePopup = (id) => { + console.log(id) setPopup({ children: [...popup.children.filter((child) => child.id !== id)] }) } + const closePopups = (ids) => { + setPopup({ children: [...popup.children.filter((child) => !ids.includes(child.id))] }) + } + const closeAll = () => { setPopup({ children: [] }) } @@ -34,6 +39,7 @@ export function usePopup() { setPopup, addPopup, closePopup, + closePopups, closeAll, } } diff --git a/src/locales/ja.json b/src/locales/ja.json index 20fea301..b6f41c05 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -157,6 +157,14 @@ "plan.mode.vertical.horizontal": "垂直水平モード", "plan.mode.free": "프리 모드(JA)", "modal.font.setting": "フォント設定", + "modal.font": "フォント", + "modal.font.style": "フォントスタイル", + "modal.font.size": "サイズ", + "modal.font.color": "フォン", + "common.horizon": "ガロ", + "common.vertical": "縦ロ", + "modal.font.setting.display": "見る", + "modal.font.setting.info": "ントです。プリンタと画面 でも同じフォントを使用します.", "modal.canvas.setting": "Canvas設定", "modal.canvas.setting.display": "ディスプレイ設定", "modal.canvas.setting.font.plan": " フォントと図面サイズの設定", diff --git a/src/locales/ko.json b/src/locales/ko.json index b853a3d0..525ae91c 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -161,6 +161,14 @@ "plan.mode.vertical.horizontal": "수직 수평 모드", "plan.mode.free": "프리 모드", "modal.font.setting": "글꼴 설정", + "modal.font": "글꼴", + "modal.font.style": "글꼴 스타일", + "modal.font.size": "크기", + "modal.font.color": "글꼴 색", + "common.horizon": "가로", + "common.vertical": "세로", + "modal.font.setting.display": "보기", + "modal.font.setting.info": "이것은 Open Type 글꼴입니다. 프린터 및 화면에서도 같은 글꼴을 사용합니다.", "modal.canvas.setting": "Canvas 설정", "modal.canvas.setting.display": "디스플레이 설정", "modal.canvas.setting.font.plan": "글꼴 및 도면 크기 설정", diff --git a/src/styles/_contents.scss b/src/styles/_contents.scss index ee823bab..f70745b3 100644 --- a/src/styles/_contents.scss +++ b/src/styles/_contents.scss @@ -424,8 +424,11 @@ // &::-webkit-scrollbar-track { // background-color: #fff; // } - canvas{ + .canvas-container{ + margin: 0 auto; background-color: #fff; + } + canvas{ position: absolute; top: 0; left: 0; diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss index 5a8167eb..9dc39b65 100644 --- a/src/styles/_modal.scss +++ b/src/styles/_modal.scss @@ -1629,7 +1629,7 @@ $alert-color: #101010; min-height: 80px; background-color: #fff; } - + } // 치수선 설정