diff --git a/public/static/images/canvas/menu_icon00.svg b/public/static/images/canvas/menu_icon00.svg new file mode 100644 index 0000000..f0adffd --- /dev/null +++ b/public/static/images/canvas/menu_icon00.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/components/canvas/CanvasMenu.jsx b/src/components/canvas/CanvasMenu.jsx index 3eda273..8f9f018 100644 --- a/src/components/canvas/CanvasMenu.jsx +++ b/src/components/canvas/CanvasMenu.jsx @@ -5,6 +5,7 @@ import MenuDepth01 from "./MenuDepth01"; export default function CanvasMenu({setModalOpen}) { const [menuNumber, setMenuNumber] = useState(null); + const [vertical, setVertical] = useState(true); const SelectOption = [ {name: '瓦53A',}, {name: '瓦53A'} ] @@ -18,6 +19,9 @@ export default function CanvasMenu({setModalOpen}) {
-
- -
+
+
+ 垂直水平モード + +
+
+ +
+
@@ -62,6 +72,7 @@ export default function CanvasMenu({setModalOpen}) {
+ {menuNumber === 0 && } {menuNumber === 1 && } {menuNumber === 2 && } {menuNumber === 3 && } diff --git a/src/components/canvas/modal/settoing01/FirstOption.jsx b/src/components/canvas/modal/settoing01/FirstOption.jsx index 298c7df..8eed536 100644 --- a/src/components/canvas/modal/settoing01/FirstOption.jsx +++ b/src/components/canvas/modal/settoing01/FirstOption.jsx @@ -1,5 +1,3 @@ -import { HandleBtnClick } from "./SettingModal01" - const buttonList01 = [ {id: 1, name: '割り当て表示'}, {id: 2, name: '実寸表示'}, @@ -19,14 +17,15 @@ const buttonList02 = [ {id: 3, name: 'All painted'}, ] -export default function FirstOption (){ +export default function FirstOption (props){ + const { onClick } = props return( <>

※図面に表示する項目をクリックすると適用されます。

{buttonList01.map((item)=>( - @@ -37,7 +36,7 @@ export default function FirstOption (){

画面表示

{buttonList02.map((item)=>( - diff --git a/src/components/canvas/modal/settoing01/SecondOption.jsx b/src/components/canvas/modal/settoing01/SecondOption.jsx index 067ec64..d88aeca 100644 --- a/src/components/canvas/modal/settoing01/SecondOption.jsx +++ b/src/components/canvas/modal/settoing01/SecondOption.jsx @@ -1,5 +1,3 @@ -import { HandleBtnClick } from "./SettingModal01" - const buttonList01 = [ {id: 1, name: '文字フォントの変更'}, {id: 2, name: 'フロー方向フォントの変更'}, @@ -13,7 +11,8 @@ const buttonList02 = [ {id: 4, name: 'ティーン'}, ] -export default function SecondOption (){ +export default function SecondOption (props){ + const { onClick } = props return( <>
@@ -30,7 +29,7 @@ export default function SecondOption (){

吸着範囲の設定

{buttonList02.map((item)=>( - diff --git a/src/components/canvas/modal/settoing01/SettingModal01.jsx b/src/components/canvas/modal/settoing01/SettingModal01.jsx index ecc4f45..43354a7 100644 --- a/src/components/canvas/modal/settoing01/SettingModal01.jsx +++ b/src/components/canvas/modal/settoing01/SettingModal01.jsx @@ -5,7 +5,7 @@ import FirstOption from "./FirstOption"; import SecondOption from "./SecondOption"; import WithDraggable from "@/components/common/draggable/withDraggable"; -export const HandleBtnClick = (e) => { +const HandleBtnClick = (e) => { const button = e.target.closest('button'); if(!button.classList.contains('act')){ button.classList.add('act'); @@ -13,6 +13,9 @@ export const HandleBtnClick = (e) => { button.classList.remove('act'); } } +const propsClick = { + onClick: HandleBtnClick +} export default function SettingModal01 ({modalOpen, setModalOpen}){ const [buttonAct, setButtonAct] = useState(1); @@ -47,8 +50,8 @@ export default function SettingModal01 ({modalOpen, setModalOpen}){ フォントと図面サイズの設定
- {buttonAct === 1 && } - {buttonAct === 2 && } + {buttonAct === 1 && } + {buttonAct === 2 && }
diff --git a/src/styles/_contents.scss b/src/styles/_contents.scss index 5d6b0ba..ff6005c 100644 --- a/src/styles/_contents.scss +++ b/src/styles/_contents.scss @@ -51,6 +51,7 @@ background-position: center; background-size: cover; margin-right: 10px; + &.con00{background-image: url(/static/images/canvas/menu_icon00.svg);} &.con01{background-image: url(/static/images/canvas/menu_icon01.svg);} &.con02{background-image: url(/static/images/canvas/menu_icon02.svg);} &.con03{background-image: url(/static/images/canvas/menu_icon03.svg);} @@ -109,6 +110,30 @@ } } } + .vertical-horizontal{ + display: flex; + min-width: 170px; + height: 28px; + margin: 0 5px; + border-radius: 2px; + background: #373737; + line-height: 28px; + overflow: hidden; + span{ + padding: 0 10px; + font-size: 13px; + color: #fff; + } + button{ + margin-left: auto; + height: 100%; + background-color: #4B4B4B; + font-size: 13px; + font-weight: 400; + color: #fff; + padding: 0 7.5px; + } + } .size-control{ display: flex; align-items: center; @@ -318,7 +343,7 @@ .canvas-frame{ position: relative; - height: calc(100% - 35.5px); + height: calc(100% - 36.5px); canvas{ position: absolute; top: 0;