From c40dc0fa50cdff3545e724b34bad68fd4027d9dd Mon Sep 17 00:00:00 2001 From: lyswhut Date: Fri, 2 Oct 2020 12:59:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=9A=E5=90=88?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 23 +--------------------- src/renderer/utils/music/wy/musicSearch.js | 5 ++--- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 3be7f95e..d0f62f40 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,25 +1,4 @@ -提前祝大家中秋&国庆快乐~ - -### 新增 - -- 播放控制栏开启/关闭桌面歌词按钮 新增右击按钮时锁定/解锁桌面歌词功能 - -### 优化 - -- 优化我的列表滚动条位置的保存逻辑 -- 更新设置-备份与恢复功能的描述 -- 优化软件内鼠标悬停的提示界面 - ### 修复 -- 修复桌面歌词窗口不允许拖出桌面之外的位置计算偏移Bug -- 修复网易云KTV嗨榜无法加载的问题 -- 修复初始化搜索历史列表功能 -- 修复重启软件后试听列表与收藏列表无法恢复上次的滚动位置的问题 -- 修复歌曲封面无法嵌入的Bug -- 修复酷狗歌词格式问题 -- 修复关闭切换动画时从搜索候选列表点击内容无效的问题 +- 修复聚合搜索的分页问题 -### 其他 - -- 更新 Electron 到 v10.1.3 diff --git a/src/renderer/utils/music/wy/musicSearch.js b/src/renderer/utils/music/wy/musicSearch.js index 78ef0125..6f99b12e 100644 --- a/src/renderer/utils/music/wy/musicSearch.js +++ b/src/renderer/utils/music/wy/musicSearch.js @@ -84,12 +84,11 @@ export default { if (limit != null) this.limit = limit return this.musicSearch(str, page).then(result => { if (!result || result.code !== 200) return this.search(str, page, { limit }, retryNum) - // console.log(result.result) - let list = this.handleResult(result.result.songs) + let list = this.handleResult(result.result.songs || []) if (list == null) return this.search(str, page, { limit }, retryNum) - this.total = result.result.songCount + this.total = result.result.songCount || 0 this.page = page this.allPage = Math.ceil(this.total / this.limit) From 7720b416d525cb9602ab4714fe6558ff8b18d778 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 7 Oct 2020 21:37:02 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 235 +++++++++++++++++++++++++++++----------------- package.json | 16 ++-- 2 files changed, 158 insertions(+), 93 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc783b32..c72c72e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "1.1.2", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -4063,8 +4063,8 @@ }, "atomically": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.3.2.tgz", - "integrity": "sha512-MAiqx5ir1nOoMeG2vLXJnj4oFROJYB1hMqa2aAo6GQVIkPdkIcrq9W9SR0OaRtvEowO7Y2bsXqKFuDMTO4iOAQ==" + "resolved": "https://registry.npm.taobao.org/atomically/download/atomically-1.3.2.tgz", + "integrity": "sha1-chFW5cTwPnaKtU8+bJ3FUNRpB2E=" }, "aws-sign2": { "version": "0.7.0", @@ -5866,8 +5866,8 @@ }, "clone-deep": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "resolved": "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz", + "integrity": "sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c=", "dev": true, "requires": { "is-plain-object": "^2.0.4", @@ -6045,9 +6045,9 @@ } }, "conf": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/conf/-/conf-7.1.1.tgz", - "integrity": "sha512-njOu3so+7zcR1oQzXKP0mpPMKRf+riaaWmxBUhgP/c9k32PuDX/SQ+N6cO6ZylY6NOZGPwgzicGxdlRGXUOkSQ==", + "version": "7.1.2", + "resolved": "https://registry.npm.taobao.org/conf/download/conf-7.1.2.tgz", + "integrity": "sha1-2WeKnY8E3ov1zUdRBdqP2uScLsQ=", "requires": { "ajv": "^6.12.2", "atomically": "^1.3.1", @@ -6062,9 +6062,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.5", + "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz", + "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -6074,23 +6074,23 @@ }, "make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz", + "integrity": "sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8=", "requires": { "semver": "^6.0.0" }, "dependencies": { "semver": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz", + "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=" } } }, "semver": { "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" + "resolved": "https://registry.npm.taobao.org/semver/download/semver-7.3.2.tgz", + "integrity": "sha1-YElisFK4HtB4aq6EOJ/7pw/9OTg=" } } }, @@ -6246,9 +6246,9 @@ "dev": true }, "copy-webpack-plugin": { - "version": "6.1.1", - "resolved": "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-6.1.1.tgz?cache=0&sync_timestamp=1600448449433&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-6.1.1.tgz", - "integrity": "sha1-c3o7ohwWzG3cqXL1z43iVWjKBhY=", + "version": "6.2.0", + "resolved": "https://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-6.2.0.tgz", + "integrity": "sha1-2s0/m25R6CEyoS+jdBCvNezvDJ4=", "dev": true, "requires": { "cacache": "^15.0.5", @@ -6266,7 +6266,7 @@ "dependencies": { "ajv": { "version": "6.12.5", - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600261920612&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz", + "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz", "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=", "dev": true, "requires": { @@ -6392,7 +6392,7 @@ }, "schema-utils": { "version": "2.7.1", - "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1598872175167&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz", + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.1.tgz", "integrity": "sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc=", "dev": true, "requires": { @@ -6929,16 +6929,16 @@ }, "debounce-fn": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz", - "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==", + "resolved": "https://registry.npm.taobao.org/debounce-fn/download/debounce-fn-4.0.0.tgz", + "integrity": "sha1-7XbSBtilDmDeDdZtSU2Cg1/+Ycc=", "requires": { "mimic-fn": "^3.0.0" }, "dependencies": { "mimic-fn": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz", - "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ==" + "version": "3.1.0", + "resolved": "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-3.1.0.tgz?cache=0&sync_timestamp=1596093969209&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-fn%2Fdownload%2Fmimic-fn-3.1.0.tgz", + "integrity": "sha1-ZXVRRbvz42lUuUnBZFBCdFHVynQ=" } } }, @@ -7389,7 +7389,7 @@ "dependencies": { "@types/node": { "version": "12.12.62", - "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.62.tgz?cache=0&sync_timestamp=1600732787803&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.62.tgz", + "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.62.tgz?cache=0&sync_timestamp=1600365423347&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.62.tgz", "integrity": "sha1-czkj1zZpGI01lQJT3RiiFXAIXSs=", "dev": true } @@ -7558,11 +7558,11 @@ } }, "electron-store": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-6.0.0.tgz", - "integrity": "sha512-ujb0a/6gxMxb9vOQ2BjOehK9VCyq5OKvttekd9v/tohA9oBHnAdV+Vxu4eoRh+/F9ShPFhcvDZkMdqO5i+TXUw==", + "version": "6.0.1", + "resolved": "https://registry.npm.taobao.org/electron-store/download/electron-store-6.0.1.tgz", + "integrity": "sha1-IXi53Deut0nZnPnR0bwJCJC5Itw=", "requires": { - "conf": "^7.1.1", + "conf": "^7.1.2", "type-fest": "^0.16.0" } }, @@ -8821,7 +8821,7 @@ "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&sync_timestamp=1600502894812&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz", + "resolved": "https://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz?cache=0&sync_timestamp=1591174870850&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-2.6.9.tgz", "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "requires": { @@ -11030,7 +11030,7 @@ }, "is-plain-obj": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-1.1.0.tgz", "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", "dev": true }, @@ -11273,8 +11273,8 @@ }, "json-schema-typed": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz", - "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A==" + "resolved": "https://registry.npm.taobao.org/json-schema-typed/download/json-schema-typed-7.0.3.tgz", + "integrity": "sha1-I/9IG4tO680soSO0+gQJ5mRpotk=" }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -11572,7 +11572,7 @@ }, "lines-and-columns": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "resolved": "https://registry.npm.taobao.org/lines-and-columns/download/lines-and-columns-1.1.6.tgz", "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", "dev": true }, @@ -11929,9 +11929,9 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "0.11.2", - "resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.11.2.tgz?cache=0&sync_timestamp=1599924011913&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-0.11.2.tgz", - "integrity": "sha1-469NXgT7yq8Rg4qyMFEAcwYLN78=", + "version": "0.12.0", + "resolved": "https://registry.npm.taobao.org/mini-css-extract-plugin/download/mini-css-extract-plugin-0.12.0.tgz", + "integrity": "sha1-3et0/WMEyp+Zwdt0rMfVtQdwVFQ=", "dev": true, "requires": { "loader-utils": "^1.1.0", @@ -11942,7 +11942,7 @@ "dependencies": { "normalize-url": { "version": "1.9.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-1.9.1.tgz", "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", "dev": true, "requires": { @@ -11954,13 +11954,13 @@ }, "prepend-http": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "resolved": "https://registry.npm.taobao.org/prepend-http/download/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", "dev": true }, "schema-utils": { "version": "1.0.0", - "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&sync_timestamp=1598872175167&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", "dev": true, "requires": { @@ -12927,8 +12927,8 @@ }, "pkg-up": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", - "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "resolved": "https://registry.npm.taobao.org/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1589682752621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz", + "integrity": "sha1-EA7CNcwVDk/UJRlBJZaihRKg3vU=", "requires": { "find-up": "^3.0.0" } @@ -13098,13 +13098,13 @@ } }, "postcss-loader": { - "version": "4.0.2", - "resolved": "https://registry.npm.taobao.org/postcss-loader/download/postcss-loader-4.0.2.tgz?cache=0&sync_timestamp=1600187725595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-loader%2Fdownload%2Fpostcss-loader-4.0.2.tgz", - "integrity": "sha1-ueVaYSbuZ7t7lLv8vxqiTGnxEik=", + "version": "4.0.3", + "resolved": "https://registry.npm.taobao.org/postcss-loader/download/postcss-loader-4.0.3.tgz?cache=0&sync_timestamp=1601642425414&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-loader%2Fdownload%2Fpostcss-loader-4.0.3.tgz", + "integrity": "sha1-M39Ru9+wImn7Qvfbn8fwqTwbLj8=", "dev": true, "requires": { "cosmiconfig": "^7.0.0", - "klona": "^2.0.3", + "klona": "^2.0.4", "loader-utils": "^2.0.0", "schema-utils": "^2.7.1", "semver": "^7.3.2" @@ -13112,7 +13112,7 @@ "dependencies": { "ajv": { "version": "6.12.5", - "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600261920612&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz", + "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz", "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=", "dev": true, "requires": { @@ -13141,6 +13141,12 @@ "yaml": "^1.10.0" } }, + "klona": { + "version": "2.0.4", + "resolved": "https://registry.npm.taobao.org/klona/download/klona-2.0.4.tgz?cache=0&sync_timestamp=1600226616064&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fklona%2Fdownload%2Fklona-2.0.4.tgz", + "integrity": "sha1-e7Hjr/sMuGJFR+9+j2cI6i4538A=", + "dev": true + }, "loader-utils": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", @@ -13166,7 +13172,7 @@ }, "schema-utils": { "version": "2.7.1", - "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1598872175167&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz", + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.1.tgz", "integrity": "sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc=", "dev": true, "requires": { @@ -14035,7 +14041,7 @@ }, "query-string": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "resolved": "https://registry.npm.taobao.org/query-string/download/query-string-4.3.4.tgz?cache=0&sync_timestamp=1601654316965&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fquery-string%2Fdownload%2Fquery-string-4.3.4.tgz", "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { @@ -15046,8 +15052,8 @@ }, "shallow-clone": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "resolved": "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz", + "integrity": "sha1-jymBrZJTH1UDWwH7IwdppA4C76M=", "dev": true, "requires": { "kind-of": "^6.0.2" @@ -15294,7 +15300,7 @@ }, "sort-keys": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "resolved": "https://registry.npm.taobao.org/sort-keys/download/sort-keys-1.1.2.tgz", "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { @@ -15634,7 +15640,7 @@ }, "strict-uri-encode": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, @@ -15834,21 +15840,86 @@ } }, "stylus-loader": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", - "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", + "version": "4.1.0", + "resolved": "https://registry.npm.taobao.org/stylus-loader/download/stylus-loader-4.1.0.tgz", + "integrity": "sha1-ezztTRU7qLxzR553XkMM5cYoxoc=", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "lodash.clonedeep": "^4.5.0", - "when": "~3.6.x" + "fast-glob": "^3.2.4", + "klona": "^2.0.4", + "loader-utils": "^2.0.0", + "normalize-path": "^3.0.0", + "schema-utils": "^2.7.1" }, "dependencies": { - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "ajv": { + "version": "6.12.5", + "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.12.5.tgz?cache=0&sync_timestamp=1600886864349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.5.tgz", + "integrity": "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo=", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1595908717940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz", + "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=", "dev": true + }, + "fast-glob": { + "version": "3.2.4", + "resolved": "https://registry.npm.taobao.org/fast-glob/download/fast-glob-3.2.4.tgz?cache=0&sync_timestamp=1592290276588&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-glob%2Fdownload%2Ffast-glob-3.2.4.tgz", + "integrity": "sha1-0grvv5lXk4Pn88xmUpFYybmFVNM=", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npm.taobao.org/glob-parent/download/glob-parent-5.1.1.tgz", + "integrity": "sha1-tsHvQXxOVmPqSY8cRa+saRa7wik=", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "klona": { + "version": "2.0.4", + "resolved": "https://registry.npm.taobao.org/klona/download/klona-2.0.4.tgz?cache=0&sync_timestamp=1600226616064&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fklona%2Fdownload%2Fklona-2.0.4.tgz", + "integrity": "sha1-e7Hjr/sMuGJFR+9+j2cI6i4538A=", + "dev": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", + "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.7.1.tgz", + "integrity": "sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc=", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } } } }, @@ -16445,8 +16516,8 @@ }, "type-fest": { "version": "0.16.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz", - "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==" + "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.16.0.tgz?cache=0&sync_timestamp=1601425309553&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftype-fest%2Fdownload%2Ftype-fest-0.16.0.tgz", + "integrity": "sha1-MkC4kaeLDerpENvrhlU+VSoUiGA=" }, "type-is": { "version": "1.6.18", @@ -16905,9 +16976,9 @@ "dev": true }, "vue-i18n": { - "version": "8.21.1", - "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.21.1.tgz", - "integrity": "sha512-KEakJLI7R6+UCmhJOMZ0K7C+Zf5FcMh7QDkBRaEq39V7d9JgSrTDBf/9HuHU3TaxQYXx4fUi5PTIPdwLXq+iow==" + "version": "8.22.0", + "resolved": "https://registry.npm.taobao.org/vue-i18n/download/vue-i18n-8.22.0.tgz?cache=0&sync_timestamp=1602001179053&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-i18n%2Fdownload%2Fvue-i18n-8.22.0.tgz", + "integrity": "sha1-ZAM4Gm6rHSKeUVpirdspsv86v+0=" }, "vue-loader": { "version": "15.9.3", @@ -16923,9 +16994,9 @@ } }, "vue-router": { - "version": "3.4.5", - "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.5.tgz?cache=0&sync_timestamp=1601131068569&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.5.tgz", - "integrity": "sha1-05bsA3s1kxvdHpt+3Yb5eI3BUXU=" + "version": "3.4.6", + "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz", + "integrity": "sha1-972iyaQ9OYN2IcmgK6d4n12qJLI=" }, "vue-style-loader": { "version": "4.1.2", @@ -17774,9 +17845,9 @@ } }, "webpack-merge": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz", - "integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==", + "version": "5.2.0", + "resolved": "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-5.2.0.tgz?cache=0&sync_timestamp=1602063120051&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-5.2.0.tgz", + "integrity": "sha1-McvMlU+Pic1LBsqNl6OFSffz8Mk=", "dev": true, "requires": { "clone-deep": "^4.0.1", @@ -17816,12 +17887,6 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, - "when": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", - "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", - "dev": true - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -17848,8 +17913,8 @@ }, "wildcard": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", + "resolved": "https://registry.npm.taobao.org/wildcard/download/wildcard-2.0.0.tgz", + "integrity": "sha1-p30g5SAMb6qsl55LOq3Hs91/j+w=", "dev": true }, "window-size": { diff --git a/package.json b/package.json index c7a90d96..6a61f8bb 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "cfonts": "^2.8.6", "chalk": "^4.1.0", "changelog-parser": "^2.8.0", - "copy-webpack-plugin": "^6.1.1", + "copy-webpack-plugin": "^6.2.0", "core-js": "^3.6.5", "cross-env": "^7.0.2", "css-loader": "^4.3.0", @@ -195,9 +195,9 @@ "less": "^3.12.2", "less-loader": "^7.0.1", "markdown-it": "^11.0.1", - "mini-css-extract-plugin": "^0.11.2", + "mini-css-extract-plugin": "^0.12.0", "optimize-css-assets-webpack-plugin": "^5.0.4", - "postcss-loader": "^4.0.2", + "postcss-loader": "^4.0.3", "postcss-pxtorem": "^5.1.1", "pug": "^3.0.0", "pug-loader": "^2.4.0", @@ -206,7 +206,7 @@ "rimraf": "^3.0.2", "spinnies": "^0.5.1", "stylus": "^0.54.8", - "stylus-loader": "^3.0.2", + "stylus-loader": "^4.1.0", "terser-webpack-plugin": "^4.2.2", "url-loader": "^4.1.0", "vue-loader": "^15.9.3", @@ -215,13 +215,13 @@ "webpack-cli": "^3.3.12", "webpack-dev-server": "^3.11.0", "webpack-hot-middleware": "^2.25.0", - "webpack-merge": "^5.1.4" + "webpack-merge": "^5.2.0" }, "dependencies": { "crypto-js": "^4.0.0", "dnscache": "^1.0.2", "electron-log": "^4.2.4", - "electron-store": "^6.0.0", + "electron-store": "^6.0.1", "electron-updater": "^4.3.5", "iconv-lite": "^0.6.2", "image-size": "^0.9.1", @@ -231,8 +231,8 @@ "node-id3": "^0.1.19", "request": "^2.88.2", "vue": "^2.6.12", - "vue-i18n": "^8.21.1", - "vue-router": "^3.4.5", + "vue-i18n": "^8.22.0", + "vue-router": "^3.4.6", "vuex": "^3.5.1", "vuex-router-sync": "^5.0.0" } From 82e047dc660e73d02f832868d149561e911b8f39 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 8 Oct 2020 17:09:26 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E7=BB=84=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 2 +- src/renderer/components/material/Input.vue | 4 ++-- src/renderer/lang/en-us/view/setting.json | 2 +- src/renderer/lang/zh-cn/view/setting.json | 2 +- src/renderer/lang/zh-tw/view/setting.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index d0f62f40..140dab0e 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,4 +1,4 @@ ### 修复 - 修复聚合搜索的分页问题 - +- 修复代理输入框输入的内容不生效的问题 diff --git a/src/renderer/components/material/Input.vue b/src/renderer/components/material/Input.vue index 958bbecf..1f0bf89f 100644 --- a/src/renderer/components/material/Input.vue +++ b/src/renderer/components/material/Input.vue @@ -1,7 +1,7 @@