From d042c93bec2794979bc44cac1504bbb024cfab44 Mon Sep 17 00:00:00 2001 From: Molunerfinn Date: Sat, 28 Apr 2018 00:16:17 +0800 Subject: [PATCH] Added: picgo-setting page --- src/datastore/pic-bed.js | 39 ++++++--- src/renderer/components/SettingPage.vue | 39 ++++----- .../components/SettingView/Gallery.vue | 2 +- .../components/SettingView/PicGoSetting.vue | 84 +++++++++++++++++++ .../components/SettingView/Upload.vue | 6 +- src/renderer/router/index.js | 5 ++ 6 files changed, 138 insertions(+), 37 deletions(-) create mode 100644 src/renderer/components/SettingView/PicGoSetting.vue diff --git a/src/datastore/pic-bed.js b/src/datastore/pic-bed.js index 42d61e5..79643b7 100644 --- a/src/datastore/pic-bed.js +++ b/src/datastore/pic-bed.js @@ -1,24 +1,41 @@ +import weiboUpload from '../main/utils/weiboUpload' +import qiniuUpload from '../main/utils/qiniuUpload' +import tcYunUpload from '../main/utils/tcYunUpload' +import upYunUpload from '../main/utils/upYunUpload' +import githubUpload from '../main/utils/githubUpload' + const picBed = [ { - title: '微博图床', - value: 'weibo' + type: 'weibo', + name: '微博图床' }, { - title: '七牛云', - value: 'qiniu' + type: 'qiniu', + name: '七牛图床' }, { - title: '腾讯COS', - value: 'tcyun' + type: 'tcyun', + name: '腾讯云COS' }, { - title: '又拍云', - value: 'upyun' + type: 'upyun', + name: '又拍云图床' }, { - title: 'GitHub图床', - value: 'github' + type: 'github', + name: 'GitHub图床' } ] -export default picBed +const picBedHandler = { + weibo: weiboUpload, + qiniu: qiniuUpload, + tcyun: tcYunUpload, + upyun: upYunUpload, + github: githubUpload +} + +export { + picBed, + picBedHandler +} diff --git a/src/renderer/components/SettingPage.vue b/src/renderer/components/SettingPage.vue index 7401fb7..b1c7b32 100644 --- a/src/renderer/components/SettingPage.vue +++ b/src/renderer/components/SettingPage.vue @@ -13,6 +13,7 @@ class="picgo-sidebar" :default-active="defaultActive" @select="handleSelect" + :unique-opened="true" > @@ -29,29 +30,21 @@ 图床设置 - - - 微博设置 - - - - 七牛云设置 - - - - 腾讯COS设置 - - - - 又拍云设置 - - - - GitHub设置 + + + {{ item.name }} + + + PicGo设置 + - + @@ -157,6 +150,7 @@ import pkg from '../../../package.json' import keyDetect from 'utils/key-binding' import { remote } from 'electron' import db from '../../datastore' +import { picBed } from '../../datastore/pic-bed' const { Menu, dialog, BrowserWindow } = remote export default { name: 'setting-page', @@ -186,7 +180,8 @@ export default { os: '', shortKey: { upload: db.read().get('shortKey.upload').value() - } + }, + picBed } }, created () { @@ -323,7 +318,7 @@ export default { overflow-x hidden overflow-y auto width 170px - .el-icon-setting + .el-icon-setting.setting-window position fixed bottom 4px left 4px diff --git a/src/renderer/components/SettingView/Gallery.vue b/src/renderer/components/SettingView/Gallery.vue index be9f5c9..84f7c48 100644 --- a/src/renderer/components/SettingView/Gallery.vue +++ b/src/renderer/components/SettingView/Gallery.vue @@ -20,7 +20,7 @@ > diff --git a/src/renderer/components/SettingView/PicGoSetting.vue b/src/renderer/components/SettingView/PicGoSetting.vue new file mode 100644 index 0000000..3644330 --- /dev/null +++ b/src/renderer/components/SettingView/PicGoSetting.vue @@ -0,0 +1,84 @@ + + + \ No newline at end of file diff --git a/src/renderer/components/SettingView/Upload.vue b/src/renderer/components/SettingView/Upload.vue index 42ed2b4..410fe5c 100644 --- a/src/renderer/components/SettingView/Upload.vue +++ b/src/renderer/components/SettingView/Upload.vue @@ -54,7 +54,7 @@