Commit 104fd92e authored by zhengke's avatar zhengke

no message

parent 878e22b4
...@@ -381,28 +381,6 @@ export default ( ...@@ -381,28 +381,6 @@ export default (
height = getSizeWithinRange(elOriginHeight - moveY) height = getSizeWithinRange(elOriginHeight - moveY)
top = elOriginTop - (height - elOriginHeight) top = elOriginTop - (height - elOriginHeight)
} }
else if (command === OperateResizeHandlers.LEFT) {
const { offsetX } = alignedAdsorption(elOriginLeft + moveX, null)
moveX = moveX - offsetX
width = getSizeWithinRange(elOriginWidth - moveX)
left = elOriginLeft - (width - elOriginWidth)
}
else if (command === OperateResizeHandlers.RIGHT) {
const { offsetX } = alignedAdsorption(elOriginLeft + elOriginWidth + moveX, null)
moveX = moveX - offsetX
width = getSizeWithinRange(elOriginWidth + moveX)
}
else if (command === OperateResizeHandlers.TOP) {
const { offsetY } = alignedAdsorption(null, elOriginTop + moveY)
moveY = moveY - offsetY
height = getSizeWithinRange(elOriginHeight - moveY)
top = elOriginTop - (height - elOriginHeight)
}
else if (command === OperateResizeHandlers.BOTTOM) {
const { offsetY } = alignedAdsorption(null, elOriginTop + elOriginHeight + moveY)
moveY = moveY - offsetY
height = getSizeWithinRange(elOriginHeight + moveY)
}
} }
elementList.value = elementList.value.map(el => { elementList.value = elementList.value.map(el => {
...@@ -433,7 +411,8 @@ export default ( ...@@ -433,7 +411,8 @@ export default (
idData = el.id idData = el.id
oWidth = el.width oWidth = el.width
oHeight = el.height oHeight = el.height
return { ...el, left, top, width, height } console.log(oHeight,'------')
return { ...el, left, top, width, height, fontSize:2 }
}) })
} }
...@@ -452,14 +431,28 @@ export default ( ...@@ -452,14 +431,28 @@ export default (
if (startPageX === currentPageX && startPageY === currentPageY) return if (startPageX === currentPageX && startPageY === currentPageY) return
slidesStore.updateSlide({ elements: elementList.value }) let richTextAttr = richTextAttrs.value.fontsize.split('px')
mainStore.setScalingState(false) let baseFontSize =  Number(richTextAttr[0])
let textIdData = elementList.value.filter(x=>x.id==idData) let textIdData = elementList.value.filter(x=>x.id==idData)
let el = textIdData[0] let el = textIdData[0]
nWidth = el.width nWidth = el.width
nHeight = el.height nHeight = el.height
console.log(textIdData[0],'-----')
const fontSizeW = Math.round(nWidth / 100 * baseFontSize);
const fontSizeH = Math.round(nHeight / 100 * parseInt(baseFontSize));
let value = fontSizeH+'px'
console.log(value,'111---')
let command = 'fontsize'
// useFontStore().loadFontToDocument([value])
// emitter.emit(EmitterEvents.RICH_TEXT_COMMAND, { action: { command, value } })
slidesStore.updateSlide({ elements: elementList.value })
mainStore.setScalingState(false)
addHistorySnapshot() addHistorySnapshot()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment