Canvas 그리드 설정 조회/등록 추가

This commit is contained in:
changkyu choi 2024-10-02 18:49:59 +09:00
parent 955117a1c8
commit d40b196f3d
3 changed files with 203 additions and 116 deletions

View File

@ -1,12 +1,15 @@
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 { useState } from 'react' import { useEffect, useState } from 'react'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import { canvasState, dotLineGridSettingState, dotLineIntervalSelector } from '@/store/canvasAtom' import { canvasState, dotLineGridSettingState, dotLineIntervalSelector } from '@/store/canvasAtom'
import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil' import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil'
import { onlyNumberInputChange } from '@/util/input-utils' import { onlyNumberInputChange } from '@/util/input-utils'
import { fabric } from 'fabric' import { fabric } from 'fabric'
import { useAxios } from '@/hooks/useAxios'
import { useSwal } from '@/hooks/useSwal'
import { gridColorState } from '@/store/gridAtom' import { gridColorState } from '@/store/gridAtom'
import { settingModalGridOptionsState } from '@/store/settingAtom'
const TYPE = { const TYPE = {
DOT: 'DOT', DOT: 'DOT',
@ -15,6 +18,7 @@ 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 [objectNo, setObjectNo] = useState('test123240912001') //
const [close, setClose] = useState(false) const [close, setClose] = useState(false)
const { setShowDotLineGridModal } = props const { setShowDotLineGridModal } = props
const gridColor = useRecoilValue(gridColorState) const gridColor = useRecoilValue(gridColorState)
@ -25,6 +29,11 @@ export default function DotLineGrid(props) {
const interval = useRecoilValue(dotLineIntervalSelector) const interval = useRecoilValue(dotLineIntervalSelector)
const { getMessage } = useMessage() const { getMessage } = useMessage()
const { get, post } = useAxios()
const { swalFire } = useSwal()
const [gridOptions, setGridOptions] = useRecoilState(settingModalGridOptionsState)
const SelectOption = [ const SelectOption = [
{ id: 1, name: getMessage('modal.canvas.setting.grid.dot.line.setting.line.origin'), value: 1 }, { id: 1, name: getMessage('modal.canvas.setting.grid.dot.line.setting.line.origin'), value: 1 },
{ id: 2, name: '1/2', value: 1 / 2 }, { id: 2, name: '1/2', value: 1 / 2 },
@ -34,12 +43,22 @@ export default function DotLineGrid(props) {
const [selectOption, setSelectOption] = useState(SelectOption[0]) const [selectOption, setSelectOption] = useState(SelectOption[0])
const HandleClickClose = () => { const HandleClickClose = () => {
// setClose(true) setShowDotLineGridModal(false) //
// setTimeout(() => {
// setModalOption({ ...modalOption, gridoption: false }) const newGridOptions = [...gridOptions] //
// setClose(false) newGridOptions.map((item) => {
// }, 180) if (item.id === 2) {
item.selected = false
} }
})
setGridOptions(newGridOptions)
}
//
useEffect(() => {
console.log('DotLineGrid useEffect 실행')
fetchGridSettings()
}, [objectNo])
const handleCheckBoxChange = (e) => { const handleCheckBoxChange = (e) => {
const { value, checked } = e.target const { value, checked } = e.target
@ -51,7 +70,53 @@ export default function DotLineGrid(props) {
}) })
} }
const handleSave = () => { // Canvas Grid Setting
const fetchGridSettings = async () => {
try {
const res = await get({ url: `/api/canvas-management/canvas-grid-settings/by-object/${objectNo}` })
const patternData = {
INTERVAL: {
type: res.gridType,
horizontalInterval: res.gridHorizon,
verticalInterval: res.gridVertical,
ratioInterval: res.gridRatio,
},
dimension: res.gridDimen,
DOT: res.dotGridDisplay,
LINE: res.lineGridDisplay,
}
const matchedOption = SelectOption.find((option) => option.value == res.gridDimen)
// dimension
setSelectOption(matchedOption)
//
setDotLineGridSettingState(patternData)
} catch (error) {
console.error('Data fetching error:', error)
}
}
//
const handleSave = async () => {
try {
const patternData = {
objectNo,
dotGridDisplay: dotLineGridSetting.DOT,
lineGridDisplay: dotLineGridSetting.LINE,
gridType: dotLineGridSetting.INTERVAL.type,
gridHorizon: dotLineGridSetting.INTERVAL.horizontalInterval,
gridVertical: dotLineGridSetting.INTERVAL.verticalInterval,
gridRatio: dotLineGridSetting.INTERVAL.ratioInterval,
gridDimen: dotLineGridSetting.INTERVAL.dimension,
}
// HTTP POST
await post({ url: `/api/canvas-management/canvas-grid-settings`, data: patternData }).then((res) => {
swalFire({ text: getMessage(res.returnMessage) })
// 1. . // 1. .
canvas canvas
?.getObjects() ?.getObjects()
@ -62,10 +127,7 @@ export default function DotLineGrid(props) {
.filter((obj) => obj.name === 'dotGrid') .filter((obj) => obj.name === 'dotGrid')
.forEach((obj) => canvas?.remove(obj)) .forEach((obj) => canvas?.remove(obj))
const horizontalInterval = interval.horizontalInterval if (patternData.dotGridDisplay) {
const verticalInterval = interval.verticalInterval
if (dotLineGridSetting.DOT) {
const circle = new fabric.Circle({ const circle = new fabric.Circle({
radius: 2, radius: 2,
fill: 'red', fill: 'red',
@ -81,8 +143,8 @@ export default function DotLineGrid(props) {
}) })
const patternSourceCanvas = new fabric.StaticCanvas(null, { const patternSourceCanvas = new fabric.StaticCanvas(null, {
width: horizontalInterval, width: patternData.gridHorizon,
height: verticalInterval, height: patternData.gridVertical,
}) })
patternSourceCanvas.add(circle) patternSourceCanvas.add(circle)
@ -118,10 +180,15 @@ export default function DotLineGrid(props) {
canvas.renderAll() canvas.renderAll()
} }
if (dotLineGridSetting.LINE) { if (patternData.lineGridDisplay) {
for (let i = 0; i < canvas.height / verticalInterval + 1; i++) { for (let i = 0; i < canvas.height / patternData.gridVertical + 1; i++) {
const horizontalLine = new fabric.Line( const horizontalLine = new fabric.Line(
[0, i * verticalInterval - verticalInterval / 2, canvas.width, i * verticalInterval - verticalInterval / 2], [
0,
i * patternData.gridVertical - patternData.gridVertical / 2,
canvas.width,
i * patternData.gridVertical - patternData.gridVertical / 2,
],
{ {
stroke: gridColor, stroke: gridColor,
strokeWidth: 1, strokeWidth: 1,
@ -140,9 +207,14 @@ export default function DotLineGrid(props) {
canvas.add(horizontalLine) canvas.add(horizontalLine)
} }
for (let i = 0; i < canvas.width / horizontalInterval + 1; i++) { for (let i = 0; i < canvas.width / patternData.gridHorizon + 1; i++) {
const verticalLine = new fabric.Line( const verticalLine = new fabric.Line(
[i * horizontalInterval - horizontalInterval / 2, 0, i * horizontalInterval - horizontalInterval / 2, canvas.height], [
i * patternData.gridHorizon - patternData.gridHorizon / 2,
0,
i * patternData.gridHorizon - patternData.gridHorizon / 2,
canvas.height,
],
{ {
stroke: 'black', stroke: 'black',
strokeWidth: 1, strokeWidth: 1,
@ -161,8 +233,11 @@ export default function DotLineGrid(props) {
canvas.add(verticalLine) canvas.add(verticalLine)
} }
} }
canvas.renderAll() canvas.renderAll()
})
} catch (error) {
swalFire({ text: getMessage(res.returnMessage), icon: 'error' })
}
} }
const handleRadioChange = (e) => { const handleRadioChange = (e) => {
@ -224,7 +299,7 @@ export default function DotLineGrid(props) {
<div className={`modal-pop-wrap ssm mount`}> <div className={`modal-pop-wrap ssm mount`}>
<div className="modal-head"> <div className="modal-head">
<h1 className="title">{getMessage('modal.canvas.setting.grid.dot.line.setting')}</h1> <h1 className="title">{getMessage('modal.canvas.setting.grid.dot.line.setting')}</h1>
<button className="modal-close" onClick={() => setShowDotLineGridModal(false)}> <button className="modal-close" onClick={HandleClickClose}>
닫기 닫기
</button> </button>
</div> </div>

View File

@ -116,11 +116,21 @@ export default function FirstOption() {
} }
} }
const onClickDimension = async (item) => { const onClickOnlyOne = async (item) => {
//
if (item.column === 'onlyBorder' || item.column === 'lineHatch' || item.column === 'allPainted') {
const options2 = settingModalFirstOptions?.option2.map((option2) => {
option2.selected = option2.id === item.id
return option2
})
//
} else {
const options = settingModalFirstOptions?.dimensionDisplay.map((option) => { const options = settingModalFirstOptions?.dimensionDisplay.map((option) => {
option.selected = option.id === item.id option.selected = option.id === item.id
return option return option
}) })
}
setSettingModalFirstOptions({ option1, option2, dimensionDisplay }) setSettingModalFirstOptions({ option1, option2, dimensionDisplay })
@ -205,7 +215,7 @@ export default function FirstOption() {
<div className="flex-check-box for-line"> <div className="flex-check-box for-line">
{settingModalFirstOptions && {settingModalFirstOptions &&
settingModalFirstOptions.dimensionDisplay.map((item) => ( settingModalFirstOptions.dimensionDisplay.map((item) => (
<button key={item.id} className={`check-btn ${item.selected ? 'act' : ''}`} onClick={(e) => onClickDimension(item)}> <button key={item.id} className={`check-btn ${item.selected ? 'act' : ''}`} onClick={(e) => onClickOnlyOne(item)}>
<span className="check-area"></span> <span className="check-area"></span>
<span className="title-area">{getMessage(item.name)}</span> <span className="title-area">{getMessage(item.name)}</span>
</button> </button>
@ -217,7 +227,7 @@ export default function FirstOption() {
<div className="flex-check-box for-line"> <div className="flex-check-box for-line">
{settingModalFirstOptions && {settingModalFirstOptions &&
settingModalFirstOptions.option2.map((item) => ( settingModalFirstOptions.option2.map((item) => (
<button key={item.id} className={`check-btn ${item.selected ? 'act' : ''}`} onClick={(e) => onClickOption(item)}> <button key={item.id} className={`check-btn ${item.selected ? 'act' : ''}`} onClick={(e) => onClickOnlyOne(item)}>
<span className="check-area"></span> <span className="check-area"></span>
<span className="title-area">{getMessage(item.name)}</span> <span className="title-area">{getMessage(item.name)}</span>
</button> </button>

View File

@ -1,4 +1,4 @@
import React, { useEffect } from 'react' import React, { useEffect, useState } from 'react'
import { useRecoilState } from 'recoil' import { useRecoilState } from 'recoil'
import { settingModalGridOptionsState } from '@/store/settingAtom' import { settingModalGridOptionsState } from '@/store/settingAtom'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
@ -16,9 +16,11 @@ export default function GridOption(props) {
const { tempGridMode, setTempGridMode } = useTempGrid() const { tempGridMode, setTempGridMode } = useTempGrid()
const [color, setColor] = useColor(gridColor) const [color, setColor] = useColor(gridColor)
const [colorPickerShow, setColorPickerShow] = useState(false)
useEffect(() => { useEffect(() => {
console.log(color) console.log('GridOption useEffect 실행')
//console.log(color)
setGridColor(color.hex) setGridColor(color.hex)
}, [color]) }, [color])