Merge remote-tracking branch 'origin/main' into yangws

Reviewed-on: #257

src/renderer/src/components/ai-chart/index.vue

@@ -115,7 +115,7 @@ const outerAi = [
     title: '生成图片',
     secondTit: '文生图大模型',
     img: new URL('../../../src/assets/images/ai-01.png', import.meta.url).href,
-    path: '/ais/aisd3'
+    path: '/ais/aiwenxinyige'
   },
   {
     id: 2,

src/renderer/src/components/choose-textbook/index.vue

@@ -114,6 +114,7 @@ const emitChangeBook = async () => {
    */
   let levelFirstId = null
   let levelSecondId = null
+  let bookeId = curBook.data.id
    if (curData.parentNode) {
     levelFirstId = curData.parentNode.id
     levelSecondId = curData.id
@@ -121,7 +122,7 @@ const emitChangeBook = async () => {
     levelFirstId = curData.id
     levelSecondId = ''
   }
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
   emit('changeBook', data)
 }
 
@@ -206,6 +207,7 @@ const handleNodeClick = (data, node) => {
  */
   let levelFirstId = null
   let levelSecondId = null
+  let bookeId = curBook.data.id
    if (nodeData.parentNode) {
     levelFirstId = nodeData.parentNode.id
     levelSecondId = nodeData.id
@@ -213,7 +215,7 @@ const handleNodeClick = (data, node) => {
     levelFirstId = nodeData.id
     levelSecondId = ''
   }
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
 
   emit('nodeClick', curData)
 
@@ -233,6 +235,7 @@ onMounted( async () => {
     }
     else{
       curBook.data = useSubject.subjectList[0]
+      localStorage.setItem('curBook', JSON.stringify(curBook.data))
       treeData.value = useSubject.treeData
     }
     // 设置展开并选中

src/renderer/src/hooks/useGetClassWork.js

@@ -102,8 +102,9 @@ const getTreeData = () => {
       levelFirstId = curNode.id
       levelSecondId = ''
     }
+    let bookeId = curBookId
     // 头部 教材分析、作业设计：打开外部链接需要当前章节ID
-    localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+    localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
 
     // const data = {
     //   textBook: {

src/renderer/src/layout/components/Header.vue

@@ -65,7 +65,7 @@
 <script setup>
 import { ref, watch, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, ElMessage } from 'element-plus'
 import { ArrowDown } from '@element-plus/icons-vue'
 import WindowTools from '@/components/window-tools/index.vue'
 import useUserStore from '@/store/modules/user'
@@ -74,6 +74,10 @@ import outLink from '@/utils/linkConfig'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
 import { clearBookInfo } from '@/utils/ruoyi'
+import { sessionStore } from '@/utils/store'
+import { useToolState } from '@/store/modules/tool'
+
+const toolState = useToolState();
 let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
@@ -166,6 +170,8 @@ function handleCommand(command) {
 }
 
 function logout() {
+  const hasClass = sessionStore.has('activeClass.id')
+  if (hasClass || toolState.isToolWin) return ElMessage.warning('当前正在上课，请先结结束上课')
   ElMessageBox.confirm('确认退出系统吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',

src/renderer/src/plugins/shareStore.js

@@ -5,6 +5,8 @@ const isNode = typeof require !== 'undefined' // 是否支持node函数
 const { ipcRenderer } = isNode?require('electron'):{} // app使用
 import { sessionStore } from '@/utils/store'
 import CircularJSON from 'circular-json'
+import _ from 'lodash'
+
 // import { diff } from 'jsondiffpatch'
 // const Remote = isNode?require('@electron/remote'):{}  // 远程模块
 
@@ -19,19 +21,14 @@ export function shareStorePlugin({store}) {
     const storeName = mutation.storeId
     // 用于多窗口共享(需要共享的状态名称)
     const names = ['tool']
-    if (names.includes(storeName)) {
-      const { storeId: storeName, payload, events, type } = mutation // direct
-      // if (!Object.keys(payload).length) return
-      // if (type != 'direct' || !events || Array.isArray(events) || !events.key) return
-      stateSyncWatch(storeName, state) // 需要同步
-    }
+    if (names.includes(storeName)) stateSyncWatch(storeName, state) // 需要同步
   })
 
   // 暴露方法-手动同步
   store.stateSync = (storeName, key, value) => {
     const state = store.$state
     if (!storeName && !!key && !!value) stateSync(storeName, key, value, state)
-    else stateSyncAll(store, state)
+    else stateSyncAll(store)
   }
   // 暴露方法-发送当前状态-新窗口
   store.stateSyncInit = wid => stateSyncInit(wid, store)
@@ -58,21 +55,42 @@ function stateSync(storeName, key, value, state) {
 function stateSyncWatch(storeName, newState) {
   const oldState = sessionStore.store // 旧数据
   const diffData = findDifferences(oldState, newState)
-  // console.log('state-change-diffData', diffData)
+  if(!_.keys(diffData).length) return // 没有变化就终止执行
+  // 数据处理: 找出差异
+  console.log('state-change-diffData', diffData)
   try {
+    let pinaValue = {} // store pina状态管理需要的数据格式
+    // 数据转换处理
     for(const key in diffData) {
       const value = diffData[key] || null
       const newValue = {} // 重新组装pinia需要的数据 {a:{b:1}} 这种
       const keyArr = key.split('.') || []
       keyArr.reduce((o,c,i)=>{o[c] = i === keyArr.length-1 ? value : {};return o[c]}, newValue)
-      const jsonStr = JSON.stringify(newValue) // 从新组装-json数据
-      // 更新本地数据-session
-      // console.log('state-change-update:', key, value)
-      sessionStore.set(key, value)
-      // 通知主线程更新
-      ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
-      // console.log('======',key, value, jsonStr )
+      // 合并数据 loadsh _.merge() 函数
+      _.merge(pinaValue, newValue)
     }
+
+    // 数据处理: electron-store
+    const [key, value] = _.toPairs(pinaValue)[0] // 对象转换为数组 {a:1} toPairs [['a',1]]
+    // 无数据就终止执行
+    if (!key || !value) return
+    
+    // 更新本地数据-session
+    // 直接获取当前最新值(整体更新)，上面获取到value是差异值，并不能知道删除还是新增
+    const newValAll = _.get(newState, key)
+    const oldValAll = sessionStore.get(key)
+    
+    // 没变化也终止执行
+    if (_.isEqual(oldValAll, newValAll)) return
+
+    // 更新本地数据-session
+    sessionStore.set(key, newValAll)
+
+    // 数据处理: pina-store
+    const jsonStr = JSON.stringify(pinaValue) // 从新组装-json数据
+    // 通知主线程更新
+    ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
+    // console.log('======',key, value, jsonStr )
   } catch (error) {
     console.log('state-change-error', error)
   }

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

@@ -24,10 +24,11 @@ export const useToolState = defineStore('tool', {
   actions: {
     async resetDef() { // 重置数据-下课
       this.model = 'select'        // 悬浮球-当前模式
-      await sleep(20) // 休眠20ms
+      await sleep(50) // 休眠50ms
       this.showBoardAll = false    // 全屏画板-是否显示
-      await sleep(20) // 休眠20ms
+      await sleep(50) // 休眠50ms
       this.isToolWin = false       // 工具窗口是否打开
+      await sleep(50) // 休眠50ms
     }
   }
 })

src/renderer/src/views/desktop/index.vue

@@ -8,7 +8,7 @@
             <div class="item-title">{{ item.name }}</div>
             <div class="item-content">
               <ul class="flex con-ul">
-                <li v-for="menu in item.list" @click="clickMenu(menu)" class="flex item-menu" :class="menu.disabled ? 'menu-disabled' : ''">
+                <li v-for="menu in item.list" :key="menu.id" @click="clickMenu(menu)" class="flex item-menu" :class="menu.disabled ? 'menu-disabled' : ''">
                   <i class="iconfont" :class="menu.icon"></i>
                   <span>{{ menu.name }}</span>
                 </li>
@@ -47,13 +47,10 @@ import outLink from '@/utils/linkConfig'
 import * as echarts from 'echarts'
 import { useGetClassWork } from '@/hooks/useGetClassWork'
 
-
 const router = useRouter()
 const { ipcRenderer } = window.electron || {}
-const type = ref(-1)
 const chartDom = ref(null);
 let chartInstance = null
-
 const menuList = [{
     name: '课程教学',
     span: 24,
@@ -63,38 +60,39 @@ const menuList = [{
         name: '课标分析',
         icon: 'icon-kecheng',
         isOuter: true,
-        path: '/teaching/chatwithstandard'
+        path: '/teaching/chatwithstandard',
+        id: '1-1'
       },
       {
         name: '教材分析',
         icon: 'icon-jiaocaixuanze',
         isOuter: true,
-        path: '/teaching/chatwithtextbook'
+        path: '/teaching/chatwithtextbook',
+        id: '1-2'
       },
       {
         name: '考试分析',
         icon: 'icon-kaoshi',
-        path: '/examReport'
+        path: '/examReport',
+        id: '1-3'
       },
       {
         name: '学情分析',
         icon: 'icon-xueqingfenxi',
-        disabled: true
+        disabled: true,
+        id: '1-4'
       },
-      // {
-      //   name: '教学设计',
-      //   icon: 'icon-jiaoxuesheji',
-      //   path: '/prepare'
-      // },
       {
         name: '教学实践',
         icon: 'icon-jiaoxuefenxi',
-        path: '/prepare'
+        path: '/prepare',
+        id: '1-5'
       },
       {
         name: '教学反思',
         icon: 'icon-jiaoxuefansi',
-        disabled: true
+        disabled: true,
+        id: '1-6'
       },
     ]
   },
@@ -107,27 +105,27 @@ const menuList = [{
         name: '作业设计',
         icon: 'icon-jiaoxuefansi',
         isOuter: true,
-        path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask'
-        //path: '/newClassTask'
-        //path: '/classTaskAssign'
-        //isOuter: true,
-        //path: '/teaching/classtaskassign?titleName=作业布置&&openDialog=newClassTask'
+        path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask',
+        id: '2-1'
       },
       {
         name: '作业布置',
         icon: 'icon-xiezuo1',
         isOuter: true,
-        path: '/teaching/classtaskassign?titleName=作业布置'
+        path: '/teaching/classtaskassign?titleName=作业布置',
+        id: '2-2'
       },
       {
         name: '作业批改',
         icon: 'icon-pigai',
-        path: '/classTask'
+        path: '/classTask',
+        id: '2-3'
       },
       {
         name: '作业统计',
         icon: 'icon-tongji',
-        disabled: true
+        disabled: true,
+        id: '2-4'
       },
     ]
   },
@@ -139,41 +137,47 @@ const menuList = [{
       {
         name: '教学计划',
         icon: 'icon-jiaoxuejihua',
-        disabled: true
+        disabled: true,
+        id: '3-1'
       },
       {
         name: '教学组织',
         icon: 'icon-organization-framework-line',
-        disabled: true
+        disabled: true,
+        id: '3-2'
       },
       {
         name: '教学质量',
         icon: 'icon-jiaoxuezhiliangfenxi',
-        disabled: true
+        disabled: true,
+        id: '3-3'
       },
       {
         name: '教学反馈',
         icon: 'icon-fankui',
-        disabled: true
+        disabled: true,
+        id: '3-4'
       },
     ]
   }
 ]
  
-const clickMenu = ({isOuter, path, disabled}) =>{
+const clickMenu = ({isOuter, path, disabled, id}) =>{
   if(disabled) return
   // 弹窗
   if(isOuter){
     let configObj = outLink().getBaseData()
     let fullPath = configObj.fullPath + path
-    if(path == '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask' || path == '/teaching/classtaskassign?titleName=作业布置'){
+    if(id == '1-2' || id == '2-1' || id == '2-2' ){
       // 头部 教材分析打开外部链接需要当前章节ID
-      const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
-
+      const { levelFirstId, levelSecondId, bookeId } = JSON.parse(localStorage.getItem('unitId'))
       let unitId = levelSecondId ? levelSecondId : levelFirstId
-      fullPath = fullPath + `&unitId=${unitId}`
-
-      console.log(fullPath)
+      if(fullPath.indexOf('?') == -1){
+        fullPath += `?unitId=${unitId}&bookeId=${bookeId}`
+      }
+      else{
+         fullPath += `&unitId=${unitId}&bookeId=${bookeId}`
+      }
     }
     fullPath = fullPath.replaceAll('//', '/')
      // 通知主进程

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -208,7 +208,8 @@ export default {
     openFileWin(items) {
       if (items.fileFlag === 'apt') {
         console.log(this.curNode);
-        const path="/teaching/aptindex?id="+items.fileId + "&cataId=" + this.curNode.id;
+        let curBook = JSON.parse(localStorage.getItem('curBook'))
+        const path="/teaching/aptindex?id="+items.fileId + "&unitId=" + this.curNode.id + "&bookId=" + curBook.id;
         let configObj = outLink().getBaseData()
         let fullPath = configObj.fullPath + path
         fullPath = fullPath.replaceAll('//', '/')

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

@@ -219,15 +219,15 @@ const sideChange = async o => {
       }).then(async() => {
         await imChatRef.value?.imChatObj?.imChat?.sendMsgClosed() // 发送下课消息
         // const elMsg = ElMessage.warning({duration:0,message:'正在下课...'})
-        // const elMsg = ElLoading.service({lock: true, text: '正在下课...', background: 'rgba(0, 0, 0, 0.7)'})
+        const elMsg = ElLoading.service({lock: true, text: '正在下课...', background: 'rgba(0, 0, 0, 0.7)'})
         // 延迟2秒后关闭窗口，如果马上解散群，会导致群组不存在
         setTimeout(async() => {
-          // elMsg.close()
           // toolStore.isToolWin = false
           toolStore.resetDef() // 重置状态
           await imChatRef.value?.deleteGroup()  // 解散群
           await imChatRef.value?.logout()       // 退出im
           await classManageApi.endClass(route.query.reservId)
+          elMsg.close()
           ipcMsgSend('tool-sphere:close')       // 关闭窗口
         }, 500);
 
@@ -243,6 +243,7 @@ const sideChange = async o => {
 
 // === 监听器 ===
 watchEffect(() => {
+  if (isOver.value) return // 下课, 不往下执行
   // 不同的时候, 更新值: 是否显示-画板
   const show = !toolStore.isPdfWin && toolStore.showBoardAll
   if (show != isShow.value) isShow.value = show

src/renderer/src/views/tool/test.vue

@@ -1,9 +1,15 @@
 <template>
-  <canvas ref="canvasRef" />
-  <button @click="eraseTo">橡皮擦
-    <i class="iconfont icon-xiangpica"></i>
-  </button>
-  <button @click="close">销毁</button>
+  <canvas ref="canvasRef" style="pointer-events: none;" />
+  <div style="position: absolute;top: 0;" @click="test('click')"
+  @mouseenter="test('mouseenter')" @mousemove="test('mousemove')" @mouseleave="test('mouseleave')"
+  @touchstart="test('touchstart')" @touchmove="test('touchmove')" @touchend="test('touchend')"
+  @touchcancel="test('touchcancel')" @mousedown="test('mousedown')" @mouseup="test('mouseup')"
+  @mouseout="test('mouseout')" @mouseover="test('mouseover')" @mousewheel="test('mousewheel')">
+    <!-- <button @click="eraseTo">橡皮擦</button> -->
+    <!-- <i class="iconfont icon-xiangpica"></i> -->
+    <!-- <button @click="close">销毁</button> -->
+    <div style="width: 100px;height: 100px;background: #ffbcbc;">小星星</div>
+  </div>
 </template>
 
 <script setup>
@@ -43,6 +49,10 @@ const eraseTo = () => { // 橡皮擦
   // canvas.dispose()
 }
 const close = () => { FabricVue.removeCanvas() }
+
+const test = (key, e) => {
+  console.log('event: ', key)
+}
 </script>
 
 <style lang="scss" scoped>