Merge remote-tracking branch 'origin/main' into yangws
This commit is contained in:
yangws
commit
4596ce4911
|
|
@ -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数据
|
||||
// 合并数据 loadsh _.merge() 函数
|
||||
_.merge(pinaValue, newValue)
|
||||
}
|
||||
|
||||
// 数据处理: electron-store
|
||||
const [key, value] = _.toPairs(pinaValue)[0] // 对象转换为数组 {a:1} toPairs [['a',1]]
|
||||
// 无数据就终止执行
|
||||
if (!key || !value) return
|
||||
|
||||
// 更新本地数据-session
|
||||
// console.log('state-change-update:', key, value)
|
||||
sessionStore.set(key, value)
|
||||
// 直接获取当前最新值(整体更新)，上面获取到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)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ export const useToolState = defineStore('tool', {
|
|||
}),
|
||||
actions: {
|
||||
async resetDef() { // 重置数据-下课
|
||||
// this.model = 'select' // 悬浮球-当前模式
|
||||
this.model = 'select' // 悬浮球-当前模式
|
||||
await sleep(50) // 休眠50ms
|
||||
this.showBoardAll = false // 全屏画板-是否显示
|
||||
await sleep(50) // 休眠50ms
|
||||
|
|
|
|||
|
|
@ -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,42 +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, bookeId } = JSON.parse(localStorage.getItem('unitId'))
|
||||
|
||||
let unitId = levelSecondId ? levelSecondId : levelFirstId
|
||||
|
||||
fullPath = fullPath + `&unitId=${unitId}&bookeId=${bookeId}`
|
||||
|
||||
console.log(fullPath)
|
||||
if(fullPath.indexOf('?') == -1){
|
||||
fullPath += `?unitId=${unitId}&bookeId=${bookeId}`
|
||||
}
|
||||
else{
|
||||
fullPath += `&unitId=${unitId}&bookeId=${bookeId}`
|
||||
}
|
||||
}
|
||||
fullPath = fullPath.replaceAll('//', '/')
|
||||
// 通知主进程
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue