From 53751c1d356dc5eb412aa3458717ac60d76a7fc3 Mon Sep 17 00:00:00 2001 From: pipipi-pikachu Date: Sat, 11 Jan 2025 20:51:51 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96PPTX=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 18 +++++++++--------- package.json | 2 +- src/hooks/useImport.ts | 4 +++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index c40a3e23..644d5502 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pptist", - "version": "1.0.0", + "version": "2.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pptist", - "version": "1.0.0", + "version": "2.0.0", "dependencies": { "@icon-park/vue-next": "^1.4.2", "animate.css": "^4.1.1", @@ -24,7 +24,7 @@ "number-precision": "^1.6.0", "pinia": "^2.1.7", "pptxgenjs": "^3.12.0", - "pptxtojson": "^1.1.0", + "pptxtojson": "^1.1.1", "prosemirror-commands": "^1.6.0", "prosemirror-dropcursor": "^1.8.1", "prosemirror-gapcursor": "^1.3.2", @@ -4177,9 +4177,9 @@ } }, "node_modules/pptxtojson": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.1.0.tgz", - "integrity": "sha512-JJdk9vLwYq+p9T33cqT3O24CDK+0EU4XsNR1kGJxtSnO4QWGVmlkvX1Mmd2me4tSdGEeRX35+ljerwL/PFJabw==", + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.1.1.tgz", + "integrity": "sha512-J8K0BdRTlbVeKGu3tbK8qlSxAc8HKfnsn4ycANBsgPuVvsSEf9VmcmwH/tFJjLZgeoJ0qjo9v780pliAdZ85SA==", "dependencies": { "jszip": "^3.10.1", "tinycolor2": "1.6.0", @@ -8393,9 +8393,9 @@ } }, "pptxtojson": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.1.0.tgz", - "integrity": "sha512-JJdk9vLwYq+p9T33cqT3O24CDK+0EU4XsNR1kGJxtSnO4QWGVmlkvX1Mmd2me4tSdGEeRX35+ljerwL/PFJabw==", + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.1.1.tgz", + "integrity": "sha512-J8K0BdRTlbVeKGu3tbK8qlSxAc8HKfnsn4ycANBsgPuVvsSEf9VmcmwH/tFJjLZgeoJ0qjo9v780pliAdZ85SA==", "requires": { "jszip": "^3.10.1", "tinycolor2": "1.6.0", diff --git a/package.json b/package.json index fbdff1a6..a2af8c8b 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "number-precision": "^1.6.0", "pinia": "^2.1.7", "pptxgenjs": "^3.12.0", - "pptxtojson": "^1.1.0", + "pptxtojson": "^1.1.1", "prosemirror-commands": "^1.6.0", "prosemirror-dropcursor": "^1.8.1", "prosemirror-gapcursor": "^1.3.2", diff --git a/src/hooks/useImport.ts b/src/hooks/useImport.ts index 2efa8fa4..2654c6c1 100644 --- a/src/hooks/useImport.ts +++ b/src/hooks/useImport.ts @@ -190,7 +190,9 @@ export default () => { } const parseElements = (elements: Element[]) => { - for (const el of elements) { + const sortedElements = elements.sort((a, b) => a.order - b.order) + + for (const el of sortedElements) { const originWidth = el.width || 1 const originHeight = el.height || 1 const originLeft = el.left