no message

This commit is contained in:
kuaifan 2022-11-18 13:17:48 +08:00
parent 963474f32e
commit 374d3b85cf
17 changed files with 101 additions and 25 deletions

View File

@ -485,12 +485,31 @@ ipcMain.on('updateCheckAndDownload', (event, args) => {
})
})
/**
* 将主窗口激活到顶层
*/
ipcMain.on('mainWindowTop', (event) => {
mainWindow.moveTop()
event.returnValue = "ok"
})
/**
* 将主窗口激活
*/
ipcMain.on('mainWindowFocus', (event) => {
mainWindow.focus()
event.returnValue = "ok"
})
/**
* 退出并安装更新
*/
ipcMain.on('updateQuitAndInstall', (event) => {
event.returnValue = "ok"
willQuitApp = true
subWindow.some(({browser}) => {
browser && browser.destroy()
})
setTimeout(() => autoUpdater.quitAndInstall(true, true), 1)
})

View File

@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.20.80",
"version": "0.20.83",
"description": "DooTask is task management system.",
"scripts": {
"start": "./cmd dev",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -19,3 +19,11 @@
*/
/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
/**
* Vue Jsonp.
* # Carry Your World #
*
* @author: LancerComet
* @license: MIT
*/

File diff suppressed because one or more lines are too long

View File

@ -19,3 +19,11 @@
*/
/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
/**
* Vue Jsonp.
* # Carry Your World #
*
* @author: LancerComet
* @license: MIT
*/

File diff suppressed because one or more lines are too long

View File

@ -20,6 +20,14 @@
/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
/**
* Vue Jsonp.
* # Carry Your World #
*
* @author: LancerComet
* @license: MIT
*/
/**!
* Sortable 1.10.2
* @author RubaXa <trash@rubaxa.org>

File diff suppressed because one or more lines are too long

View File

@ -21,3 +21,11 @@
/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
/**
* Vue Jsonp.
* # Carry Your World #
*
* @author: LancerComet
* @license: MIT
*/

View File

@ -9,16 +9,16 @@
{name: '撸串去', path: '02.gif'},
{name: '来喝酒', path: '03.gif'},
{name: '走啦', path: '04.gif'},
{name: '蟹蟹', path: '05.gif'},
{name: '蟹蟹', key: '谢谢', path: '05.gif'},
{name: '加个好友呗', path: '06.gif'},
{name: '醉了', path: '07.gif'},
{name: '哈喽', path: '08.gif'},
{name: '哈喽', key: '你好', path: '08.gif'},
{name: '呼叫呼叫', path: '09.gif'},
{name: '收到over', path: '10.gif'},
{name: '呕', path: '11.gif'},
{name: '来嘛', path: '12.gif'},
{name: '借酒消愁', path: '13.gif'},
{name: '你还太年轻', path: '14.gif'},
{name: '借酒消愁', key: '烦', path: '13.gif'},
{name: '你还太年轻', key: '小样', path: '14.gif'},
{name: '来 再战', path: '15.gif'},
{name: '醒醒', path: '16.gif'},
{name: '请你吃饭', path: '17.gif'},
@ -27,7 +27,7 @@
{name: '好的', path: '20.gif'},
{name: '你又迟到了', path: '21.gif'},
{name: '自罚一杯', path: '22.gif'},
{name: '哈哈', path: '23.gif'},
{name: '哈哈', path: '23.gif'},
{name: '少喝点酒', path: '24.gif'},
]
},
@ -36,20 +36,20 @@
path: '02',
icon: 'icon.png',
list: [
{name: '爱老虎油', path: '01.gif'},
{name: '爱老虎油', key: '爱你', path: '01.gif'},
{name: '比心', path: '02.gif'},
{name: '呐,送你花花', path: '03.gif'},
{name: '赞', path: '04.gif'},
{name: '赞', key: '真棒 牛逼', path: '04.gif'},
{name: '买买买', path: '05.gif'},
{name: '饥饿', path: '06.gif'},
{name: '问号', path: '07.gif'},
{name: '围观', path: '08.gif'},
{name: '哈哈哈哈哈', path: '09.gif'},
{name: '哈哈', path: '09.gif'},
{name: '加一', path: '10.gif'},
{name: '嗯嗯', path: '11.gif'},
{name: '暗中观察', path: '12.gif'},
{name: '生日快乐', path: '13.gif'},
{name: '蟹蟹', path: '14.gif'},
{name: '蟹蟹', key: '谢谢', path: '14.gif'},
{name: '加油', path: '15.gif'},
{name: '突然吃瓜', path: '16.gif'},
{name: '抱抱', path: '17.gif'},
@ -79,10 +79,10 @@
{name: '开始摆烂', path: '11.gif'},
{name: '震惊', path: '12.gif'},
{name: '收到', path: '13.gif'},
{name: '赞', path: '14.gif'},
{name: '赞', key: '真棒 牛逼', path: '14.gif'},
{name: '心花怒放', path: '15.gif'},
{name: '无聊', path: '16.gif'},
{name: 'NONONO', path: '17.gif'},
{name: 'NONONO', key: '不要 不好', path: '17.gif'},
{name: '扎心了', path: '18.gif'},
{name: '哼', path: '19.gif'},
{name: '晚安', path: '20.gif'},
@ -113,7 +113,7 @@
{name: '打卡', path: '18.gif'},
{name: '摇摆', path: '19.gif'},
{name: '脑瓜嗡嗡', path: '20.gif'},
{name: 'yes sir', path: '21.gif'},
{name: 'yes sir', key: '是的', path: '21.gif'},
{name: '不开心', path: '22.gif'},
{name: '对', path: '23.gif'},
{name: '比猪', path: '24.gif'},

View File

@ -1 +1 @@
88ea1da372d84b4e
94541639e501a3e5

View File

@ -776,8 +776,6 @@
"/js/build/415.js": "/js/build/415.js",
"/js/build/425.js": "/js/build/425.js",
"/js/build/425.js.LICENSE.txt": "/js/build/425.js.LICENSE.txt",
"/js/build/434.js": "/js/build/434.js",
"/js/build/434.js.LICENSE.txt": "/js/build/434.js.LICENSE.txt",
"/js/build/479.js": "/js/build/479.js",
"/js/build/481.js": "/js/build/481.js",
"/js/build/481.js.LICENSE.txt": "/js/build/481.js.LICENSE.txt",
@ -801,6 +799,8 @@
"/js/build/826.js.LICENSE.txt": "/js/build/826.js.LICENSE.txt",
"/js/build/827.js": "/js/build/827.js",
"/js/build/834.js": "/js/build/834.js",
"/js/build/853.js": "/js/build/853.js",
"/js/build/853.js.LICENSE.txt": "/js/build/853.js.LICENSE.txt",
"/js/build/856.js": "/js/build/856.js",
"/js/build/856.js.LICENSE.txt": "/js/build/856.js.LICENSE.txt",
"/js/build/889.js": "/js/build/889.js",
@ -1237,6 +1237,8 @@
"/uploads/chat/202211/33/f682a136679c12bb641bb6967a9ff475.mov": "/uploads/chat/202211/33/f682a136679c12bb641bb6967a9ff475.mov",
"/uploads/chat/202211/45/088a642eb13ee5cf.jpg": "/uploads/chat/202211/45/088a642eb13ee5cf.jpg",
"/uploads/chat/202211/45/088a642eb13ee5cf.jpg_thumb.jpg": "/uploads/chat/202211/45/088a642eb13ee5cf.jpg_thumb.jpg",
"/uploads/chat/202211/45/31a18be2d4d4bd9e.png": "/uploads/chat/202211/45/31a18be2d4d4bd9e.png",
"/uploads/chat/202211/45/31a18be2d4d4bd9e.png_thumb.jpg": "/uploads/chat/202211/45/31a18be2d4d4bd9e.png_thumb.jpg",
"/uploads/chat/202211/45/d2a5dd9e848e1fce.jpg": "/uploads/chat/202211/45/d2a5dd9e848e1fce.jpg",
"/uploads/chat/202211/45/d2a5dd9e848e1fce.jpg_thumb.jpg": "/uploads/chat/202211/45/d2a5dd9e848e1fce.jpg_thumb.jpg",
"/uploads/chat/202211/45/e093daa871e780d9.jpg": "/uploads/chat/202211/45/e093daa871e780d9.jpg",
@ -1298,6 +1300,20 @@
"/uploads/desktop/0.13.1/t.hitosea.com-v0.13.1-mac-x64.zip": "/uploads/desktop/0.13.1/t.hitosea.com-v0.13.1-mac-x64.zip",
"/uploads/desktop/0.13.1/t.hitosea.com-v0.13.1-mac-x64.zip.blockmap": "/uploads/desktop/0.13.1/t.hitosea.com-v0.13.1-mac-x64.zip.blockmap",
"/uploads/desktop/latest": "/uploads/desktop/latest",
"/uploads/emosearch/21/0f/021cb950d4acdc0f": "/uploads/emosearch/21/0f/021cb950d4acdc0f",
"/uploads/emosearch/39/57/35cd87a00c9cc957": "/uploads/emosearch/39/57/35cd87a00c9cc957",
"/uploads/emosearch/6a/59/0f97745bc1e97059": "/uploads/emosearch/6a/59/0f97745bc1e97059",
"/uploads/emosearch/74/c4/fc7f44a3a0f9f4c4.gif": "/uploads/emosearch/74/c4/fc7f44a3a0f9f4c4.gif",
"/uploads/emosearch/92/f2/deaeac98e58db3f2": "/uploads/emosearch/92/f2/deaeac98e58db3f2",
"/uploads/emosearch/9a/8f/95700b2393c41f8f.jpeg": "/uploads/emosearch/9a/8f/95700b2393c41f8f.jpeg",
"/uploads/emosearch/bc/02/64690ca1cf8cee02": "/uploads/emosearch/bc/02/64690ca1cf8cee02",
"/uploads/emosearch/bf/55/f35622fe8bb3bd55.jpeg": "/uploads/emosearch/bf/55/f35622fe8bb3bd55.jpeg",
"/uploads/emosearch/c3/be/a7bee27747a48bbe": "/uploads/emosearch/c3/be/a7bee27747a48bbe",
"/uploads/emosearch/d3/b5/4ca1b30de7d99eb5.jpg": "/uploads/emosearch/d3/b5/4ca1b30de7d99eb5.jpg",
"/uploads/emosearch/e5/a8/820c0c9527273fa8.gif": "/uploads/emosearch/e5/a8/820c0c9527273fa8.gif",
"/uploads/emosearch/ec/fb/b79521dc14f6dafb": "/uploads/emosearch/ec/fb/b79521dc14f6dafb",
"/uploads/emosearch/ec/fb/b79521dc14f6dafb.png": "/uploads/emosearch/ec/fb/b79521dc14f6dafb.png",
"/uploads/emosearch/f8/37/bcdecbfa0a7c2437.jpeg": "/uploads/emosearch/f8/37/bcdecbfa0a7c2437.jpeg",
"/uploads/file/archive/202203/17/cb4d58116886e9f710759ba953a507e2.zip": "/uploads/file/archive/202203/17/cb4d58116886e9f710759ba953a507e2.zip",
"/uploads/file/archive/202204/816/8744757e35934b1f881596f3b82f0115.zip": "/uploads/file/archive/202204/816/8744757e35934b1f881596f3b82f0115.zip",
"/uploads/file/archive/202204/820/8744757e35934b1f881596f3b82f0115.zip": "/uploads/file/archive/202204/820/8744757e35934b1f881596f3b82f0115.zip",

View File

@ -1106,7 +1106,12 @@ export default {
onclick: ({target}) => {
console.log("[Notification] Click", target);
this.notificationManage.close();
try {window.focus()}catch (e) {}
try {
window.focus()
if (this.$Electron) {
this.$Electron.sendMessage('mainWindowFocus')
}
}catch (e) {}
//
const {tag, data} = target;
if (tag == 'dialog') {
@ -1115,6 +1120,10 @@ export default {
}
this.goForward({name: 'manage-messenger'});
this.$store.dispatch('openDialog', data.dialog_id)
//
if (this.$Electron) {
this.$Electron.sendMessage('mainWindowTop')
}
}
},
});

@ -1 +1 @@
Subproject commit 3c614707aa7879e5855755e59484527fdaea5474
Subproject commit e4787035887d0890ac931ef49173fbd99e5bfce5