🐛 Fix(custom): fix delete bug when using in render process

This commit is contained in:
Kuingsmile
2025-07-31 23:23:51 +08:00
parent b7d7badda9
commit 89976c73a9
36 changed files with 78 additions and 729 deletions

View File

@@ -29,6 +29,11 @@ import { isMacOSVersionGreaterThanOrEqualTo } from '~/utils/getMacOSVersion'
import pasteTemplate from '~/utils/pasteTemplate'
import { hideMiniWindow, openMainWindow, openMiniWindow } from '~/utils/windowHelper'
import menubarPng from '../../../../../resources/menubar.png?asset'
import menubarNewDarwinTemplate from '../../../../../resources/menubar-newdarwinTemplate.png?asset'
import menubarNodarwin from '../../../../../resources/menubar-nodarwin.png?asset'
import uploadPng from '../../../../../resources/upload.png?asset'
import uploadDarkPng from '../../../../../resources/upload-dark.png?asset'
let contextMenu: Menu | null
export function setDockMenu () {
@@ -219,9 +224,9 @@ export function createContextMenu () {
const getTrayIcon = () => {
if (process.platform === 'darwin') {
const isMacOSGreaterThan11 = isMacOSVersionGreaterThanOrEqualTo('11')
return isMacOSGreaterThan11 ? './resources/menubar-newdarwinTemplate.png' : './resources/menubar.png'
return isMacOSGreaterThan11 ? menubarNewDarwinTemplate : menubarPng
} else {
return './resources/menubar-nodarwin.png'
return menubarNodarwin
}
}
@@ -291,9 +296,9 @@ export function createTray (tooltip: string) {
tray.on('drag-enter', () => {
if (nativeTheme.shouldUseDarkColors) {
tray!.setImage('./resources/upload-dark.png')
tray!.setImage(uploadDarkPng)
} else {
tray!.setImage('./resources/upload.png')
tray!.setImage(uploadPng)
}
})

View File

@@ -12,6 +12,7 @@ import { IBrowserWindowOptions } from '#/types/types'
import { configPaths } from '#/utils/configPaths'
import { T } from '~/i18n'
import logo from '../../../../../resources/logo.png?asset'
import {
MANUAL_WINDOW_URL,
MINI_WINDOW_URL,
@@ -111,7 +112,7 @@ if (process.platform !== 'darwin') {
settingWindowOptions.frame = false
settingWindowOptions.backgroundColor = '#3f3c37'
settingWindowOptions.transparent = false
settingWindowOptions.icon = '.resources/logo.png'
settingWindowOptions.icon = '../../../../../resources/logo.png'
}
const miniWindowOptions = {
@@ -123,7 +124,7 @@ const miniWindowOptions = {
skipTaskbar: true,
resizable: false,
transparent: process.platform !== 'linux',
icon: './resources/logo.png',
icon: logo,
webPreferences: {
sandbox: false,
preload: preloadPath,
@@ -172,7 +173,7 @@ const toolboxWindowOptions = {
resizable: false,
title: `PicList ${T('TOOLBOX')}`,
vibrancy: 'ultra-dark',
icon: './resources/logo.png',
icon: logo,
webPreferences: {
sandbox: false,
backgroundThrottling: false,

View File

@@ -1,6 +1,7 @@
import qiniu from 'qiniu'
import { IQiniuConfig, PartialKeys } from '#/types/types'
import { deleteFailedLog, deleteLog } from '~/utils/deleteLog'
interface IConfigMap {
fileName: string
config: PartialKeys<IQiniuConfig, 'path'>
@@ -12,10 +13,10 @@ export default class QiniuApi {
fileName,
config: { accessKey, secretKey, bucket, path }
} = configMap
const mac = new window.node.qiniu.auth.digest.Mac(accessKey, secretKey)
const qiniuConfig = new window.node.qiniu.conf.Config()
const mac = new qiniu.auth.digest.Mac(accessKey, secretKey)
const qiniuConfig = new qiniu.conf.Config()
try {
const bucketManager = new window.node.qiniu.rs.BucketManager(mac, qiniuConfig)
const bucketManager = new qiniu.rs.BucketManager(mac, qiniuConfig)
const formattedPath = path?.replace(/^\/+|\/+$/, '') || ''
const key = path === '/' || !path ? fileName : `${formattedPath}/${fileName}`
const res = (await new Promise((resolve, reject) => {