From 1c7e5d537b7147e98277cf4b5edda4cb7e8eae67 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Mon, 23 Sep 2024 18:27:24 +0900 Subject: [PATCH] =?UTF-8?q?Canvas=20=EC=84=A4=EC=A0=95=20=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EB=8B=A8=EC=88=9C=ED=99=94=20=EB=B0=8F=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/setting01/FirstOption.jsx | 27 ++++--------------- .../modal/setting01/SecondOption.jsx | 26 +++--------------- src/store/settingAtom.js | 4 +-- 3 files changed, 11 insertions(+), 46 deletions(-) diff --git a/src/components/floor-plan/modal/setting01/FirstOption.jsx b/src/components/floor-plan/modal/setting01/FirstOption.jsx index f5e2dea2..bf17944d 100644 --- a/src/components/floor-plan/modal/setting01/FirstOption.jsx +++ b/src/components/floor-plan/modal/setting01/FirstOption.jsx @@ -24,28 +24,11 @@ export default function FirstOption() { const fetchSettings = async () => { try { const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${objectNo}` }) - const options1 = [ - 'assignDisplay', - 'drawDisplay', - 'gridDisplay', - '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]] })) + //const option1 = settingModalFirstOptions.option1.map((item, index) => ({ ...item, selected: res[optionsData1[index]] })) + const option1 = settingModalFirstOptions.option1.map((item) => ({ ...item, selected: res[item.column] })) + const option2 = settingModalFirstOptions.option2.map((item) => ({ ...item, selected: res[item.column] })) + const option3 = settingModalSecondOptions.option3.map((item) => ({ ...item })) + const option4 = settingModalSecondOptions.option4.map((item) => ({ ...item, selected: res[item.column] })) // 데이터 설정 setSettingModalFirstOptions({ diff --git a/src/components/floor-plan/modal/setting01/SecondOption.jsx b/src/components/floor-plan/modal/setting01/SecondOption.jsx index 2dc85daf..de453021 100644 --- a/src/components/floor-plan/modal/setting01/SecondOption.jsx +++ b/src/components/floor-plan/modal/setting01/SecondOption.jsx @@ -25,28 +25,10 @@ export default function SecondOption() { try { const res = await get({ url: `/api/canvas-management/canvas-settings/by-object/${objectNo}` }) - const options1 = [ - 'assignDisplay', - 'drawDisplay', - 'gridDisplay', - '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]] })) + const option1 = settingModalFirstOptions.option1.map((item) => ({ ...item, selected: res[item.column] })) + const option2 = settingModalFirstOptions.option2.map((item) => ({ ...item, selected: res[item.column] })) + const option3 = settingModalSecondOptions.option3.map((item) => ({ ...item })) + const option4 = settingModalSecondOptions.option4.map((item) => ({ ...item, selected: res[item.column] })) // 데이터 설정 setSettingModalFirstOptions({ diff --git a/src/store/settingAtom.js b/src/store/settingAtom.js index 2e09ba2e..2308bb9c 100644 --- a/src/store/settingAtom.js +++ b/src/store/settingAtom.js @@ -28,13 +28,13 @@ export const settingModalFirstOptionsState = atom({ export const settingModalSecondOptionsState = atom({ key: 'settingModalSecondOptions', default: { - option1: [ + option3: [ { id: 1, name: 'modal.canvas.setting.font.plan.edit.word' }, { id: 2, name: 'modal.canvas.setting.font.plan.edit.flow' }, { id: 3, name: 'modal.canvas.setting.font.plan.edit.dimension' }, { 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: 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 },