qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: qcast3:7be6b60e12e0a4ea3dfdc556c1eb397a8cac09f9
Branches Tags
qcast3:main
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/pv-btob
qcast3:hotfix/dev_yscha
qcast3:feature/redo-undo
qcast3:feature/jp_0615
qcast3:feature/roofline-edit2
qcast3:feature/roofline-edit
qcast3:hotfix/9999
qcast3:feature/qcast-1512
qcast3:feature/skeleton-dev
qcast3:feature/design-remake
qcast3:qcast-pub
qcast3:feature/sketon_cha
qcast3:feature/batch-angle
qcast3:feature/module-group
qcast3:feature/dev-yj
qcast3:feature/jimp-test
qcast3:feature/chore-env
qcast3:feature/jaeyoung
qcast3:feature/qcast-1052
qcast3:feature/qcast-1053
qcast3:feature/dev-yj-layout
qcast3:feature/qcast-886
qcast3:feature/module-grouping
qcast3:feature/qcast-944
qcast3:feature/qcast-950
qcast3:feature/qcast-947
qcast3:feature/qcast-925
..
compare: qcast3:b6bfa8fd2ed9295d937311ecdbb9b84f728f805a
Branches Tags
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:feature/pv-btob
qcast3:hotfix/dev_yscha
qcast3:feature/redo-undo
qcast3:feature/jp_0615
qcast3:feature/roofline-edit2
qcast3:feature/roofline-edit
qcast3:hotfix/9999
qcast3:feature/qcast-1512
qcast3:feature/skeleton-dev
qcast3:feature/design-remake
qcast3:qcast-pub
qcast3:feature/sketon_cha
qcast3:feature/batch-angle
qcast3:feature/module-group
qcast3:feature/dev-yj
qcast3:feature/jimp-test
qcast3:feature/chore-env
qcast3:feature/jaeyoung
qcast3:feature/qcast-1052
qcast3:feature/qcast-1053
qcast3:feature/dev-yj-layout
qcast3:feature/qcast-886
qcast3:feature/module-grouping
qcast3:feature/qcast-944
qcast3:feature/qcast-950
qcast3:feature/qcast-947
qcast3:feature/qcast-925
qcast3:main

No commits in common. "7be6b60e12e0a4ea3dfdc556c1eb397a8cac09f9" and "b6bfa8fd2ed9295d937311ecdbb9b84f728f805a" have entirely different histories.
7be6b60e12 ... b6bfa8fd2e

4 changed files with 793 additions and 902 deletions
Show Stats Expand all files Collapse all files

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

