From 5c3f5a76bab5515117cf6e1a96243d18a0437921 Mon Sep 17 00:00:00 2001 From: muwoo <2424880409@qq.com> Date: Wed, 28 Jul 2021 10:36:25 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=90=9C=E7=B4=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 328 ++++++++++++++++++++++++---- package.json | 3 + src/renderer/assets/common/utils.js | 32 +-- src/renderer/store/modules/main.js | 11 +- 4 files changed, 309 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index 047da83..15bd23d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -988,8 +988,7 @@ "ansi-regex": { "version": "3.0.0", "resolved": "http://npmreg.qa.91jkys.com/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, "ansi-styles": { "version": "3.2.1", @@ -1186,8 +1185,7 @@ "aproba": { "version": "1.2.0", "resolved": "http://npmreg.qa.91jkys.com/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=", - "dev": true + "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=" }, "archive-type": { "version": "4.0.0", @@ -1208,7 +1206,6 @@ "version": "1.1.5", "resolved": "http://npmreg.qa.91jkys.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=", - "dev": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -1456,6 +1453,68 @@ } } }, + "aws-sdk": { + "version": "2.955.0", + "resolved": "https://registry.nlark.com/aws-sdk/download/aws-sdk-2.955.0.tgz", + "integrity": "sha1-DUsbPiOkGFJAJhjiWhdegck4c/Y=", + "requires": { + "buffer": "4.9.2", + "events": "1.1.1", + "ieee754": "1.1.13", + "jmespath": "0.15.0", + "querystring": "0.2.0", + "sax": "1.2.1", + "url": "0.10.3", + "uuid": "3.3.2", + "xml2js": "0.4.19" + }, + "dependencies": { + "buffer": { + "version": "4.9.2", + "resolved": "https://registry.npm.taobao.org/buffer/download/buffer-4.9.2.tgz?cache=0&sync_timestamp=1606098073225&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-4.9.2.tgz", + "integrity": "sha1-Iw6tNEACmIZEhBqwJEr4xEu+Pvg=", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + } + }, + "events": { + "version": "1.1.1", + "resolved": "https://registry.nlark.com/events/download/events-1.1.1.tgz", + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" + }, + "ieee754": { + "version": "1.1.13", + "resolved": "https://registry.npm.taobao.org/ieee754/download/ieee754-1.1.13.tgz?cache=0&sync_timestamp=1603838418666&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fieee754%2Fdownload%2Fieee754-1.1.13.tgz", + "integrity": "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q=" + }, + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npm.taobao.org/punycode/download/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" + }, + "sax": { + "version": "1.2.1", + "resolved": "https://registry.npm.taobao.org/sax/download/sax-1.2.1.tgz", + "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=" + }, + "url": { + "version": "0.10.3", + "resolved": "https://registry.npm.taobao.org/url/download/url-0.10.3.tgz", + "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + } + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.nlark.com/uuid/download/uuid-3.3.2.tgz?cache=0&sync_timestamp=1622213136953&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fuuid%2Fdownload%2Fuuid-3.3.2.tgz", + "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=" + } + } + }, "aws-sign2": { "version": "0.7.0", "resolved": "http://npmreg.qa.91jkys.com/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -2780,6 +2839,17 @@ "qs": "6.7.0", "raw-body": "2.4.0", "type-is": "~1.6.17" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz", + "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "bonjour": { @@ -4285,8 +4355,7 @@ "console-control-strings": { "version": "1.1.0", "resolved": "http://npmreg.qa.91jkys.com/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "consolidate": { "version": "0.15.1", @@ -5017,8 +5086,7 @@ "delegates": { "version": "1.0.0", "resolved": "http://npmreg.qa.91jkys.com/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "depd": { "version": "1.1.2", @@ -5060,8 +5128,7 @@ "detect-libc": { "version": "1.0.3", "resolved": "http://npmreg.qa.91jkys.com/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, "detect-node": { "version": "2.1.0", @@ -6618,6 +6685,11 @@ } } }, + "expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npm.taobao.org/expand-template/download/expand-template-2.0.3.tgz", + "integrity": "sha1-bhSz/O4POmNA7LV9LokYaSBSpHw=" + }, "expand-tilde": { "version": "2.0.2", "resolved": "http://npmreg.qa.91jkys.com/expand-tilde/-/expand-tilde-2.0.2.tgz", @@ -7104,7 +7176,6 @@ "version": "2.7.4", "resolved": "http://npmreg.qa.91jkys.com/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -7119,14 +7190,12 @@ "ansi-regex": { "version": "2.1.1", "resolved": "http://npmreg.qa.91jkys.com/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "http://npmreg.qa.91jkys.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7135,7 +7204,6 @@ "version": "1.0.2", "resolved": "http://npmreg.qa.91jkys.com/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7146,7 +7214,6 @@ "version": "3.0.1", "resolved": "http://npmreg.qa.91jkys.com/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7226,6 +7293,11 @@ "resolved": "http://npmreg.qa.91jkys.com/git-clone/-/git-clone-0.1.0.tgz", "integrity": "sha1-DXYWN3gJOu9/HDAjjyqe8/B6Lrk=" }, + "github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npm.taobao.org/github-from-package/download/github-from-package-0.0.0.tgz", + "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" + }, "glob": { "version": "7.1.7", "resolved": "http://npmreg.qa.91jkys.com/glob/-/glob-7.1.7.tgz", @@ -7496,8 +7568,7 @@ "has-unicode": { "version": "2.0.1", "resolved": "http://npmreg.qa.91jkys.com/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "has-value": { "version": "1.0.0", @@ -7929,12 +8000,12 @@ } }, "iconv-lite": { - "version": "0.4.24", - "resolved": "http://npmreg.qa.91jkys.com/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "version": "0.6.3", + "resolved": "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.6.3.tgz", + "integrity": "sha1-pS+AvzjaGVLrXGgXkHGYcaGnJQE=", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "icss-replace-symbols": { @@ -8308,8 +8379,7 @@ "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "http://npmreg.qa.91jkys.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, "is-glob": { "version": "4.0.1", @@ -8612,6 +8682,11 @@ "minimatch": "^3.0.4" } }, + "jmespath": { + "version": "0.15.0", + "resolved": "https://registry.npm.taobao.org/jmespath/download/jmespath-0.15.0.tgz", + "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=" + }, "js-base64": { "version": "2.6.4", "resolved": "http://npmreg.qa.91jkys.com/js-base64/-/js-base64-2.6.4.tgz", @@ -8699,7 +8774,6 @@ "version": "4.0.0", "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz?cache=0&sync_timestamp=1604161844511&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, "requires": { "graceful-fs": "^4.1.6" } @@ -9173,6 +9247,11 @@ "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", "dev": true }, + "lodash.set": { + "version": "4.3.2", + "resolved": "https://registry.npm.taobao.org/lodash.set/download/lodash.set-4.3.2.tgz", + "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=" + }, "lodash.some": { "version": "4.6.0", "resolved": "http://npmreg.qa.91jkys.com/lodash.some/-/lodash.some-4.6.0.tgz", @@ -9715,6 +9794,33 @@ "minimist": "^1.2.5" } }, + "mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npm.taobao.org/mkdirp-classic/download/mkdirp-classic-0.5.3.tgz", + "integrity": "sha1-+hDJEVzG2IZb4iG6R+6b7XhgERM=" + }, + "mock-aws-s3": { + "version": "4.0.2", + "resolved": "https://registry.nlark.com/mock-aws-s3/download/mock-aws-s3-4.0.2.tgz", + "integrity": "sha1-QLHZhLa4l/FXIkwtxlh0rDRLbMg=", + "requires": { + "bluebird": "^3.5.1", + "fs-extra": "^7.0.1", + "underscore": "1.12.1" + }, + "dependencies": { + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-7.0.1.tgz", + "integrity": "sha1-TxicRKoSO4lfcigE9V6iPq3DSOk=", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } + } + }, "moment": { "version": "2.29.1", "resolved": "http://npmreg.qa.91jkys.com/moment/-/moment-2.29.1.tgz", @@ -9930,9 +10036,7 @@ "nan": { "version": "2.14.2", "resolved": "http://npmreg.qa.91jkys.com/nan/-/nan-2.14.2.tgz", - "integrity": "sha1-9TdkAGlRaPTMaUrJOT0MlYXu6hk=", - "dev": true, - "optional": true + "integrity": "sha1-9TdkAGlRaPTMaUrJOT0MlYXu6hk=" }, "nanomatch": { "version": "1.2.13", @@ -9976,6 +10080,11 @@ "resolved": "http://npmreg.qa.91jkys.com/nanopop/-/nanopop-2.1.0.tgz", "integrity": "sha1-I0dlE87iQFiIr9LopLVAZrcLnmA=" }, + "napi-build-utils": { + "version": "1.0.2", + "resolved": "https://registry.npm.taobao.org/napi-build-utils/download/napi-build-utils-1.0.2.tgz", + "integrity": "sha1-sf3cCyxG44Cgt6dvmE3UfEGhOAY=" + }, "natives": { "version": "1.1.6", "resolved": "http://npmreg.qa.91jkys.com/natives/-/natives-1.1.6.tgz", @@ -10010,6 +10119,15 @@ "ms": "^2.1.1" } }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz", + "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, "ms": { "version": "2.1.3", "resolved": "http://npmreg.qa.91jkys.com/ms/-/ms-2.1.3.tgz", @@ -10045,11 +10163,36 @@ "lower-case": "^1.1.1" } }, + "nock": { + "version": "13.1.1", + "resolved": "https://registry.nlark.com/nock/download/nock-13.1.1.tgz", + "integrity": "sha1-PIMBKdRWCVf1m29ICkHduvnPV68=", + "requires": { + "debug": "^4.1.0", + "json-stringify-safe": "^5.0.1", + "lodash.set": "^4.3.2", + "propagate": "^2.0.0" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.nlark.com/debug/download/debug-4.3.2.tgz?cache=0&sync_timestamp=1625374675284&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdebug%2Fdownload%2Fdebug-4.3.2.tgz", + "integrity": "sha1-8KScGKyHeeMdSgxgKd+3aHPHQos=", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz?cache=0&sync_timestamp=1607433872491&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.1.2.tgz", + "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=" + } + } + }, "node-abi": { "version": "2.30.0", "resolved": "http://npmreg.qa.91jkys.com/node-abi/-/node-abi-2.30.0.tgz", "integrity": "sha1-i+U78+eUWjTuoQ4PyaWYJ3bPVQs=", - "dev": true, "requires": { "semver": "^5.4.1" }, @@ -10057,8 +10200,7 @@ "semver": { "version": "5.7.1", "resolved": "http://npmreg.qa.91jkys.com/semver/-/semver-5.7.1.tgz", - "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=", - "dev": true + "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=" } } }, @@ -10369,7 +10511,6 @@ "version": "4.1.2", "resolved": "http://npmreg.qa.91jkys.com/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", - "dev": true, "requires": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", @@ -11809,6 +11950,37 @@ "uniqs": "^2.0.0" } }, + "prebuild-install": { + "version": "6.1.3", + "resolved": "https://registry.nlark.com/prebuild-install/download/prebuild-install-6.1.3.tgz", + "integrity": "sha1-jqH51zhqCzD37yAkfjb4srgoJaI=", + "requires": { + "detect-libc": "^1.0.3", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^2.21.0", + "npmlog": "^4.0.1", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^3.0.3", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + }, + "dependencies": { + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz", + "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=", + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } + } + }, "prepend-http": { "version": "2.0.0", "resolved": "http://npmreg.qa.91jkys.com/prepend-http/-/prepend-http-2.0.0.tgz", @@ -11923,6 +12095,11 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, + "propagate": { + "version": "2.0.1", + "resolved": "https://registry.npm.taobao.org/propagate/download/propagate-2.0.1.tgz", + "integrity": "sha1-QM3tqxgIXHkjNOZPCsFyVtOPmkU=" + }, "proto-list": { "version": "1.2.4", "resolved": "http://npmreg.qa.91jkys.com/proto-list/-/proto-list-1.2.4.tgz", @@ -12224,8 +12401,7 @@ "querystring": { "version": "0.2.0", "resolved": "http://npmreg.qa.91jkys.com/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" }, "querystring-es3": { "version": "0.2.1", @@ -12288,6 +12464,17 @@ "http-errors": "1.7.2", "iconv-lite": "0.4.24", "unpipe": "1.0.0" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz", + "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "rc": { @@ -12886,6 +13073,14 @@ } } }, + "robotjs": { + "version": "git+https://github.com/Toinane/robotjs.git#66bf4fe6206d25400eed6090f9e68326faf3c18a", + "from": "git+https://github.com/Toinane/robotjs.git", + "requires": { + "nan": "^2.14.2", + "prebuild-install": "^6.1.2" + } + }, "run-queue": { "version": "1.0.3", "resolved": "http://npmreg.qa.91jkys.com/run-queue/-/run-queue-1.0.3.tgz", @@ -12926,8 +13121,7 @@ "sax": { "version": "1.2.4", "resolved": "http://npmreg.qa.91jkys.com/sax/-/sax-1.2.4.tgz", - "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", - "dev": true + "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=" }, "seek-bzip": { "version": "1.0.6", @@ -13115,8 +13309,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "http://npmreg.qa.91jkys.com/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-value": { "version": "2.0.1", @@ -13192,6 +13385,36 @@ "resolved": "http://npmreg.qa.91jkys.com/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha1-oUEMLt2PB3sItOJTyOrPyvBXRhw=" }, + "simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/simple-concat/download/simple-concat-1.0.1.tgz", + "integrity": "sha1-9Gl2CCujXCJj8cirXt/ibEHJVS8=" + }, + "simple-get": { + "version": "3.1.0", + "resolved": "https://registry.npm.taobao.org/simple-get/download/simple-get-3.1.0.tgz", + "integrity": "sha1-tFvgYkNeUNFZVAtXYgLO7EC5xrM=", + "requires": { + "decompress-response": "^4.2.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + }, + "dependencies": { + "decompress-response": { + "version": "4.2.1", + "resolved": "https://registry.npm.taobao.org/decompress-response/download/decompress-response-4.2.1.tgz?cache=0&sync_timestamp=1613125479486&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdecompress-response%2Fdownload%2Fdecompress-response-4.2.1.tgz", + "integrity": "sha1-QUAjzHowLaJc4uyC0NUjjMr9iYY=", + "requires": { + "mimic-response": "^2.0.0" + } + }, + "mimic-response": { + "version": "2.1.0", + "resolved": "https://registry.npm.taobao.org/mimic-response/download/mimic-response-2.1.0.tgz", + "integrity": "sha1-0Tdj019hPQnsN+uzC6wEacDuj0M=" + } + } + }, "single-line-log": { "version": "1.1.2", "resolved": "https://registry.npm.taobao.org/single-line-log/download/single-line-log-1.1.2.tgz", @@ -13823,7 +14046,6 @@ "version": "2.1.1", "resolved": "http://npmreg.qa.91jkys.com/string-width/-/string-width-2.1.1.tgz", "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", - "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -13861,7 +14083,6 @@ "version": "4.0.0", "resolved": "http://npmreg.qa.91jkys.com/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, "requires": { "ansi-regex": "^3.0.0" } @@ -14647,6 +14868,11 @@ "through": "^2.3.8" } }, + "underscore": { + "version": "1.12.1", + "resolved": "https://registry.nlark.com/underscore/download/underscore-1.12.1.tgz", + "integrity": "sha1-e7jMmz05fiAc+FUzNtJiVE6tgp4=" + }, "union-value": { "version": "1.0.1", "resolved": "http://npmreg.qa.91jkys.com/union-value/-/union-value-1.0.1.tgz", @@ -14701,8 +14927,7 @@ "universalify": { "version": "0.1.2", "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz?cache=0&sync_timestamp=1603180042770&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-0.1.2.tgz", - "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=", - "dev": true + "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY=" }, "unpipe": { "version": "1.0.0", @@ -16176,7 +16401,6 @@ "version": "1.1.3", "resolved": "http://npmreg.qa.91jkys.com/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=", - "dev": true, "requires": { "string-width": "^1.0.2 || 2" } @@ -16313,6 +16537,22 @@ "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=", "dev": true }, + "xml2js": { + "version": "0.4.19", + "resolved": "https://registry.nlark.com/xml2js/download/xml2js-0.4.19.tgz", + "integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=", + "requires": { + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" + }, + "dependencies": { + "xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" + } + } + }, "xmlbuilder": { "version": "15.1.1", "resolved": "http://npmreg.qa.91jkys.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz", diff --git a/package.json b/package.json index b5f082f..81cb99b 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ }, "dependencies": { "ant-design-vue": "^1.7.5", + "aws-sdk": "^2.955.0", "axios": "^0.18.1", "bplist-parser": "^0.3.0", "download": "^8.0.0", @@ -70,6 +71,8 @@ "marked": "^2.0.7", "md5": "^2.3.0", "mime-types": "^2.1.31", + "mock-aws-s3": "^4.0.2", + "nock": "^13.1.1", "node-fetch": "^2.6.1", "puppeteer-core": "^10.0.0", "puppeteer-in-electron": "^3.0.3", diff --git a/src/renderer/assets/common/utils.js b/src/renderer/assets/common/utils.js index 84a308f..3557d48 100644 --- a/src/renderer/assets/common/utils.js +++ b/src/renderer/assets/common/utils.js @@ -229,32 +229,24 @@ APP_FINDER_PATH.forEach((searchPath, index) => { icon: img.toDataURL(), desc: path.join(searchPath, appName), type: 'app', - action: `open ${path.join(searchPath, appName).replace(' ', '\\ ')}` + action: `open ${path.join(searchPath, appName).replace(' ', '\\ ')}`, + keyWords: [appSubStr] }; + if (appZhName && isZhRegex.test(appZhName)) { + const pinyinArr = pinyin(appZhName, { style: pinyin.STYLE_NORMAL }); + // pinyinArr = [['pin'], ['yin']] + const firstLetterArr = pinyinArr.map((str) => str[0][0]); + fileOptions.keyWords.push(appZhName); + fileOptions.keyWords.push(pinyinArr.join('')); + fileOptions.keyWords.push(firstLetterArr.join('')); + } + fileLists.push({ ...fileOptions, name: appSubStr, - keyWord: appSubStr + names: JSON.parse(JSON.stringify(fileOptions.keyWords)), }); - - if (appZhName && isZhRegex.test(appZhName)) { - let cmds = []; - const pinyinArr = pinyin(appZhName, { style: pinyin.STYLE_NORMAL }); - // pinyinArr = [['pin'], ['yin']] - const firstLetterArr = pinyinArr.map((str) => str[0][0]); - cmds.push(appZhName); - cmds.push(pinyinArr.join('')); - cmds.push(firstLetterArr.join('')); - - cmds.forEach((cmd) => { - fileLists.push({ - ...fileOptions, - name: appZhName, - keyWord: cmd - }); - }); - } } catch (e) {} } } diff --git a/src/renderer/store/modules/main.js b/src/renderer/store/modules/main.js index f1e878a..252ab97 100644 --- a/src/renderer/store/modules/main.js +++ b/src/renderer/store/modules/main.js @@ -214,7 +214,16 @@ const actions = { .filter((plugin) => { if (!descMap.get(plugin)) { descMap.set(plugin, true); - return plugin.keyWord.toLocaleUpperCase().indexOf(value.toLocaleUpperCase()) >= 0; + let has = false; + plugin.keyWords.some(keyWord => { + if (keyWord.toLocaleUpperCase().indexOf(value.toLocaleUpperCase()) >= 0) { + has = keyWord; + plugin.name = keyWord; + return true; + } + return false; + }); + return has; } else { return false; }