添加桌面通知，更新依赖

张恒
dist/electron/.gitkeep
package-lock.json
package.json
src/main/config/menu.js
src/renderer/components/LandingPage.vue
src/renderer/tools/dialog.js
src/renderer/tools/notification.js
--- a/dist/electron/.gitkeep deleted 100644 → 0
查看文件 @a430fe4
+++ b/dist/electron/.gitkeep deleted 100644 → 0
查看文件 @a430fe4
--- a/package-lock.json
查看文件 @70c33f7
+++ b/package-lock.json
查看文件 @70c33f7
@@ -1734,9 +1734,9 @@
       }
     },
     "acorn": {
-      "version": "7.0.0",
+      "version": "7.1.0",
-      "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-7.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-7.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-7.1.0.tgz",
-      "integrity": "sha1-JrjRzZqbcANQtxwJBVRvZNEoTno=",
+      "integrity": "sha1-lJ028sKSU12mAig1hsJHfFfrLWw=",
       "dev": true
     },
     "acorn-jsx": {
@@ -5151,9 +5151,9 @@
       "dev": true
     },
     "eslint": {
-      "version": "6.4.0",
+      "version": "6.5.0",
-      "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-6.4.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/eslint/download/eslint-6.5.0.tgz?cache=0&sync_timestamp=1569733601164&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint%2Fdownload%2Feslint-6.5.0.tgz",
-      "integrity": "sha1-WqkifD++khmCsu2pS6DX+uhYYRo=",
+      "integrity": "sha1-MEYj7skDlp3VyfLWHGzj1uzsh1A=",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -5221,9 +5221,9 @@
           }
         },
         "glob-parent": {
-          "version": "5.0.0",
+          "version": "5.1.0",
-          "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.0.tgz?cache=0&sync_timestamp=1569108917227&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.0.tgz",
-          "integrity": "sha1-HcmfDzmwBtPpLCwoQGg4Lwwg6VQ=",
+          "integrity": "sha1-X0wdHnSNMM1zrSlEs1d6gbCB6MI=",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -6389,6 +6389,15 @@
         "universalify": "^0.1.0"
       }
     },
+    "fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npm.taobao.org/fs-minipass/download/fs-minipass-1.2.7.tgz",
+      "integrity": "sha1-zP+FcIQef+QmVpPaiJNsVa7X98c=",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.6.0"
+      }
+    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
       "resolved": "https://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz",
