- {selectedModels.map((model, index) => (
-
- setSelectedPcs(model)}
- />
-
-
- ))}
+ {models
+ .filter((model) => model.selected)
+ .map((model, index) => (
+
+ setSelectedPcs(model)}
+ />
+
+
+ ))}
{/*
diff --git a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
index aff0926b..2fbe78e9 100644
--- a/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
+++ b/src/components/floor-plan/modal/panelBatch/PanelBatchStatistics.jsx
@@ -33,8 +33,9 @@ export default function PanelBatchStatistics() {
{rows.map((row, index) => (
{header.map((item, i) => (
- // | {item.prop === 'name' ? item.name : item.prop === 'powerGeneration' ? item.powerGeneration : item.amount} |
- {row[item.prop]} |
+
+ {typeof row[item.prop] === 'number' ? row[item.prop].toLocaleString('ko-KR', { maximumFractionDigits: 4 }) : row[item.prop]}
+ |
))}
))}
diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js
index 53607ef5..4c28b481 100644
--- a/src/hooks/module/useModuleBasicSetting.js
+++ b/src/hooks/module/useModuleBasicSetting.js
@@ -2308,12 +2308,14 @@ export function useModuleBasicSetting() {
})
return {
...rowObject, // ์ด ๋ฐ์ ๋ = ๋ฐ์ ๋ * ๋ชจ๋ ๊ฐ์
+ ...surface,
name: canvas.getObjects().filter((obj) => obj.id === surface.parentId)[0].directionText, // ์ง๋ถ๋ฉด
// powerGeneration: wpOut.toLocaleString('ko-KR', { maximumFractionDigits: 4 }),
wpOut: wpOut,
}
})
+ console.log('๐ ~ getModuleStatistics ~ rows:', rows)
console.log('๐ ~ getModuleStatistics ~ moduleInfo:', moduleInfo)
const header = [
{ name: getMessage('modal.panel.batch.statistic.roof.shape'), prop: 'name' },
@@ -2334,15 +2336,7 @@ export function useModuleBasicSetting() {
footer.push(footerData[key])
})
footer.push(totalWpout)
- // const footer = [
- // 'ํฉ๊ณ',
- // ...Object.keys(moduleInfo).map((key) => {
- // return { name: moduleInfo[key].name, prop: moduleInfo[key] }
- // }),
- // totalWpout,
- // ]
- // const footer = []
- console.log('@@@@@@@@@@', header, rows, footer)
+ console.log({ header: header, rows, footer: footer })
setModuleStatistics({ header: header, rows, footer: footer })
}
diff --git a/src/hooks/module/useModulePlace.js b/src/hooks/module/useModulePlace.js
index b519f063..13767b83 100644
--- a/src/hooks/module/useModulePlace.js
+++ b/src/hooks/module/useModulePlace.js
@@ -51,6 +51,7 @@ export function useModulePlace() {
useEffect(() => {
//์ง๋ถ์ ๊ฐ์ ธ์ด
+ console.log('๐ ~ trestleDetailList.forEach ~ trestleDetailList:', trestleDetailList)
canvas
.getObjects()
.filter((roof) => roof.name === 'roof')
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 72addabb..3ce7f729 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -281,6 +281,12 @@
"modal.object.setting.direction.select": "ๆนๅใฎ้ธๆ",
"modal.placement.surface.setting.info": "โ โ ใฎ้ทใๅ
ฅๅๅพใซๅฏพ่ง็ทใฎ้ทใใๅ
ฅๅใใใจใโกใฎ้ทใใ่ชๅ่จ็ฎใใพใใ",
"modal.placement.surface.setting.diagonal.length": "ๆใใฎ้ทใ",
+ "modal.placement.surface.drawing.straight.line": "์ง์ (JA)",
+ "modal.placement.surface.drawing.right.angle": "์ง๊ฐ(JA)",
+ "modal.placement.surface.drawing.double.pitch": "์ด๊ตฌ๋ฐฐ(JA)",
+ "modal.placement.surface.drawing.angle": "๊ฐ๋(JA)",
+ "modal.placement.surface.drawing.diagonal": "๋๊ฐ์ (JA)",
+ "modal.placement.surface.drawing.fix": "๋ฐฐ์น๋ฉด ํ์ (JA)",
"modal.color.picker.title": "่ฒใฎ่จญๅฎ",
"modal.color.picker.default.color": "ๅบๆฌ่ฒ",
"modal.size.setting": "ใตใคใบๅคๆด",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index d2113d2e..ecb685c0 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -80,6 +80,7 @@
"modal.placement.surface.drawing.double.pitch": "์ด๊ตฌ๋ฐฐ",
"modal.placement.surface.drawing.angle": "๊ฐ๋",
"modal.placement.surface.drawing.diagonal": "๋๊ฐ์ ",
+ "modal.placement.surface.drawing.fix": "๋ฐฐ์น๋ฉด ํ์ ",
"plan.menu.placement.surface.arrangement": "๋ฉดํ์ ๋ฐฐ์น",
"plan.menu.placement.surface.object": "์ค๋ธ์ ํธ ๋ฐฐ์น",
"plan.menu.placement.surface.all.remove": "๋ฐฐ์น๋ฉด ์ ์ฒด ์ญ์ ",
diff --git a/src/store/circuitTrestleAtom.js b/src/store/circuitTrestleAtom.js
index 05a11760..46f62676 100644
--- a/src/store/circuitTrestleAtom.js
+++ b/src/store/circuitTrestleAtom.js
@@ -42,4 +42,5 @@ export const moduleStatisticsState = atom({
rows: [],
footer: ['ํฉ๊ณ', '0'],
},
+ dangerouslyAllowMutability: true,
})
diff --git a/src/util/common-utils.js b/src/util/common-utils.js
index b77cf62d..bb875e5b 100644
--- a/src/util/common-utils.js
+++ b/src/util/common-utils.js
@@ -149,3 +149,7 @@ export const unescapeString = (str) => {
return str.replace(regex, (matched) => chars[matched] || matched)
}
}
+
+export const isNullOrUndefined = (value) => {
+ return value === null || value === undefined
+}
From 673c99a674bdbe89c0bbf8234f7050737fadea5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
<43837214+Minsiki@users.noreply.github.com>
Date: Tue, 21 Jan 2025 16:33:55 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=ED=9A=8C=EB=A1=9C?=
=?UTF-8?q?=ED=95=A0=EB=8B=B9=20=EA=B0=9C=EB=B0=9C=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
index ac0829fc..34eb4acb 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
@@ -16,7 +16,7 @@ export default function StepUp(props) {
const [arrayLength, setArrayLength] = useState(3) //module-table-inner์ ๋ฐ๋ณต ๊ฐ์
const [pcsCheck, setPcsCheck] = useRecoilState(pcsCheckState)
const { models } = props
- const { getPcsAutoRecommendList } = useMasterController()
+ const { getPcsVoltageStepUpList, getPcsAutoRecommendList } = useMasterController()
const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
const canvas = useRecoilValue(canvasState)
const selectedModules = useRecoilValue(selectedModuleState)