Merge branch 'main' into zouyf_dev

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

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>