- 다국어 추가

- 회로 초기화시 집계표 반영

src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx

@@ -51,6 +51,7 @@ export default function CircuitTrestleSetting({ id }) {
   // const [stepUpListData, setStepUpListData] = useRecoilState(stepUpListDataState)
   const [stepUpListData, setStepUpListData] = useState([])
   const [seletedOption, setSeletedOption] = useState(null)
+  const { setModuleStatisticsData } = useCircuitTrestle()
 
   const { handleCanvasToPng } = useImgLoader()
   const { saveCanvas } = usePlan()
@@ -104,7 +105,7 @@ export default function CircuitTrestleSetting({ id }) {
   const onAutoRecommend = () => {
     if (series.filter((s) => s.selected).length === 0) {
       swalFire({
-        title: '시리즈를 선택해 주세요.',
+        title: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error02'),
         type: 'alert',
       })
       return
@@ -304,7 +305,7 @@ export default function CircuitTrestleSetting({ id }) {
 
       if (placementModules.length > target) {
         swalFire({
-          title: '배치가능 매수를 초과합니다. 파워컨디셔너를 다시 선택해 주세요.',
+          title: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error01'),
           type: 'alert',
         })
         return
@@ -358,7 +359,7 @@ export default function CircuitTrestleSetting({ id }) {
   const onClickPrev = () => {
     // setAllocationType(ALLOCATION_TYPE.AUTO)
     swalFire({
-      text: '할당한 회로 번호가 초기화됩니다.',
+      text: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset.info'),
       type: 'alert',
       icon: 'warning',
       confirmFn: () => {
@@ -376,6 +377,7 @@ export default function CircuitTrestleSetting({ id }) {
         }
 
         canvas.renderAll()
+        setModuleStatisticsData()
       },
     })
   }

src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx

@@ -41,8 +41,8 @@ export default function PowerConditionalSelect(props) {
   const { trigger: moduleSelectedDataTrigger } = useCanvasPopupStatusController(2)
   const [moduleSelectionData, setModuleSelectionData] = useRecoilState(moduleSelectionDataState)
   const modelHeader = [
-    { name: getMessage('시리즈'), width: '15%', prop: 'pcsSerNm', type: 'color-box' },
-    { name: getMessage('명칭'), width: '15%', prop: 'goodsNo', type: 'color-box' },
+    { name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.series'), width: '15%', prop: 'pcsSerNm', type: 'color-box' },
+    { name: getMessage('modal.circuit.trestle.setting.circuit.allocation.passivity.name'), width: '15%', prop: 'goodsNo', type: 'color-box' },
     {
       name: `${getMessage('modal.circuit.trestle.setting.power.conditional.select.rated.output')} (kW)`,
       width: '10%',
@@ -73,26 +73,6 @@ export default function PowerConditionalSelect(props) {
     }
   }, [])
 
-  const checkValidation = () => {
-    const checkedSeries = series.filter((s) => s.selected)
-    if (checkedSeries.length === 0) {
-      swalFire({
-        title: 'PCS 시리즈를 선택해 주세요.',
-        icon: 'warning',
-      })
-      return false
-    } else if (checkedSeries.length === 1) {
-      if (checkedSeries[0].pcsMkrMultiType === 'SINGLE-P' && checkedSeries[0].pcsSerParallelYn === 'Y') {
-        swalFire({
-          title: '병설은 단독으로 안 됨',
-          icon: 'warning',
-        })
-      }
-      return false
-    }
-    return true
-  }
-
   const onCheckSeries = (data) => {
     let copySeries = []
     if (data.pcsMkrMultiType === 'MULTI') {

src/hooks/common/useCanvasPopupStatusController.js

@@ -50,6 +50,7 @@ export function useCanvasPopupStatusController(param = 1) {
     for (let i = 1; i < 3; i++) {
       const result = await getModuleSelection(i)
       // setModuleSelectionTotal((prev) => ({ ...prev, [i]: JSON.parse(unescapeString(result.popupStatus)) }))
+      if(!result) return
       if (i === 1) {
         setCompasDeg(result.popupStatus)
       } else if (i === 2) {

src/locales/ja.json

@@ -148,6 +148,8 @@
   "modal.circuit.trestle.setting.circuit.allocation.auto": "自動回路割り当て",
   "modal.circuit.trestle.setting.circuit.allocation.passivity": "手動回路割り当て",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit": "回路",
+  "modal.circuit.trestle.setting.circuit.allocation.passivity.series": "시리즈(JA)",
+  "modal.circuit.trestle.setting.circuit.allocation.passivity.name": "명칭(JA)",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.info": "同じ回路のモジュールを選択状態にした後、[番号確定]ボタンを押すと番号が割り当てられます。",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional": "選択したパワーコンディショナー",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num": "設定する回路番号（1～）",
@@ -156,6 +158,8 @@
   "modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional.reset.info": "선택된 파워 컨디셔너의 회로할당을 초기화합니다.(JA)",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset": "すべての回路番号の初期化",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset.info": "회로 할당의 설정을 초기화합니다.(JA)",
+  "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error01": "배치가능 매수를 초과합니다. 파워컨디셔너를 다시 선택해 주세요.(JA)",
+  "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error02": "시리즈를 선택해주세요.(JA)",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num.fix": "番号確定",
   "modal.circuit.trestle.setting.step.up.allocation": "昇圧設定",
   "modal.circuit.trestle.setting.step.up.allocation.serial.amount": "シリアル枚数",

src/locales/ko.json

@@ -148,6 +148,8 @@
   "modal.circuit.trestle.setting.circuit.allocation.auto": "자동회로 할당",
   "modal.circuit.trestle.setting.circuit.allocation.passivity": "수동회로 할당",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit": "회로",
+  "modal.circuit.trestle.setting.circuit.allocation.passivity.series": "시리즈",
+  "modal.circuit.trestle.setting.circuit.allocation.passivity.name": "명칭",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.info": "동일한 회로의 모듈을 선택 상태로 만든 후 [번호 확정] 버튼을 누르면 번호가 할당됩니다.",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional": "선택된 파워컨디셔너",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num": "설정할 회로번호(1~)",
@@ -156,6 +158,8 @@
   "modal.circuit.trestle.setting.circuit.allocation.passivity.selected.power.conditional.reset.info": "선택된 파워 컨디셔너의 회로할당을 초기화합니다.",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset": "모든 회로번호 초기화",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset.info": "회로 할당의 설정을 초기화합니다.",
+  "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error01": "배치가능 매수를 초과합니다. 파워컨디셔너를 다시 선택해 주세요.",
+  "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.validation.error02": "시리즈를 선택해주세요.",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num.fix": "번호 확정",
   "modal.circuit.trestle.setting.step.up.allocation": "승압 설정",
   "modal.circuit.trestle.setting.step.up.allocation.serial.amount": "직렬매수",