@ -11,7 +11,6 @@ import { moduleSelectionDataState } from '@/store/selectedModuleOptions'
import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController' import { useCanvasPopupStatusController } from '@/hooks/common/useCanvasPopupStatusController'
import { isObjectNotEmpty } from '@/util/common-utils' import { isObjectNotEmpty } from '@/util/common-utils'
import { normalizeDecimal} from '@/util/input-utils' import { normalizeDecimal} from '@/util/input-utils'
import { CalculatorInput } from '@/components/common/input/CalcInput'
export default function Module({ setTabNum }) { export default function Module({ setTabNum }) {
const { getMessage } = useMessage() const { getMessage } = useMessage()
@ -186,23 +185,11 @@ export default function Module({ setTabNum }) {
<div className="eaves-keraba-td"> <div className="eaves-keraba-td">
<div className="outline-form"> <div className="outline-form">
<div className="grid-select mr10"> <div className="grid-select mr10">
{/*<input*/} <input
{/* type="text"*/} type="text"
{/* className="input-origin block"*/}
{/* value={inputInstallHeight}*/}
{/* onChange={(e) => setInputInstallHeight(normalizeDecimal(e.target.value))}*/}
{/*/>*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block" className="input-origin block"
value={inputInstallHeight} value={inputInstallHeight}
onChange={(value) => setInputInstallHeight(value)} onChange={(e) => setInputInstallHeight(normalizeDecimal(e.target.value))}
options={{
allowNegative: false,
allowDecimal: false
}}
/> />
</div> </div>
<span className="thin">m</span> <span className="thin">m</span>

74
src/components/floor-plan/modal/basic/step/Orientation.jsx
View File

@ -10,7 +10,6 @@ import { useModuleBasicSetting } from '@/hooks/module/useModuleBasicSetting'
import { useCommonCode } from '@/hooks/common/useCommonCode' import { useCommonCode } from '@/hooks/common/useCommonCode'
import Swal from 'sweetalert2' import Swal from 'sweetalert2'
import { normalizeDecimal} from '@/util/input-utils' import { normalizeDecimal} from '@/util/input-utils'
import { CalculatorInput } from '@/components/common/input/CalcInput'
export const Orientation = forwardRef((props, ref) => { export const Orientation = forwardRef((props, ref) => {
const { getMessage } = useMessage() const { getMessage } = useMessage()
@ -437,26 +436,13 @@ export const Orientation = forwardRef((props, ref) => {
<label htmlFor="ch99">{getMessage('modal.module.basic.setting.orientation.setting.angle.passivity')}</label> <label htmlFor="ch99">{getMessage('modal.module.basic.setting.orientation.setting.angle.passivity')}</label>
</div> </div>
<div className="input-grid mr10" style={{ width: '60px' }}> <div className="input-grid mr10" style={{ width: '60px' }}>
{/*<input*/} <input
{/* type="text"*/} type="text"
{/* className="input-origin block"*/}
{/* value={inputCompasDeg}*/}
{/* readOnly={!hasAnglePassivity}*/}
{/* placeholder={0}*/}
{/* onChange={(e) => checkDegree(e.target.value)}*/}
{/*/>*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block" className="input-origin block"
value={inputCompasDeg} value={inputCompasDeg}
readOnly={!hasAnglePassivity} readOnly={!hasAnglePassivity}
onChange={(value) => setInputCompasDeg(value)} placeholder={0}
options={{ onChange={(e) => checkDegree(e.target.value)}
allowNegative: true,
allowDecimal: false
}}
/> />
</div> </div>
<span className="thin">°</span> <span className="thin">°</span>
@ -547,19 +533,7 @@ export const Orientation = forwardRef((props, ref) => {
<div className="outline-form mt15"> <div className="outline-form mt15">
<span>{getMessage('modal.module.basic.setting.module.placement.area')}</span> <span>{getMessage('modal.module.basic.setting.module.placement.area')}</span>
<div className="input-grid mr10" style={{ width: '60px' }}> <div className="input-grid mr10" style={{ width: '60px' }}>
{/*<input type="text" className="input-origin block" value={inputMargin} onChange={(e) => setInputMargin(normalizeDecimal(e.target.value))} />*/} <input type="text" className="input-origin block" value={inputMargin} onChange={(e) => setInputMargin(normalizeDecimal(e.target.value))} />
<CalculatorInput
id=""
name=""
label=""
className="input-origin block"
value={inputMargin}
onChange={(value) => setInputMargin(value)}
options={{
allowNegative: false,
allowDecimal: false
}}
/>
</div> </div>
<span className="thin">m</span> <span className="thin">m</span>
</div> </div>
@ -587,23 +561,11 @@ export const Orientation = forwardRef((props, ref) => {
<div className="outline-form"> <div className="outline-form">
<span>{getMessage('modal.module.basic.setting.module.fitting.height')}</span> <span>{getMessage('modal.module.basic.setting.module.fitting.height')}</span>
<div className="input-grid mr10"> <div className="input-grid mr10">
{/*<input*/} <input
{/* type="text"*/} type="text"
{/* className="input-origin block"*/}
{/* value={inputInstallHeight}*/}
{/* onChange={(e) => handleChangeInstallHeight(normalizeDecimal(e.target.value))}*/}
{/*/>*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block" className="input-origin block"
value={inputInstallHeight} value={inputInstallHeight}
onChange={(value) => handleChangeInstallHeight(value)} onChange={(e) => handleChangeInstallHeight(normalizeDecimal(e.target.value))}
options={{
allowNegative: false,
allowDecimal: false
}}
/> />
</div> </div>
<span className="thin">m</span> <span className="thin">m</span>
@ -627,23 +589,11 @@ export const Orientation = forwardRef((props, ref) => {
<div className="outline-form"> <div className="outline-form">
<span>{getMessage('modal.module.basic.setting.module.standard.snowfall.amount')}</span> <span>{getMessage('modal.module.basic.setting.module.standard.snowfall.amount')}</span>
<div className="input-grid mr10"> <div className="input-grid mr10">
{/*<input*/} <input
{/* type="text"*/} type="text"
{/* className="input-origin block"*/}
{/* value={inputVerticalSnowCover}*/}
{/* onChange={(e) => handleChangeVerticalSnowCover(normalizeDecimal(e.target.value))}*/}
{/*/>*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block" className="input-origin block"
value={inputInstallHeight} value={inputVerticalSnowCover}
onChange={(value) => handleChangeVerticalSnowCover(value)} onChange={(e) => handleChangeVerticalSnowCover(normalizeDecimal(e.target.value))}
options={{
allowNegative: false,
allowDecimal: false
}}
/> />
</div> </div>
<span className="thin">cm</span> <span className="thin">cm</span>

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

@ -10,7 +10,6 @@ import { forwardRef, useContext, useEffect, useImperativeHandle, useRef, useStat
import { useRecoilState, useRecoilValue } from 'recoil' import { useRecoilState, useRecoilValue } from 'recoil'
import Swal from 'sweetalert2' import Swal from 'sweetalert2'
import { normalizeDigits } from '@/util/input-utils' import { normalizeDigits } from '@/util/input-utils'
import { CalculatorInput } from '@/components/common/input/CalcInput'
const Trestle = forwardRef((props, ref) => { const Trestle = forwardRef((props, ref) => {
const { tabNum, setTabNum, trestleTrigger, roofs, setRoofs, moduleSelectionData, setModuleSelectionData, setRoofsStore } = props const { tabNum, setTabNum, trestleTrigger, roofs, setRoofs, moduleSelectionData, setModuleSelectionData, setRoofsStore } = props
@ -886,24 +885,12 @@ const Trestle = forwardRef((props, ref) => {
<div className="outline-form mr15"> <div className="outline-form mr15">
<span>{getMessage('modal.module.basic.setting.module.placement.area.eaves')}</span> <span>{getMessage('modal.module.basic.setting.module.placement.area.eaves')}</span>
<div className="input-grid mr10"> <div className="input-grid mr10">
{/*<input*/} <input
{/* type="number"*/} type="number"
{/* className="input-origin block"*/}
{/* value={eavesMargin ?? 0}*/}
{/* // onChange={(e) => dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, eavesMargin: e.target.value } })}*/}
{/* onChange={(e) => setEavesMargin(+e.target.value)}*/}
{/*/>*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block" className="input-origin block"
value={eavesMargin ?? 0} value={eavesMargin ?? 0}
onChange={(value) => setEavesMargin(value)} // onChange={(e) => dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, eavesMargin: e.target.value } })}
options={{ onChange={(e) => setEavesMargin(+e.target.value)}
allowNegative: false,
allowDecimal: false
}}
/> />
</div> </div>
<span className="thin">mm</span> <span className="thin">mm</span>
@ -911,24 +898,12 @@ const Trestle = forwardRef((props, ref) => {
<div className="outline-form mr15"> <div className="outline-form mr15">
<span>{getMessage('modal.module.basic.setting.module.placement.area.ridge')}</span> <span>{getMessage('modal.module.basic.setting.module.placement.area.ridge')}</span>
<div className="input-grid mr10"> <div className="input-grid mr10">
{/*<input*/} <input
{/* type="number"*/} type="number"
{/* className="input-origin block"*/}
{/* value={ridgeMargin ?? 0}*/}
{/* // onChange={(e) => dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, ridgeMargin: e.target.value } })}*/}
{/* onChange={(e) => setRidgeMargin(+e.target.value)}*/}
{/*/>*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block" className="input-origin block"
value={ridgeMargin ?? 0} value={ridgeMargin ?? 0}
onChange={(value) => setRidgeMargin(value)} // onChange={(e) => dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, ridgeMargin: e.target.value } })}
options={{ onChange={(e) => setRidgeMargin(+e.target.value)}
allowNegative: false,
allowDecimal: false
}}
/> />
</div> </div>
<span className="thin">mm</span> <span className="thin">mm</span>
@ -936,24 +911,12 @@ const Trestle = forwardRef((props, ref) => {
<div className="outline-form "> <div className="outline-form ">
<span>{getMessage('modal.module.basic.setting.module.placement.area.keraba')}</span> <span>{getMessage('modal.module.basic.setting.module.placement.area.keraba')}</span>
<div className="input-grid mr10"> <div className="input-grid mr10">
{/*<input*/} <input
{/* type="number"*/} type="number"
{/* className="input-origin block"*/}
{/* value={kerabaMargin ?? 0}*/}
{/* // onChange={(e) => dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, kerabaMargin: e.target.value } })}*/}
{/* onChange={(e) => setKerabaMargin(+e.target.value)}*/}
{/*/>*/}
<CalculatorInput
id=""
name=""
label=""
className="input-origin block" className="input-origin block"
value={kerabaMargin ?? 0} value={kerabaMargin ?? 0}
onChange={(value) => setKerabaMargin(value)} // onChange={(e) => dispatch({ type: 'SET_TRESTLE_DETAIL', roof: { ...trestleState, kerabaMargin: e.target.value } })}
options={{ onChange={(e) => setKerabaMargin(+e.target.value)}
allowNegative: false,
allowDecimal: false
}}
/> />
</div> </div>
<span className="thin">mm</span> <span className="thin">mm</span>

1541
src/util/skeleton-utils.js
View File

File diff suppressed because it is too large Load Diff