- 메뉴 추가 및 변경

2024-09-26 10:28:30 +09:00 · 2024-09-26 10:28:30 +09:00 · 32c6bb5d7f
commit 32c6bb5d7f
parent 4283ff9dcf
6 changed files with 53 additions and 31 deletions
--- a/src/common/common.js
+++ b/src/common/common.js
@ -4,19 +4,27 @@ export const MENU = {
  ROOF_COVERING: {
    EXTERIOR_WALL_LINE: 'exteriorWallLine', // 외벽선 그리기
    ROOF_SHAPE_SETTINGS: 'roofShapeSettings', // 지붕형상 설정
+    ROOF_SHAPE_PASSIVITY_SETTINGS: 'roofShapePassivitySettings', // 지붕형상 수동설정
    ROOF_SHAPE_EDITING: 'roofShapeEditing', // 지붕형상 편집
    HELP_LINE_DRAWING: 'helpLineDrawing', // 보조선 그리기
+    EAVES_KERAVA_EDIT: 'eavesKeravaEdit', // 처마.케라마 변경
+    MOVEMENT_SHAPE_UPDOWN: 'movementShapeUpdown', // 동선이동.형올림내림
+    OUTLINE_EDIT_OFFSET: 'outlineEditOffset', // 외벽선 편집 및 오프셋
+    ROOF_SHAPE_ALLOC: 'rootShapeAlloc', // 지붕면 항당
    DEFAULT: 'roofCoveringDefault', // 아무것도 선택 안할 경우
  }, // 지붕덮개
  BATCH_CANVAS: {
+    SLOPE_SETTING: 'slopeSetting', // 경사 설정
    BATCH_DRAWING: 'batchDrawing', // 배치면 그리기
    SURFACE_SHAPE_BATCH: 'surfaceShapeBatch', // 면형상 배치
    OBJECT_BATCH: 'objectBatch', // 오브젝트 배치
+    ALL_REMOVE: 'allRemove', // 전체 삭제
    DEFAULT: 'batchCanvasDefault', // default
  }, // 배치면
  MODULE_CIRCUIT_SETTING: {
    BASIC_SETTING: 'basicSetting', // 기본설정
    CIRCUIT_TRESTLE_SETTING: 'circuitTrestleSetting', // 회로가대설정
+    PLAN_ORIENTATION: 'planOrientation', // 도면 방위적용
    DEFAULT: 'moduleCircuitSettingDefault',
  }, // 모듈회로구성
  ESTIMATE: 'estimate', // todo 견적서
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@ -113,17 +113,17 @@ export default function CanvasMenu(props) {
        <div className="canvas-side-btn-wrap">
          {menuNumber !== 6 && menuNumber !== 5 && (
            <>
+              {
+                <div className={`vertical-horizontal ${verticalHorizontalMode ? 'on' : ''}`}>
+                  <span>{getMessage('plan.mode.vertical.horizontal')}</span>
+                  <button onClick={() => setVerticalHorizontalMode(!verticalHorizontalMode)}>{verticalHorizontalMode ? 'ON' : 'OFF'}</button>
+                </div>
+              }
              <div className="btn-from">
                <button className="btn01"></button>
                <button className="btn02 active"></button>
                <button className="btn03 "></button>
              </div>
-              {menuNumber !== 4 && (
-                <div className={`vertical-horizontal ${verticalHorizontalMode ? 'on' : ''}`}>
-                  <span>{getMessage('plan.mode.vertical.horizontal')}</span>
-                  <button onClick={() => setVerticalHorizontalMode(!verticalHorizontalMode)}>{verticalHorizontalMode ? 'ON' : 'OFF'}</button>
-                </div>
-              )}
              <div className="select-box">
                <QSelectBox title={'瓦53A'} option={SelectOption} />
              </div>
--- a/src/components/floor-plan/MenuDepth01.jsx
+++ b/src/components/floor-plan/MenuDepth01.jsx
@ -1,6 +1,5 @@
 'use client'

-import { ToggleonMouse } from '@/components/header/Header'
 import { useMessage } from '@/hooks/useMessage'
 import { useEffect, useState } from 'react'
 import { MENU } from '@/common/common'
@ -30,23 +29,39 @@ export default function MenuDepth01(props) {
      // 지붕덮개
      { id: 0, name: 'plan.menu.roof.cover.outline.drawing', menu: MENU.ROOF_COVERING.EXTERIOR_WALL_LINE },
      { id: 1, name: 'plan.menu.roof.cover.roof.shape.setting', menu: MENU.ROOF_COVERING.ROOF_SHAPE_SETTINGS },
-      { id: 2, name: 'plan.menu.roof.cover.roof.shape.edit', menu: MENU.ROOF_COVERING.ROOF_SHAPE_EDITING },
+      {
+        id: 2,
+        name: 'plan.menu.roof.cover.roof.shape.passivity.setting',
+        menu: MENU.ROOF_COVERING.ROOF_SHAPE_PASSIVITY_SETTINGS,
+      },
      { id: 3, name: 'plan.menu.roof.cover.auxiliary.line.drawing', menu: MENU.ROOF_COVERING.HELP_LINE_DRAWING },
+      { id: 4, name: 'plan.menu.roof.cover.eaves.kerava.edit', menu: MENU.ROOF_COVERING.EAVES_KERAVA_EDIT },
+      { id: 5, name: 'plan.menu.roof.cover.movement.shape.updown', menu: MENU.ROOF_COVERING.MOVEMENT_SHAPE_UPDOWN },
+      { id: 6, name: 'plan.menu.roof.cover.outline.edit.offset', menu: MENU.ROOF_COVERING.OUTLINE_EDIT_OFFSET },
+      { id: 7, name: 'plan.menu.roof.cover.roof.surface.alloc', menu: MENU.ROOF_COVERING.ROOF_SHAPE_ALLOC },
    ],
    surface: [
      // 배치면
-      { id: 0, name: 'plan.menu.placement.surface.drawing', menu: MENU.BATCH_CANVAS.BATCH_DRAWING },
-      { id: 1, name: 'plan.menu.placement.surface.surface', menu: MENU.BATCH_CANVAS.SURFACE_SHAPE_BATCH },
-      { id: 2, name: 'plan.menu.placement.surface.object', menu: MENU.BATCH_CANVAS.OBJECT_BATCH },
+      { id: 0, name: 'plan.menu.placement.surface.slope.setting', menu: MENU.BATCH_CANVAS.SLOPE_SETTING },
+      { id: 1, name: 'plan.menu.placement.surface.drawing', menu: MENU.BATCH_CANVAS.BATCH_DRAWING },
+      { id: 2, name: 'plan.menu.placement.surface.arrangement', menu: MENU.BATCH_CANVAS.SURFACE_SHAPE_BATCH },
+      { id: 3, name: 'plan.menu.placement.surface.object', menu: MENU.BATCH_CANVAS.OBJECT_BATCH },
+      { id: 4, name: 'plan.menu.placement.surface.all.remove', menu: MENU.BATCH_CANVAS.ALL_REMOVE },
    ],
    module: [
      // 모듈, 회로 구성
+
      { id: 0, name: 'plan.menu.module.circuit.setting.default', menu: MENU.MODULE_CIRCUIT_SETTING.BASIC_SETTING },
      {
        id: 1,
        name: 'plan.menu.module.circuit.setting.circuit.trestle.setting',
        menu: MENU.MODULE_CIRCUIT_SETTING.CIRCUIT_TRESTLE_SETTING,
      },
+      {
+        id: 2,
+        name: 'plan.menu.module.circuit.setting.plan.orientation',
+        menu: MENU.MODULE_CIRCUIT_SETTING.PLAN_ORIENTATION,
+      },
    ],
  }
  return (
@ -60,17 +75,6 @@ export default function MenuDepth01(props) {
          )
        })}
      </ul>
-      <ul className="canvas-depth2-btn-list">
-        <li className="depth2-btn-box" onMouseEnter={(e) => ToggleonMouse(e, 'add', 'ul')} onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'ul')}>
-          <button>{getMessage('plan.menu.estimate.roof.alloc')}</button>
-        </li>
-        <li className="depth2-btn-box" onMouseEnter={(e) => ToggleonMouse(e, 'add', 'ul')} onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'ul')}>
-          <button>屋根材の設定と変更</button>
-        </li>
-        <li className="depth2-btn-box" onMouseEnter={(e) => ToggleonMouse(e, 'add', 'ul')} onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'ul')}>
-          <button>屋根面全体削除</button>
-        </li>
-      </ul>
    </div>
  )
 }