@@ -8237,7 +8246,7 @@
       "dependencies": {
         "supports-color": {
           "version": "6.1.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
           "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
           "dev": true,
           "requires": {
@@ -9136,6 +9145,43 @@
       "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
+    "minipass": {
+      "version": "2.8.6",
+      "resolved": "https://registry.npm.taobao.org/minipass/download/minipass-2.8.6.tgz",
+      "integrity": "sha1-Yg2Ims4mNWOR0BDsuUWHSd+bbbU=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "minipass-collect": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/minipass-collect/download/minipass-collect-1.0.1.tgz",
+      "integrity": "sha1-ThRTceADIzLTmLsOGL29VrcTFEM=",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.5.1"
+      }
+    },
+    "minipass-flush": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npm.taobao.org/minipass-flush/download/minipass-flush-1.0.4.tgz",
+      "integrity": "sha1-5DJhZJ2n/5udtSntxjW4+DVBF1k=",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.6.2"
+      }
+    },
+    "minipass-pipeline": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npm.taobao.org/minipass-pipeline/download/minipass-pipeline-1.2.1.tgz",
+      "integrity": "sha1-bhlTdvx3/C7re4R2q/f7rQPXbAo=",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.8.1"
+      }
+    },
     "mississippi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -11465,7 +11511,7 @@
     },
     "rxjs": {
       "version": "6.5.3",
-      "resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.3.tgz?cache=0&sync_timestamp=1567543670628&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frxjs%2Fdownload%2Frxjs-6.5.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/rxjs/download/rxjs-6.5.3.tgz?cache=0&sync_timestamp=1568815796923&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frxjs%2Fdownload%2Frxjs-6.5.3.tgz",
       "integrity": "sha1-UQ4mMX9NuRp+sd532d2boKSJmjo=",
       "dev": true,
       "requires": {
@@ -11912,7 +11958,7 @@
     },
     "slice-ansi": {
       "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/slice-ansi/download/slice-ansi-2.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/slice-ansi/download/slice-ansi-2.1.0.tgz?cache=0&sync_timestamp=1568743500638&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fslice-ansi%2Fdownload%2Fslice-ansi-2.1.0.tgz",
       "integrity": "sha1-ys12k0YaY3pXiNkqfdT7oGjoFjY=",
       "dev": true,
       "requires": {
@@ -12955,44 +13001,53 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "2.1.0",
+      "version": "2.1.2",
-      "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.1.2.tgz",
-      "integrity": "sha1-uc7nmaLaK854hUDDc44IG22yjYo=",
+      "integrity": "sha1-K5uBR6bxiRg0ggCADPlWDFD3Abs=",
       "dev": true,
       "requires": {
-        "cacache": "^12.0.3",
+        "cacache": "^13.0.0",
         "find-cache-dir": "^3.0.0",
         "jest-worker": "^24.9.0",
-        "schema-utils": "^2.2.0",
+        "schema-utils": "^2.4.1",
         "serialize-javascript": "^2.1.0",
         "source-map": "^0.6.1",
-        "terser": "^4.3.1",
+        "terser": "^4.3.4",
         "webpack-sources": "^1.4.3"
       },
       "dependencies": {
         "cacache": {
-          "version": "12.0.3",
+          "version": "13.0.0",
-          "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-12.0.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.0.tgz",
-          "integrity": "sha1-vpmruk4b9d9GHNWiwQcfxDJXM5A=",
+          "integrity": "sha1-F5fJV7zd97xpdSCSDjooTmT8Icw=",
           "dev": true,
           "requires": {
-            "bluebird": "^3.5.5",
+            "chownr": "^1.1.2",
-            "chownr": "^1.1.1",
             "figgy-pudding": "^3.5.1",
+            "fs-minipass": "^1.2.7",
             "glob": "^7.1.4",
-            "graceful-fs": "^4.1.15",
+            "graceful-fs": "^4.2.2",
-            "infer-owner": "^1.0.3",
+            "infer-owner": "^1.0.4",
             "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
+            "minipass": "^2.6.5",
+            "minipass-collect": "^1.0.1",
+            "minipass-flush": "^1.0.3",
+            "minipass-pipeline": "^1.1.2",
             "mkdirp": "^0.5.1",
             "move-concurrently": "^1.0.1",
+            "p-map": "^3.0.0",
             "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.3",
+            "rimraf": "^2.7.1",
-            "ssri": "^6.0.1",
+            "ssri": "^7.0.0",
-            "unique-filename": "^1.1.1",
+            "unique-filename": "^1.1.1"
-            "y18n": "^4.0.0"
           }
         },
+        "commander": {
+          "version": "2.20.1",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.20.1.tgz?cache=0&sync_timestamp=1569709401112&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.1.tgz",
+          "integrity": "sha1-OGPOPKktCDHc8qEC9ftLWSav0Pk=",
+          "dev": true
+        },
         "find-cache-dir": {
           "version": "3.0.0",
           "resolved": "https://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-3.0.0.tgz",
@@ -13072,9 +13127,9 @@
           }
         },
         "schema-utils": {
-          "version": "2.2.0",
+          "version": "2.4.1",
-          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.2.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.4.1.tgz?cache=0&sync_timestamp=1569583621807&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.4.1.tgz",
-          "integrity": "sha1-SKBlziGeDKz0YxRzFZA3ssGugto=",
+          "integrity": "sha1-6JreXQVtyLyso3dXS7SpxOG4vlY=",
           "dev": true,
           "requires": {
             "ajv": "^6.10.2",
@@ -13098,6 +13153,27 @@
           "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
           "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
+        },
+        "ssri": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-7.0.0.tgz",
+          "integrity": "sha1-XCIpkQqRtsFhMSqNJgjT6D6CxDE=",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "minipass": "^2.5.1"
+          }
+        },
+        "terser": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.3.4.tgz",
+          "integrity": "sha1-rZG63pVhnjQ0aF1p76Yhpa9fh30=",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.6.1",
+            "source-map-support": "~0.5.12"
+          }
         }
       }
     },
