From 0d6767170ddc78ab96d386f91d0654e22a76ea92 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Wed, 25 Dec 2024 17:24:48 +0800
Subject: [PATCH 1/2] edit

---
 src/renderer/src/components/whiteboard/whiteboard.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/components/whiteboard/whiteboard.vue b/src/renderer/src/components/whiteboard/whiteboard.vue
index c6eb9a2..1c8b781 100644
--- a/src/renderer/src/components/whiteboard/whiteboard.vue
+++ b/src/renderer/src/components/whiteboard/whiteboard.vue
@@ -507,6 +507,11 @@ const backToCenter = () => {
   app.scrollToCenter()
 }
 
+const cancelActiveElement = () =>{
+  app.cancelActiveElement()
+}
+
+
 // 显示全部
 const showFit = () => {
   let elementList = app.elements.elementList
@@ -700,8 +705,6 @@ const getCanvasBlob = async () =>{
   })
 }
 
-
-
 watch(() => props.data, (newVal) => {
   if (newVal) {
     setCanvasData(newVal)
@@ -791,7 +794,8 @@ defineExpose({
   getCanvasJson,
   getCanvasBase64,
   setCanvasData,
-  getCanvasBlob
+  getCanvasBlob,
+  cancelActiveElement
 })
 </script>
 

From eb7d6df35577e258a6f147ce91beb66eeec23f77 Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Wed, 25 Dec 2024 17:29:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/AixPPTist/src/api/watcher.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/AixPPTist/src/api/watcher.ts b/src/renderer/src/AixPPTist/src/api/watcher.ts
index 29ea2e7..5a9e731 100644
--- a/src/renderer/src/AixPPTist/src/api/watcher.ts
+++ b/src/renderer/src/AixPPTist/src/api/watcher.ts
@@ -99,7 +99,7 @@ export default () => {
           }
           break
         case MsgEnum.HEADS.MSG_slideFlapping: // 幻灯片翻页
-          emitter.emit('closegridPic')
+          emitter.emit('closegridPic') //如果有推图片窗口 就关闭
           const slideIndex = content?.current || 0
           const type = content?.animation // 上下动作
           const steps = content?.animationSteps // 动画步骤
@@ -132,7 +132,7 @@ export default () => {
           break
           case MsgEnum.HEADS.MSG_pushSreen_ImgList: // 推图片上屏
           const imgArray = content.ImgList.map((obj) => obj.url);
-          emitter.emit('opengridPic',{arr:imgArray})
+          emitter.emit('opengridPic',{arr:imgArray}) // 打开推图片上屏窗口
           break
         case MsgEnum.HEADS.MSG_0010: // 备用
           break