Merge pull request 'dev' (#439) from dev into dev-deploy

Reviewed-on: #439

src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx

@@ -799,7 +799,8 @@ export default function CircuitTrestleSetting({ id }) {
         onFold={() => setIsFold(!isFold)}
       />
       <WithDraggable.Body>
-        <div style={{ display: isFold ? 'none' : 'block' }}>
+        <div style={{ display: !(tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY) && isFold ? 'none' : 'block' }}>
+          <div style={{ display: tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && isFold ? 'none' : 'block' }}>
             <div className="roof-module-tab">
               <div className={`module-tab-bx act`}>{getMessage('modal.circuit.trestle.setting.power.conditional.select')}</div>
               <span className={`tab-arr ${tabNum === 2 ? 'act' : ''}`}></span>
@@ -807,9 +808,10 @@ export default function CircuitTrestleSetting({ id }) {
                 {getMessage('modal.circuit.trestle.setting.circuit.allocation')}({getMessage('modal.circuit.trestle.setting.step.up.allocation')})
               </div>
             </div>
+          </div>
           {tabNum === 1 && allocationType === ALLOCATION_TYPE.AUTO && <PowerConditionalSelect {...powerConditionalSelectProps} />}
           {tabNum === 1 && allocationType === ALLOCATION_TYPE.PASSIVITY && (
-            <PassivityCircuitAllocation {...passivityProps} ref={passivityCircuitAllocationRef} />
+            <PassivityCircuitAllocation {...passivityProps} ref={passivityCircuitAllocationRef} isFold={isFold} />
           )}
           {tabNum === 2 && <StepUp {...stepUpProps} onInitialize={handleStepUpInitialize} />}
         </div>

src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx

@@ -1,7 +1,6 @@
 import { GlobalDataContext } from '@/app/GlobalDataProvider'
 import { POLYGON_TYPE } from '@/common/common'
 import { useMasterController } from '@/hooks/common/useMasterController'
-import { useModule } from '@/hooks/module/useModule'
 import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle'
 import { useMessage } from '@/hooks/useMessage'
 import { useSwal } from '@/hooks/useSwal'
@@ -11,7 +10,7 @@ import { fontSelector } from '@/store/fontAtom'
 import { selectedModuleState } from '@/store/selectedModuleOptions'
 import { circuitNumDisplaySelector } from '@/store/settingAtom'
 import { useContext, useEffect, useState } from 'react'
-import { useRecoilState, useRecoilValue } from 'recoil'
+import { useRecoilValue } from 'recoil'
 import { normalizeDigits } from '@/util/input-utils'
 
 export default function PassivityCircuitAllocation(props) {
@@ -22,6 +21,7 @@ export default function PassivityCircuitAllocation(props) {
     getOptYn: getApiProps,
     getUseModuleItemList: getSelectedModuleList,
     getSelectModelList: getSelectModelList,
+    isFold,
   } = props
   const { swalFire } = useSwal()
   const { getMessage } = useMessage()
@@ -497,6 +497,7 @@ export default function PassivityCircuitAllocation(props) {
   return (
     <>
       <div className="properties-setting-wrap outer">
+        <div style={{ display: isFold ? 'none' : 'block' }}>
           <div className="setting-tit">{getMessage('modal.circuit.trestle.setting.circuit.allocation')}</div>
           <div className="module-table-box mb10">
             <div className="module-table-inner">
@@ -541,7 +542,9 @@ export default function PassivityCircuitAllocation(props) {
             <div className="module-table-inner">
               <div className="hexagonal-wrap">
                 <div className="hexagonal-item">
-                <div className="bold-font">{getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional')}</div>
+                  <div className="bold-font">
+                    {getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional')}
+                  </div>
                 </div>
                 <div className="hexagonal-item">
                   {selectedModels.map((model, index) => (
@@ -568,6 +571,7 @@ export default function PassivityCircuitAllocation(props) {
               </div>
             </div>
           </div>
+        </div>
         <div className="slope-wrap">
           <div className="circuit-right-wrap mb15">
             <div className="outline-form">

src/components/floor-plan/modal/object/SizeSetting.jsx

@@ -21,8 +21,8 @@ export default function SizeSetting(props) {
   const { resizeSurfaceShapeBatch } = useSurfaceShapeBatch({})
   const widthRef = useRef(null)
   const heightRef = useRef(null)
-  const [width, setWidth] = useState(target?.originWidth ? (target.originWidth * 10) : 0)
+  const [width, setWidth] = useState(target?.originWidth ? target.originWidth * 10 : (target.width * 10).toFixed(0))
-  const [height, setHeight] = useState(target?.originHeight ? (target.originHeight * 10) : 0)
+  const [height, setHeight] = useState(target?.originHeight ? target.originHeight * 10 : (target.height * 10).toFixed(0))
   // const { initEvent } = useEvent()
   // const { initEvent } = useContext(EventContext)