From db2aad967388cffe9bcccacab498f55baa825ad6 Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 7 Mar 2025 10:03:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=9E=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/StuffDetail.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index ab719b45..06a9b35a 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -2,7 +2,6 @@ import { useState, useEffect, useRef, useContext } from 'react' import { useRouter, useSearchParams } from 'next/navigation' -import { Button } from '@nextui-org/react' import Select from 'react-select' import { useAxios } from '@/hooks/useAxios' import { globalLocaleStore } from '@/store/localeAtom' @@ -2311,7 +2310,12 @@ export default function StuffDetail() { {managementState?.tempFlg === '1' ? ( <> - From 9a47549716c1ad279a28ae6d1831ede4c207f819 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 7 Mar 2025 10:31:53 +0900 Subject: [PATCH 2/3] =?UTF-8?q?-=20canvas=20load=EC=8B=9C=20canvasZoom=20r?= =?UTF-8?q?eset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useCanvas.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/hooks/useCanvas.js b/src/hooks/useCanvas.js index 2afbe126..f1451bd1 100644 --- a/src/hooks/useCanvas.js +++ b/src/hooks/useCanvas.js @@ -3,8 +3,8 @@ import { fabric } from 'fabric' import { actionHandler, anchorWrapper, polygonPositionHandler } from '@/util/canvas-util' -import { useRecoilState, useRecoilValue } from 'recoil' -import { canvasSizeState, canvasState, fontSizeState } from '@/store/canvasAtom' +import { useRecoilState, useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil' +import { canvasSizeState, canvasState, canvasZoomState, fontSizeState } from '@/store/canvasAtom' import { QLine } from '@/components/fabric/QLine' import { QPolygon } from '@/components/fabric/QPolygon' import { defineQLine } from '@/util/qline-utils' @@ -27,6 +27,7 @@ export function useCanvas(id) { const { setCanvasForEvent, attachDefaultEventOnCanvas } = useCanvasEvent() const isImageDisplay = useRecoilValue(imageDisplaySelector) const {} = useFont() + const resetCanvasZoom = useResetRecoilState(canvasZoomState) /** * 처음 셋팅 @@ -43,7 +44,7 @@ export function useCanvas(id) { setCanvas(c) setCanvasForEvent(c) attachDefaultEventOnCanvas() - + resetCanvasZoom() return () => { // c.dispose() c.clear() From 33d66cce8b19d7763752da05a83f0461accde4d1 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 7 Mar 2025 11:05:29 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=A7=80=EC=A7=80=EA=B8=88=EA=B5=AC=20?= =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=8B=9C=20=EA=B0=84=EA=B2=A9=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index d507ab9c..9b17d5b9 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -1665,13 +1665,13 @@ export const useTrestle = () => { canvas.add(bracket) canvas.renderAll() if (direction === 'south') { - startPointY -= height + startPointY -= height - moduleIntvlVer / 10 } else if (direction === 'north') { - startPointY += height + startPointY += height + moduleIntvlVer / 10 } else if (direction === 'east') { - startPointX -= width + startPointX -= width - moduleIntvlHor / 10 } else if (direction === 'west') { - startPointX += width + startPointX += width + moduleIntvlHor / 10 } } }