From 6df1b8d8563a009733104b52125a1d7d480cb73d Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Sun, 22 Dec 2024 20:36:24 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20pptxtojson=20=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                  | 14 +++++++-------
 package.json                       |  2 +-
 src/hooks/useImport.ts             |  1 +
 src/views/Screen/PresenterView.vue | 10 ++++++++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cf91be495..1368664ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
         "number-precision": "^1.6.0",
         "pinia": "^2.1.7",
         "pptxgenjs": "^3.12.0",
-        "pptxtojson": "^1.0.3",
+        "pptxtojson": "^1.1.0",
         "prosemirror-commands": "^1.6.0",
         "prosemirror-dropcursor": "^1.8.1",
         "prosemirror-gapcursor": "^1.3.2",
@@ -4091,9 +4091,9 @@
       }
     },
     "node_modules/pptxtojson": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.0.3.tgz",
-      "integrity": "sha512-Q7tvtqFUm9x4CGRv/BUt69yeJS1RtIKBuh/G/gpxdtSbm7zAVeTPbPRMS+1hfliVXhzYJDgbg4zc8F4hwmq71A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.1.0.tgz",
+      "integrity": "sha512-JJdk9vLwYq+p9T33cqT3O24CDK+0EU4XsNR1kGJxtSnO4QWGVmlkvX1Mmd2me4tSdGEeRX35+ljerwL/PFJabw==",
       "dependencies": {
         "jszip": "^3.10.1",
         "tinycolor2": "1.6.0",
@@ -8246,9 +8246,9 @@
       }
     },
     "pptxtojson": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.0.3.tgz",
-      "integrity": "sha512-Q7tvtqFUm9x4CGRv/BUt69yeJS1RtIKBuh/G/gpxdtSbm7zAVeTPbPRMS+1hfliVXhzYJDgbg4zc8F4hwmq71A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/pptxtojson/-/pptxtojson-1.1.0.tgz",
+      "integrity": "sha512-JJdk9vLwYq+p9T33cqT3O24CDK+0EU4XsNR1kGJxtSnO4QWGVmlkvX1Mmd2me4tSdGEeRX35+ljerwL/PFJabw==",
       "requires": {
         "jszip": "^3.10.1",
         "tinycolor2": "1.6.0",
diff --git a/package.json b/package.json
index d4710eeb0..41f3f3bb9 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "number-precision": "^1.6.0",
     "pinia": "^2.1.7",
     "pptxgenjs": "^3.12.0",
-    "pptxtojson": "^1.0.3",
+    "pptxtojson": "^1.1.0",
     "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 c85adb5d5..97c146231 100644
--- a/src/hooks/useImport.ts
+++ b/src/hooks/useImport.ts
@@ -160,6 +160,7 @@ export default () => {
           id: nanoid(10),
           elements: [],
           background,
+          remark: item.note || '',
         }
 
         const parseElements = (elements: Element[]) => {
diff --git a/src/views/Screen/PresenterView.vue b/src/views/Screen/PresenterView.vue
index 953e6e386..5ca00b2da 100644
--- a/src/views/Screen/PresenterView.vue
+++ b/src/views/Screen/PresenterView.vue
@@ -67,7 +67,7 @@
         <span>演讲者备注</span>
         <span>P {{slideIndex + 1}} / {{slides.length}}</span>
       </div>
-      <div class="remark-content ProseMirror-static" :style="{ fontSize: remarkFontSize + 'px' }" v-html="currentSlideRemark"></div>
+      <div class="remark-content ProseMirror-static" :class="{ 'empty': !currentSlideRemark }" :style="{ fontSize: remarkFontSize + 'px' }" v-html="currentSlideRemark || '无备注'"></div>
       <div class="remark-scale">
         <div :class="['scale-btn', { 'disable': remarkFontSize === 12 }]" @click="setRemarkFontSize(remarkFontSize - 2)"><IconMinus /></div>
         <div :class="['scale-btn', { 'disable': remarkFontSize === 40 }]" @click="setRemarkFontSize(remarkFontSize + 2)"><IconPlus /></div>
@@ -125,7 +125,8 @@ const { fullscreenState, manualExitFullscreen } = useFullscreen()
 
 const remarkFontSize = ref(16)
 const currentSlideRemark = computed(() => {
-  return parseText2Paragraphs(currentSlide.value.remark || '无备注')
+  if (!currentSlide.value.remark) return ''
+  return parseText2Paragraphs(currentSlide.value.remark)
 })
 
 const handleMousewheelThumbnails = (e: WheelEvent) => {
@@ -297,6 +298,11 @@ const contextmenus = (): ContextmenuItem[] => {
     padding: 20px;
     line-height: 1.5;
     @include overflow-overlay();
+
+    &.empty {
+      color: #999;
+      font-style: italic;
+    }
   }
 
   .remark-scale {