Compare commits
No commits in common. "e1a25f47f07e5c6243723e20d0e304efa78e0d60" and "41a2e1648e8d1a8af9168c33bd0e5a0ca9ca20aa" have entirely different histories.
e1a25f47f0
...
41a2e1648e
@ -10,7 +10,6 @@ import Angle from '@/components/floor-plan/modal/lineTypes/Angle'
|
||||
import DoublePitch from '@/components/floor-plan/modal/lineTypes/DoublePitch'
|
||||
import Diagonal from '@/components/floor-plan/modal/lineTypes/Diagonal'
|
||||
import { usePopup } from '@/hooks/usePopup'
|
||||
import { useSwal } from '@/hooks/useSwal'
|
||||
import { useState } from 'react'
|
||||
import Image from 'next/image'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
@ -19,7 +18,6 @@ export default function WallLineSetting(props) {
|
||||
const { id } = props
|
||||
const { addPopup, closePopup } = usePopup()
|
||||
const { getMessage } = useMessage()
|
||||
const { swalFire } = useSwal()
|
||||
const [propertiesId, setPropertiesId] = useState(uuidv4())
|
||||
const [useCalcPad, setUseCalcPad] = useState(false)
|
||||
const {
|
||||
@ -184,11 +182,10 @@ export default function WallLineSetting(props) {
|
||||
<button
|
||||
className="btn-frame modal act"
|
||||
onClick={() => {
|
||||
swalFire({
|
||||
type: 'confirm',
|
||||
text: getMessage('modal.cover.outline.fix.confirm'),
|
||||
confirmFn: handleFix,
|
||||
})
|
||||
handleFix()
|
||||
// closePopup(id)
|
||||
|
||||
// setShowPropertiesSettingModal(true)
|
||||
}}
|
||||
>
|
||||
{getMessage('modal.cover.outline.fix')}
|
||||
|
||||
@ -30,8 +30,6 @@ import { calculateAngle } from '@/util/qpolygon-utils'
|
||||
import { fabric } from 'fabric'
|
||||
import { outlineDisplaySelector } from '@/store/settingAtom'
|
||||
import { usePopup } from '@/hooks/usePopup'
|
||||
import { useSwal } from '@/hooks/useSwal'
|
||||
import { useMessage } from '@/hooks/useMessage'
|
||||
import Big from 'big.js'
|
||||
import RoofShapeSetting from '@/components/floor-plan/modal/roofShape/RoofShapeSetting'
|
||||
import { useObject } from '@/hooks/useObject'
|
||||
@ -86,8 +84,6 @@ export function useOuterLineWall(id, propertiesId) {
|
||||
const arrow1Ref = useRef(arrow1)
|
||||
const arrow2Ref = useRef(arrow2)
|
||||
const { addPopup, closePopup } = usePopup()
|
||||
const { swalFire } = useSwal()
|
||||
const { getMessage } = useMessage()
|
||||
|
||||
const setOuterLineFix = useSetRecoilState(outerLineFixState)
|
||||
|
||||
@ -933,11 +929,7 @@ export function useOuterLineWall(id, propertiesId) {
|
||||
|
||||
const enterCheck = (e) => {
|
||||
if (e.key === 'Enter') {
|
||||
swalFire({
|
||||
type: 'confirm',
|
||||
text: getMessage('modal.cover.outline.fix.confirm'),
|
||||
confirmFn: handleFix,
|
||||
})
|
||||
handleFix()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -70,7 +70,6 @@
|
||||
"modal.cover.outline.length": "長さ(mm)",
|
||||
"modal.cover.outline.arrow": "方向(矢印)",
|
||||
"modal.cover.outline.fix": "外壁線確定",
|
||||
"modal.cover.outline.fix.confirm": "本当に確定しますか?確定後は修正できません。",
|
||||
"modal.cover.outline.rollback": "前に戻る",
|
||||
"modal.cover.outline.finish": "設定完了",
|
||||
"common.setting.finish": "設定完了",
|
||||
|
||||
@ -70,7 +70,6 @@
|
||||
"modal.cover.outline.length": "길이(mm)",
|
||||
"modal.cover.outline.arrow": "방향(화살표)",
|
||||
"modal.cover.outline.fix": "외벽선 확정",
|
||||
"modal.cover.outline.fix.confirm": "정말로 확정하시겠습니까? 확정 후에는 수정할 수 없습니다.",
|
||||
"modal.cover.outline.rollback": "일변전으로 돌아가기",
|
||||
"modal.cover.outline.finish": "설정완료",
|
||||
"common.setting.finish": "설정완료",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user