Merge pull request '修复 bug' (#173) from zdg into main

Reviewed-on: #173

src/renderer/src/components/pdf/index.vue

@@ -102,8 +102,10 @@ const renderPage = async (canvasobj) => {
 // 保存数据
 const savaDataStore = (type) => {
   if(!toolState.isToolWin){
-      toolState.isPdfWin=false
+      toolState.isPdfWin = false
-      toolState.showBoardAll=true //恢复默认值
+      nextTick(() => {
+      toolState.showBoardAll = true //恢复默认值
+      })
       if(type=='rest'){
         ipcRenderer.invoke('tool-sphere:reset') //重置tool状态
         ipcRenderer.send('open-PDF:close')
@@ -143,7 +145,9 @@ const savaDataStore = (type) => {
     })
     Promise.all(promises).then(res=>{
       toolState.isPdfWin=false
-      toolState.showBoardAll=true //恢复默认值
+      nextTick(() => {
+        toolState.showBoardAll=true //恢复默认值
+      })
       // ipcRenderer.send('open-PDF:minimize')
       if(type=='rest'){
         ipcRenderer.invoke('tool-sphere:reset') //重置tool状态

src/renderer/src/views/classBegins/index.vue

@@ -105,6 +105,7 @@ const switchPageMode = () => {
 }
 onMounted(async () => {
   const isDev = process.env.NODE_ENV == 'development'
+  // toolState.showBoardAll = false // 隐藏画板
   toolState.isPdfWin=true //设置打开pdf窗口
   if (isDev) 
     pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地

src/renderer/src/views/tool/sphere.vue

@@ -83,6 +83,8 @@ const btnList = [                 // 工具栏按钮列表
 // === 页面加载完毕 ===
 onMounted(async() => {
   if (!electron) return // 浏览器端
+  // window.test = sessionStore
+  // window.test1 = toolStore
   getClassInfo()        // 获取课堂详情 ex3
   resetStatus()       // 开启重置状态-监听
 })
@@ -104,6 +106,7 @@ const getClassInfo = async () => {
 const tabChange = (val) => {
   const bool = !toolStore.isPdfWin && !toolStore.showBoardAll
   if(bool) toolStore.showBoardAll = true
+  console.log('tabChange:', val, bool)
   toolStore.model = val // 存储当前tab
 }
 // logo 点击-事件 折叠|展开
@@ -133,7 +136,13 @@ const logoHandle = (e,t) => {
 const mouseChange = (bool) => {
   let resBool = false
   if (tabActive.value == 'select') resBool = !!bool
-  if (!isShow.value) resBool = !!bool
+  else {
+    if (!isShow.value) resBool = !!bool
+    // pdf强行穿透
+    const isPdf = !resBool && toolStore.isPdfWin
+    if (isPdf) resBool = true
+  }
+  // console.log('mouseChange:', bool, resBool)
   setIgnore(resBool)
 }
 // im-chat: 聊天事件 {type, data}