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

Canvas 설정 소스 단순화 및 오류 수정

Browse Source
This commit is contained in:
changkyu choi 2024-09-23 18:27:24 +09:00
parent d5a5778adc
commit 1c7e5d537b
3 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,28 +24,11 @@ export default function FirstOption() {
const fetchSettings = async () => { const fetchSettings = async () => {
try { try {
const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${objectNo}` }) const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${objectNo}` })
const options1 = [ //const option1 = settingModalFirstOptions.option1.map((item, index) => ({ ...item, selected: res[optionsData1[index]] }))
'assignDisplay', const option1 = settingModalFirstOptions.option1.map((item) => ({ ...item, selected: res[item.column] }))
'drawDisplay', const option2 = settingModalFirstOptions.option2.map((item) => ({ ...item, selected: res[item.column] }))
'gridDisplay', const option3 = settingModalSecondOptions.option3.map((item) => ({ ...item }))
'charDisplay', const option4 = settingModalSecondOptions.option4.map((item) => ({ ...item, selected: res[item.column] }))
'flowDisplay',
'hallwayDimenDisplay',
'actualDimenDisplay',
'noDimenDisplay',
'trestleDisplay',
'coordiDisplay',
'drawConverDisplay',
]
const option1 = settingModalFirstOptions.option1.map((item, index) => ({ ...item, selected: res[options1[index]] }))
const options2 = ['onlyBorder', 'lineHatch', 'allPainted']
const option2 = settingModalFirstOptions.option2.map((item, index) => ({ ...item, selected: res[options2[index]] }))
const option3 = settingModalSecondOptions.option1.map((item) => ({ ...item }))
const options4 = ['adsorpRangeSmall', 'adsorpRangeSmallSemi', 'adsorpRangeMedium', 'adsorpRangeLarge']
const option4 = settingModalSecondOptions.option2.map((item, index) => ({ ...item, selected: res[options4[index]] }))
// 데이터 설정 // 데이터 설정
setSettingModalFirstOptions({ setSettingModalFirstOptions({

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

@ -25,28 +25,10 @@ export default function SecondOption() {
try { try {
const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${objectNo}` }) const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${objectNo}` })
const options1 = [ const option1 = settingModalFirstOptions.option1.map((item) => ({ ...item, selected: res[item.column] }))
'assignDisplay', const option2 = settingModalFirstOptions.option2.map((item) => ({ ...item, selected: res[item.column] }))
'drawDisplay', const option3 = settingModalSecondOptions.option3.map((item) => ({ ...item }))
'gridDisplay', const option4 = settingModalSecondOptions.option4.map((item) => ({ ...item, selected: res[item.column] }))
'charDisplay',
'flowDisplay',
'hallwayDimenDisplay',
'actualDimenDisplay',
'noDimenDisplay',
'trestleDisplay',
'coordiDisplay',
'drawConverDisplay',
]
const option1 = settingModalFirstOptions.option1.map((item, index) => ({ ...item, selected: res[options1[index]] }))
const options2 = ['onlyBorder', 'lineHatch', 'allPainted']
const option2 = settingModalFirstOptions.option2.map((item, index) => ({ ...item, selected: res[options2[index]] }))
const option3 = settingModalSecondOptions.option1.map((item) => ({ ...item }))
const options4 = ['adsorpRangeSmall', 'adsorpRangeSmallSemi', 'adsorpRangeMedium', 'adsorpRangeLarge']
const option4 = settingModalSecondOptions.option2.map((item, index) => ({ ...item, selected: res[options4[index]] }))
// 데이터 설정 // 데이터 설정
setSettingModalFirstOptions({ setSettingModalFirstOptions({

4
src/store/settingAtom.js
View File

@ -28,13 +28,13 @@ export const settingModalFirstOptionsState = atom({
export const settingModalSecondOptionsState = atom({ export const settingModalSecondOptionsState = atom({
key: 'settingModalSecondOptions', key: 'settingModalSecondOptions',
default: { default: {
option1: [ option3: [
{ id: 1, name: 'modal.canvas.setting.font.plan.edit.word' }, { id: 1, name: 'modal.canvas.setting.font.plan.edit.word' },
{ id: 2, name: 'modal.canvas.setting.font.plan.edit.flow' }, { id: 2, name: 'modal.canvas.setting.font.plan.edit.flow' },
{ id: 3, name: 'modal.canvas.setting.font.plan.edit.dimension' }, { id: 3, name: 'modal.canvas.setting.font.plan.edit.dimension' },
{ id: 4, name: 'modal.canvas.setting.font.plan.edit.circuit.num' }, { id: 4, name: 'modal.canvas.setting.font.plan.edit.circuit.num' },
], ],
option2: [ option4: [
{ id: 1, column: 'adsorpRangeSmall', name: 'modal.canvas.setting.font.plan.absorption.small', selected: true }, { id: 1, column: 'adsorpRangeSmall', name: 'modal.canvas.setting.font.plan.absorption.small', selected: true },
{ id: 2, column: 'adsorpRangeSmallSemi', name: 'modal.canvas.setting.font.plan.absorption.small.semi', selected: false }, { id: 2, column: 'adsorpRangeSmallSemi', name: 'modal.canvas.setting.font.plan.absorption.small.semi', selected: false },
{ id: 3, column: 'adsorpRangeMedium', name: 'modal.canvas.setting.font.plan.absorption.medium', selected: false }, { id: 3, column: 'adsorpRangeMedium', name: 'modal.canvas.setting.font.plan.absorption.medium', selected: false },