From 2e402738bf30fce3cb7af136d6458a19d2398089 Mon Sep 17 00:00:00 2001 From: basssy Date: Wed, 5 Feb 2025 13:47:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EB=AA=A9=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/StuffSearchCondition.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/management/StuffSearchCondition.jsx b/src/components/management/StuffSearchCondition.jsx index 82b5e42e..c5862641 100644 --- a/src/components/management/StuffSearchCondition.jsx +++ b/src/components/management/StuffSearchCondition.jsx @@ -87,6 +87,7 @@ export default function StuffSearchCondition() { } setIsGlobalLoading(true) + if (stuffSearch.code === 'S') { if (stuffSearch.pageNo !== 1) { setStuffSearch({ @@ -119,7 +120,7 @@ export default function StuffSearchCondition() { schAddress: address ? address.trim() : '', schObjectName: objectName ? objectName.trim() : '', schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', - schSelSaleStoreId: schSelSaleStoreId ? schSelSaleStoreId : stuffSearch.schSelSaleStoreId, + schSelSaleStoreId: '', schOtherSelSaleStoreId: otherSaleStoreId ? otherSaleStoreId : stuffSearch.schOtherSelSaleStoreId, schReceiveUser: receiveUser ? receiveUser.trim() : '', schDateType: dateType, @@ -209,7 +210,7 @@ export default function StuffSearchCondition() { schAddress: address ? address.trim() : '', schObjectName: objectName ? objectName.trim() : '', schDispCompanyName: dispCompanyName ? dispCompanyName.trim() : '', - schSelSaleStoreId: myDataCheck ? schSelSaleStoreId : otherSaleStoreId ? schSelSaleStoreId : '', + schSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId ? '' : '', schOtherSelSaleStoreId: myDataCheck ? '' : otherSaleStoreId, schReceiveUser: receiveUser ? receiveUser.trim() : '', schDateType: dateType, From 77c9a2b1b300e8ff28782d8e01eb6dea060020bc Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Wed, 5 Feb 2025 14:01:29 +0900 Subject: [PATCH 2/2] =?UTF-8?q?connList=20null=20=EC=9D=B8=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../circuitTrestle/CircuitTrestleSetting.jsx | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx index 240bc554..98d96ace 100644 --- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx @@ -522,11 +522,13 @@ export default function CircuitTrestleSetting({ id }) { pcsItemId: item.itemId, pscOptCd: seletedOption.code, paralQty: serQty.paralQty, - connections: [ - { - connItemId: item.connList[0].itemId, - }, - ], + connections: item.connList?.length + ? [ + { + connItemId: item.connList[0].itemId, + }, + ] + : [], } })[0] }) @@ -534,23 +536,6 @@ export default function CircuitTrestleSetting({ id }) { // 닫기 버튼 클릭 시 처리하는 함수 추가 const handleClose = () => { - // // 회로 번호 텍스트 제거 - // const circuitTexts = canvas.getObjects().filter((obj) => obj.name === 'circuitNumber') - // canvas.remove(...circuitTexts) - - // // 모듈의 회로 정보 초기화 - // canvas - // .getObjects() - // .filter((obj) => obj.name === POLYGON_TYPE.MODULE) - // .forEach((obj) => { - // obj.circuit = null - // obj.pcsItemId = null - // obj.circuitNumber = null - // }) - - // canvas.renderAll() - // closePopup(id) - swalFire({ title: '변경사항을 저장하시겠습니까?', //text: '저장하지 않은 변경사항은 모두 사라집니다.',