--- a/package.json
查看文件 @70c33f7
+++ b/package.json
查看文件 @70c33f7
@@ -106,7 +106,7 @@
     "electron": "^6.0.10",
     "electron-builder": "^21.2.0",
     "electron-devtools-installer": "^2.2.4",
-    "eslint": "^6.4.0",
+    "eslint": "^6.5.0",
     "eslint-config-standard": "^14.1.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-loader": "^3.0.2",
@@ -125,7 +125,7 @@
     "split2": "^3.1.1",
     "style-loader": "^1.0.0",
     "svg-sprite-loader": "^4.1.6",
-    "terser-webpack-plugin": "^2.1.0",
+    "terser-webpack-plugin": "^2.1.2",
     "through2-filter": "^3.0.0",
     "url-loader": "^2.1.0",
     "vue-html-loader": "^1.2.4",
--- a/src/main/config/menu.js
查看文件 @70c33f7
+++ b/src/main/config/menu.js
查看文件 @70c33f7
 // 这里是定义菜单的地方，详情请查看 https://electronjs.org/docs/api/menu
 const { dialog } = require('electron')
+const os = require('os')
+const version = require('../../../package.json').version
 const menu = [
   {
     label: '设置',
@@ -30,7 +32,10 @@ function info () {
   dialog.showMessageBox({
     title: '关于',
     type: 'info',
-    message: ''
+    message: 'electron-Vue框架',
+    detail: `版本信息：${version}\n引擎版本：${process.versions.v8}\n当前系统：${os.type()} ${os.arch()} ${os.release()}`,
+    noLink: true,
+    buttons: ['查看github', '确定']
   })
 }
 export default menu
--- a/src/renderer/components/LandingPage.vue
查看文件 @70c33f7
+++ b/src/renderer/components/LandingPage.vue
查看文件 @70c33f7
@@ -71,7 +71,8 @@ export default {
       const dialog = this.$electron.remote.dialog;
       const data = {
         title: "清除数据",
-        buttons: ["OK", "Cancel"],
+        buttons: ["确定了！", "才不要，我手滑了"],
+        noLink: true,
         message: "此操作会清空本地数据库中的所有数据，是否继续？"
       };
       const fun = this.$db.deleall({ name: "yyy" });
--- a/src/renderer/tools/dialog.js
查看文件 @70c33f7
+++ b/src/renderer/tools/dialog.js
查看文件 @70c33f7
@@ -13,7 +13,8 @@ export default {
         type: 'info',
         title: data.title,
         buttons: data.buttons,
-        message: data.message
+        message: data.message,
+        noLink: data.noLink || false
       }, index => {
         if (index === 0) {
           // eslint-disable-next-line prefer-const
--- a/src/renderer/tools/notification.js 0 → 100644
查看文件 @70c33f7
+++ b/src/renderer/tools/notification.js 0 → 100644
查看文件 @70c33f7
+/**
+ * @export
+ * @Author: Sky
+ * @Date: 2019-09-29 20:23:16
+ * @Last Modified by: Sky
+ * @Last Modified time: 2019-09-29 21:01:24
+ * @param {Object} option
+ * @returns
+ * @feature 对于普通的通知只需要加入传入title,body；而对于需要图标的还需要传入icon，当然它也接受一个图片链接,当用户点击通知之后，会返回一个true
+ * 由于是一个promise，请使用then接受
+ **/
+
+export default {
+  DesktopMsg (option) {
+    const msgfunc = new window.Notification(option.title, option)
+    return new Promise((resolve) => {
+      msgfunc.onclick = () => {
+        resolve(true)
+      }
+    })
+  }
+}