From 9c12fb6ede8d6c93e7312872aeeed350aa68d14d Mon Sep 17 00:00:00 2001
From: PiEgg <marksz@teamsz.xyz>
Date: Sun, 25 Nov 2018 23:53:26 +0800
Subject: [PATCH] Fixed: #140 || drag the image to app will be opened by Chrome
 & gallery close button

---
 src/main/utils/uploader.js                      |  1 +
 src/renderer/components/RenamePage.vue          |  2 ++
 src/renderer/components/SettingPage.vue         |  2 ++
 src/renderer/components/SettingView/Gallery.vue | 14 +++++++++++---
 src/renderer/components/SettingView/Plugin.vue  |  2 ++
 src/renderer/components/TrayPage.vue            |  2 ++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/utils/uploader.js b/src/main/utils/uploader.js
index 789b3a12..a33a2fb7 100644
--- a/src/main/utils/uploader.js
+++ b/src/main/utils/uploader.js
@@ -137,6 +137,7 @@ const uploader = (img, type, webContents) => {
       }
     })
     picgo.on('failed', ctx => {
+      console.log(ctx)
       resolve(false)
     })
   })
diff --git a/src/renderer/components/RenamePage.vue b/src/renderer/components/RenamePage.vue
index d496fbbb..331c7067 100644
--- a/src/renderer/components/RenamePage.vue
+++ b/src/renderer/components/RenamePage.vue
@@ -22,8 +22,10 @@
   </div>
 </template>
 <script>
+import mixin from './mixin'
 export default {
   name: 'rename-page',
+  mixins: [mixin],
   data () {
     return {
       fileName: '',
diff --git a/src/renderer/components/SettingPage.vue b/src/renderer/components/SettingPage.vue
index 8395ba73..85257779 100644
--- a/src/renderer/components/SettingPage.vue
+++ b/src/renderer/components/SettingPage.vue
@@ -136,9 +136,11 @@ import pkg from '../../../package.json'
 import keyDetect from 'utils/key-binding'
 import { remote } from 'electron'
 import db from '../../datastore'
+import mixin from './mixin'
 const { Menu, dialog, BrowserWindow } = remote
 export default {
   name: 'setting-page',
+  mixins: [mixin],
   data () {
     const customLinkRule = (rule, value, callback) => {
       if (!/\$url/.test(value)) {
diff --git a/src/renderer/components/SettingView/Gallery.vue b/src/renderer/components/SettingView/Gallery.vue
index 20411bc3..b94bcd66 100644
--- a/src/renderer/components/SettingView/Gallery.vue
+++ b/src/renderer/components/SettingView/Gallery.vue
@@ -76,8 +76,10 @@
 <script>
 import gallerys from 'vue-gallery'
 import pasteStyle from '../../../main/utils/pasteTemplate'
+import mixin from '../mixin'
 export default {
   name: 'gallery',
+  mixins: [mixin],
   components: {
     gallerys
   },
@@ -150,9 +152,18 @@ export default {
     },
     zoomImage (index) {
       this.idx = index
+      this.changeZIndexForGallery(true)
+    },
+    changeZIndexForGallery (isOpen) {
+      if (isOpen) {
+        document.querySelector('.main-content.el-row').style.zIndex = 101
+      } else {
+        document.querySelector('.main-content.el-row').style.zIndex = 10
+      }
     },
     handleClose () {
       this.idx = null
+      this.changeZIndexForGallery(false)
     },
     copy (url) {
       const style = this.$db.read().get('settings.pasteStyle').value() || 'markdown'
@@ -371,9 +382,6 @@ export default {
         &.el-icon-delete
           &:hover
             color #F15140
-  .blueimp-gallery
-    .title
-      top 30px
   .handle-bar
     color #ddd
     .pic-bed-item
diff --git a/src/renderer/components/SettingView/Plugin.vue b/src/renderer/components/SettingView/Plugin.vue
index 3a17e486..e5fe0358 100644
--- a/src/renderer/components/SettingView/Plugin.vue
+++ b/src/renderer/components/SettingView/Plugin.vue
@@ -81,8 +81,10 @@
 <script>
 import ConfigForm from '../ConfigForm'
 import { debounce } from 'lodash'
+import mixin from '../mixin'
 export default {
   name: 'plugin',
+  mixins: [mixin],
   components: {
     ConfigForm
   },
diff --git a/src/renderer/components/TrayPage.vue b/src/renderer/components/TrayPage.vue
index 041a7b3d..4c0ea737 100644
--- a/src/renderer/components/TrayPage.vue
+++ b/src/renderer/components/TrayPage.vue
@@ -23,9 +23,11 @@
 </template>
 
 <script>
+  import mixin from './mixin'
   import pasteTemplate from '../../main/utils/pasteTemplate'
   export default {
     name: 'tray-page',
+    mixins: [mixin],
     data () {
       return {
         files: [],