Merge branch 'dev' into feature/dev-yj-layout

src/components/common/select/QSelectBox.jsx

@@ -26,6 +26,7 @@ export default function QSelectBox({
   targetKey = '',
   showKey = '',
   params = {},
+  tagTitle = '',
 }) {
   const { getMessage } = useMessage()
 
@@ -82,6 +83,7 @@ export default function QSelectBox({
       className={`sort-select ${openSelect ? 'active' : ''} ${disabled ? 'disabled' : ''}`}
       ref={ref}
       onClick={disabled ? () => {} : () => setOpenSelect(!openSelect)}
+      title={tagTitle}
     >
       <p>{selected}</p>
       <ul className="select-item-wrap">

src/components/floor-plan/CanvasMenu.jsx

@@ -548,13 +548,26 @@ export default function CanvasMenu(props) {
               {
                 <div className={`vertical-horizontal ${verticalHorizontalMode ? 'on' : ''}`}>
                   <span>{getMessage('plan.mode.vertical.horizontal')}</span>
-                  <button onClick={() => setVerticalHorizontalMode(!verticalHorizontalMode)}>{verticalHorizontalMode ? 'ON' : 'OFF'}</button>
+                  <button
+                    title={`${getMessage('plan.mode.vertical.horizontal')} ${verticalHorizontalMode ? 'ON' : 'OFF'}`}
+                    onClick={() => setVerticalHorizontalMode(!verticalHorizontalMode)}
+                  >
+                    {verticalHorizontalMode ? 'ON' : 'OFF'}
+                  </button>
                 </div>
               }
               <div className="btn-from">
-                <button className={`btn01 ${commonUtils.text ? 'active' : ''}`} onClick={() => commonFunctions('text')}></button>
+                <button className={`btn01 ${commonUtils.text ? 'active' : ''}`} onClick={() => commonFunctions('text')} title="文字作成"></button>
-                <button className={`btn02 ${commonUtils.dimension ? 'active' : ''} `} onClick={() => commonFunctions('dimension')}></button>
+                <button
-                <button className={`btn03 ${commonUtils.distance ? 'active' : ''} `} onClick={() => commonFunctions('distance')}></button>
+                  className={`btn02 ${commonUtils.dimension ? 'active' : ''} `}
+                  onClick={() => commonFunctions('dimension')}
+                  title="寸法作成"
+                ></button>
+                <button
+                  className={`btn03 ${commonUtils.distance ? 'active' : ''} `}
+                  onClick={() => commonFunctions('distance')}
+                  title="定規"
+                ></button>
               </div>
               {isObjectNotEmpty(selectedRoofMaterial) && addedRoofs.length > 0 && (
                 <div className="select-box">
@@ -580,6 +593,7 @@ export default function CanvasMenu(props) {
                       sourceKey={'index'}
                       targetKey={'index'}
                       disabled={+basicSetting.roofSizeSet === 3}
+                      tagTitle={'屋根材変更'}
                     />
                   }
                 </div>
@@ -588,9 +602,10 @@ export default function CanvasMenu(props) {
                 <button
                   className={`btn10 ${floorPlanState.refFileModalOpen && 'active'}`}
                   onClick={() => setFloorPlanState({ ...floorPlanState, refFileModalOpen: true })}
+                  title="読込"
                 ></button>
                 {/*<button className="btn04" onClick={() => setShowCanvasSettingModal(true)}></button>*/}
-                <button className="btn04" onClick={handlePopup}></button>
+                <button className="btn04" onClick={handlePopup} title="設定"></button>
               </div>
               <div className="size-control">
                 <button
@@ -599,7 +614,9 @@ export default function CanvasMenu(props) {
                     handleZoom(false)
                   }}
                 ></button>
-                <span onClick={handleZoomClear}>{canvasZoom}%</span>
+                <span onClick={handleZoomClear} title="拡大・縮小">
+                  {canvasZoom}%
+                </span>
                 <button
                   className="control-btn plus"
                   onClick={() => {
@@ -608,8 +625,8 @@ export default function CanvasMenu(props) {
                 ></button>
               </div>
               <div className="btn-from">
-                <button className="btn08" onClick={handleSaveCanvas}></button>
+                <button className="btn08" onClick={handleSaveCanvas} title="保存"></button>
-                <button className="btn09" onClick={handleLeaveCanvas}></button>
+                <button className="btn09" onClick={handleLeaveCanvas} title="物件検索画面へ移動"></button>
               </div>
             </>
           )}

src/components/floor-plan/modal/basic/step/Trestle.jsx

@@ -625,19 +625,19 @@ const Trestle = forwardRef((props, ref) => {
             <div className="module-flex-item non-flex">
               <div className="flex-item-btn-wrap">
                 <button className={`btn-frame roof ${getConstructionState(0)}`} onClick={() => handleConstruction(0)}>
-                  {constructionList.length > 0 && constructionList[0].constTpJp}
+                  {getMessage('modal.module.basic.setting.module.standard.construction')}(I)
                 </button>
                 <button className={`btn-frame roof ${getConstructionState(3)}`} onClick={() => handleConstruction(3)}>
-                  {constructionList.length > 0 && constructionList[3].constTpJp}
+                  {getMessage('modal.module.basic.setting.module.multiple.construction')}
                 </button>
                 <button className={`btn-frame roof ${getConstructionState(1)}`} onClick={() => handleConstruction(1)}>
-                  {constructionList.length > 0 && constructionList[1].constTpJp}
+                  {getMessage('modal.module.basic.setting.module.standard.construction')}
                 </button>
                 <button className={`btn-frame roof ${getConstructionState(4)}`} onClick={() => handleConstruction(4)}>
-                  {constructionList.length > 0 && constructionList[4].constTpJp}
+                  {getMessage('modal.module.basic.setting.module.multiple.construction')}(II)
                 </button>
                 <button className={`btn-frame roof ${getConstructionState(2)}`} onClick={() => handleConstruction(2)}>
-                  {constructionList.length > 0 && constructionList[2].constTpJp}
+                  {getMessage('modal.module.basic.setting.module.enforce.construction')}
                 </button>
               </div>
               <div className="grid-check-form-flex">

src/hooks/module/useModuleTrestle.js

@@ -24,7 +24,7 @@ const trestleReducer = (state, action) => {
         moduleTpCd: action.roof.module?.itemTp ?? '',
         roofMatlCd: action.roof?.roofMatlCd ?? '',
         hajebichi: action.roof?.hajebichi ?? 0,
-        raftBaseCd: action.roof?.raftBaseCd ?? null,
+        raftBaseCd: action.roof?.raft ?? null,
         trestleMkrCd: action.roof.trestle?.trestleMkrCd ?? null,
         constMthdCd: action.roof.trestle?.constMthdCd ?? null,
         constTp: action.roof.construction?.constTp ?? null,

src/locales/ja.json

@@ -110,7 +110,7 @@
   "modal.module.basic.setting.module.standard.snowfall.amount": "積雪量",
   "modal.module.basic.setting.module.standard.construction": "標準施工",
   "modal.module.basic.setting.module.enforce.construction": "強化施工",
-  "modal.module.basic.setting.module.multiple.construction": "多設施工",
+  "modal.module.basic.setting.module.multiple.construction": "多雪施工",
   "modal.module.basic.setting.module.eaves.bar.fitting": "軒カバーの設置",
   "modal.module.basic.setting.module.blind.metal.fitting": "落雪防止金具設置",
   "modal.module.basic.setting.module.select": "モジュール/架台選択",