diff --git a/src/main/apis/app/window/windowList.ts b/src/main/apis/app/window/windowList.ts index 3aa58031..69393155 100644 --- a/src/main/apis/app/window/windowList.ts +++ b/src/main/apis/app/window/windowList.ts @@ -164,7 +164,6 @@ windowList.set(IWindowList.TRAY_WINDOW, { options: () => trayWindowOptions, callback (window) { if (!app.isPackaged && process.env.ELECTRON_RENDERER_URL) { - console.log('load setting window from renderer url') window.loadURL(process.env.ELECTRON_RENDERER_URL) } else { window.loadFile(path.join(__dirname, '../render/index.html')) @@ -181,7 +180,6 @@ windowList.set(IWindowList.SETTING_WINDOW, { options: () => settingWindowOptions, callback (window, windowManager) { if (!app.isPackaged && process.env.ELECTRON_RENDERER_URL) { - console.log('load setting window from renderer url') window.loadURL(`${process.env.ELECTRON_RENDERER_URL}#main-page/upload`) } else { window.loadFile(path.join(__dirname, '../render/index.html'), { @@ -222,7 +220,6 @@ windowList.set(IWindowList.RENAME_WINDOW, { options: () => renameWindowOptions, async callback (window, windowManager) { if (!app.isPackaged && process.env.ELECTRON_RENDERER_URL) { - console.log('load setting window from renderer url') window.loadURL(`${process.env.ELECTRON_RENDERER_URL}#rename-page`) } else { window.loadFile(path.join(__dirname, '../render/index.html'), { @@ -245,7 +242,6 @@ windowList.set(IWindowList.TOOLBOX_WINDOW, { options: () => toolboxWindowOptions, async callback (window, windowManager) { if (!app.isPackaged && process.env.ELECTRON_RENDERER_URL) { - console.log('load setting window from renderer url') window.loadURL(`${process.env.ELECTRON_RENDERER_URL}#toolbox-page`) } else { window.loadFile(path.join(__dirname, '../render/index.html'), { diff --git a/src/preload/index.ts b/src/preload/index.ts index a78bb9e3..a62bdbe1 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -1,7 +1,7 @@ import crypto from 'node:crypto' import path from 'node:path' -import { clipboard, contextBridge, ipcRenderer, webFrame } from 'electron' +import { clipboard, contextBridge, ipcRenderer, webFrame, webUtils } from 'electron' import fs from 'fs-extra' import yaml from 'js-yaml' import mime from 'mime-types' @@ -59,6 +59,9 @@ try { }, ipcRendererRemoveListener: (channel: string, listener: IpcRendererListener) => { ipcRenderer.removeListener(channel, listener) + }, + showFilePath (file: File) { + return webUtils.getPathForFile(file) } }) diff --git a/src/renderer/components/ui/TitleBar.vue b/src/renderer/components/ui/TitleBar.vue index 10178c1a..6278f974 100644 --- a/src/renderer/components/ui/TitleBar.vue +++ b/src/renderer/components/ui/TitleBar.vue @@ -42,7 +42,7 @@ @click="setAlwaysOnTop" > diff --git a/src/renderer/pages/MiniPage.vue b/src/renderer/pages/MiniPage.vue index 4e6395e5..68c11bf9 100644 --- a/src/renderer/pages/MiniPage.vue +++ b/src/renderer/pages/MiniPage.vue @@ -153,7 +153,7 @@ function ipcSendFiles (files: FileList) { Array.from(files).forEach(item => { const obj = { name: item.name, - path: item.webkitRelativePath + path: window.electron.showFilePath(item) } sendFiles.push(obj) }) diff --git a/src/renderer/pages/Upload.vue b/src/renderer/pages/Upload.vue index 7f3a74bd..899cd7ae 100644 --- a/src/renderer/pages/Upload.vue +++ b/src/renderer/pages/Upload.vue @@ -69,7 +69,6 @@ ref="fileInput" type="file" multiple - accept="image/*" style="display: none" @change="onChange" > @@ -364,7 +363,7 @@ function ipcSendFiles (files: FileList) { Array.from(files).forEach(item => { const obj = { name: item.name, - path: item.webkitRelativePath + path: window.electron.showFilePath(item) } sendFiles.push(obj) }) diff --git a/src/universal/types/shims-tsx.d.ts b/src/universal/types/shims-tsx.d.ts index 9c146791..525da07e 100644 --- a/src/universal/types/shims-tsx.d.ts +++ b/src/universal/types/shims-tsx.d.ts @@ -32,7 +32,8 @@ declare global { ipcRendererRemoveListener: (channel: string, listener: IpcRendererListener) => void clipboard: { writeText: typeof clipboard.writeText - } + }, + showFilePath: (file: File) => string } node: { path: {