mirror of
https://github.com/pipipi-pikachu/PPTist.git
synced 2025-04-15 02:20:00 +08:00
perf: pptxtojson 升级调整
This commit is contained in:
zxc
parent
72446dc39c
commit
6674cd691b
14
package-lock.json
generated
14
package-lock.json
generated
@ -23,7 +23,7 @@
|
||||
"number-precision": "^1.6.0",
|
||||
"pinia": "^2.1.7",
|
||||
"pptxgenjs": "^3.12.0",
|
||||
"pptxtojson": "^0.1.8",
|
||||
"pptxtojson": "^1.0.2",
|
||||
"prosemirror-commands": "^1.6.0",
|
||||
"prosemirror-dropcursor": "^1.8.1",
|
||||
"prosemirror-gapcursor": "^1.3.2",
|
||||
@ -4090,9 +4090,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/pptxtojson": {
|
||||
"version": "0.1.8",
|
||||
"resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-0.1.8.tgz",
|
||||
"integrity": "sha512-bxjx62jgyB7SLQuw1irzYc7O9Ar9TlTnBPSSFTxECEkFPru26KLUv8HaHLCuBKlDqMNTreFg8auC5UL5j+wXWA==",
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.0.2.tgz",
|
||||
"integrity": "sha512-+khrcgKHCDDnMLZ+RWm2cXS1D69VPl9LKlQhcb2GBCcRb0WfNrIabXptCKYR+NaLbykWkNCi7dal/6OY9GeljQ==",
|
||||
"dependencies": {
|
||||
"jszip": "^3.10.1",
|
||||
"tinycolor2": "1.6.0",
|
||||
@ -8217,9 +8217,9 @@
|
||||
}
|
||||
},
|
||||
"pptxtojson": {
|
||||
"version": "0.1.8",
|
||||
"resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-0.1.8.tgz",
|
||||
"integrity": "sha512-bxjx62jgyB7SLQuw1irzYc7O9Ar9TlTnBPSSFTxECEkFPru26KLUv8HaHLCuBKlDqMNTreFg8auC5UL5j+wXWA==",
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.0.2.tgz",
|
||||
"integrity": "sha512-+khrcgKHCDDnMLZ+RWm2cXS1D69VPl9LKlQhcb2GBCcRb0WfNrIabXptCKYR+NaLbykWkNCi7dal/6OY9GeljQ==",
|
||||
"requires": {
|
||||
"jszip": "^3.10.1",
|
||||
"tinycolor2": "1.6.0",
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
"number-precision": "^1.6.0",
|
||||
"pinia": "^2.1.7",
|
||||
"pptxgenjs": "^3.12.0",
|
||||
"pptxtojson": "^0.1.8",
|
||||
"pptxtojson": "^1.0.2",
|
||||
"prosemirror-commands": "^1.6.0",
|
||||
"prosemirror-dropcursor": "^1.8.1",
|
||||
"prosemirror-gapcursor": "^1.3.2",
|
||||
|
||||
@ -22,6 +22,12 @@ import type {
|
||||
PPTTextElement,
|
||||
} from '@/types/slides'
|
||||
|
||||
const convertFontSizePtToPx = (html: string, ratio: number) => {
|
||||
return html.replace(/font-size:\s*([\d.]+)pt/g, (match, p1) => {
|
||||
return `font-size: ${(parseFloat(p1) * ratio).toFixed(1)}px`
|
||||
})
|
||||
}
|
||||
|
||||
export default () => {
|
||||
const slidesStore = useSlidesStore()
|
||||
const { theme } = storeToRefs(useSlidesStore())
|
||||
@ -98,13 +104,11 @@ export default () => {
|
||||
|
||||
const reader = new FileReader()
|
||||
reader.onload = async e => {
|
||||
const json = await parse(e.target!.result as ArrayBuffer, {
|
||||
slideFactor: 75 / 914400,
|
||||
fontsizeFactor: 100 / 98,
|
||||
})
|
||||
const json = await parse(e.target!.result as ArrayBuffer)
|
||||
|
||||
const width = json.size.width
|
||||
const scale = VIEWPORT_SIZE / width
|
||||
const ratio = VIEWPORT_SIZE / width
|
||||
const fontsizeRatio = 96 / 72
|
||||
|
||||
const slides: Slide[] = []
|
||||
for (const item of json.slides) {
|
||||
@ -152,10 +156,10 @@ export default () => {
|
||||
const originLeft = el.left
|
||||
const originTop = el.top
|
||||
|
||||
el.width = el.width * scale
|
||||
el.height = el.height * scale
|
||||
el.left = el.left * scale
|
||||
el.top = el.top * scale
|
||||
el.width = el.width * ratio
|
||||
el.height = el.height * ratio
|
||||
el.left = el.left * ratio
|
||||
el.top = el.top * ratio
|
||||
|
||||
if (el.type === 'text') {
|
||||
const textEl: PPTTextElement = {
|
||||
@ -168,7 +172,7 @@ export default () => {
|
||||
rotate: el.rotate,
|
||||
defaultFontName: theme.value.fontName,
|
||||
defaultColor: theme.value.fontColor,
|
||||
content: el.content,
|
||||
content: convertFontSizePtToPx(el.content, fontsizeRatio),
|
||||
lineHeight: 1,
|
||||
outline: {
|
||||
color: el.borderColor,
|
||||
@ -178,7 +182,14 @@ export default () => {
|
||||
fill: el.fillColor,
|
||||
vertical: el.isVertical,
|
||||
}
|
||||
if (el.shadow) textEl.shadow = el.shadow
|
||||
if (el.shadow) {
|
||||
textEl.shadow = {
|
||||
h: el.shadow.h * fontsizeRatio,
|
||||
v: el.shadow.v * fontsizeRatio,
|
||||
blur: el.shadow.blur * fontsizeRatio,
|
||||
color: el.shadow.color,
|
||||
}
|
||||
}
|
||||
slide.elements.push(textEl)
|
||||
}
|
||||
else if (el.type === 'image') {
|
||||
@ -257,7 +268,7 @@ export default () => {
|
||||
style: el.borderType === 'solid' ? 'solid' : 'dashed',
|
||||
},
|
||||
text: {
|
||||
content: el.content,
|
||||
content: convertFontSizePtToPx(el.content, fontsizeRatio),
|
||||
defaultFontName: theme.value.fontName,
|
||||
defaultColor: theme.value.fontColor,
|
||||
align: vAlignMap[el.vAlign] || 'middle',
|
||||
@ -265,7 +276,14 @@ export default () => {
|
||||
flipH: el.isFlipH,
|
||||
flipV: el.isFlipV,
|
||||
}
|
||||
if (el.shadow) element.shadow = el.shadow
|
||||
if (el.shadow) {
|
||||
element.shadow = {
|
||||
h: el.shadow.h * fontsizeRatio,
|
||||
v: el.shadow.v * fontsizeRatio,
|
||||
blur: el.shadow.blur * fontsizeRatio,
|
||||
color: el.shadow.color,
|
||||
}
|
||||
}
|
||||
|
||||
if (shape) {
|
||||
element.path = shape.path
|
||||
@ -310,8 +328,11 @@ export default () => {
|
||||
textDiv.innerHTML = cellData.text
|
||||
const p = textDiv.querySelector('p')
|
||||
const align = p?.style.textAlign || 'left'
|
||||
const fontsize = p?.style.fontSize || ''
|
||||
const fontname = p?.style.fontFamily || ''
|
||||
|
||||
const span = textDiv.querySelector('span')
|
||||
const fontsize = span?.style.fontSize ? (parseInt(span?.style.fontSize) * fontsizeRatio).toFixed(1) + 'px' : ''
|
||||
const fontname = span?.style.fontFamily || ''
|
||||
const color = span?.style.color || cellData.fontColor
|
||||
|
||||
rowCells.push({
|
||||
id: nanoid(10),
|
||||
@ -323,6 +344,9 @@ export default () => {
|
||||
align: ['left', 'right', 'center'].includes(align) ? (align as 'left' | 'right' | 'center') : 'left',
|
||||
fontsize,
|
||||
fontname,
|
||||
color,
|
||||
bold: cellData.fontBold,
|
||||
backcolor: cellData.fillColor,
|
||||
},
|
||||
})
|
||||
textDiv = null
|
||||
@ -343,16 +367,9 @@ export default () => {
|
||||
rotate: 0,
|
||||
data,
|
||||
outline: {
|
||||
width: 2,
|
||||
style: 'solid',
|
||||
color: '#eeece1',
|
||||
},
|
||||
theme: {
|
||||
color: el.themeColor,
|
||||
rowHeader: true,
|
||||
rowFooter: false,
|
||||
colHeader: false,
|
||||
colFooter: false,
|
||||
width: el.borderWidth || 2,
|
||||
style: el.borderType === 'solid' ? 'solid' : 'dashed',
|
||||
color: el.borderColor || '#eeece1',
|
||||
},
|
||||
cellMinHeight: 36,
|
||||
})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user