--- a/src/components/floor-plan/modal/setting01/SettingModal01.jsx
+++ b/src/components/floor-plan/modal/setting01/SettingModal01.jsx
@ -14,7 +14,7 @@ export default function SettingModal01(props) {

  return (
    <WithDraggable isShow={true} pos={{ x: 50, y: 30 }}>
-      <div className={`modal-pop-wrap sm`}>
+      <div className={`modal-pop-wrap sm mount`}>
        <div className="modal-head">
          <h1 className="title">{getMessage('modal.canvas.setting')}</h1>
          <button className="modal-close" onClick={() => setShowCanvasSettingModal(false)}>
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@ -38,12 +38,15 @@
  "plan.menu.roof.cover.roof.edit": "지붕형상 편집",
  "plan.menu.roof.cover.sub.line": "補助線を描",
  "plan.menu.placement.surface": "配置面",
-  "plan.menu.placement.surface.drawing": "배치면 그리기",
-  "plan.menu.placement.surface.surface": "면형상 배치",
-  "plan.menu.placement.surface.object": "오브젝트 배치",
+  "plan.menu.placement.surface.slope.setting": "傾斜設定",
+  "plan.menu.placement.surface.drawing": "配置面の描画",
+  "plan.menu.placement.surface.arrangement": "面形状の配置",
+  "plan.menu.placement.surface.object": "オブジェクトの配置",
+  "plan.menu.placement.surface.all.remove": "配置面全体を削除",
  "plan.menu.module.circuit.setting": "モジュール回路構成",
-  "plan.menu.module.circuit.setting.default": "기본 설정",
-  "plan.menu.module.circuit.setting.circuit.trestle.setting": "회로 및 가대 설정",
+  "plan.menu.module.circuit.setting.default": "基本設定",
+  "plan.menu.module.circuit.setting.circuit.trestle.setting": "回路と架台の設定",
+  "plan.menu.module.circuit.setting.plan.orientation": "図面方位の適用",
  "plan.menu.estimate": "見積",
  "plan.menu.estimate.roof.alloc": "屋根面の割り当て",
  "plan.menu.estimate.save": "保存",
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@ -18,9 +18,13 @@
  "plan.menu.roof.cover": "지붕덮개",
  "plan.menu.roof.cover.outline.drawing": "외벽선 그리기",
  "plan.menu.roof.cover.roof.shape.setting": "지붕형상 설정",
-  "plan.menu.roof.cover.roof.shape.edit": "지붕형상 편집",
-  "plan.menu.roof.cover.auxiliary.line.drawing": "보조선 그리기",
+  "plan.menu.roof.cover.roof.shape.passivity.setting": "지붕형상 수동 설정",
+  "plan.menu.roof.cover.eaves.kerava.edit": "처마·케라바 변경",
+  "plan.menu.roof.cover.movement.shape.updown": "동선이동·형올림내림",
+  "plan.menu.roof.cover.outline.edit.offset": "외벽선 편집 및 오프셋",
  "plan.menu.roof.cover.roof.surface.alloc": "지붕면 할당",
+  "plan.menu.roof.cover.roof.shape.edit": "지붕형상 편집",
+  "plan.menu.roof.cover.auxiliary.line.drawing": "보조선 작성",
  "modal.cover.outline.drawing": "외벽선 작성",
  "modal.cover.outline": "외벽선",
  "modal.cover.outline.right.angle": "직각",
@ -35,12 +39,15 @@
  "modal.cover.outline.remove": "외벽 제거",
  "modal.cover.outline.select.move": "외벽 선택, 이동",
  "plan.menu.placement.surface": "배치면",
+  "plan.menu.placement.surface.slope.setting": "경사설정",
  "plan.menu.placement.surface.drawing": "배치면 그리기",
-  "plan.menu.placement.surface.surface": "면형상 배치",
+  "plan.menu.placement.surface.arrangement": "면형상 배치",
  "plan.menu.placement.surface.object": "오브젝트 배치",
+  "plan.menu.placement.surface.all.remove": "배치면 전체 삭제",
  "plan.menu.module.circuit.setting": "모듈,회로 구성",
  "plan.menu.module.circuit.setting.default": "기본 설정",
  "plan.menu.module.circuit.setting.circuit.trestle.setting": "회로 및 가대 설정",
+  "plan.menu.module.circuit.setting.plan.orientation": "도면 방위 적용",
  "plan.menu.estimate": "견적서",
  "plan.menu.estimate.roof.alloc": "지붕면 할당",
  "plan.menu.estimate.save": "저장",