GithubBackup/PicList
1
0
Fork 0
mirror of https://github.com/Kuingsmile/PicList.git synced 2026-05-06 20:42:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix(custom): fix file selection bug in upload page

Browse Source
This commit is contained in:
Kuingsmile
2025-08-05 15:41:43 +08:00
parent b1f514e80c
commit fe945a0136
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/apis/app/window/windowList.ts
View File

@@ -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'), {

5
src/preload/index.ts
View File

@@ -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)
}
})

2
src/renderer/components/ui/TitleBar.vue
View File

@@ -42,7 +42,7 @@
@click="setAlwaysOnTop"
>
<PinIcon
:color="isAlwaysOnTop ? '#CE6769' : '#000'"
:color="isAlwaysOnTop ? '#CE6769' : '#6B7280'"
:size="14"
/>
</button>

2
src/renderer/pages/MiniPage.vue
View File

@@ -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)
})

3
src/renderer/pages/Upload.vue
View File

@@ -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)
})

3
src/universal/types/shims-tsx.d.ts vendored
View File

@@ -32,7 +32,8 @@ declare global {
ipcRendererRemoveListener: (channel: string, listener: IpcRendererListener) => void
clipboard: {
writeText: typeof clipboard.writeText
}
},
showFilePath: (file: File) => string
}
node: {
path: {