zdg #167

Merged
zhengdegang merged 4 commits from zdg into main 2024-09-02 22:23:09 +08:00
4 changed files with 11 additions and 16 deletions
Showing only changes of commit 1d808950b5 - Show all commits

View File

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

View File

@ -104,9 +104,12 @@ const switchPageMode = () => {
} }
} }
onMounted(async () => { onMounted(async () => {
const isDev = process.env.NODE_ENV == 'development'
toolState.isPdfWin=true //pdf 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 textbookId.value = route.query.textbookId
pdfObj.bookId=textbookId.value pdfObj.bookId=textbookId.value
// //

View File

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

View File

@ -51,8 +51,9 @@ import imChat from './components/imChat.vue' // im-chat-子组件
import vDrag from './directive/drag' // - import vDrag from './directive/drag' // -
import vIgnore from './directive/ignore' // -穿 import vIgnore from './directive/ignore' // -穿
import { useToolState } from '@/store/modules/tool' // - 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) import MsgEnum from '@/plugins/imChat/msgEnum' // -(nuem)
const route = useRoute(); const route = useRoute();
const tabActive = ref('select') // const tabActive = ref('select') //
const isFold = ref(false) // const isFold = ref(false) //
@ -82,7 +83,8 @@ const btnList = [ // 工具栏按钮列表
// === === // === ===
onMounted(async() => { onMounted(async() => {
if (!electron) return // if (!electron) return //
getClassInfo() // ex3 // console.log(sessionStore)
// getClassInfo() // ex3
setTimeout(() => { setTimeout(() => {
resetStatus() // - resetStatus() // -
}, 200); }, 200);
@ -104,7 +106,6 @@ 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
// ipcMsgSend('tool-sphere:close')
toolStore.model = val // tab toolStore.model = val // tab
} }
// logo - | // logo - |