zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

修复 bug

This commit is contained in:
zdg 2024-09-04 19:50:23 +08:00
parent 3171c0b3f9
commit 70e99e69ba
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/renderer/src/components/pdf/index.vue
View File

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

1
src/renderer/src/views/classBegins/index.vue
View File

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

9
src/renderer/src/views/tool/sphere.vue
View File

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