From 46aacba037d662860013a761811e680ece9225bf Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 27 Oct 2019 11:58:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E6=9C=89=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E6=97=B6=E7=A8=8B=E5=BA=8F=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 20 ++++++++++---------- publish/changeLog.md | 8 +------- src/main/utils/index.js | 2 +- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 394ae906..3b475b88 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "0.7.0", + "version": "0.9.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1676,7 +1676,7 @@ "dependencies": { "inherits": { "version": "2.0.1", - "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz", + "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz?cache=0&sync_timestamp=1560975547815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finherits%2Fdownload%2Finherits-2.0.1.tgz", "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", "dev": true }, @@ -2993,7 +2993,7 @@ }, "buffer": { "version": "4.9.1", - "resolved": "https://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz", + "resolved": "https://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, "requires": { @@ -12032,7 +12032,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npm.taobao.org/sha.js/download/sha.js-2.4.11.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsha.js%2Fdownload%2Fsha.js-2.4.11.tgz", + "resolved": "https://registry.npm.taobao.org/sha.js/download/sha.js-2.4.11.tgz", "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=", "dev": true, "requires": { @@ -13700,7 +13700,7 @@ "dependencies": { "inherits": { "version": "2.0.3", - "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz", + "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz?cache=0&sync_timestamp=1560975547815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finherits%2Fdownload%2Finherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true } @@ -13989,13 +13989,13 @@ "dependencies": { "acorn": { "version": "6.3.0", - "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.3.0.tgz", + "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.3.0.tgz", "integrity": "sha1-AIdQkRn/pPwKAEHR6TpBfmjLhW4=", "dev": true }, "cacache": { "version": "12.0.3", - "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.3.tgz", + "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", "integrity": "sha1-vpmruk4b9d9GHNWiwQcfxDJXM5A=", "dev": true, "requires": { @@ -14018,7 +14018,7 @@ }, "eslint-scope": { "version": "4.0.3", - "resolved": "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.3.tgz", + "resolved": "https://registry.npm.taobao.org/eslint-scope/download/eslint-scope-4.0.3.tgz?cache=0&sync_timestamp=1563679289211&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-scope%2Fdownload%2Feslint-scope-4.0.3.tgz", "integrity": "sha1-ygODMxD2iJoyZHgaqC5j65z+eEg=", "dev": true, "requires": { @@ -14046,7 +14046,7 @@ }, "terser-webpack-plugin": { "version": "1.4.1", - "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.1.tgz", + "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-1.4.1.tgz", "integrity": "sha1-YbGOQOruW+l+dxzbsQ7RKAiIwrQ=", "dev": true, "requires": { @@ -14063,7 +14063,7 @@ }, "webpack-sources": { "version": "1.4.3", - "resolved": "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1568302837530&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz", + "resolved": "https://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz", "integrity": "sha1-7t2OwLko+/HL/plOItLYkPMwqTM=", "dev": true, "requires": { diff --git a/publish/changeLog.md b/publish/changeLog.md index c2054ff4..4d2ffee6 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,9 +1,3 @@ -#### 新增 - -- 新增窗口大小设置，若觉得软件窗口小可以到设置页调大点 -- 新增定位当前播放歌曲，点击播放栏左侧的**歌曲图片**可在播放列表定位当前播放的歌曲（该功能对播放下载列表的歌曲无效） - #### 修复 -- 修复搜索提示失效的问题 -- 修复从歌单或列表点击搜索按钮搜索目标歌曲时，搜索框未聚焦仍然弹出候选搜索列表的问题 +- 修复没有配置文件时程序启动出错的问题 diff --git a/src/main/utils/index.js b/src/main/utils/index.js index edea2bda..cc9f65b9 100644 --- a/src/main/utils/index.js +++ b/src/main/utils/index.js @@ -3,6 +3,6 @@ const { windowSizeList } = require('../../common/config') exports.getWindowSizeInfo = () => { let electronStore = new Store() - const { windowSizeId = 1 } = electronStore.get('setting') + const { windowSizeId = 1 } = electronStore.get('setting') || {} return windowSizeList.find(i => i.id === windowSizeId) || windowSizeList[0] }