github/PPTist
1
0
Fork 0
mirror of https://github.com/pipipi-pikachu/PPTist.git synced 2025-04-15 02:20:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复文字高度同步的bug

Browse Source
This commit is contained in:
pipipi-pikachu 2021-01-21 19:57:14 +08:00
parent a0f7732d22
commit 96e811d502
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/Editor/Canvas/hooks/useScaleElement.ts
View File

@ -378,7 +378,6 @@ export default (
document.onmouseup = e => {
isMouseDown = false
emitter.emit(EmitterEvents.SCALE_ELEMENT_STATE, false)
document.onmousemove = null
document.onmouseup = null
alignmentLines.value = []
@ -386,6 +385,8 @@ export default (
if(startPageX === e.pageX && startPageY === e.pageY) return
store.commit(MutationTypes.UPDATE_SLIDE, { elements: elementList.value })
emitter.emit(EmitterEvents.SCALE_ELEMENT_STATE, false)
addHistorySnapshot()
}
}

21
src/views/components/element/TextElement/index.vue
View File

@ -85,9 +85,23 @@ export default defineComponent({
const elementRef = ref<HTMLElement | null>(null)
const isScaling = ref(false)
const realHeightCache = ref(-1)
emitter.on(EmitterEvents.SCALE_ELEMENT_STATE, state => {
const scaleElementStateListener = (state: boolean) => {
isScaling.value = state
if(!state && realHeightCache.value !== -1) {
store.commit(MutationTypes.UPDATE_ELEMENT, {
id: props.elementInfo.id,
props: { height: realHeightCache.value },
})
realHeightCache.value = -1
}
}
emitter.on(EmitterEvents.SCALE_ELEMENT_STATE, state => scaleElementStateListener(state))
onUnmounted(() => {
emitter.off(EmitterEvents.SCALE_ELEMENT_STATE, state => scaleElementStateListener(state))
})
const updateTextElementHeight = (entries: ResizeObserverEntry[]) => {
@ -96,13 +110,14 @@ export default defineComponent({
const realHeight = contentRect.height
if(!isScaling.value) {
if(props.elementInfo.height !== realHeight) {
if(props.elementInfo.height !== realHeight) {
if(!isScaling.value) {
store.commit(MutationTypes.UPDATE_ELEMENT, {
id: props.elementInfo.id,
props: { height: realHeight },
})
}
else realHeightCache.value = realHeight
}
}
const resizeObserver = new ResizeObserver(updateTextElementHeight)