修复 bug #173

Merged
zhengdegang merged 1 commits from zdg into main 2024-09-04 19:51:08 +08:00
3 changed files with 18 additions and 4 deletions
Showing only changes of commit 70e99e69ba - Show all commits

View File

@ -102,8 +102,10 @@ const renderPage = async (canvasobj) => {
// //
const savaDataStore = (type) => { const savaDataStore = (type) => {
if(!toolState.isToolWin){ if(!toolState.isToolWin){
toolState.isPdfWin=false toolState.isPdfWin = false
toolState.showBoardAll=true // nextTick(() => {
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

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) //

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}