mirror of
https://github.com/Kuingsmile/PicList.git
synced 2026-09-05 15:37:21 +08:00
Fixed: #140 || drag the image to app will be opened by Chrome & gallery close button
This commit is contained in:
@@ -137,6 +137,7 @@ const uploader = (img, type, webContents) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
picgo.on('failed', ctx => {
|
picgo.on('failed', ctx => {
|
||||||
|
console.log(ctx)
|
||||||
resolve(false)
|
resolve(false)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -22,8 +22,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
|
import mixin from './mixin'
|
||||||
export default {
|
export default {
|
||||||
name: 'rename-page',
|
name: 'rename-page',
|
||||||
|
mixins: [mixin],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
fileName: '',
|
fileName: '',
|
||||||
|
|||||||
@@ -136,9 +136,11 @@ import pkg from '../../../package.json'
|
|||||||
import keyDetect from 'utils/key-binding'
|
import keyDetect from 'utils/key-binding'
|
||||||
import { remote } from 'electron'
|
import { remote } from 'electron'
|
||||||
import db from '../../datastore'
|
import db from '../../datastore'
|
||||||
|
import mixin from './mixin'
|
||||||
const { Menu, dialog, BrowserWindow } = remote
|
const { Menu, dialog, BrowserWindow } = remote
|
||||||
export default {
|
export default {
|
||||||
name: 'setting-page',
|
name: 'setting-page',
|
||||||
|
mixins: [mixin],
|
||||||
data () {
|
data () {
|
||||||
const customLinkRule = (rule, value, callback) => {
|
const customLinkRule = (rule, value, callback) => {
|
||||||
if (!/\$url/.test(value)) {
|
if (!/\$url/.test(value)) {
|
||||||
|
|||||||
@@ -76,8 +76,10 @@
|
|||||||
<script>
|
<script>
|
||||||
import gallerys from 'vue-gallery'
|
import gallerys from 'vue-gallery'
|
||||||
import pasteStyle from '../../../main/utils/pasteTemplate'
|
import pasteStyle from '../../../main/utils/pasteTemplate'
|
||||||
|
import mixin from '../mixin'
|
||||||
export default {
|
export default {
|
||||||
name: 'gallery',
|
name: 'gallery',
|
||||||
|
mixins: [mixin],
|
||||||
components: {
|
components: {
|
||||||
gallerys
|
gallerys
|
||||||
},
|
},
|
||||||
@@ -150,9 +152,18 @@ export default {
|
|||||||
},
|
},
|
||||||
zoomImage (index) {
|
zoomImage (index) {
|
||||||
this.idx = 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 () {
|
handleClose () {
|
||||||
this.idx = null
|
this.idx = null
|
||||||
|
this.changeZIndexForGallery(false)
|
||||||
},
|
},
|
||||||
copy (url) {
|
copy (url) {
|
||||||
const style = this.$db.read().get('settings.pasteStyle').value() || 'markdown'
|
const style = this.$db.read().get('settings.pasteStyle').value() || 'markdown'
|
||||||
@@ -371,9 +382,6 @@ export default {
|
|||||||
&.el-icon-delete
|
&.el-icon-delete
|
||||||
&:hover
|
&:hover
|
||||||
color #F15140
|
color #F15140
|
||||||
.blueimp-gallery
|
|
||||||
.title
|
|
||||||
top 30px
|
|
||||||
.handle-bar
|
.handle-bar
|
||||||
color #ddd
|
color #ddd
|
||||||
.pic-bed-item
|
.pic-bed-item
|
||||||
|
|||||||
@@ -81,8 +81,10 @@
|
|||||||
<script>
|
<script>
|
||||||
import ConfigForm from '../ConfigForm'
|
import ConfigForm from '../ConfigForm'
|
||||||
import { debounce } from 'lodash'
|
import { debounce } from 'lodash'
|
||||||
|
import mixin from '../mixin'
|
||||||
export default {
|
export default {
|
||||||
name: 'plugin',
|
name: 'plugin',
|
||||||
|
mixins: [mixin],
|
||||||
components: {
|
components: {
|
||||||
ConfigForm
|
ConfigForm
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -23,9 +23,11 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import mixin from './mixin'
|
||||||
import pasteTemplate from '../../main/utils/pasteTemplate'
|
import pasteTemplate from '../../main/utils/pasteTemplate'
|
||||||
export default {
|
export default {
|
||||||
name: 'tray-page',
|
name: 'tray-page',
|
||||||
|
mixins: [mixin],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
files: [],
|
files: [],
|
||||||
|
|||||||
Reference in New Issue
Block a user