Merge remote-tracking branch 'origin/qcast-pub' into dev

# Conflicts:
#	src/components/floor-plan/modal/basic/step/Module.jsx

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

@@ -81,6 +81,7 @@ export default function Module({ setTabNum }) {
 
   return (
     <>
+      <div className="roof-module-tab2-overflow">
         <div className="module-table-flex-wrap mb10">
           <div className="module-table-box">
             <div className="module-table-inner">
@@ -114,9 +115,9 @@ export default function Module({ setTabNum }) {
                   </thead>
                   <tbody>
                     {selectedModules.itemList &&
-                    selectedModules.itemList.map((row, index) => (
+                      selectedModules.itemList.map((row) => (
                         <>
-                        <tr key={index}>
+                          <tr>
                             <td>
                               <div className="color-wrap">
                                 <span className="color-box" style={{ backgroundColor: row.color }}></span>
@@ -134,6 +135,7 @@ export default function Module({ setTabNum }) {
               </div>
             </div>
           </div>
+
           <div className="module-table-box none-flex">
             <div className="module-table-inner">
               <div className="module-table-tit">{getMessage('modal.module.basic.setting.module.stuff.info')}</div>
@@ -142,7 +144,7 @@ export default function Module({ setTabNum }) {
                   <div className="eaves-keraba-th">{getMessage('modal.module.basic.setting.module.surface.type')}</div>
                   <div className="eaves-keraba-td">
                     <div className="outline-form">
-                    <div className="grid-select" style={{ width: '95.77px', flex: 'none' }}>
+                      <div className="grid-select">
                         {roughnessCodes.length > 0 && (
                           <QSelectBox
                             options={roughnessCodes}
@@ -157,6 +159,7 @@ export default function Module({ setTabNum }) {
                     </div>
                   </div>
                 </div>
+
                 <div className="eaves-keraba-item">
                   <div className="eaves-keraba-th">{getMessage('modal.module.basic.setting.module.fitting.height')}</div>
                   <div className="eaves-keraba-td">
@@ -214,6 +217,7 @@ export default function Module({ setTabNum }) {
             </div>
           </div>
         </div>
+
         <div className="module-table-box mb10">
           <div className="module-box-tab">
             {addedRoofs &&
@@ -240,7 +244,6 @@ export default function Module({ setTabNum }) {
               </div>
             ))}
         </div>
-
         <div className="module-bottom">
           <div className="module-table-box ">
             <div className="warning-guide">
@@ -254,6 +257,7 @@ export default function Module({ setTabNum }) {
           {/* 설정 오류시 노출 */}
           <div className="reset-word">※ 施工方法が選択できません。 基準風速または基準積雪量を確認してください。</div>
         </div>
+      </div>
     </>
   )
 }

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

@@ -286,6 +286,22 @@ export default function ModuleTabContents({
               {globalPitchText}）
             </div>
             <div className="eaves-keraba-table">
+              <div className="eaves-keraba-item">
+                <div className="eaves-keraba-th">マンドンピッチ</div>
+                <div className="eaves-keraba-td">
+                  <div className="grid-select">
+                    <QSelectBox
+                      options={raftCodes}
+                      value={addRoof}
+                      sourceKey={'clCode'}
+                      targetKey={'raftBaseCd'}
+                      showKey={'clCodeNm'}
+                      disabled={roofMaterial.raftAuth === 'R' ? true : false}
+                      onChange={handleChangeRaftBase}
+                    />
+                  </div>
+                </div>
+              </div>
               <div className="eaves-keraba-item">
                 {roofMaterial && ['C'].includes(roofMaterial.lenAuth) && (
                   <>
@@ -310,7 +326,6 @@ export default function ModuleTabContents({
                   <>
                     <div className="eaves-keraba-th">{getMessage('modal.module.basic.setting.module.rafter.margin')}</div>
                     <div className="eaves-keraba-td">
-                      <div className="keraba-flex">
                       <div className="grid-select">
                         {raftCodes.length > 0 && (
                           <QSelectBox
@@ -325,7 +340,6 @@ export default function ModuleTabContents({
                         )}
                       </div>
                     </div>
-                    </div>
                   </>
                 )}
                 {roofMaterial && ['C', 'R'].includes(roofMaterial.roofPchAuth) && (