From d079fe5948e66dea7d6caedddde9b353ae9f3a13 Mon Sep 17 00:00:00 2001 From: minsik Date: Tue, 22 Oct 2024 10:09:43 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=9A=A8chore:=20Sync=20Sass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/_contents.scss | 5 ++++- src/styles/_modal.scss | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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; } - + } // 치수선 설정 From 30267703e7a8956fc8047a444f422d91dc12c1f4 Mon Sep 17 00:00:00 2001 From: minsik Date: Tue, 22 Oct 2024 10:13:17 +0900 Subject: [PATCH 2/3] =?UTF-8?q?usePopup=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/font/FontSetting.jsx | 24 +++++----- .../floor-plan/modal/grid/DotLineGrid.jsx | 6 +-- .../floor-plan/modal/setting01/GridOption.jsx | 43 ++++++++++++----- .../modal/setting01/SecondOption.jsx | 46 ++++++++++++++++--- .../dimensionLine/DimensionLineSetting.jsx | 29 ++++++++---- src/hooks/usePopup.js | 6 +++ src/locales/ja.json | 8 ++++ src/locales/ko.json | 8 ++++ 8 files changed, 128 insertions(+), 42 deletions(-) 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 ed9ffa21..376cac03 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) @@ -311,14 +311,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 +
+
+
+ +
+
+
+
+ ) +}