From e0ec22c3ac6654f600c3db57a01918554f5f0d55 Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Tue, 24 Dec 2024 11:23:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E7=85=A7=E7=89=87?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BA=BF=E4=B8=8Aurl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/Editor/EditorHeader/index.vue        |  2 +-
 .../Toolbar/ElementStylePanel/ImageStylePanel.vue  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
index 71bce12..72eb83f 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
@@ -16,7 +16,7 @@
             <PopoverMenuItem>导入 pptx 文件</PopoverMenuItem>
           </FileInput> -->
           <PopoverMenuItem @click="setDialogForExport('pptx')">导出文件</PopoverMenuItem>
-          <PopoverMenuItem @click="resetSlides(); mainMenuVisible = false">重置幻灯片</PopoverMenuItem>
+          <!-- <PopoverMenuItem @click="resetSlides(); mainMenuVisible = false">重置幻灯片</PopoverMenuItem> -->
           <!-- <PopoverMenuItem @click="goLink('https://github.com/pipipi-pikachu/PPTist/issues')">意见反馈</PopoverMenuItem> -->
           <!-- <PopoverMenuItem @click="goLink('https://github.com/pipipi-pikachu/PPTist/blob/master/doc/Q&A.md')">常见问题</PopoverMenuItem> -->
           <PopoverMenuItem @click="mainMenuVisible = false; hotkeyDrawerVisible = true">快捷操作</PopoverMenuItem>
diff --git a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue
index 7445f45..02a794f 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue
@@ -88,7 +88,9 @@ import Button from '../../../../components/Button.vue'
 import ButtonGroup from '../../../../components/ButtonGroup.vue'
 import Popover from '../../../../components/Popover.vue'
 import NumberInput from '../../../../components/NumberInput.vue'
-
+import { PPTApi } from '../../../../api'
+import { Console } from 'node:console'
+import { x64 } from 'crypto-js'
 const shapeClipPathOptions = CLIPPATHS
 const ratioClipOptions = [
   {
@@ -221,10 +223,14 @@ const presetImageClip = (shape: string, ratio = 0) => {
 const replaceImage = (files: FileList) => {
   const imageFile = files[0]
   if (!imageFile) return
-  getImageDataURL(imageFile).then(dataURL => {
-    const props = { src: dataURL }
-    updateImage(props)
+  PPTApi.toRousrceUrl(imageFile).then(data=>{
+    const props = { src: data }
+      updateImage(props)
   })
+  // getImageDataURL(imageFile).then(dataURL => {
+    // const props = { src: dataURL }
+    // updateImage(props)
+  // })
 }
 
 // 重置图片：清除全部样式
-- 
2.44.0.windows.1


From 5550ca570c3a5c497c25b0c90a94b2309bc67078 Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Wed, 25 Dec 2024 10:25:07 +0800
Subject: [PATCH 2/2] no message

---
 .../src/AixPPTist/src/views/Editor/EditorHeader/index.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
index 8b5365a..83000c8 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue
@@ -16,7 +16,7 @@
             <PopoverMenuItem>导入 pptx 文件</PopoverMenuItem>
           </FileInput>
           <PopoverMenuItem @click="setDialogForExport('pptx')">导出文件</PopoverMenuItem> -->
-          <PopoverMenuItem @click="resetSlides(); mainMenuVisible = false">重置幻灯片</PopoverMenuItem>
+          <!-- <PopoverMenuItem @click="resetSlides(); mainMenuVisible = false">重置幻灯片</PopoverMenuItem> -->
           <!-- <PopoverMenuItem @click="goLink('https://github.com/pipipi-pikachu/PPTist/issues')">意见反馈</PopoverMenuItem> -->
           <!-- <PopoverMenuItem @click="goLink('https://github.com/pipipi-pikachu/PPTist/blob/master/doc/Q&A.md')">常见问题</PopoverMenuItem> -->
           <PopoverMenuItem @click="mainMenuVisible = false; hotkeyDrawerVisible = true">快捷操作</PopoverMenuItem>
-- 
2.44.0.windows.1