Compare commits

..

No commits in common. "f057320625484de0df09b046de92b8702cdd44cb" and "529197c9dc8210308a022f63b6d2bb0c0eb342c4" have entirely different histories.

2 changed files with 3 additions and 3 deletions

View File

@ -115,7 +115,7 @@ export function toolWindow({url, isFile, isConsole, option={}}) {
} }
// 创建-新窗口 // 创建-新窗口
let win = new Remote.BrowserWindow(config) let win = new Remote.BrowserWindow(config)
if (!isDev) win.loadFile(urlAll,{hash: url}) // 加载文件 if (!!isFile) win.loadFile(urlAll,{hash: url}) // 加载文件
else win.loadURL(urlAll) // 加载url else win.loadURL(urlAll) // 加载url
win.once('ready-to-show', () => {resolve(win)}) win.once('ready-to-show', () => {resolve(win)})
// 主窗口关闭事件 // 主窗口关闭事件

View File

@ -36,7 +36,7 @@ import { ref, onMounted, watch, reactive } from 'vue'
import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf' import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf'
pdfjsLib.GlobalWorkerOptions.workerSrc = '/lib/build/pdf.worker.mjs' pdfjsLib.GlobalWorkerOptions.workerSrc = '/lib/build/pdf.worker.mjs'
import pdfCanvas from '@/components/pdf/index.vue' import pdfCanvas from '@/components/pdf/index.vue'
const { ipcRenderer } = window.electron || {} const { ipcRenderer } = require('electron')
// //
const pdfObj = reactive({ const pdfObj = reactive({
numberOfPdf: 2, // numberOfPdf: 2, //
@ -125,4 +125,4 @@ onMounted(async () => {})
} }
} }
} }
</style> </style>