tcjlj/PicList
1
0
Fork 0
mirror of https://github.com/Kuingsmile/PicList.git synced 2025-02-08 21:38:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ Feature: only shows visible pic-beds

Browse Source 
ISSUES CLOSED: #310
This commit is contained in:
Molunerfinn 2019-12-28 16:23:16 +08:00
parent cd30a6c70c
commit 9d4d605acf
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/background.ts
View File

@ -63,7 +63,7 @@ fixPath()
function createContextMenu () { function createContextMenu () {
const picBeds = getPicBeds() const picBeds = getPicBeds()
const submenu = picBeds.map(item => { const submenu = picBeds.filter(item => item.visible).map(item => {
return { return {
label: item.name, label: item.name,
type: 'radio', type: 'radio',
@ -147,6 +147,8 @@ function createTray () {
}) })
tray.on('click', (event, bounds) => { tray.on('click', (event, bounds) => {
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
toggleWindow(bounds)
setTimeout(() => {
let img = clipboard.readImage() let img = clipboard.readImage()
let obj: ImgInfo[] = [] let obj: ImgInfo[] = []
if (!img.isEmpty()) { if (!img.isEmpty()) {
@ -159,8 +161,6 @@ function createTray () {
imgUrl imgUrl
}) })
} }
toggleWindow(bounds)
setTimeout(() => {
window!.webContents.send('clipboardFiles', obj) window!.webContents.send('clipboardFiles', obj)
}, 0) }, 0)
} else { } else {

4
src/main/utils/getPicBeds.ts
View File

@ -1,9 +1,8 @@
import db from '#/datastore'
import picgo from './picgo' import picgo from './picgo'
const getPicBeds = () => { const getPicBeds = () => {
const picBedTypes = picgo.helper.uploader.getIdList() const picBedTypes = picgo.helper.uploader.getIdList()
const picBedFromDB = db.get('picBed.list') || [] const picBedFromDB = picgo.getConfig('picBed.list') || []
const picBeds = picBedTypes.map((item: string) => { const picBeds = picBedTypes.map((item: string) => {
const visible = picBedFromDB.find((i: IPicBedType) => i.type === item) // object or undefined const visible = picBedFromDB.find((i: IPicBedType) => i.type === item) // object or undefined
return { return {
@ -12,7 +11,6 @@ const getPicBeds = () => {
visible: visible ? visible.visible : true visible: visible ? visible.visible : true
} }
}) as IPicBedType[] }) as IPicBedType[]
picgo.cmd.program.removeAllListeners()
return picBeds return picBeds
} }

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

@ -137,7 +137,7 @@ export default class extends Vue {
} }
buildMenu () { buildMenu () {
const _this = this const _this = this
const submenu = this.picBed.map(item => { const submenu = this.picBed.filter(item => item.visible).map(item => {
return { return {
label: item.name, label: item.name,
type: 'radio', type: 'radio',

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

@ -160,7 +160,7 @@ export default class extends Vue {
} }
buildMenu () { buildMenu () {
const _this = this const _this = this
const submenu = this.picBed.map(item => { const submenu = this.picBed.filter(item => item.visible).map(item => {
return { return {
label: item.name, label: item.name,
type: 'radio', type: 'radio',