fix：看不了学生信息；

Reviewed-on: #168

src/main/index.js

@@ -13,7 +13,7 @@ import remote from '@electron/remote/main'
 // 第二步： 初始化remote
 remote.initialize()
 // 日志配置-初始化(日志直接绑定到console上)
-Logger.initialize()
+if(!is.dev) Logger.initialize()
 // 持久化数据-初始化
 Store.initialize()
 

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

@@ -383,16 +383,7 @@ defineExpose({
   savaDataStore
 })
 watchEffect(() => {
-  setTimeout(() => {
-    console.log(toolState,'监听')
-
-  }, 300)
   if(toolState.isPdfWin){
-  // if(toolState.isToolWin){
-  //   ispointer.value=false
-  // }else{
-  //   ispointer.value=true
-  // }
     watchToolState() //监听工具栏
   }
 })

src/renderer/src/plugins/shareStore.js

@@ -3,13 +3,14 @@
  */
 const isNode = typeof require !== 'undefined' // 是否支持node函数
 const { ipcRenderer } = isNode?require('electron'):{} // app使用
+import { sessionStore } from '@/utils/store'
 // const Remote = isNode?require('@electron/remote'):{}  // 远程模块
 export function shareStorePlugin({store}) {
   store.$subscribe((mutation, state) => { // 自动同步
     // mutation 变量包含了变化前后的状态
     // mutation.events: key newValue target oldValue oldTarget
     // state 是变化后的状态
-    // console.log('store.$subscribe', mutation)
+    // console.log('store.$subscribe', mutation, state, store)
     // 在存储变化的时候执行
     // const storeName = store.$id
     const storeName = mutation.storeId
@@ -19,13 +20,15 @@ export function shareStorePlugin({store}) {
       const { storeId: storeName, payload, events, type } = mutation // direct
       // if (!Object.keys(payload).length) return
       if (type != 'direct' || !events || Array.isArray(events) || !events.key) return
-      stateSync(storeName, events.key, events.newValue) // 需要同步
+      stateSync(storeName, events.key, events.newValue, state) // 需要同步
     }
   })
+
   // 暴露方法-手动同步
   store.stateSync = (storeName, key, value) => {
-    if (!storeName && !!key && !!value) stateSync(storeName, key, value)
+    const state = store.$state
-    else stateSyncAll(store)
+    if (!storeName && !!key && !!value) stateSync(storeName, key, value, state)
+    else stateSyncAll(store, state)
   }
   // 暴露方法-发送当前状态-新窗口
   store.stateSyncInit = wid => stateSyncInit(wid, store)
@@ -34,14 +37,16 @@ export function shareStorePlugin({store}) {
 }
 
 // 同步数据-发送给主线程-单独
-function stateSync(storeName, key, value) {
+function stateSync(storeName, key, value, state) {
   // console.log('state-change', storeName, key, value)
   try {
-    let jsonStr = ''
+    const { data, keystr } = filterByKey(state, key, value)
-    if (typeof key === 'string') jsonStr = JSON.stringify({[key]:value})
+    const jsonStr = JSON.stringify(data) // 从新组装-json数据
-    else if (typeof value === 'object') jsonStr = JSON.stringify(key)
+    // 更新本地数据-session
+    sessionStore.set(keystr, value)
     // 通知主线程更新
     ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
+    // console.log('======',keystr, jsonStr )
   } catch (error) {
     console.log('state-change-error', error)
   }
@@ -95,3 +100,29 @@ const circularSafeStringify = (obj) => {
   });
 }
 
+// 过滤对象
+const filterByKey = (obj, key, value) => {
+  let res = { data:{}, keystr:'' }
+  for (let k in obj) {
+    if (obj.hasOwnProperty(k)) {
+        const isEqual = JSON.stringify(obj[k]) === JSON.stringify(value) // 值是否相同
+      if (k === key && isEqual) {
+        // 如果匹配，则添加到新对象中
+        res.data[k] = obj[k];
+        res.keystr = k;
+      } else {
+      if (obj[k] !== null && typeof obj[k] === 'object') {
+          // 如果是对象，则递归处理
+          const {data, keystr} = filterByKey(obj[k], key, value)
+          if(!!keystr) {
+            res.data[k] = data
+            res.keystr = `${k}.${keystr}`
+          }
+        }
+      }
+    }
+  }
+  return res;
+}
+// 对象克隆
+const objClone = (obj) => JSON.parse(JSON.stringify(obj))

src/renderer/src/store/modules/tool.js

@@ -2,6 +2,10 @@
  * 工具类-窗口-状态管理
  */
 import { defineStore } from 'pinia'
+import { sessionStore } from '@/utils/tool'
+
+// 默认数据
+const defData = sessionStore.store || {}
 
 export const useToolState = defineStore('tool', {
   state: () => ({
@@ -10,9 +14,10 @@ export const useToolState = defineStore('tool', {
     isPdfWin: false,        // pdf窗口是否打开
     isToolWin: false,       // 工具窗口是否打开
     curSubjectNode: {
-      data: {},              // 当前教材节点 （包含当前教材 单元）
+      data: {},             // 当前教材节点 （包含当前教材 单元）
       querySearch: {}       // 查询资源所需参数
-    }      
+    },
+    ...defData              // 默认数据-覆盖上面的配置(不要删除, 会导致新窗口-获取状态失败)
   }),
   actions: {
   }

src/renderer/src/utils/store.js

@@ -0,0 +1,25 @@
+/**
+ * @description : 存储对象-本地存储 封装工具(渲染器)
+ * @author : zdg
+ * @date : 2024-09-03
+ */
+const isNode = typeof require !== 'undefined'       // 是否支持node函数
+const Store = isNode?require('electron-store'):null // 持久化存储
+
+// 暴露sessionStore存储对象
+export const sessionStore = Store ? new Store({
+  name: 'session-store',                  // 存储文件名
+  fileExtension: 'ini',                   // 文件后缀名
+  encryptionKey: 'BvPLmgCC4DSIG0KkTec5'   // 数据加密-防止用户直接改配置
+}) : {}
+
+// 暴露localStore存储对象
+export const localStore = Store ? new Store({
+  name: 'local-store',                    // 存储文件名
+  fileExtension: 'ini',                   // 文件后缀名
+  encryptionKey: '6CyoHQmUaPmLzvVsh'      // 数据加密-防止用户直接改配置
+}) : {}
+
+export default {
+  sessionStore, localStore
+}

src/renderer/src/utils/tool.js

@@ -11,30 +11,26 @@ const path = isNode?require('path'):{}
 const Remote = isNode?require('@electron/remote'):{}
 const { ipcRenderer } = isNode?require('electron'):window.electron || {}
 const API = isNode?window.api:{}                    // preload-api
-import { useToolState } from '@/store/modules/tool' // 获取store状态
+// import { useToolState } from '@/store/modules/tool' // 获取store状态
-const Store = isNode?require('electron-store'):null // 持久化存储
+// const Store = isNode?require('electron-store'):null // 持久化存储
+import store from './store'
 
 // 常用变量
 const BaseUrl = isNode?process.env['ELECTRON_RENDERER_URL']+'/#':''
 const isDev = isNode?process.env.NODE_ENV !== 'production':''
-const toolState = useToolState() // 获取store状态
+// const toolState = useToolState() // 获取store状态
 
 // 暴露Remote中的属性
 export const ipcMain = Remote?.ipcMain || {}
 
 // 暴露sessionStore存储对象
-export const sessionStore = Store ? new Store({
+export const sessionStore = store.sessionStore
-  name: 'session-store',                  // 存储文件名
-  fileExtension: 'ini',                   // 文件后缀名
-  encryptionKey: 'BvPLmgCC4DSIG0KkTec5'   // 数据加密-防止用户直接改配置
-}) : {}
 
 // 暴露localStore存储对象
-export const localStore = Store ? new Store({
+export const localStore = store.localStore
-  name: 'local-store',                    // 存储文件名
+
-  fileExtension: 'ini',                   // 文件后缀名
+// 暴露Store存储对象
-  encryptionKey: '6CyoHQmUaPmLzvVsh'      // 数据加密-防止用户直接改配置
+export const Store = store
-}) : {}
 
 /**
  * 获取静态资源，开发和生产环境
@@ -137,7 +133,7 @@ export const createWindow = async (type, data) => {
           winPdf.restore();
         } else{
           winPdf.focus();
-          toolState.isPdfWin=true
+          // toolState.isPdfWin=true
         }
         
           return
@@ -204,9 +200,9 @@ export function toolWindow({url, isConsole, isWeb=true, option={}}) {
     mainWin.once('closed', () => { win.destroy()})
     // 内部监听器
     win.webContents.on('did-finish-load', () => {
-      setTimeout(() => {
+      // setTimeout(() => {
-        toolState.stateSyncInit(win.id) // 同步状态
+      //   toolState.stateSyncInit(win.id) // 同步状态
-      }, 200);
+      // }, 200);
     })
     // 内部监听器-是否打印
     if (!!isConsole) {

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

@@ -104,9 +104,12 @@ const switchPageMode = () => {
   }
 }
 onMounted(async () => {
+  const isDev = process.env.NODE_ENV == 'development'
   toolState.isPdfWin=true //设置打开pdf窗口
-  pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线上
+  if (isDev) 
-  // pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地
+    pdfObj.pdfUrl = getStaticUrl('aaa.pdf', 'user', 'selfFile', true) //本地
+  else
+    pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true) //线上
   textbookId.value = route.query.textbookId
   pdfObj.bookId=textbookId.value
   //初始化获取接口数据

src/renderer/src/views/classManage/studentList.vue

@@ -13,7 +13,7 @@
       <div>
         <div class="studentContent">
           <template v-if="studentList.length > 0">
-            <div v-for="(item,index) in studentList" :key="index" style="width: 10%" @click="addStudent(item.studentid)">
+            <div v-for="(item,index) in studentList" :key="index" style="width: 10%">
               <div>
                 <el-avatar
                   src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"

src/renderer/src/views/prepare/index.vue

@@ -122,6 +122,7 @@
     :book-id="uploadData.textbookId"
     @add-success="initReserv"
   ></reserv>
+  <!-- <button @click="ipcMsgSend('tool-sphere:close')">测试</button> -->
 </template>
 <script setup>
 import { Check } from '@element-plus/icons-vue'
@@ -144,12 +145,13 @@ import { parseCataByNode, creatPPT, asyncLocalFile } from '@/utils/talkFile'
 import FileOperBatch from '@/views/prepare/container/file-oper-batch.vue'
 import SetHomework from '@/components/set-homework/index.vue'
 import outLink from '@/utils/linkConfig'
-import { createWindow } from '@/utils/tool'
+import { createWindow, ipcMsgSend } from '@/utils/tool'
 import { cloneDeep } from 'lodash'
 import { delClasswork } from '@/api/teaching/classwork'
 import { getSelfReserv, startClass } from '@/api/classManage'
 import { useGetHomework } from '@/hooks/useGetHomework'
 const toolStore = useToolState()
+
 const fs = require('fs')
 const { ipcRenderer } = window.electron || {}
 
@@ -423,7 +425,8 @@ export default {
       this.uploadData.levelThirdId = cata[2]
       this.uploadData.textbookId = data.textBook.curBookId
       toolStore.curSubjectNode.data = data
-      toolStore.curSubjectNode.querySearch = this.uploadData
+      // 不要同时修改共享数据，这样只会触发一次
+      this.$nextTick(() =>{ toolStore.curSubjectNode.querySearch = this.uploadData })
       this.initHomeWork()
       await this.asyncAllFile()
     },

src/renderer/src/views/tool/components/board.vue

@@ -29,7 +29,7 @@ onMounted(async() => {
 const handleMode = (newVal, oldVal) => {
   if(toolStore.isPdfWin){
     if(newVal=='clear'){
-      emit('update:modelValue', oldVal)
+      setTimeout(() => emit('update:modelValue', oldVal), 10)
     }
     return
   }
@@ -47,7 +47,7 @@ const handleMode = (newVal, oldVal) => {
     case 'clear':   // 清空画布
       if(oldVal){
         FabricVue.history?.clean()
-        emit('update:modelValue', oldVal)
+        setTimeout(() => emit('update:modelValue', oldVal), 10)
       }
       
       break

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

@@ -51,8 +51,9 @@ import imChat from './components/imChat.vue'    // im-chat-子组件
 import vDrag from './directive/drag'            // 自定义指令-拖拽
 import vIgnore from './directive/ignore'        // 自定义指令-穿透
 import { useToolState } from '@/store/modules/tool' // 数据状态-缓存
-import { ipcMsgSend, ipcHandle, ipcMain, ipcMsgInvoke } from '@/utils/tool' // 相关工具
+import { ipcMsgSend, ipcMain, sessionStore } from '@/utils/tool' // 相关工具
 import MsgEnum from '@/plugins/imChat/msgEnum' // 消息头-相关定义(nuem)
+
 const route = useRoute();
 const tabActive = ref('select')   // 工具栏当前选中项
 const isFold = ref(false)         // 折叠工具栏
@@ -82,10 +83,11 @@ const btnList = [                 // 工具栏按钮列表
 // === 页面加载完毕 ===
 onMounted(async() => {
   if (!electron) return // 浏览器端
+  // console.log(sessionStore)
+  // window.test = sessionStore
+  // window.test1 = toolStore
   getClassInfo()        // 获取课堂详情 ex3
-  setTimeout(() => {
+  resetStatus()       // 开启重置状态-监听
-    resetStatus()       // 开启重置状态-监听
-  }, 200);
 })
 
 // ==== 方法 ===
@@ -104,7 +106,6 @@ const getClassInfo = async () => {
 const tabChange = (val) => {
   const bool = !toolStore.isPdfWin && !toolStore.showBoardAll
   if(bool) toolStore.showBoardAll = true
-  // ipcMsgSend('tool-sphere:close')
   toolStore.model = val // 存储当前tab
 }
 // logo 点击-事件 折叠|展开