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

Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

Browse Source
This commit is contained in:
hyojun.choi 2024-12-10 14:36:54 +09:00
commit 694e768043
13 changed files with 269 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/layout.js
View File

@ -55,6 +55,10 @@ export default async function RootLayout({ children }) {
redirect('/login') redirect('/login')
} }
if (headerPathname === '/login' && session.isLoggedIn) {
redirect('/')
}
return ( return (
<RecoilRootWrapper> <RecoilRootWrapper>
<html lang="en"> <html lang="en">

16
src/components/Main.jsx
View File

@ -13,14 +13,14 @@ import ChangePasswordPop from './main/ChangePasswordPop'
import { searchState } from '@/store/boardAtom' import { searchState } from '@/store/boardAtom'
import { SessionContext } from '@/app/SessionProvider' import { SessionContext } from '@/app/SessionProvider'
import { QcastContext } from '@/app/QcastProvider' import { QcastContext } from '@/app/QcastProvider'
import { sessionStore } from '@/store/commonAtom'
import { isObjectNotEmpty } from '@/util/common-utils'
export default function MainPage() { export default function MainPage(mainPageProps) {
const [sessionState, setSessionState] = useRecoilState(sessionStore)
const [chagePasswordPopOpen, setChagePasswordPopOpen] = useState(false) const [chagePasswordPopOpen, setChagePasswordPopOpen] = useState(false)
const { session } = useContext(SessionContext) const { session } = useContext(SessionContext)
const globalLocaleState = useRecoilValue(globalLocaleStore)
const { promiseGet } = useAxios(globalLocaleState)
const router = useRouter() const router = useRouter()
const { getMessage } = useMessage() const { getMessage } = useMessage()
@ -74,10 +74,12 @@ export default function MainPage() {
} }
useEffect(() => { useEffect(() => {
if (session?.pwdInitYn !== 'Y') { if (isObjectNotEmpty(sessionState)) {
setChagePasswordPopOpen(true) if (sessionState?.pwdInitYn !== 'Y') {
setChagePasswordPopOpen(true)
}
} }
}, [session]) }, [sessionState])
return ( return (
<> <>

24
src/components/common/color-picker/ColorPickerModal.jsx
View File

@ -8,13 +8,28 @@ import { contextPopupPositionState } from '@/store/popupAtom'
export default function ColorPickerModal(props) { export default function ColorPickerModal(props) {
const contextPopupPosition = useRecoilValue(contextPopupPositionState) // 현재 메뉴 const contextPopupPosition = useRecoilValue(contextPopupPositionState) // 현재 메뉴
const { isShow, setIsShow, pos = contextPopupPosition, color, setColor, id, isConfig = false } = props //color = '#ff0000' const {
isShow,
setIsShow,
pos = contextPopupPosition,
color,
setColor,
id,
name,
isConfig = false,
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
} = props //color = '#ff0000'
const [originColor, setOriginColor] = useState(color) const [originColor, setOriginColor] = useState(color)
const { getMessage } = useMessage() const { getMessage } = useMessage()
const { closePopup } = usePopup() const { closePopup } = usePopup()
useEffect(() => { useEffect(() => {
setOriginColor(originColor) setOriginColor(originColor)
//치수선색설정 아닐 때만 바로 저장 실행
if (name !== 'DimensionLineColor') setSettingsDataSave({ ...settingsData })
}, [isShow]) }, [isShow])
return ( return (
@ -49,6 +64,13 @@ export default function ColorPickerModal(props) {
if (setColor) setColor(originColor) if (setColor) setColor(originColor)
if (setIsShow) setIsShow(false) if (setIsShow) setIsShow(false)
//치수선색설정 아닐 때만 바로 저장 실행
if (name !== 'DimensionLineColor')
setSettingsData({
...settingsData,
color: originColor,
})
closePopup(id, isConfig) closePopup(id, isConfig)
}} }}
> >

8
src/components/estimate/Estimate.jsx
View File

@ -1100,9 +1100,11 @@ export default function Estimate({ params }) {
<div className="input-wrap mr5" style={{ width: '610px' }}> <div className="input-wrap mr5" style={{ width: '610px' }}>
<input type="text" className="input-light" value={roofList} readOnly /> <input type="text" className="input-light" value={roofList} readOnly />
</div> </div>
<div className="input-wrap" style={{ width: '200px' }}> {constructSpecificationMulti ? (
<input type="text" className="input-light" value={constructSpecificationMulti[index]} readOnly /> <div className="input-wrap" style={{ width: '200px' }}>
</div> <input type="text" className="input-light" value={constructSpecificationMulti[index]} readOnly />
</div>
) : null}
</div> </div>
) )
})} })}

38
src/components/floor-plan/modal/grid/DotLineGrid.jsx
View File

