From 13ca774f8db86de7c47da971cada511b8c94517f Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Thu, 24 Dec 2020 14:57:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DelConfirm=E6=9C=AAreject?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8Del-popover?= =?UTF-8?q?=E4=B8=ADv-slot=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/full/package-lock.json | 36 +++++++++++----------- vue/full/package.json | 2 +- vue/full/src/router/guardian/avoidReuse.js | 2 +- vue/full/src/util/message.js | 17 +++++----- 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/vue/full/package-lock.json b/vue/full/package-lock.json index baf4be1..63351f8 100644 --- a/vue/full/package-lock.json +++ b/vue/full/package-lock.json @@ -4511,8 +4511,8 @@ }, "async-validator": { "version": "1.8.5", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", - "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&sync_timestamp=1605749896979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz", + "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=", "requires": { "babel-runtime": "6.x" } @@ -4617,8 +4617,8 @@ }, "babel-helper-vue-jsx-merge-props": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", - "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==" + "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz", + "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY=" }, "babel-loader": { "version": "8.1.0", @@ -4733,7 +4733,7 @@ }, "babel-runtime": { "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { "core-js": "^2.4.0", @@ -4741,14 +4741,14 @@ }, "dependencies": { "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + "version": "2.6.12", + "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1607215964031&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz", + "integrity": "sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw=" }, "regenerator-runtime": { "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz?cache=0&sync_timestamp=1595456095182&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.11.1.tgz", + "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=" } } }, @@ -6953,9 +6953,9 @@ "dev": true }, "element-ui": { - "version": "2.13.2", - "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.2.tgz", - "integrity": "sha512-r761DRPssMPKDiJZWFlG+4e4vr0cRG/atKr3Eqr8Xi0tQMNbtmYU1QXvFnKiFPFFGkgJ6zS6ASkG+sellcoHlQ==", + "version": "2.14.1", + "resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.14.1.tgz?cache=0&sync_timestamp=1605089928506&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felement-ui%2Fdownload%2Felement-ui-2.14.1.tgz", + "integrity": "sha1-i1dFxzZsHBpgO7bAIShupxh+KqI=", "requires": { "async-validator": "~1.8.1", "babel-helper-vue-jsx-merge-props": "^2.0.0", @@ -9610,7 +9610,7 @@ }, "normalize-wheel": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz", "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" }, "normalize.css": { @@ -11444,8 +11444,8 @@ }, "resize-observer-polyfill": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", - "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" }, "resolve": { "version": "1.13.1", @@ -13081,8 +13081,8 @@ }, "throttle-debounce": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", - "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" + "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz?cache=0&sync_timestamp=1604313880785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthrottle-debounce%2Fdownload%2Fthrottle-debounce-1.1.0.tgz", + "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0=" }, "through2": { "version": "2.0.5", diff --git a/vue/full/package.json b/vue/full/package.json index 24f16a9..33c4979 100644 --- a/vue/full/package.json +++ b/vue/full/package.json @@ -11,7 +11,7 @@ "axios": "^0.19.2", "core-js": "^3.6.5", "decimal.js": "^10.2.0", - "element-ui": "^2.13.2", + "element-ui": "^2.14.1", "file-saver": "^2.0.5", "js-md5": "^0.7.3", "normalize.css": "^8.0.1", diff --git a/vue/full/src/router/guardian/avoidReuse.js b/vue/full/src/router/guardian/avoidReuse.js index d7c6c67..b87e2bd 100644 --- a/vue/full/src/router/guardian/avoidReuse.js +++ b/vue/full/src/router/guardian/avoidReuse.js @@ -16,7 +16,7 @@ export default function (router) { } window.addEventListener('unhandledrejection', event => { - if (event.reason.stack.startsWith('Error: Redirected when going from')) { + if (event.reason.stack && event.reason.stack.startsWith('Error: Redirected when going from')) { event.preventDefault() } }) diff --git a/vue/full/src/util/message.js b/vue/full/src/util/message.js index 39285cc..eabcc6c 100644 --- a/vue/full/src/util/message.js +++ b/vue/full/src/util/message.js @@ -22,16 +22,13 @@ export function elAlert(msg, callback = () => ({})) { } export function elConfirm(msg = '确认进行该操作？', ignoreReject = true) { - const promise = MessageBox.confirm(msg, { - type: 'warning', - cancelButtonClass: 'is-plain' - }) - - if (ignoreReject) { - promise.catch(() => ({})) - } - - return promise + return new Promise(((resolve, reject) => { + MessageBox.confirm(msg, { + type: 'warning', + cancelButtonClass: 'is-plain' + }) + .then(resolve, ignoreReject ? () => ({}) : reject) + })) } export function elPrompt(msg) {