Compare commits
No commits in common. "55d9b065c3908d87007e630591730cc7d4a34188" and "e1a25f47f07e5c6243723e20d0e304efa78e0d60" have entirely different histories.
55d9b065c3
...
e1a25f47f0
@ -9,13 +9,11 @@ import { OUTER_LINE_TYPE } from '@/store/outerLineAtom'
|
|||||||
import OuterLineWall from '@/components/floor-plan/modal/lineTypes/OuterLineWall'
|
import OuterLineWall from '@/components/floor-plan/modal/lineTypes/OuterLineWall'
|
||||||
import { usePlacementShapeDrawing } from '@/hooks/surface/usePlacementShapeDrawing'
|
import { usePlacementShapeDrawing } from '@/hooks/surface/usePlacementShapeDrawing'
|
||||||
import { usePopup } from '@/hooks/usePopup'
|
import { usePopup } from '@/hooks/usePopup'
|
||||||
import { useSwal } from '@/hooks/useSwal'
|
|
||||||
import Image from 'next/image'
|
import Image from 'next/image'
|
||||||
|
|
||||||
export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) {
|
export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) {
|
||||||
const { getMessage } = useMessage()
|
const { getMessage } = useMessage()
|
||||||
const { closePopup } = usePopup()
|
const { closePopup } = usePopup()
|
||||||
const { swalFire } = useSwal()
|
|
||||||
const [buttonAct, setButtonAct] = useState(1)
|
const [buttonAct, setButtonAct] = useState(1)
|
||||||
const [useCalcPad, setUseCalcPad] = useState(false)
|
const [useCalcPad, setUseCalcPad] = useState(false)
|
||||||
const types = [
|
const types = [
|
||||||
@ -157,16 +155,7 @@ export default function PlacementShapeDrawing({ id, pos = { x: 50, y: 230 } }) {
|
|||||||
<button className="btn-frame modal mr5" onClick={handleRollback}>
|
<button className="btn-frame modal mr5" onClick={handleRollback}>
|
||||||
{getMessage('modal.cover.outline.rollback')}
|
{getMessage('modal.cover.outline.rollback')}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button className="btn-frame modal act" onClick={handleFix}>
|
||||||
className="btn-frame modal act"
|
|
||||||
onClick={() => {
|
|
||||||
swalFire({
|
|
||||||
type: 'confirm',
|
|
||||||
text: getMessage('modal.cover.outline.fix.confirm'),
|
|
||||||
confirmFn: handleFix,
|
|
||||||
})
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{getMessage('modal.placement.surface.drawing.fix')}
|
{getMessage('modal.placement.surface.drawing.fix')}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -22,8 +22,6 @@ import {
|
|||||||
import { usePolygon } from '@/hooks/usePolygon'
|
import { usePolygon } from '@/hooks/usePolygon'
|
||||||
import { POLYGON_TYPE } from '@/common/common'
|
import { POLYGON_TYPE } from '@/common/common'
|
||||||
import { usePopup } from '@/hooks/usePopup'
|
import { usePopup } from '@/hooks/usePopup'
|
||||||
import { useSwal } from '@/hooks/useSwal'
|
|
||||||
import { useMessage } from '@/hooks/useMessage'
|
|
||||||
import { useSurfaceShapeBatch } from './useSurfaceShapeBatch'
|
import { useSurfaceShapeBatch } from './useSurfaceShapeBatch'
|
||||||
|
|
||||||
import { roofDisplaySelector } from '@/store/settingAtom'
|
import { roofDisplaySelector } from '@/store/settingAtom'
|
||||||
@ -50,8 +48,6 @@ export function usePlacementShapeDrawing(id) {
|
|||||||
const { setSurfaceShapePattern } = useRoofFn()
|
const { setSurfaceShapePattern } = useRoofFn()
|
||||||
const { changeSurfaceLineType } = useSurfaceShapeBatch({})
|
const { changeSurfaceLineType } = useSurfaceShapeBatch({})
|
||||||
const { handleSelectableObjects } = useObject()
|
const { handleSelectableObjects } = useObject()
|
||||||
const { swalFire } = useSwal()
|
|
||||||
const { getMessage } = useMessage()
|
|
||||||
|
|
||||||
const verticalHorizontalMode = useRecoilValue(verticalHorizontalModeState)
|
const verticalHorizontalMode = useRecoilValue(verticalHorizontalModeState)
|
||||||
const adsorptionRange = useRecoilValue(adsorptionRangeState)
|
const adsorptionRange = useRecoilValue(adsorptionRangeState)
|
||||||
@ -1093,11 +1089,7 @@ export function usePlacementShapeDrawing(id) {
|
|||||||
|
|
||||||
const enterCheck = (e) => {
|
const enterCheck = (e) => {
|
||||||
if (e.key === 'Enter') {
|
if (e.key === 'Enter') {
|
||||||
swalFire({
|
handleFix()
|
||||||
type: 'confirm',
|
|
||||||
text: getMessage('modal.cover.outline.fix.confirm'),
|
|
||||||
confirmFn: handleFix,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user