Feature: only shows visible pic-beds

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

View File

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

View File

@ -1,9 +1,8 @@
import db from '#/datastore'
import picgo from './picgo'
const getPicBeds = () => {
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 visible = picBedFromDB.find((i: IPicBedType) => i.type === item) // object or undefined
return {
@ -12,7 +11,6 @@ const getPicBeds = () => {
visible: visible ? visible.visible : true
}
}) as IPicBedType[]
picgo.cmd.program.removeAllListeners()
return picBeds
}

View File

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

View File

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