qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of ssh://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

Browse Source
This commit is contained in:
yoosangwook 2025-03-07 11:24:26 +09:00
commit eeb13ce9b5
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/management/StuffDetail.jsx
View File

@ -2,7 +2,6 @@
import { useState, useEffect, useRef, useContext } from 'react' import { useState, useEffect, useRef, useContext } from 'react'
import { useRouter, useSearchParams } from 'next/navigation' import { useRouter, useSearchParams } from 'next/navigation'
import { Button } from '@nextui-org/react'
import Select from 'react-select' import Select from 'react-select'
import { useAxios } from '@/hooks/useAxios' import { useAxios } from '@/hooks/useAxios'
import { globalLocaleStore } from '@/store/localeAtom' import { globalLocaleStore } from '@/store/localeAtom'
@ -2311,7 +2310,12 @@ export default function StuffDetail() {
</div> </div>
{managementState?.tempFlg === '1' ? ( {managementState?.tempFlg === '1' ? (
<> <>
<button className="btn-origin grey" onPress={onSearchDesignRequestPopOpen} style={{ display: showButton }}> <button
type="button"
className="btn-origin grey"
onClick={onSearchDesignRequestPopOpen}
style={{ display: showButton }}
>
{getMessage('stuff.planReqPopup.title')} {getMessage('stuff.planReqPopup.title')}
</button> </button>
</> </>

8
src/hooks/module/useTrestle.js
View File

@ -1665,13 +1665,13 @@ export const useTrestle = () => {
canvas.add(bracket) canvas.add(bracket)
canvas.renderAll() canvas.renderAll()
if (direction === 'south') { if (direction === 'south') {
startPointY -= height startPointY -= height - moduleIntvlVer / 10
} else if (direction === 'north') { } else if (direction === 'north') {
startPointY += height startPointY += height + moduleIntvlVer / 10
} else if (direction === 'east') { } else if (direction === 'east') {
startPointX -= width startPointX -= width - moduleIntvlHor / 10
} else if (direction === 'west') { } else if (direction === 'west') {
startPointX += width startPointX += width + moduleIntvlHor / 10
} }
} }
} }

7
src/hooks/useCanvas.js
View File

@ -3,8 +3,8 @@ import { fabric } from 'fabric'
import { actionHandler, anchorWrapper, polygonPositionHandler } from '@/util/canvas-util' import { actionHandler, anchorWrapper, polygonPositionHandler } from '@/util/canvas-util'
import { useRecoilState, useRecoilValue } from 'recoil' import { useRecoilState, useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil'
import { canvasSizeState, canvasState, fontSizeState } from '@/store/canvasAtom' import { canvasSizeState, canvasState, canvasZoomState, fontSizeState } from '@/store/canvasAtom'
import { QLine } from '@/components/fabric/QLine' import { QLine } from '@/components/fabric/QLine'
import { QPolygon } from '@/components/fabric/QPolygon' import { QPolygon } from '@/components/fabric/QPolygon'
import { defineQLine } from '@/util/qline-utils' import { defineQLine } from '@/util/qline-utils'
@ -27,6 +27,7 @@ export function useCanvas(id) {
const { setCanvasForEvent, attachDefaultEventOnCanvas } = useCanvasEvent() const { setCanvasForEvent, attachDefaultEventOnCanvas } = useCanvasEvent()
const isImageDisplay = useRecoilValue(imageDisplaySelector) const isImageDisplay = useRecoilValue(imageDisplaySelector)
const {} = useFont() const {} = useFont()
const resetCanvasZoom = useResetRecoilState(canvasZoomState)
/** /**
* 처음 셋팅 * 처음 셋팅
@ -43,7 +44,7 @@ export function useCanvas(id) {
setCanvas(c) setCanvas(c)
setCanvasForEvent(c) setCanvasForEvent(c)
attachDefaultEventOnCanvas() attachDefaultEventOnCanvas()
resetCanvasZoom()
return () => { return () => {
// c.dispose() // c.dispose()
c.clear() c.clear()