From 0964c1423bd01d9ea476434a421c3743d496d50a Mon Sep 17 00:00:00 2001 From: Molunerfinn Date: Thu, 7 Dec 2017 11:26:29 +0800 Subject: [PATCH] Added: gallery --- package.json | 1 + src/main/utils/img2base64.js | 2 +- src/renderer/components/SettingPage.vue | 10 +- .../components/SettingView/Gallery.vue | 151 ++++++++++++++++++ src/renderer/components/SettingView/Weibo.vue | 3 +- src/renderer/router/index.js | 5 + yarn.lock | 10 ++ 7 files changed, 177 insertions(+), 5 deletions(-) create mode 100644 src/renderer/components/SettingView/Gallery.vue diff --git a/package.json b/package.json index c5df8567..e178f137 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "request-promise": "^4.2.2", "vue": "^2.3.3", "vue-electron": "^1.0.6", + "vue-gallery": "^1.2.4", "vue-router": "^2.5.3", "vuex": "^2.3.1" }, diff --git a/src/main/utils/img2base64.js b/src/main/utils/img2base64.js index 21ed908f..b59717db 100644 --- a/src/main/utils/img2base64.js +++ b/src/main/utils/img2base64.js @@ -21,7 +21,7 @@ const imgFromPath = async (imgPath) => { const imgFromClipboard = (file) => { let result = [] - const today = new Date().toLocaleString() + const today = new Date().toLocaleString().replace(/[ ]+/g, '-') result.push({ base64Image: file.imgUrl.replace(/^data\S+,/, ''), fileName: `${today}.png`, diff --git a/src/renderer/components/SettingPage.vue b/src/renderer/components/SettingPage.vue index 0f428b13..3b0101be 100644 --- a/src/renderer/components/SettingPage.vue +++ b/src/renderer/components/SettingPage.vue @@ -3,7 +3,7 @@
PicGo
- + 上传区 + + + 相册 + 微博设置 @@ -24,7 +28,7 @@ - + @@ -62,11 +66,13 @@ export default { color #eee font-size 12px line-height h + position fixed .picgo-sidebar height calc(100vh - 22px) .el-menu border-right none background transparent + position fixed &-item color #eee position relative diff --git a/src/renderer/components/SettingView/Gallery.vue b/src/renderer/components/SettingView/Gallery.vue new file mode 100644 index 00000000..da5b9916 --- /dev/null +++ b/src/renderer/components/SettingView/Gallery.vue @@ -0,0 +1,151 @@ + + + \ No newline at end of file diff --git a/src/renderer/components/SettingView/Weibo.vue b/src/renderer/components/SettingView/Weibo.vue index a3a46ed8..dac0b6de 100644 --- a/src/renderer/components/SettingView/Weibo.vue +++ b/src/renderer/components/SettingView/Weibo.vue @@ -34,7 +34,7 @@ - 确定 + 确定 @@ -102,7 +102,6 @@ export default { color #eee .el-button width 100% - border-radius 19px .el-input__inner border-radius 19px .el-radio-group diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js index 8a5cc8e6..286aa2a9 100644 --- a/src/renderer/router/index.js +++ b/src/renderer/router/index.js @@ -29,6 +29,11 @@ export default new Router({ path: 'qiniu', component: require('@/components/SettingView/Qiniu').default, name: 'qiniu' + }, + { + path: 'gallery', + component: require('@/components/SettingView/Gallery').default, + name: 'gallery' } ] }, diff --git a/yarn.lock b/yarn.lock index 052c4792..351a153d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1445,6 +1445,10 @@ bluebird@^3.1.1, bluebird@^3.3.0, bluebird@^3.4.7, bluebird@^3.5.0, bluebird@^3. version "3.5.1" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" +blueimp-gallery@^2.27.0: + version "2.29.0" + resolved "https://registry.yarnpkg.com/blueimp-gallery/-/blueimp-gallery-2.29.0.tgz#04164eb34d7a5f502d32c518a096f988a3934e2d" + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" @@ -7891,6 +7895,12 @@ vue-electron@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/vue-electron/-/vue-electron-1.0.6.tgz#e798e03180b8933539defe31f92e53b9242b9406" +vue-gallery@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/vue-gallery/-/vue-gallery-1.2.4.tgz#67799ccd9c82efbce57d7ed45d5021a57121cb3c" + dependencies: + blueimp-gallery "^2.27.0" + vue-hot-reload-api@^2.2.0: version "2.2.4" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz#683bd1d026c0d3b3c937d5875679e9a87ec6cd8f"