From f3dfc50f6ed782654f985d5f91132102dccea1bf Mon Sep 17 00:00:00 2001 From: ysCha Date: Wed, 23 Apr 2025 16:13:07 +0900 Subject: [PATCH 1/3] =?UTF-8?q?986=20-=20=EC=8B=9C=EA=B3=B5=EC=82=AC?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=B6=94=EA=B0=80,=20=EC=8B=9C=EA=B3=B5?= =?UTF-8?q?=EC=82=AC(userId)=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A7=8C=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/layout.js | 1 + src/components/management/Stuff.jsx | 2 ++ src/hooks/main/useMainContentsController.js | 2 +- src/lib/authActions.js | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/layout.js b/src/app/layout.js index 6186f5ed..dbd6c9a1 100644 --- a/src/app/layout.js +++ b/src/app/layout.js @@ -58,6 +58,7 @@ export default async function RootLayout({ children }) { pwdInitYn: session.pwdInitYn, custCd: session.custCd, isLoggedIn: session.isLoggedIn, + builderNo: session.builderNo } } if (!headerPathname.includes('/login') && !session.isLoggedIn) { diff --git a/src/components/management/Stuff.jsx b/src/components/management/Stuff.jsx index 83bc71ce..d5d83411 100644 --- a/src/components/management/Stuff.jsx +++ b/src/components/management/Stuff.jsx @@ -238,6 +238,8 @@ export default function Stuff() { schSortType: stuffSearchParams.schSortType, pageNo: stuffSearchParams?.pageNo ? stuffSearchParams.pageNo : 1, pageSize: stuffSearchParams?.pageSize ? stuffSearchParams.pageSize : 100, + builderNo: session.builderNo, + userId: session.userId } if (!params.saleStoreId) { diff --git a/src/hooks/main/useMainContentsController.js b/src/hooks/main/useMainContentsController.js index f065c90f..1938a37a 100644 --- a/src/hooks/main/useMainContentsController.js +++ b/src/hooks/main/useMainContentsController.js @@ -27,7 +27,7 @@ export const useMainContentsController = () => { */ const fetchObjectList = async () => { try { - const apiUrl = `/api/main-page/object/${session?.storeId}/list` + const apiUrl = `/api/main-page/object/${session?.storeId}/${session?.userId}/${session?.builderNo}/list` await promiseGet({ url: apiUrl, }).then((res) => { diff --git a/src/lib/authActions.js b/src/lib/authActions.js index 5a63d684..5e7055d0 100644 --- a/src/lib/authActions.js +++ b/src/lib/authActions.js @@ -48,6 +48,7 @@ export async function setSession(data) { session.pwdInitYn = data.pwdInitYn session.custCd = data.custCd session.isLoggedIn = true + session.builderNo = data.builderNo await session.save() } From 287ce5c85abb4e4a3aed383c537302bba8471604 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 23 Apr 2025 17:09:33 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=B3=B4=EC=A1=B0=EC=84=A0=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99,=20=EB=B3=B5=EC=82=AC=20=EC=8B=9C=20=EB=82=98?= =?UTF-8?q?=EB=88=84=EA=B8=B0=2010=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/auxiliary/AuxiliaryEdit.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/floor-plan/modal/auxiliary/AuxiliaryEdit.jsx b/src/components/floor-plan/modal/auxiliary/AuxiliaryEdit.jsx index 744b3387..f10322ca 100644 --- a/src/components/floor-plan/modal/auxiliary/AuxiliaryEdit.jsx +++ b/src/components/floor-plan/modal/auxiliary/AuxiliaryEdit.jsx @@ -40,15 +40,15 @@ export default function AuxiliaryEdit(props) { if (currentObject) { copy( currentObject, - arrow2 ? (arrow2 === '←' ? Number(horizonSize) * -1 : Number(horizonSize)) : 0, - arrow1 ? (arrow1 === '↑' ? Number(verticalSize) * -1 : Number(verticalSize)) : 0, + arrow2 ? (arrow2 === '←' ? Number(+horizonSize / 10) * -1 : Number(+horizonSize / 10)) : 0, + arrow1 ? (arrow1 === '↑' ? Number(+verticalSize / 10) * -1 : Number(+verticalSize / 10)) : 0, ) } } else { move( currentObject, - arrow2 ? (arrow2 === '←' ? Number(horizonSize) * -1 : Number(horizonSize)) : 0, - arrow1 ? (arrow1 === '↑' ? Number(verticalSize) * -1 : Number(verticalSize)) : 0, + arrow2 ? (arrow2 === '←' ? Number(+horizonSize / 10) * -1 : Number(+horizonSize / 10)) : 0, + arrow1 ? (arrow1 === '↑' ? Number(+verticalSize / 10) * -1 : Number(+verticalSize / 10)) : 0, ) } From 6b56af61198ce65c41453434885b89922c2b24f5 Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 24 Apr 2025 09:45:36 +0900 Subject: [PATCH 3/3] =?UTF-8?q?1003=20-=20calcLineActualSize()=20degree?= =?UTF-8?q?=EA=B0=80=20undefined=20=3D>=200=20=EC=B2=98=EB=A6=AC=20showLin?= =?UTF-8?q?e=20=ED=95=A8=EC=88=98=EC=9D=98=20canvas.getObjects().find()?= =?UTF-8?q?=EA=B0=80=20undefined=20=3D>=20Optional=20chaining=20(=3F.)=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useLine.js | 4 ++-- src/util/qpolygon-utils.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hooks/useLine.js b/src/hooks/useLine.js index b447d4f0..21fd9aa5 100644 --- a/src/hooks/useLine.js +++ b/src/hooks/useLine.js @@ -53,8 +53,8 @@ export const useLine = () => { }) canvas ?.getObjects() - .find((obj) => obj.parentId === line.id) - .set({ + ?.find((obj) => obj.parentId === line.id) + ?.set({ visible: true, }) canvas?.renderAll() diff --git a/src/util/qpolygon-utils.js b/src/util/qpolygon-utils.js index 34bc2320..2705b546 100644 --- a/src/util/qpolygon-utils.js +++ b/src/util/qpolygon-utils.js @@ -3527,7 +3527,7 @@ export const calcLinePlaneSize = (points) => { * @param degree * @returns number */ -export const calcLineActualSize = (points, degree) => { +export const calcLineActualSize = (points, degree = 0) => { const { x1, y1, x2, y2 } = points const planeSize = calcLinePlaneSize(points) let height = Big(Math.tan(Big(degree).times(Math.PI / 180))).times(planeSize)