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

src/components/common/select/QSelectBox.jsx

@@ -35,7 +35,8 @@ export default function QSelectBox({
     if (options.length === 0) return title !== '' ? title : '선택하세요.'
     if (showKey !== '' && !value) {
       //value가 없으면 showKey가 있으면 우선 보여준다
-      return options[0][showKey]
+      // return options[0][showKey]
+      return title
     } else if (showKey !== '' && value) {
       //value가 있으면 sourceKey와 targetKey를 비교하여 보여준다
 
@@ -58,6 +59,8 @@ export default function QSelectBox({
   const ref = useRef(null)
 
   const handleClickSelectOption = (option) => {
+    console.log('🚀 ~ handleClickSelectOption ~ option:', option)
+
     setSelected(showKey !== '' ? option[showKey] : option.name)
     onChange?.(option, params)
   }

src/components/floor-plan/modal/roofAllocation/RoofAllocationSetting.jsx

@@ -10,6 +10,7 @@ import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementSha
 import { useCanvasSetting } from '@/hooks/option/useCanvasSetting'
 import { useCommonCode } from '@/hooks/common/useCommonCode'
 import { globalLocaleStore } from '@/store/localeAtom'
+import { useRoofShapeSetting } from '@/hooks/roofcover/useRoofShapeSetting'
 
 export default function RoofAllocationSetting(props) {
   const contextPopupPosition = useRecoilValue(contextPopupPositionState)
@@ -29,6 +30,7 @@ export default function RoofAllocationSetting(props) {
     handleChangeLayout,
     currentRoofList,
   } = useRoofAllocationSetting(id)
+  const { pitchText } = useRoofShapeSetting(id)
   const { findCommonCode } = useCommonCode()
   const [raftCodes, setRaftCodes] = useState([])
   const globalLocale = useRecoilValue(globalLocaleStore)
@@ -104,6 +106,15 @@ export default function RoofAllocationSetting(props) {
                           {index !== 0 && <button className="delete" onClick={() => onDeleteRoofMaterial(index)}></button>}
                         </div>
                       </div>
+                      <div className="block-box">
+                        <div className="flex-ment">
+                          <span>{getMessage('slope')}</span>
+                          <div className="input-grid" style={{ width: '214px' }}>
+                            <input type="text" className="input-origin block" defaultValue={4} />
+                          </div>
+                          <span>{pitchText}</span>
+                        </div>
+                      </div>
                       {(roof.widAuth || roof.lenAuth) && (
                         <div className="block-box">
                           {roof.widAuth && (

src/components/floor-plan/modal/roofShape/passivity/Shed.jsx

@@ -0,0 +1,18 @@
+import { useMessage } from '@/hooks/useMessage'
+
+export default function Shed({ offsetRef }) {
+  const { getMessage } = useMessage()
+  return (
+    <>
+      <div className="outline-form mb10">
+        <span className="mr10" style={{ width: '63px' }}>
+          {getMessage('shed.width')}
+        </span>
+        <div className="input-grid mr5">
+          <input type="text" className="input-origin block" defaultValue={300} ref={offsetRef} />
+        </div>
+        <span className="thin">mm</span>
+      </div>
+    </>
+  )
+}

src/hooks/useContextMenu.js

@@ -572,6 +572,29 @@ export function useContextMenu() {
             ],
           ])
           break
+        case 'adsorptionPoint':
+          setContextMenu([
+            [
+              {
+                id: 'remove',
+                name: getMessage('contextmenu.remove'),
+                fn: () => {
+                  canvas.remove(currentObject)
+                  canvas.discardActiveObject()
+                },
+              },
+              {
+                id: 'removeAll',
+                name: getMessage('contextmenu.remove.all'),
+                fn: () => {
+                  removeGrid()
+                  removeAdsorptionPoint()
+                  canvas.discardActiveObject()
+                },
+              },
+            ],
+          ])
+          break
         case 'dimensionGroup':
           setContextMenu([
             [

src/styles/_table.scss

@@ -311,6 +311,25 @@ table{
                 }
             }
         }
+        &.min{
+            table{
+                tbody{
+                    max-height: 150px;
+                    td{
+                        height: 30px;
+                    }
+                }
+            }
+        }
+    }
+    &.min{
+        table{
+            tbody{
+                td{
+                    font-size: 11px;
+                }
+            }
+        }
     }
 }