优化bug
This commit is contained in:
parent
d65af70a34
commit
1d808950b5
|
@ -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() //监听工具栏
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -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
|
||||||
//初始化获取接口数据
|
//初始化获取接口数据
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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 点击-事件 折叠|展开
|
||||||
|
|
Loading…
Reference in New Issue