@ -1,6 +1,6 @@
import WithDraggable from '@/components/common/draggable/WithDraggable' import WithDraggable from '@/components/common/draggable/WithDraggable'
import QSelectBox from '@/components/common/select/QSelectBox' import QSelectBox from '@/components/common/select/QSelectBox'
import { useEffect } from 'react' import { useEffect, useState } from 'react'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import { canvasState } from '@/store/canvasAtom' import { canvasState } from '@/store/canvasAtom'
import { useRecoilValue } from 'recoil' import { useRecoilValue } from 'recoil'
@ -17,27 +17,26 @@ const TYPE = {
export default function DotLineGrid(props) { export default function DotLineGrid(props) {
// const [modalOption, setModalOption] = useRecoilState(modalState); //modal 열림닫힘 state // const [modalOption, setModalOption] = useRecoilState(modalState); //modal 열림닫힘 state
//const interval = useRecoilValue(dotLineIntervalSelector) //const interval = useRecoilValue(dotLineIntervalSelector)
const { id, setIsShow, pos = { x: 840, y: -815 }, isConfig = false } = props const { id, setIsShow, pos = { x: 840, y: -815 }, isConfig = false, settingsData, setSettingsData, settingsDataSave, setSettingsDataSave } = props
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
const { getMessage } = useMessage() const { getMessage } = useMessage()
const { closePopup } = usePopup() const { closePopup } = usePopup()
const { swalFire } = useSwal() const { swalFire } = useSwal()
const { const [selectOption, setSelectOption] = useState()
selectOption,
setSelectOption, const { SelectOptions, currentSetting, setCurrentSetting, dotLineGridSettingState, setSettingModalGridOptions, setDotLineGridSettingState } =
SelectOptions, useCanvasSetting()
currentSetting,
setCurrentSetting,
dotLineGridSettingState,
setSettingModalGridOptions,
setDotLineGridSettingState,
} = useCanvasSetting()
// 데이터를 최초 한 번만 조회 // 데이터를 최초 한 번만 조회
useEffect(() => { useEffect(() => {
console.log('DotLineGrid useEffect 실행') console.log('DotLineGrid useEffect 실행')
setSettingsDataSave({ ...settingsData })
// dimension 값에 맞는 옵션을 선택
const matchedOption = SelectOptions.find((option) => option.value == currentSetting.INTERVAL.dimension)
setSelectOption(matchedOption)
return () => { return () => {
setSettingModalGridOptions((prev) => { setSettingModalGridOptions((prev) => {
@ -84,11 +83,24 @@ export default function DotLineGrid(props) {
}, },
DOT: currentSetting.DOT, DOT: currentSetting.DOT,
LINE: currentSetting.LINE, LINE: currentSetting.LINE,
flag: true, //flag: true,
} }
//setDotLineGridSettingState({ ...currentSetting }) //setDotLineGridSettingState({ ...currentSetting })
}) })
setSettingsData({
...settingsData,
INTERVAL: {
type: currentSetting.INTERVAL.type,
horizontalInterval: currentSetting.INTERVAL.horizontalInterval,
verticalInterval: currentSetting.INTERVAL.verticalInterval,
ratioInterval: currentSetting.INTERVAL.ratioInterval,
dimension: currentSetting.INTERVAL.dimension,
},
DOT: currentSetting.DOT,
LINE: currentSetting.LINE,
})
setIsShow(false) setIsShow(false)
closePopup(id, isConfig) closePopup(id, isConfig)
} }

19
src/components/floor-plan/modal/setting01/FirstOption.jsx
View File

@ -8,21 +8,22 @@ import { useEvent } from '@/hooks/useEvent'
export default function FirstOption(props) { export default function FirstOption(props) {
const { getMessage } = useMessage() const { getMessage } = useMessage()
// const { canvas, settingModalFirstOptions, setSettingModalFirstOptions, settingsData, setSettingsData } = useCanvasSetting() // const { canvas, settingModalFirstOptions, setSettingModalFirstOptions, settingsData, setSettingsData } = useCanvasSetting()
let { canvas, settingModalFirstOptions, setSettingModalFirstOptions, settingsData, setSettingsData } = props let { canvas, settingModalFirstOptions, setSettingModalFirstOptions, settingsData, setSettingsData, settingsDataSave, setSettingsDataSave } = props
const { option1, option2, dimensionDisplay } = settingModalFirstOptions const { option1, option2, dimensionDisplay } = settingModalFirstOptions
const { initEvent } = useEvent() const { initEvent } = useEvent()
// 데이터를 최초 한 번만 조회 // 데이터를 최초 한 번만 조회
useEffect(() => { useEffect(() => {
console.log('FirstOption useEffect 실행') console.log('FirstOption useEffect 실행')
setSettingsDataSave({ ...settingsData })
}, []) }, [])
const onClickOption = async (item) => { const onClickOption = async (item) => {
//치수 표시(단 건 선택)
let dimensionDisplay = settingModalFirstOptions?.dimensionDisplay let dimensionDisplay = settingModalFirstOptions?.dimensionDisplay
let option1 = settingModalFirstOptions?.option1 let option1 = settingModalFirstOptions?.option1
let option2 = settingModalFirstOptions?.option2 let option2 = settingModalFirstOptions?.option2
//치수 표시(단 건 선택)
if (item.column === 'corridorDimension' || item.column === 'realDimension' || item.column === 'noneDimension') { if (item.column === 'corridorDimension' || item.column === 'realDimension' || item.column === 'noneDimension') {
dimensionDisplay = settingModalFirstOptions?.dimensionDisplay.map((option) => { dimensionDisplay = settingModalFirstOptions?.dimensionDisplay.map((option) => {
option.selected = option.id === item.id option.selected = option.id === item.id
@ -33,9 +34,9 @@ export default function FirstOption(props) {
//화면 표시(단 건 선택) //화면 표시(단 건 선택)
} else if (item.column === 'onlyBorder' || item.column === 'lineHatch' || item.column === 'allPainted') { } else if (item.column === 'onlyBorder' || item.column === 'lineHatch' || item.column === 'allPainted') {
option2 = settingModalFirstOptions?.option2.map((option2) => { option2 = settingModalFirstOptions?.option2.map((option) => {
option2.selected = option2.id === item.id option.selected = option.id === item.id
return option2 return option
}) })
// setSettingModalFirstOptions({ ...settingModalFirstOptions, option2: [...options] }) // setSettingModalFirstOptions({ ...settingModalFirstOptions, option2: [...options] })
@ -47,11 +48,11 @@ export default function FirstOption(props) {
}) })
//디스플레이 설정 표시(단 건 선택) //디스플레이 설정 표시(단 건 선택)
} else { } else {
option1 = settingModalFirstOptions?.option1.map((opt) => { option1 = settingModalFirstOptions?.option1.map((option) => {
if (opt.id === item.id) { if (option.id === item.id) {
opt.selected = !opt.selected option.selected = !option.selected
} }
return opt return option
}) })
// setSettingModalFirstOptions({ ...settingModalFirstOptions, option1: [...options] }) // setSettingModalFirstOptions({ ...settingModalFirstOptions, option1: [...options] })

16
src/components/floor-plan/modal/setting01/GridOption.jsx
View File

@ -28,8 +28,13 @@ export default function GridOption(props) {
const { initEvent } = useEvent() const { initEvent } = useEvent()
const { SelectOptions, settingsData, setSettingsData, settingsDataSave, setSettingsDataSave } = useCanvasSetting()
useEffect(() => { useEffect(() => {
console.log('GridOption useEffect 실행') console.log('GridOption useEffect 실행')
}, [])
useEffect(() => {
setGridColor(color.hex) setGridColor(color.hex)
}, [color]) }, [color])
@ -96,7 +101,7 @@ export default function GridOption(props) {
} }
useEffect(() => { useEffect(() => {
console.log('🚀 ~ useEffect ~ initEvent:') //console.log('🚀 ~ useEffect ~ initEvent:')
initEvent() initEvent()
}, [gridOptions]) }, [gridOptions])
@ -108,10 +113,15 @@ export default function GridOption(props) {
x: 845, x: 845,
y: 180, y: 180,
}, },
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
} }
const colorPickerProps = { const colorPickerProps = {
id: colorId, id: colorId,
name: 'gridOptionColor',
color: gridColor, color: gridColor,
setColor: setGridColor, setColor: setGridColor,
isShow: showColorPickerModal, isShow: showColorPickerModal,
@ -121,6 +131,10 @@ export default function GridOption(props) {
x: 785, x: 785,
y: 180, y: 180,
}, },
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
} }
return ( return (

54
src/components/floor-plan/modal/setting01/SecondOption.jsx
View File

@ -37,6 +37,7 @@ export default function SecondOption(props) {
// setAdsorptionPointMode, // setAdsorptionPointMode,
// setAdsorptionRange, // setAdsorptionRange,
// } = useCanvasSetting() // } = useCanvasSetting()
const { const {
fetchSettings, fetchSettings,
planSizeSettingMode, planSizeSettingMode,
@ -46,12 +47,17 @@ export default function SecondOption(props) {
adsorptionPointMode, adsorptionPointMode,
setAdsorptionPointMode, setAdsorptionPointMode,
setAdsorptionRange, setAdsorptionRange,
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
} = props } = props
const { option3, option4 } = settingModalSecondOptions const { option3, option4 } = settingModalSecondOptions
// 데이터를 최초 한 번만 조회 // 데이터를 최초 한 번만 조회
useEffect(() => { useEffect(() => {
console.log('SecondOption useEffect 실행') console.log('SecondOption useEffect 실행')
setSettingsDataSave({ ...settingsData })
}, []) }, [])
const handlePopup = (type) => { const handlePopup = (type) => {
@ -142,18 +148,24 @@ export default function SecondOption(props) {
return { return {
...prev, ...prev,
[fontProps.type]: { [fontProps.type]: {
// fontFamily: font.fontFamily.value,
// fontWeight: font.fontWeight.value,
// fontSize: font.fontSize.value,
// fontColor: font.fontColor.value,
fontFamily: font.fontFamily, fontFamily: font.fontFamily,
fontWeight: font.fontWeight, fontWeight: font.fontWeight,
fontSize: font.fontSize, fontSize: font.fontSize,
fontColor: font.fontColor, fontColor: font.fontColor,
}, },
fontFlag: true, //fontFlag: true,
} }
}) })
setSettingsData({
...settingsData,
[fontProps.type]: {
fontFamily: font.fontFamily,
fontWeight: font.fontWeight,
fontSize: font.fontSize,
fontColor: font.fontColor,
},
})
} }
const fontProps = { const fontProps = {
@ -168,6 +180,10 @@ export default function SecondOption(props) {
id: dimensionId, id: dimensionId,
isShow: showDimensionLineSettingModal, isShow: showDimensionLineSettingModal,
setIsShow: setShowDimensionLineSettingModal, setIsShow: setShowDimensionLineSettingModal,
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
} }
const planSizeProps = { const planSizeProps = {
@ -177,9 +193,16 @@ export default function SecondOption(props) {
isShow: showPlanSizeSettingModal, isShow: showPlanSizeSettingModal,
setIsShow: setShowPlanSizeSettingModal, setIsShow: setShowPlanSizeSettingModal,
pos: { x: 1025, y: 180 }, pos: { x: 1025, y: 180 },
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
} }
const onClickOption = async (item) => { const onClickOption = async (item) => {
let option4Data = settingModalSecondOptions?.option4
let adsorpPointData = adsorptionPointMode.adsorptionPoint
//흡착범위 설정(단 건 선택) //흡착범위 설정(단 건 선택)
if ( if (
item.column === 'adsorpRangeSmall' || item.column === 'adsorpRangeSmall' ||
@ -189,21 +212,26 @@ export default function SecondOption(props) {
) { ) {
// option4에서 한 개만 선택 가능하도록 처리 // option4에서 한 개만 선택 가능하도록 처리
//const updatedOption4 = option4.map((option) => (option.id === item.id ? { ...option, selected: true } : { ...option, selected: false })) //const updatedOption4 = option4.map((option) => (option.id === item.id ? { ...option, selected: true } : { ...option, selected: false }))
const options = settingModalSecondOptions?.option4.map((option4) => { option4Data = settingModalSecondOptions?.option4.map((option) => {
option4.selected = option4.id === item.id option.selected = option.id === item.id
return option4 return option
}) })
setSettingModalSecondOptions({ ...settingModalSecondOptions, option3, option4, fontFlag: true }) //사용여부 확인 필요
setAdsorptionRange(item.range)
//setAdsorptionRange(50)
setAdsorptionPointMode({ ...adsorptionPointMode, adsorptionPoint: adsorpPointData })
} else if (item === 'adsorpPoint') { } else if (item === 'adsorpPoint') {
setAdsorptionPointMode({ ...adsorptionPointMode, adsorptionPoint: !adsorptionPointMode.adsorptionPoint, fontFlag: true }) setAdsorptionPointMode({ ...adsorptionPointMode, adsorptionPoint: !adsorpPointData })
adsorpPointData = !adsorpPointData
} }
//setAdsorptionRange(item.range) //사용여부 확인 필요
setAdsorptionRange(50) setSettingsData({ ...settingsData, option4: [...option4Data], adsorptionPoint: adsorpPointData })
} }
useEffect(() => { useEffect(() => {
console.log('🚀 ~ useEffect ~ initEvent:') //console.log('🚀 ~ useEffect ~ initEvent:')
initEvent() initEvent()
}, [adsorptionPointMode]) }, [adsorptionPointMode])

20
src/components/floor-plan/modal/setting01/SettingModal01.jsx
View File

@ -24,7 +24,11 @@ export default function SettingModal01(props) {
setSettingModalFirstOptions, setSettingModalFirstOptions,
settingsData, settingsData,
setSettingsData, setSettingsData,
settingsDataSave,
setSettingsDataSave,
fetchSettings, fetchSettings,
globalFont,
setGlobalFont,
planSizeSettingMode, planSizeSettingMode,
setPlanSizeSettingMode, setPlanSizeSettingMode,
settingModalSecondOptions, settingModalSecondOptions,
@ -36,9 +40,19 @@ export default function SettingModal01(props) {
setGridColor, setGridColor,
color, color,
} = useCanvasSetting() } = useCanvasSetting()
const firstProps = { canvas, settingModalFirstOptions, setSettingModalFirstOptions, settingsData, setSettingsData } const firstProps = {
canvas,
settingModalFirstOptions,
setSettingModalFirstOptions,
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
}
const secondProps = { const secondProps = {
fetchSettings, fetchSettings,
globalFont,
setGlobalFont,
planSizeSettingMode, planSizeSettingMode,
setPlanSizeSettingMode, setPlanSizeSettingMode,
settingModalSecondOptions, settingModalSecondOptions,
@ -46,6 +60,10 @@ export default function SettingModal01(props) {
adsorptionPointMode, adsorptionPointMode,
setAdsorptionPointMode, setAdsorptionPointMode,
setAdsorptionRange, setAdsorptionRange,
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
} }
const gridProps = { gridColor, setGridColor, color } const gridProps = { gridColor, setGridColor, color }

23
src/components/floor-plan/modal/setting01/dimensionLine/DimensionLineSetting.jsx
View File

@ -33,7 +33,7 @@ const fontSizes = [
] ]
export default function DimensionLineSetting(props) { export default function DimensionLineSetting(props) {
const { isShow, setIsShow, id, pos = { x: 985, y: 180 } } = props const { isShow, setIsShow, id, pos = { x: 985, y: 180 }, settingsData, setSettingsData, settingsDataSave, setSettingsDataSave } = props
const { addPopup, closePopup, closePopups } = usePopup() const { addPopup, closePopup, closePopups } = usePopup()
const pixels = Array.from({ length: 5 }).map((_, index) => { const pixels = Array.from({ length: 5 }).map((_, index) => {
return { id: index, name: index + 1, value: index + 1 } return { id: index, name: index + 1, value: index + 1 }
@ -111,11 +111,16 @@ export default function DimensionLineSetting(props) {
color: originColor, color: originColor,
setColor: setOriginColor, setColor: setOriginColor,
id: colorModalId, id: colorModalId,
name: 'DimensionLineColor',
isConfig: true, isConfig: true,
pos: { pos: {
x: 495, x: 495,
y: 180, y: 180,
}, },
settingsData,
setSettingsData,
settingsDataSave,
setSettingsDataSave,
} }
const fontProps = { const fontProps = {
@ -157,9 +162,10 @@ export default function DimensionLineSetting(props) {
fontSize: originFontSize, fontSize: originFontSize,
fontColor: originFontColor, fontColor: originFontColor,
}, },
fontFlag: true, //fontFlag: true,
} }
}) })
setDimensionLineSettings((prev) => { setDimensionLineSettings((prev) => {
return { return {
...prev, ...prev,
@ -167,6 +173,19 @@ export default function DimensionLineSetting(props) {
color: originColor, color: originColor,
} }
}) })
setSettingsData({
...settingsData,
dimensionLineText: {
fontFamily: originFont,
fontWeight: originFontWeight,
fontSize: originFontSize,
fontColor: originFontColor,
},
pixel: originPixel.name,
color: originColor,
})
setIsShow(false) setIsShow(false)
closePopups([fontModalId, colorModalId, id]) closePopups([fontModalId, colorModalId, id])
} }

11
src/components/floor-plan/modal/setting01/planSize/PlanSizeSetting.jsx
View File

@ -8,7 +8,7 @@ import { useCanvasSetting } from '@/hooks/option/useCanvasSetting'
import { onlyNumberInputChange } from '@/util/input-utils' import { onlyNumberInputChange } from '@/util/input-utils'
export default function PlanSizeSetting(props) { export default function PlanSizeSetting(props) {
const { setIsShow, horizon, vertical, id, pos = { x: 985, y: 180 } } = props const { setIsShow, horizon, vertical, id, pos = { x: 985, y: 180 }, settingsData, setSettingsData, settingsDataSave, setSettingsDataSave } = props
const { closePopup } = usePopup() const { closePopup } = usePopup()
const { getMessage } = useMessage() const { getMessage } = useMessage()
@ -26,10 +26,15 @@ export default function PlanSizeSetting(props) {
...prev, ...prev,
originHorizon: Number(planSizeSettingMode.originHorizon), originHorizon: Number(planSizeSettingMode.originHorizon),
originVertical: Number(planSizeSettingMode.originVertical), originVertical: Number(planSizeSettingMode.originVertical),
flag: true,
} }
}) })
setSettingsData({
...settingsData,
originHorizon: Number(planSizeSettingMode.originHorizon),
originVertical: Number(planSizeSettingMode.originVertical),
})
canvas.setWidth(planSizeSettingMode.originHorizon) canvas.setWidth(planSizeSettingMode.originHorizon)
canvas.setHeight(planSizeSettingMode.originVertical) canvas.setHeight(planSizeSettingMode.originVertical)
canvas.renderAll() canvas.renderAll()
@ -40,7 +45,7 @@ export default function PlanSizeSetting(props) {
const changeInput = (value, e) => { const changeInput = (value, e) => {
const { name } = e.target const { name } = e.target
console.log('name', name, value)
setPlanSizeSettingMode((prev) => { setPlanSizeSettingMode((prev) => {
return { return {
...prev, ...prev,

12
src/components/main/ChangePasswordPop.jsx
View File

@ -7,7 +7,7 @@ import { useAxios } from '@/hooks/useAxios'
import { globalLocaleStore } from '@/store/localeAtom' import { globalLocaleStore } from '@/store/localeAtom'
import { useRouter } from 'next/navigation' import { useRouter } from 'next/navigation'
import { setSession } from '@/lib/authActions' import { setSession } from '@/lib/authActions'
import { logout } from '@/lib/authActions'
export default function ChangePasswordPop(props) { export default function ChangePasswordPop(props) {
const globalLocaleState = useRecoilValue(globalLocaleStore) const globalLocaleState = useRecoilValue(globalLocaleStore)
@ -77,18 +77,21 @@ export default function ChangePasswordPop(props) {
if (res?.result?.code === 200) { if (res?.result?.code === 200) {
if (res?.result?.resultCode === 'S') { if (res?.result?.resultCode === 'S') {
alert(getMessage('main.popup.login.success')) alert(getMessage('main.popup.login.success'))
logout()
//로그인 화면으로 이동해서 다시 로그인해야되서 setSessionState필요없음 //로그인 화면으로 이동해서 다시 로그인해야되서 setSessionState필요없음
// setSessionState({ ...sessionState, pwdInitYn: 'Y' }) // setSessionState({ ...sessionState, pwdInitYn: 'Y' })
props.setChagePasswordPopOpen(false) //props.setChagePasswordPopOpen(false)
router.push('/login') //router.push('/login')
} else { } else {
alert(res?.result?.resultMsg) alert(res?.result?.resultMsg)
} }
} else { } else {
logout()
console.log('code not 200 error') console.log('code not 200 error')
} }
}) })
.catch((error) => { .catch((error) => {
logout()
console.log('catch::::::::', error) console.log('catch::::::::', error)
}) })
} }
@ -165,7 +168,8 @@ export default function ChangePasswordPop(props) {
type="button" type="button"
className="btn-origin grey" className="btn-origin grey"
onClick={() => { onClick={() => {
router.push('/login') logout()
// router.push('/login')
}} }}
> >
{getMessage('main.popup.login.btn2')} {getMessage('main.popup.login.btn2')}

183
src/hooks/option/useCanvasSetting.js
View File

@ -48,28 +48,15 @@ export function useCanvasSetting() {
const [settingModalFirstOptions, setSettingModalFirstOptions] = useRecoilState(settingModalFirstOptionsState) const [settingModalFirstOptions, setSettingModalFirstOptions] = useRecoilState(settingModalFirstOptionsState)
const [settingModalSecondOptions, setSettingModalSecondOptions] = useRecoilState(settingModalSecondOptionsState) const [settingModalSecondOptions, setSettingModalSecondOptions] = useRecoilState(settingModalSecondOptionsState)
// const [settingsData, setSettingsData] = useRecoilState(settingsState)
const [settingsData, setSettingsData] = useState({ ...settingModalFirstOptions, ...settingModalSecondOptions })
const { option1, option2, dimensionDisplay } = settingModalFirstOptions
const { option4 } = settingModalSecondOptions
const corridorDimension = useRecoilValue(corridorDimensionSelector)
const globalLocaleState = useRecoilValue(globalLocaleStore)
const { get, post } = useAxios(globalLocaleState)
const { getMessage } = useMessage()
const { swalFire } = useSwal()
const [adsorptionPointMode, setAdsorptionPointMode] = useRecoilState(adsorptionPointModeState)
const [adsorptionRange, setAdsorptionRange] = useRecoilState(adsorptionRangeState)
const [planSizeSettingMode, setPlanSizeSettingMode] = useRecoilState(planSizeSettingState)
//const setAdsorptionRange = useSetRecoilState(adsorptionRangeState)
const [selectedFont, setSelectedFont] = useState() const [selectedFont, setSelectedFont] = useState()
const [selectedFontWeight, setSelectedFontWeight] = useState() const [selectedFontWeight, setSelectedFontWeight] = useState()
const [selectedFontSize, setSelectedFontSize] = useState() const [selectedFontSize, setSelectedFontSize] = useState()
const [selectedFontColor, setSelectedFontColor] = useState() const [selectedFontColor, setSelectedFontColor] = useState()
const [globalFont, setGlobalFont] = useRecoilState(globalFontAtom) const [globalFont, setGlobalFont] = useRecoilState(globalFontAtom)
const [adsorptionPointMode, setAdsorptionPointMode] = useRecoilState(adsorptionPointModeState)
const [adsorptionRange, setAdsorptionRange] = useRecoilState(adsorptionRangeState)
const [planSizeSettingMode, setPlanSizeSettingMode] = useRecoilState(planSizeSettingState)
const [dimensionLineSettings, setDimensionLineSettings] = useRecoilState(dimensionLineSettingsState) const [dimensionLineSettings, setDimensionLineSettings] = useRecoilState(dimensionLineSettingsState)
const setSettingModalGridOptions = useSetRecoilState(settingModalGridOptionsState) const setSettingModalGridOptions = useSetRecoilState(settingModalGridOptionsState)
@ -80,7 +67,26 @@ export function useCanvasSetting() {
) )
const [gridColor, setGridColor] = useRecoilState(gridColorState) const [gridColor, setGridColor] = useRecoilState(gridColorState)
const [color, setColor] = useColor(gridColor ?? '#FF0000') const [color, setColor] = useColor(gridColor ?? '#FF0000')
const [colorTemp, setColorTemp] = useState()
const [settingsData, setSettingsData] = useState({
...settingModalFirstOptions,
...settingModalSecondOptions,
...globalFont,
...dotLineGridSetting,
...planSizeSettingMode,
...dimensionLineSettings,
...color,
})
const [settingsDataSave, setSettingsDataSave] = useState()
const { option1, option2, dimensionDisplay } = settingModalFirstOptions
const { option4 } = settingModalSecondOptions
const corridorDimension = useRecoilValue(corridorDimensionSelector)
const globalLocaleState = useRecoilValue(globalLocaleStore)
const { get, post } = useAxios(globalLocaleState)
const { getMessage } = useMessage()
const { swalFire } = useSwal()
const [canvasSetting, setCanvasSetting] = useRecoilState(canvasSettingState) const [canvasSetting, setCanvasSetting] = useRecoilState(canvasSettingState)
const [basicSetting, setBasicSettings] = useRecoilState(basicSettingState) const [basicSetting, setBasicSettings] = useRecoilState(basicSettingState)
@ -91,7 +97,6 @@ export function useCanvasSetting() {
{ id: 3, name: '1/4', value: 1 / 4 }, { id: 3, name: '1/4', value: 1 / 4 },
{ id: 4, name: '1/10', value: 1 / 10 }, { id: 4, name: '1/10', value: 1 / 10 },
] ]
const [selectOption, setSelectOption] = useState(SelectOptions[0])
useEffect(() => { useEffect(() => {
if (!canvas) { if (!canvas) {
@ -132,58 +137,10 @@ export function useCanvasSetting() {
}, [canvasSetting]) }, [canvasSetting])
useEffect(() => { useEffect(() => {
console.log('🚀 ~ useEffect ~ settingsData:', settingsData) console.log('🚀 ~ useEffect ~ settingsDataSave:', settingsDataSave)
if (settingsDataSave !== undefined) onClickOption2()
}, [settingsData]) }, [settingsData])
//흡착점 ON/OFF 변경 시
// useEffect(() => {
// //console.log('useCanvasSetting 실행2', adsorptionPointMode.fontFlag, correntObjectNo)
// if (adsorptionPointMode.fontFlag) {
// onClickOption2()
// }
// }, [adsorptionPointMode])
// 1 과 2 변경 시
// useEffect(() => {
// //console.log('useCanvasSetting 실행3', settingModalFirstOptions.fontFlag, settingModalSecondOptions.fontFlag, correntObjectNo)
// if (settingModalFirstOptions.fontFlag || settingModalSecondOptions.fontFlag) {
// onClickOption2()
// }
// }, [settingModalFirstOptions, settingModalSecondOptions])
// 글꼴 변경 시
// useEffect(() => {
// //console.log('useCanvasSetting 실행4', globalFont.fontFlag, correntObjectNo)
// if (globalFont.fontFlag) {
// onClickOption2()
// }
// }, [globalFont])
// 도명크기 변경 시
// useEffect(() => {
// //console.log('useCanvasSetting 실행5', planSizeSettingMode.flag, correntObjectNo)
// if (planSizeSettingMode.flag) {
// onClickOption2()
// }
// }, [planSizeSettingMode])
// 점/선 그리드 변경 시
// useEffect(() => {
// //console.log('useCanvasSetting 실행6', dotLineGridSetting.flag)
// if (dotLineGridSetting.flag) {
// onClickOption2()
// }
// }, [dotLineGridSetting])
// 그리드 색 설정 변경 시
// useEffect(() => {
// console.log('useCanvasSetting 실행7', colorTemp, gridColor)
// //colorTemp는 변경 전.. 값이 있고 변경된 컬러와 다를 때 실행
// if (colorTemp !== undefined && colorTemp !== gridColor) {
// onClickOption2()
// }
// }, [color])
const getFonts = (itemValue) => { const getFonts = (itemValue) => {
if (!itemValue) return { id: 1, name: 'MS PGothic', value: 'MS PGothic' } if (!itemValue) return { id: 1, name: 'MS PGothic', value: 'MS PGothic' }
const data = [ const data = [
@ -357,18 +314,13 @@ export function useCanvasSetting() {
const optionData5 = settingModalFirstOptions.dimensionDisplay.map((item) => ({ ...item })) const optionData5 = settingModalFirstOptions.dimensionDisplay.map((item) => ({ ...item }))
//흡착점 ON/OFF //흡착점 ON/OFF
setAdsorptionPointMode({ ...adsorptionPointMode, adsorptionPoint: res.adsorpPoint, fontFlag: false }) setAdsorptionPointMode({ ...adsorptionPointMode, adsorptionPoint: res.adsorpPoint })
//치수선 설정 //치수선 설정
setDimensionLineSettings({ ...dimensionLineSettings, pixel: res.originPixel, color: res.originColor }) setDimensionLineSettings({ ...dimensionLineSettings, pixel: res.originPixel, color: res.originColor })
//도면크기 설정 //도면크기 설정
setPlanSizeSettingMode({ setPlanSizeSettingMode({ ...planSizeSettingMode, originHorizon: res.originHorizon, originVertical: res.originVertical })
...planSizeSettingMode,
originHorizon: res.originHorizon,
originVertical: res.originVertical,
flag: false,
})
// 데이터 설정 // 데이터 설정
setSettingModalFirstOptions({ setSettingModalFirstOptions({
@ -376,13 +328,13 @@ export function useCanvasSetting() {
option1: optionData1, option1: optionData1,
option2: optionData2, option2: optionData2,
dimensionDisplay: optionData5, dimensionDisplay: optionData5,
fontFlag: false, //fontFlag: false,
}) })
setSettingModalSecondOptions({ setSettingModalSecondOptions({
...settingModalSecondOptions, ...settingModalSecondOptions,
option3: optionData3, option3: optionData3,
option4: optionData4, option4: optionData4,
fontFlag: false, //fontFlag: false,
}) })
const fontPatternData = { const fontPatternData = {
@ -422,7 +374,7 @@ export function useCanvasSetting() {
fontColor: getFontColors(res.lengthFontColor), fontColor: getFontColors(res.lengthFontColor),
}, },
//글꼴 설정 Flag //글꼴 설정 Flag
fontFlag: false, //fontFlag: false,
} }
//조회된 글꼴 데이터 set //조회된 글꼴 데이터 set
@ -439,55 +391,45 @@ export function useCanvasSetting() {
}, },
DOT: res.dotGridDisplay, DOT: res.dotGridDisplay,
LINE: res.lineGridDisplay, LINE: res.lineGridDisplay,
flag: false,
} }
const matchedOption = SelectOptions.find((option) => option.value == res.gridDimen)
// dimension 값에 맞는 옵션을 선택
setSelectOption(matchedOption)
setDotLineGridSettingState(patternData) setDotLineGridSettingState(patternData)
//setCurrentSetting(patternData) //setCurrentSetting(patternData)
//그리드 색 설정 //그리드 색 설정
setGridColor(res.gridColor) setGridColor(res.gridColor)
setColorTemp(res.gridColor)
} else { } else {
//조회된 글꼴 데이터가 없는 경우 //조회된 글꼴 데이터가 없는 경우
//흡착점 ON/OFF //흡착점 ON/OFF
setAdsorptionPointMode({ ...adsorptionPointMode, adsorptionPoint: false, fontFlag: false }) setAdsorptionPointMode({ ...adsorptionPointMode, adsorptionPoint: false })
//치수선 설정 //치수선 설정
setDimensionLineSettings({ ...dimensionLineSettings }) setDimensionLineSettings({ ...dimensionLineSettings })
//도면크기 설정 //도면크기 설정
setPlanSizeSettingMode({ setPlanSizeSettingMode({ ...planSizeSettingMode })
...planSizeSettingMode,
flag: false,
})
// 데이터 설정 // 데이터 설정
setSettingModalFirstOptions({ setSettingModalFirstOptions({
...settingModalFirstOptions, ...settingModalFirstOptions,
fontFlag: false, //fontFlag: false,
}) })
setSettingModalSecondOptions({ setSettingModalSecondOptions({
...settingModalSecondOptions, ...settingModalSecondOptions,
fontFlag: false, //fontFlag: false,
}) })
setGlobalFont({ ...globalFont, fontFlag: false }) setGlobalFont({ ...globalFont })
//점/선 그리드 //점/선 그리드
setDotLineGridSettingState({ ...defaultDotLineGridSetting, flag: false }) setDotLineGridSettingState({ ...defaultDotLineGridSetting })
//setCurrentSetting({ ...defaultDotLineGridSetting }) //setCurrentSetting({ ...defaultDotLineGridSetting })
//그리드 색 설정 //그리드 색 설정
setGridColor('#FF0000') setGridColor('#FF0000')
setColorTemp('#FF0000')
} }
frontSettings() frontSettings()
} catch (error) { } catch (error) {
console.error('Data fetching error:', error) console.error('Data fetching error:', error)
@ -513,8 +455,31 @@ export function useCanvasSetting() {
secondOption2: option4.map((item) => ({ secondOption2: option4.map((item) => ({
column: item.column, column: item.column,
selected: item.selected, selected: item.selected,
range: item.range,
})), })),
} }
// const option1Array = dataToSend.firstOption1.map((item) => ({
// allocDisplay: item.selected,
// outlineDisplay: item.selected,
// gridDisplay: item.selected,
// lineDisplay: item.selected,
// wordDisplay: item.selected,
// circuitNumDisplay: item.selected,
// flowDisplay: item.selected,
// trestleDisplay: item.selected,
// imageDisplay: item.selected,
// totalDisplay: item.selected,
// }))
// console.log('option1Array ', option1Array)
// const option2Array = dataToSend.firstOption2.map((item) => ({
// corridorDimension: item.selected,
// realDimension: item.selected,
// noneDimension: item.selected,
// }))
// console.log('option2Array ', option2Array)
// console.log('globalFont', globalFont) // console.log('globalFont', globalFont)
const patternData = { const patternData = {
//견적서 번호 //견적서 번호
@ -543,6 +508,23 @@ export function useCanvasSetting() {
adsorpRangeSmallSemi: dataToSend.secondOption2[1].selected, adsorpRangeSmallSemi: dataToSend.secondOption2[1].selected,
adsorpRangeMedium: dataToSend.secondOption2[2].selected, adsorpRangeMedium: dataToSend.secondOption2[2].selected,
adsorpRangeLarge: dataToSend.secondOption2[3].selected, adsorpRangeLarge: dataToSend.secondOption2[3].selected,
//adsorptionRange: dataToSend.secondOption2[0].range,
// //디스플레이 설정(다중)
// option1Array,
// //차수 표시(단 건)
// option2Array,
// //화면 표시(단 건)
// onlyBorder: dataToSend.firstOption2[0].selected,
// lineHatch: dataToSend.firstOption2[1].selected,
// allPainted: dataToSend.firstOption2[2].selected,
// //흡착범위 설정(단 건)
// adsorpRangeSmall: dataToSend.secondOption2[0].selected,
// adsorpRangeSmallSemi: dataToSend.secondOption2[1].selected,
// adsorpRangeMedium: dataToSend.secondOption2[2].selected,
// adsorpRangeLarge: dataToSend.secondOption2[3].selected,
//흡착점 ON/OFF //흡착점 ON/OFF
adsorpPoint: adsorptionPointMode.adsorptionPoint, adsorpPoint: adsorptionPointMode.adsorptionPoint,
//??: adsorptionRange, 사용여부 확인 필요 //??: adsorptionRange, 사용여부 확인 필요
@ -594,14 +576,11 @@ export function useCanvasSetting() {
gridRatio: dotLineGridSetting.INTERVAL.ratioInterval / 10, gridRatio: dotLineGridSetting.INTERVAL.ratioInterval / 10,
gridDimen: dotLineGridSetting.INTERVAL.dimension, gridDimen: dotLineGridSetting.INTERVAL.dimension,
//gridColor: gridColor.gridColor,
gridColor: gridColor, gridColor: gridColor,
} }
console.log('patternData ', patternData) console.log('patternData ', patternData)
setColorTemp(gridColor)
// HTTP POST 요청 보내기 // HTTP POST 요청 보내기
await post({ url: `/api/canvas-management/canvas-settings`, data: patternData }) await post({ url: `/api/canvas-management/canvas-settings`, data: patternData })
.then((res) => { .then((res) => {
@ -719,15 +698,13 @@ export function useCanvasSetting() {
setDimensionLineSettings, setDimensionLineSettings,
planSizeSettingMode, planSizeSettingMode,
setPlanSizeSettingMode, setPlanSizeSettingMode,
selectOption,
setSelectOption,
SelectOptions, SelectOptions,
currentSetting, currentSetting,
setCurrentSetting, setCurrentSetting,
dotLineGridSettingState, dotLineGridSettingState,
setSettingModalGridOptions,
setDotLineGridSettingState, setDotLineGridSettingState,
resetDotLineGridSetting, resetDotLineGridSetting,
setSettingModalGridOptions,
gridColor, gridColor,
setGridColor, setGridColor,
color, color,
@ -740,5 +717,7 @@ export function useCanvasSetting() {
basicSettingSave, basicSettingSave,
settingsData, settingsData,
setSettingsData, setSettingsData,
settingsDataSave,
setSettingsDataSave,
} }
} }