Compare commits

..

No commits in common. "7caf530ab26b1f8b294f27ee7f619a9df757965e" and "74bd5d7b5bb29b0e145dea0f081bef27d68b2505" have entirely different histories.

3 changed files with 52 additions and 65 deletions

View File

@ -96,7 +96,7 @@ export default function QSelectBox({
title={tagTitle} title={tagTitle}
> >
<p>{selected}</p> <p>{selected}</p>
<ul className="select-item-wrap" style={{ maxHeight: '200px' }}> <ul className="select-item-wrap">
{options?.length > 0 && {options?.length > 0 &&
options?.map((option, index) => ( options?.map((option, index) => (
<li key={option.id + '_' + index} className="select-item" onClick={() => handleClickSelectOption(option)}> <li key={option.id + '_' + index} className="select-item" onClick={() => handleClickSelectOption(option)}>

View File

@ -12,7 +12,6 @@ export function useFont() {
const circuitNumberText = useRecoilValue(fontSelector('circuitNumberText')) const circuitNumberText = useRecoilValue(fontSelector('circuitNumberText'))
useEffect(() => { useEffect(() => {
setTimeout(() => {
if (canvas && commonText.fontWeight.value) { if (canvas && commonText.fontWeight.value) {
const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'commonText') const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'commonText')
textObjs.forEach((obj) => { textObjs.forEach((obj) => {
@ -25,11 +24,10 @@ export function useFont() {
}) })
}) })
canvas.renderAll() canvas.renderAll()
}}, 200) }
}, [commonText]) }, [commonText])
useEffect(() => { useEffect(() => {
setTimeout(() => {
if (canvas && dimensionLineText.fontWeight.value) { if (canvas && dimensionLineText.fontWeight.value) {
const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'dimensionLineText') const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'dimensionLineText')
textObjs.forEach((obj) => { textObjs.forEach((obj) => {
@ -43,12 +41,9 @@ export function useFont() {
}) })
canvas.renderAll() canvas.renderAll()
} }
}, 200)
}, [dimensionLineText]) }, [dimensionLineText])
useEffect(() => { useEffect(() => {
setTimeout(() => {
if (canvas && flowText.fontWeight.value) { if (canvas && flowText.fontWeight.value) {
const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'flowText') const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'flowText')
textObjs.forEach((obj) => { textObjs.forEach((obj) => {
@ -62,12 +57,9 @@ export function useFont() {
}) })
canvas.renderAll() canvas.renderAll()
} }
}, 200)
}, [flowText]) }, [flowText])
useEffect(() => { useEffect(() => {
setTimeout(() => {
if (canvas && lengthText.fontWeight.value) { if (canvas && lengthText.fontWeight.value) {
const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'lengthText') const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'lengthText')
textObjs.forEach((obj) => { textObjs.forEach((obj) => {
@ -81,11 +73,9 @@ export function useFont() {
}) })
canvas.renderAll() canvas.renderAll()
} }
}, 200)
}, [lengthText]) }, [lengthText])
useEffect(() => { useEffect(() => {
setTimeout(() => {
if (canvas && circuitNumberText.fontWeight.value) { if (canvas && circuitNumberText.fontWeight.value) {
const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'circuitNumber') const textObjs = canvas?.getObjects().filter((obj) => obj.name === 'circuitNumber')
textObjs.forEach((obj) => { textObjs.forEach((obj) => {
@ -99,7 +89,6 @@ export function useFont() {
}) })
canvas.renderAll() canvas.renderAll()
} }
}, 200)
}, [circuitNumberText]) }, [circuitNumberText])
return {} return {}

View File

@ -13,7 +13,6 @@ import { basicSettingState } from '@/store/settingAtom'
import { calcLineActualSize } from '@/util/qpolygon-utils' import { calcLineActualSize } from '@/util/qpolygon-utils'
import { getDegreeByChon } from '@/util/canvas-util' import { getDegreeByChon } from '@/util/canvas-util'
import { useText } from '@/hooks/useText' import { useText } from '@/hooks/useText'
import { fontSelector } from '@/store/fontAtom'
export const useLine = () => { export const useLine = () => {
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
@ -24,15 +23,14 @@ export const useLine = () => {
const angleUnit = useRecoilValue(showAngleUnitSelector) const angleUnit = useRecoilValue(showAngleUnitSelector)
const roofSizeSet = useRecoilValue(basicSettingState).roofSizeSet const roofSizeSet = useRecoilValue(basicSettingState).roofSizeSet
const globalPitch = useRecoilValue(globalPitchState) const globalPitch = useRecoilValue(globalPitchState)
const lengthText = useRecoilValue(fontSelector('lengthText'))
const { changeCorridorDimensionText } = useText() const { changeCorridorDimensionText } = useText()
const addLine = (points = [], options) => { const addLine = (points = [], options) => {
const line = new QLine(points, { const line = new QLine(points, {
...options, ...options,
fontSize: lengthText.fontSize.value, fontSize: fontSize,
fontFamily: lengthText.fontFamily.value, fontFamily: fontFamily,
}) })
if (line.length < 1) { if (line.length < 1) {