Skip to content

Commit f4d340f

Browse files
committed
修复更新弹窗的内容显示问题
1 parent bccadcf commit f4d340f

6 files changed

Lines changed: 37 additions & 18 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
66
Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
77
Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
88

9+
## [0.1.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.1.1...v0.1.2) - 2019-08-17
10+
11+
### 修复
12+
13+
- 修复更新弹窗的内容显示问题
14+
915
## [0.1.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.1.0...v0.1.1) - 2019-08-17
1016

1117
### 新增

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lx-music-desktop",
3-
"version": "0.1.1",
3+
"version": "0.1.2",
44
"description": "一个免费的音乐下载助手",
55
"main": "./dist/electron/main.js",
66
"scripts": {

publish/changeLog.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
### 新增
2-
3-
- QQ音乐排行榜直接试听与下载(该接口貌似不太稳定,且用且珍惜!)
4-
5-
### 优化
6-
7-
- 优化http请求机制
8-
- 更新关于本软件说明
9-
101
### 修复
112

12-
- 修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题
13-
- 修复切换歌曲时仍然播放上一首歌曲的问题
3+
- 修复更新弹窗的内容显示问题

publish/version.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
{
2-
"version": "0.1.1",
3-
"desc": "<h3>新增</h3>\n<ul>\n<li>QQ音乐排行榜直接试听与下载(该接口貌似不太稳定,且用且珍惜!)</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>优化http请求机制</li>\n<li>更新关于本软件说明</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题</li>\n<li>修复切换歌曲时仍然播放上一首歌曲的问题</li>\n</ul>\n",
2+
"version": "0.1.2",
3+
"desc": "<h3>修复</h3>\n<ul>\n<li>修复更新弹窗的内容显示问题</li>\n</ul>\n",
44
"history": [
5+
{
6+
"version": "0.1.1",
7+
"desc": "<h3>新增</h3>\n<ul>\n<li>QQ音乐排行榜直接试听与下载(该接口貌似不太稳定,且用且珍惜!)</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>优化http请求机制</li>\n<li>更新关于本软件说明</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题</li>\n<li>修复切换歌曲时仍然播放上一首歌曲的问题</li>\n</ul>\n"
8+
},
59
{
610
"version": "0.1.0",
711
"desc": "0.1.0版本发布"

src/renderer/components/material/VersionModal.vue

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ material-modal(:show="version.showModal" @close="handleClose")
88
h3 最新版本:{{version.newVersion.version}}
99
h3 当前版本:{{version.version}}
1010
h3 版本变化:
11-
p(v-html="version.newVersion.desc")
12-
div(:class="$style.history" v-if="history.length")
11+
p(:class="$style.desc" v-html="version.newVersion.desc")
12+
div(:class="[$style.history, $style.desc]" v-if="history.length")
1313
h3 历史版本:
1414
div(:class="$style.item" v-for="ver in history")
1515
h4 v{{ver.version}}
@@ -73,6 +73,7 @@ export default {
7373
display: flex;
7474
flex-flow: column nowrap;
7575
justify-content: center;
76+
overflow: hidden;
7677
// overflow-y: auto;
7778
* {
7879
box-sizing: border-box;
@@ -103,20 +104,38 @@ export default {
103104
padding-left: 15px;
104105
}
105106
}
107+
108+
.desc {
109+
h3, h4 {
110+
font-weight: bold;
111+
}
112+
h3 {
113+
padding: 5px 0 3px;
114+
}
115+
ul {
116+
list-style: initial;
117+
padding-inline-start: 30px;
118+
}
119+
}
120+
106121
.history {
107122
h3 {
108123
padding-top: 15px;
109124
}
110125
111126
.item {
127+
h3 {
128+
padding: 5px 0 3px;
129+
}
130+
padding-left: 15px;
112131
+ .item {
113132
padding-top: 15px;
114133
}
115134
h4 {
116135
font-weight: 700;
117136
}
118137
> p {
119-
padding-left: 10px;
138+
padding-left: 15px;
120139
}
121140
}
122141

src/renderer/store/mutations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default {
1616
val.history.forEach(ver => {
1717
ver.desc = ver.desc.replace(/\n/g, '<br>')
1818
})
19-
val.desc = val.desc.replace(/\n/g, '<br>')
19+
// val.desc = val.desc.replace(/\n/g, '<br>')
2020
state.version.newVersion = val
2121
},
2222
setVersionVisible(state, val) {

0 commit comments

Comments
 (0)