Skip to content

Commit

Permalink
修复更新弹窗的内容显示问题
Browse files Browse the repository at this point in the history
  • Loading branch information
lyswhut committed Aug 16, 2019
1 parent bccadcf commit f4d340f
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 18 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -6,6 +6,12 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
Change log format is based on [Keep a Changelog](http://keepachangelog.com/).

## [0.1.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.1.1...v0.1.2) - 2019-08-17

### 修复

- 修复更新弹窗的内容显示问题

## [0.1.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.1.0...v0.1.1) - 2019-08-17

### 新增
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "lx-music-desktop",
"version": "0.1.1",
"version": "0.1.2",
"description": "一个免费的音乐下载助手",
"main": "./dist/electron/main.js",
"scripts": {
Expand Down
12 changes: 1 addition & 11 deletions publish/changeLog.md
@@ -1,13 +1,3 @@
### 新增

- QQ音乐排行榜直接试听与下载(该接口貌似不太稳定,且用且珍惜!)

### 优化

- 优化http请求机制
- 更新关于本软件说明

### 修复

- 修复当上一个歌曲链接正在获取时切换歌曲请求不会取消的问题
- 修复切换歌曲时仍然播放上一首歌曲的问题
- 修复更新弹窗的内容显示问题
8 changes: 6 additions & 2 deletions publish/version.json
@@ -1,7 +1,11 @@
{
"version": "0.1.1",
"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",
"version": "0.1.2",
"desc": "<h3>修复</h3>\n<ul>\n<li>修复更新弹窗的内容显示问题</li>\n</ul>\n",
"history": [
{
"version": "0.1.1",
"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"
},
{
"version": "0.1.0",
"desc": "0.1.0版本发布"
Expand Down
25 changes: 22 additions & 3 deletions src/renderer/components/material/VersionModal.vue
Expand Up @@ -8,8 +8,8 @@ material-modal(:show="version.showModal" @close="handleClose")
h3 最新版本:{{version.newVersion.version}}
h3 当前版本:{{version.version}}
h3 版本变化:
p(v-html="version.newVersion.desc")
div(:class="$style.history" v-if="history.length")
p(:class="$style.desc" v-html="version.newVersion.desc")
div(:class="[$style.history, $style.desc]" v-if="history.length")
h3 历史版本:
div(:class="$style.item" v-for="ver in history")
h4 v{{ver.version}}
Expand Down Expand Up @@ -73,6 +73,7 @@ export default {
display: flex;
flex-flow: column nowrap;
justify-content: center;
overflow: hidden;
// overflow-y: auto;
* {
box-sizing: border-box;
Expand Down Expand Up @@ -103,20 +104,38 @@ export default {
padding-left: 15px;
}
}
.desc {
h3, h4 {
font-weight: bold;
}
h3 {
padding: 5px 0 3px;
}
ul {
list-style: initial;
padding-inline-start: 30px;
}
}
.history {
h3 {
padding-top: 15px;
}
.item {
h3 {
padding: 5px 0 3px;
}
padding-left: 15px;
+ .item {
padding-top: 15px;
}
h4 {
font-weight: 700;
}
> p {
padding-left: 10px;
padding-left: 15px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/store/mutations.js
Expand Up @@ -16,7 +16,7 @@ export default {
val.history.forEach(ver => {
ver.desc = ver.desc.replace(/\n/g, '<br>')
})
val.desc = val.desc.replace(/\n/g, '<br>')
// val.desc = val.desc.replace(/\n/g, '<br>')
state.version.newVersion = val
},
setVersionVisible(state, val) {
Expand Down

0 comments on commit f4d340f

Please sign in to comment.