删除已经过时的api调用方法，修改封装ipc错误

张恒
src/main/services/ipcMain.js
src/main/services/windowManager.js
src/renderer/components/LandingPage.vue
src/renderer/tools/dialog.js
src/renderer/utils/ipcRenderer.js
static/loader.html
--- a/src/main/services/ipcMain.js
查看文件 @d1ee4a0
+++ b/src/main/services/ipcMain.js
查看文件 @d1ee4a0
+import { ipcMain, dialog } from 'electron'
 export default {
-  Mainfunc (ipc, mainWindow, IsUseSysTitle) {
+  Mainfunc (mainWindow, IsUseSysTitle) {
-    ipc.on('IsUseSysTitle', (event) => {
+    ipcMain.on('IsUseSysTitle', (event) => {
       const data = IsUseSysTitle
       event.reply('CisUseSysTitle', data)
     })
-    ipc.on('windows-mini', () => {
+    ipcMain.on('windows-mini', () => {
       mainWindow.minimize()
     })
-    ipc.on('window-max', (event) => {
+    ipcMain.on('window-max', (event) => {
       if (mainWindow.isMaximized()) {
         event.reply('window-confirm', false)
         mainWindow.restore()
@@ -16,8 +17,25 @@ export default {
         mainWindow.maximize()
       }
     })
-    ipc.on('window-close', () => {
+    ipcMain.on('window-close', () => {
       mainWindow.close()
     })
+    ipcMain.on('open-messagebox', (event, arg) => {
+      dialog.showMessageBox(mainWindow, {
+        type: arg.type || 'info',
+        title: arg.title || '',
+        buttons: arg.buttons || [],
+        message: arg.message || '',
+        noLink: arg.noLink || true
+      }).then(res => {
+        event.reply('confirm-message', res)
+      })
+    })
+    ipcMain.on('open-errorbox', (event, arg) => {
+      dialog.showErrorBox(
+        arg.title,
+        arg.message
+      )
+    })
   }
 }
--- a/src/main/services/windowManager.js
查看文件 @d1ee4a0
+++ b/src/main/services/windowManager.js
查看文件 @d1ee4a0
-import { BrowserWindow, Menu, ipcMain } from 'electron'
+import { BrowserWindow, Menu } from 'electron'
 import menuconfig from '../config/menu'
 import config from '@config'
 import setIpc from './ipcMain'
@@ -58,7 +58,7 @@ function createMainWindow () {
   Menu.setApplicationMenu(menu)
   mainWindow.loadURL(winURL)
-  setIpc.Mainfunc(ipcMain, mainWindow, config.IsUseSysTitle)
+  setIpc.Mainfunc(mainWindow, config.IsUseSysTitle)
   upload.Update(mainWindow)
   DownloadUpdate.download(mainWindow)
--- a/src/renderer/components/LandingPage.vue
查看文件 @d1ee4a0
+++ b/src/renderer/components/LandingPage.vue
查看文件 @d1ee4a0
@@ -51,7 +51,6 @@
 <script>
 import SystemInformation from "./LandingPage/SystemInformation";
-import api from "../tools/dialog";
 import ipcApi from "../utils/ipcRenderer";
 export default {
   name: "landing-page",
@@ -62,7 +61,7 @@ export default {
       name: "yyy",
       age: "12"
     },
-    logo:require('@/assets/logo.png').default,
+    logo: require("@/assets/logo.png").default,
     textarray: [],
     percentage: 0,
     colors: [
@@ -91,7 +90,6 @@ export default {
     },
     // 获取数据库的数据
     getdata() {
-      console.log(ne)
       this.$db
         .finddata()
         .then(res => {
@@ -104,22 +102,35 @@ export default {
     // 清空数据库的数据
     deledata() {
       // dialog为electron实例，data则是显示需要的参数，fun是需要执行的函数，此选项不是为必选的
-      const dialog = this.$electron.remote.dialog;
       const data = {
         title: "清除数据",
         buttons: ["确定了！", "才不要，我手滑了"],
         noLink: true,
         message: "此操作会清空本地数据库中的所有数据，是否继续？"
       };
-      const fun = this.$db.deleall({ name: "yyy" });
+      ipcApi.send("open-messagebox", data);
-      api.MessageBox(dialog, data, fun).then(res => {
+      ipcApi.on("confirm-message", (event, arg) => {
+        console.log(arg);
+        if (arg.response === 0) {
+          this.$db.deleall({ name: "yyy" }).then(res => {
+            console.log(res);
+            if (res !== 0) {
               this.getdata();
               this.$message({
-          showClose: true,
                 message: "成功删除" + res + "条",
                 type: "success"
               });
+            } else {
+              let errormsg = {
+                title: "错误",
+                message: "已经没有数据可以被删除！"
+              };
+              ipcApi.send("open-errorbox", errormsg);
+            }
           });
+        }
+      });
+      // api.MessageBox(dialog, data, fun).then(res => {});
       // const data = {
       //   title:'发生致命错误',
       //   message:'?'
@@ -196,7 +207,7 @@ export default {
               this.$alert("下载由于未知原因被中断！", "提示", {
                 confirmButtonText: "重试",
                 callback: action => {
-                ipcApi.send('download-restart')
+                  ipcApi.send("download-restart");
                 }
               });
             }
@@ -220,6 +231,14 @@ export default {
     handleClose() {
       this.dialogVisible = false;
     }
+  },
+  destroyed() {
+    ipcApi.remove("confirm-message");
+    ipcApi.remove("download-done");
+    ipcApi.remove("download-paused");
+    ipcApi.remove("confirm-download");
+    ipcApi.remove("download-progress");
+    ipcApi.remove("download-error");
   }
 };
 </script>
@@ -277,7 +296,7 @@ main > div {
   font-size: 18px;
   margin-bottom: 10px;
 }
-.doc{
+.doc {
   margin-bottom: 20px;
 }
 .doc p {
--- a/src/renderer/tools/dialog.js deleted 100644 → 0
查看文件 @065635c
+++ b/src/renderer/tools/dialog.js deleted 100644 → 0
查看文件 @065635c
-export default {
-  /**
-     * @export
-     * @param {Array} data
-     * @param {Object} dialog
-     * @param {function} fun
-     * @returns
-     * @feature 消息弹窗通用函数
-     */
-  MessageBox (dialog, data, fun) {
-    return new Promise((resolve, reject) => {
-      dialog.showMessageBox({
-        type: 'info',
-        title: data.title,
-        buttons: data.buttons,
-        message: data.message,
-        noLink: data.noLink || false
-      }, index => {
-        if (index === 0) {
-          // eslint-disable-next-line prefer-const
-          let tempfun = async () => {
-            try {
-              resolve(await fun)
-            } catch (error) {
-              reject(error)
-            }
-          }
-          tempfun()
-        }
-      })
-    })
-  },
-  /**
-     * @export
-     * @param {Array} data
-     * @param {Object} dialog
-     * @returns
-     * @feature 错误消息弹窗
-     */
-  ErrorMessageBox (dialog, data) {
-    return dialog.showErrorBox(
-      data.title,
-      data.message
-    )
-  }
-}
--- a/src/renderer/utils/ipcRenderer.js
查看文件 @d1ee4a0
+++ b/src/renderer/utils/ipcRenderer.js
查看文件 @d1ee4a0
 import $electron from 'electron'
 export default {
-  send (data, cb) {
+  send (data, arg, cb) {
-    $electron.ipcRenderer.send(data, (event, arg) => cb(event, arg))
+    $electron.ipcRenderer.send(data, arg, (event, arg) => cb(event, arg))
   },
-  on (data, cb) {
+  on (data, arg, cb) {
-    $electron.ipcRenderer.on(data, (event, arg) => cb(event, arg))
+    $electron.ipcRenderer.on(data, arg, (event, arg) => cb(event, arg))
+  },
+  remove (data) {
+    $electron.ipcRenderer.removeAllListeners(data)
   }
 }
--- a/static/loader.html
查看文件 @d1ee4a0
+++ b/static/loader.html
查看文件 @d1ee4a0
@@ -16,7 +16,7 @@
       background-size: 163px;
       font: 14px/21px Monaco, sans-serif;
       color: #999;
-      font-smoothing: antialiased;
+      -webkit-font-smoothing: antialiased;
       -webkit-text-size-adjust: 100%;
       -moz-text-size-adjust: 100%;
       -ms-text-size-adjust: 100%;