From 6f5b70342ddff53258190f71ffd4e2ec74bc8323 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Thu, 27 Mar 2025 14:41:29 +0900 Subject: [PATCH 1/9] =?UTF-8?q?-=20pcs=20=EB=AA=A8=EB=8D=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modal/circuitTrestle/step/PowerConditionalSelect.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx index f8d1d530..b7e50fda 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx @@ -110,6 +110,7 @@ export default function PowerConditionalSelect(props) { selected: s.pcsSerCd === data.pcsSerCd ? !s.selected : false, } }) + setSelectedModels([]) } setSeries(copySeries) handleSetmodels(copySeries.filter((s) => s.selected)) From de5901492b1fb85f92fb3a7afa34dfe3f56ac929 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Thu, 27 Mar 2025 15:17:42 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EA=B8=B0=EC=A1=B4=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EB=90=9C=20=EC=A7=80=EB=B6=95=EC=9E=AC=20index=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useRoofAllocationSetting.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index 6d573ff0..b5b561cb 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -308,8 +308,17 @@ export function useRoofAllocationSetting(id) { */ const handleSaveContext = () => { const newRoofList = currentRoofList.map((roof, idx) => { + if (roof.index !== idx) { + // 기존 저장된 지붕재의 index 수정 + const roofs = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF && obj.roofMaterial?.index === roof.index) + roofs.forEach((roof) => { + setSurfaceShapePattern(roof, roofDisplay.column, false, { ...roof, index: idx }, true) + }) + } + return { ...roof, index: idx, raft: roof.raft ? roof.raft : roof.raftBaseCd } }) + setBasicSetting((prev) => { return { ...prev, From c8f70e074639bf3fc298918c94121255c733a6c4 Mon Sep 17 00:00:00 2001 From: yjnoh Date: Fri, 28 Mar 2025 10:58:34 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=EB=B2=88=EC=97=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/ja.json | 5 ++++- src/locales/ko.json | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/locales/ja.json b/src/locales/ja.json index 3bbc5344..b6d6ce50 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1041,5 +1041,8 @@ "wall.line.not.found": "外壁がありません", "roof.line.not.found": "屋根形状がありません", "roof.material.can.not.delete": "割り当てられた配置面があります。", - "chidory.can.not.install" : "千鳥配置できない工法です。" + "chidory.can.not.install": "千鳥配置できない工法です。", + "module.layout.setup.max.count": "모듈의 최대 단수는 {0}, 최대 열수는 {1} 입니다. (JA)", + "module.layout.setup.max.count.multiple": "모듈 {0}번의 최대 단수는 {1}, 최대 열수는 {2} 입니다. (JA)", + "roofAllocation.not.found": "할당할 지붕이 없습니다. (JA)" } diff --git a/src/locales/ko.json b/src/locales/ko.json index f7dca490..39d48c9e 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1041,5 +1041,8 @@ "wall.line.not.found": "외벽선이 없습니다.", "roof.line.not.found": "지붕형상이 없습니다.", "roof.material.can.not.delete": "할당된 배치면이 있습니다.", - "chidory.can.not.install" : "치조 불가 공법입니다." + "chidory.can.not.install": "치조 불가 공법입니다.", + "module.layout.setup.max.count": "모듈의 최대 단수는 {0}, 최대 열수는 {1} 입니다.", + "module.layout.setup.max.count.multiple": "모듈 {0}번의 최대 단수는 {1}, 최대 열수는 {2} 입니다.", + "roofAllocation.not.found": "할당할 지붕이 없습니다." } From 11f69a01bb0512467af672c37e28394b92ef67c8 Mon Sep 17 00:00:00 2001 From: yjnoh Date: Fri, 28 Mar 2025 11:15:12 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EB=B2=88=EC=97=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roofcover/useRoofAllocationSetting.js | 65 ++++--------------- 1 file changed, 13 insertions(+), 52 deletions(-) diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index b5b561cb..bc4d246a 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -71,30 +71,19 @@ export function useRoofAllocationSetting(id) { roof.innerLines.forEach((line) => { /** 실측값이 없는 경우 라인 두께 4로 설정 */ if (!line.attributes.actualSize || line.attributes?.actualSize === 0) { - line.set({ - strokeWidth: 4, - stroke: 'black', - selectable: true, - }) + line.set({ strokeWidth: 4, stroke: 'black', selectable: true }) } /** 현재 선택된 라인인 경우 라인 두께 2로 설정 */ if (editingLines.includes(line)) { - line.set({ - strokeWidth: 2, - stroke: 'black', - selectable: true, - }) + line.set({ strokeWidth: 2, stroke: 'black', selectable: true }) } }) }) /** 현재 선택된 객체가 보조라인, 피라미드, 힙인 경우 두께 4로 설정 */ if (currentObject && currentObject.name && ['auxiliaryLine', 'ridge', 'hip'].includes(currentObject.name)) { - currentObject.set({ - strokeWidth: 4, - stroke: '#EA10AC', - }) + currentObject.set({ strokeWidth: 4, stroke: '#EA10AC' }) } }, [currentObject]) @@ -102,7 +91,7 @@ export function useRoofAllocationSetting(id) { /** 현재 선택된 객체가 보조라인, 피라미드, 힙인 경우 두께 4로 설정 */ const roofBases = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.ROOF) if (roofBases.length === 0) { - swalFire({ text: '할당할 지붕이 없습니다.' }) + swalFire({ text: getMessage('roofAllocation.not.found'), icon: 'warning' }) closePopup(id) } @@ -115,9 +104,7 @@ export function useRoofAllocationSetting(id) { */ const fetchBasicSettings = async (planNo) => { try { - await get({ - url: `/api/canvas-management/canvas-basic-settings/by-object/${correntObjectNo}/${planNo}`, - }).then((res) => { + await get({ url: `/api/canvas-management/canvas-basic-settings/by-object/${correntObjectNo}/${planNo}` }).then((res) => { let roofsArray = {} if (res.length > 0) { @@ -187,11 +174,7 @@ export function useRoofAllocationSetting(id) { selectedRoofMaterial: selectRoofs.find((roof) => roof.selected), }) - setBasicInfo({ - planNo: '' + res[0].planNo, - roofSizeSet: '' + res[0].roofSizeSet, - roofAngleSet: '' + res[0].roofAngleSet, - }) + setBasicInfo({ planNo: '' + res[0].planNo, roofSizeSet: '' + res[0].roofSizeSet, roofAngleSet: '' + res[0].roofAngleSet }) }) } catch (error) { console.error('Data fetching error:', error) @@ -250,10 +233,7 @@ export function useRoofAllocationSetting(id) { } const originCurrentRoofList = currentRoofList.map((roof) => { - return { - ...roof, - selected: false, - } + return { ...roof, selected: false } }) originCurrentRoofList.push({ ...currentRoofMaterial, @@ -320,10 +300,7 @@ export function useRoofAllocationSetting(id) { }) setBasicSetting((prev) => { - return { - ...prev, - selectedRoofMaterial: newRoofList.find((roof) => roof.selected), - } + return { ...prev, selectedRoofMaterial: newRoofList.find((roof) => roof.selected) } }) setRoofList(newRoofList) @@ -358,11 +335,7 @@ export function useRoofAllocationSetting(id) { if (!checkInnerLines()) { apply() } else { - swalFire({ - type: 'alert', - icon: 'error', - text: getMessage('실제치수를 입력해 주세요.'), - }) + swalFire({ type: 'alert', icon: 'error', text: getMessage('실제치수를 입력해 주세요.') }) } } @@ -377,11 +350,7 @@ export function useRoofAllocationSetting(id) { if (roof.separatePolygon.length === 0) { roof.innerLines.forEach((line) => { if (!line.attributes.actualSize || line.attributes?.actualSize === 0) { - line.set({ - strokeWidth: 4, - stroke: 'black', - selectable: true, - }) + line.set({ strokeWidth: 4, stroke: 'black', selectable: true }) result = true } }) @@ -429,10 +398,7 @@ export function useRoofAllocationSetting(id) { }) setBasicSetting((prev) => { - return { - ...prev, - selectedRoofMaterial: newRoofList.find((roof) => roof.selected), - } + return { ...prev, selectedRoofMaterial: newRoofList.find((roof) => roof.selected) } }) setRoofList(newRoofList) @@ -440,9 +406,7 @@ export function useRoofAllocationSetting(id) { roofs.forEach((roof) => { if (roof.isFixed) return - roof.set({ - isFixed: true, - }) + roof.set({ isFixed: true }) /** 모양 패턴 설정 */ setSurfaceShapePattern( @@ -479,10 +443,7 @@ export function useRoofAllocationSetting(id) { if (id === line.id) { setEditingLines([...editingLines.filter((editLine) => editLine.id !== line.id), line]) line.attributes.actualSize = size - line.set({ - strokeWidth: 2, - stroke: 'black', - }) + line.set({ strokeWidth: 2, stroke: 'black' }) } }) }) From 46f90aff1fb9425868a8cc9393e2223ce9a4cd8c Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 28 Mar 2025 12:27:59 +0900 Subject: [PATCH 5/9] =?UTF-8?q?HANASYS=20=EA=B0=9C=EC=84=A0=EA=B1=B4=20#94?= =?UTF-8?q?7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/StuffDetail.jsx | 40 ++++++++--------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 9f9dfdbf..7b356a42 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -1033,8 +1033,7 @@ export default function StuffDetail() { const _saleStoreId = watch('saleStoreId') // 2차 판매점명 const _otherSaleStoreId = watch('otherSaleStoreId') - // zipNo: '', //우편번호 - const _zipNo = watch('zipNo') + // zipNo: '', //우편번호 필수값제거 #947 // prefId: '', //도도부현 const _prefId = watch('prefId') // address: '', //주소 @@ -1071,10 +1070,6 @@ export default function StuffDetail() { } } - if (!formData.zipNo) { - errors.zipNo = true - } - if (!formData.prefId) { errors.prefId = true } @@ -1115,10 +1110,6 @@ export default function StuffDetail() { } } - if (!formData.zipNo) { - errors.zipNo = true - } - if (!formData.prefId || formData.prefId === '0') { errors.prefId = true } @@ -1144,7 +1135,6 @@ export default function StuffDetail() { _objectName, _saleStoreId, _otherSaleStoreId, - _zipNo, _prefId, _address, _areaId, @@ -1189,6 +1179,14 @@ export default function StuffDetail() { } }, [prefValue]) + // 도도부현 /주소 disabled제거 변경 + const onChangePrefCode = (e) => { + setPrefValue(e.prefId) + + form.setValue('prefId', e.prefId) + form.setValue('prefName', e.prefName) + } + // 발전량 시뮬레이션 변경 const handleAreaIdOnChange = (e) => { form.setValue('areaId', e.areaId) @@ -1243,12 +1241,6 @@ export default function StuffDetail() { errors = fieldNm } - //우편번호 - if (!formData.zipNo) { - fieldNm = getMessage('stuff.detail.zipNo') - errors = fieldNm - } - //1차판매점명 if (!formData.saleStoreId) { fieldNm = getMessage('stuff.detail.saleStoreId') @@ -1558,7 +1550,7 @@ export default function StuffDetail() { type: 'alert', icon: 'error', }) - console.log('error::::::', error) + console.error('error::::::', error) }) } } @@ -2004,9 +1996,7 @@ export default function StuffDetail() { - - {getMessage('stuff.detail.zipNo')} * - + {getMessage('stuff.detail.zipNo')}
@@ -2038,10 +2028,10 @@ export default function StuffDetail() { getOptionLabel={(x) => x.prefName} getOptionValue={(x) => x.prefId} isSearchable={false} + onChange={onChangePrefCode} value={prefCodeList.filter(function (option) { return option.prefId === prefValue })} - isDisabled={true} /> )}
@@ -2571,9 +2561,7 @@ export default function StuffDetail() { - - {getMessage('stuff.detail.zipNo')} * - + {getMessage('stuff.detail.zipNo')}
@@ -2606,10 +2594,10 @@ export default function StuffDetail() { getOptionLabel={(x) => x.prefName} getOptionValue={(x) => x.prefId} isSearchable={false} + onChange={onChangePrefCode} value={prefCodeList.filter(function (option) { return option.prefId === prefValue })} - isDisabled={true} /> )}
From 25957a37e175b14aaa874f27843015b0458a5c3f Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 28 Mar 2025 12:37:54 +0900 Subject: [PATCH 6/9] =?UTF-8?q?HANASYS=20=EA=B0=9C=EC=84=A0=EA=B1=B4=20#95?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/ja.json b/src/locales/ja.json index b6d6ce50..82918191 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -999,7 +999,7 @@ "simulator.table.sub5": "枚数", "simulator.table.sub6": "合計", "simulator.table.sub7": "パワーコンディショナー", - "simulator.table.sub8": "ティーン", + "simulator.table.sub8": "台", "simulator.table.sub9": "予測発電量（kWh）", "simulator.notice.sub1": "ハンファジャパン年間発電量", "simulator.notice.sub2": "シミュレーションガイド", From 24ba8bfb14a1a0a24194f0dd919b5b3cc2d8ca01 Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 28 Mar 2025 13:27:23 +0900 Subject: [PATCH 7/9] =?UTF-8?q?#944=20=EB=AC=BC=EA=B1=B4=EB=B2=88=ED=98=B8?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=8B=9C=EC=9E=91=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20R->S=20=EB=B3=80=EA=B2=BD=EC=97=90=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EC=A3=BC=EC=84=9D=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/Stuff.jsx | 2 +- src/components/management/StuffDetail.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx index c1835874..83bc71ce 100644 --- a/src/components/management/Stuff.jsx +++ b/src/components/management/Stuff.jsx @@ -203,7 +203,7 @@ export default function Stuff() { if (event.column.colId === 'objectNo') { return } else { - //T 면 임시 R은 진짜 + //T 면 임시 S는 진짜 if (event.data.objectNo) { setIsGlobalLoading(true) if (event.data.tempFlg === '0') { diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 7b356a42..2eef9813 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -54,7 +54,7 @@ export default function StuffDetail() { const { get, promiseGet, del, promisePost, promisePut } = useAxios(globalLocaleState) //form const formInitValue = { - // 물건번호 T...(임시) R...(진짜) + // 물건번호 T...(임시) S...(진짜) planReqNo: '', //설계의뢰No receiveUser: session?.userNm, //담당자 로그인사용자명 디폴트 objectStatusId: '0', //물건구분(신축:0 기축 : 1) From 3fd81e771d59805e02144c1a2f338bd8ffa97bc8 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 28 Mar 2025 15:13:05 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EA=B7=B8=EB=A6=AC=EB=93=9C=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EA=B2=BD=EA=B3=84=ED=91=9C=EC=8B=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/_grid-detail.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/_grid-detail.scss b/src/styles/_grid-detail.scss index b0c88984..5f27bd18 100644 --- a/src/styles/_grid-detail.scss +++ b/src/styles/_grid-detail.scss @@ -24,6 +24,10 @@ .ag-header-cell{ font-size: 13px; color: #fff; + border-right: 1px solid #738596; + &:last-child{ + border: none; + } } .ag-header-cell-label{ justify-content: center; From 3509e5fbb672c1b45124bf11c995f8c403dc8a83 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Fri, 28 Mar 2025 17:13:46 +0900 Subject: [PATCH 9/9] Update startscript to run development server on port 5000 --- startscript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startscript.js b/startscript.js index 890c30f8..e276be78 100644 --- a/startscript.js +++ b/startscript.js @@ -1,2 +1,2 @@ var exec = require('child_process').exec -exec('yarn dev', { windowsHide: true }) +exec('yarn dev -p 5000', { windowsHide: true })