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

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

Browse Source 
Reviewed-on: #444
This commit is contained in:
ysCha 2025-12-01 11:25:51 +09:00
commit a73183723f
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/floor-plan/modal/object/SizeSetting.jsx
View File

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

2
src/components/floor-plan/modal/roofShape/type/option/Jerkinhead.jsx
View File

@ -76,7 +76,7 @@ export default function Jerkinhead({
label="" label=""
className="input-origin block" className="input-origin block"
value={jerkinHeadPitch} value={jerkinHeadPitch}
onChange={(value) => jerkinHeadPitch(value)} onChange={(value) => setJerkinHeadPitch(value)}
options={{ options={{
allowNegative: false, allowNegative: false,
allowDecimal: true //(index !== 0), allowDecimal: true //(index !== 0),

2
src/hooks/roofcover/useRoofAllocationSetting.js
View File

@ -569,7 +569,7 @@ export function useRoofAllocationSetting(id) {
* 피치 변경 * 피치 변경
*/ */
const handleChangePitch = (e, index) => { const handleChangePitch = (e, index) => {
let value = e.target.value let value = e //e.target.value
const reg = /^[0-9]+(\.[0-9]{0,1})?$/ const reg = /^[0-9]+(\.[0-9]{0,1})?$/
if (!reg.test(value)) { if (!reg.test(value)) {

1
src/util/qpolygon-utils.js
View File

@ -6,7 +6,6 @@ import { QPolygon } from '@/components/fabric/QPolygon'
import * as turf from '@turf/turf' import * as turf from '@turf/turf'
import { LINE_TYPE, POLYGON_TYPE } from '@/common/common' import { LINE_TYPE, POLYGON_TYPE } from '@/common/common'
import Big from 'big.js' import Big from 'big.js'
import { canvas } from 'framer-motion/m'
const TWO_PI = Math.PI * 2 const TWO_PI = Math.PI * 2