diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index 70b296258..d6d315d7f 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -188,7 +188,7 @@ export default { return true; } } - this.$Electron.registerMsgListener('dispatch', (event, args) => { + this.$Electron.registerMsgListener('dispatch', args => { if (!$A.isJson(args)) { return; } diff --git a/resources/assets/js/components/RightBottom.vue b/resources/assets/js/components/RightBottom.vue index f1d9243dd..165ac52dd 100644 --- a/resources/assets/js/components/RightBottom.vue +++ b/resources/assets/js/components/RightBottom.vue @@ -44,8 +44,8 @@ export default { this.getReleases(); // if (this.$Electron) { - this.$Electron.registerMsgListener('downloadDone', (event, {result}) => { - if (result.name == this.repoData.name) { + this.$Electron.registerMsgListener('downloadDone', ({result}) => { + if (result.name == this.repoData.name && this.repoStatus !== 2) { this.downloadResult = result; this.releasesNotification() } @@ -202,6 +202,7 @@ export default { }, releasesNotification() { + const {tag_name, body} = this.repoReleases; $A.modalConfirm({ okText: this.$L('立即更新'), onOk: () => { @@ -224,12 +225,12 @@ export default { props: { color: 'volcano' } - }, this.repoReleases.tag_name) + }, tag_name) ]), h('MarkdownPreview', { class: 'notification-body', props: { - initialValue: this.repoReleases.body + initialValue: body } }), ])