新增`显示切换动画`设置

pull/389/head
lyswhut 2020-08-24 00:44:55 +08:00
parent 669c1fe490
commit b453a8934f
11 changed files with 36 additions and 7 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "lx-music-desktop", "name": "lx-music-desktop",
"version": "1.0.1", "version": "1.1.0",
"description": "一个免费的音乐下载助手", "description": "一个免费的音乐下载助手",
"main": "./dist/electron/main.js", "main": "./dist/electron/main.js",
"productName": "lx-music-desktop", "productName": "lx-music-desktop",

View File

@ -1,8 +1,9 @@
### 新增 ### 新增
- 在歌单详情界面新增播放当前歌单按钮、收藏歌单按钮 - 在歌单详情界面新增播放当前歌单按钮、收藏歌单按钮,注:播放歌单不会将歌曲添加到试听列表
- 新增`不允许将歌词窗口拖出主屏幕之外`的设置项,默认开启,在连接多个屏幕时想要拖动到其他屏幕时可关闭此设置 - 新增`不允许将歌词窗口拖出主屏幕之外`的设置项,默认开启,在连接多个屏幕时想要拖动到其他屏幕时可关闭此设置
- 新增`显示歌词翻译`设置,默认开启,仅支持某些平台,注:无论该设置是否开启,嵌入或下载歌词时都不会带上翻译 - 新增`显示歌词翻译`设置,默认开启,仅支持某些平台,注:无论该设置是否开启,嵌入或下载歌词时都不会带上翻译
- 新增`显示切换动画`设置,默认开启,关闭时将基本禁用软件内的所有切换动画
### 修复 ### 修复
@ -22,4 +23,4 @@
### 其他 ### 其他
- 个性electron到 9.2.1 - 更新electron到 9.2.1

View File

@ -3,7 +3,7 @@ const os = require('os')
const { isMac } = require('./utils') const { isMac } = require('./utils')
const defaultSetting = { const defaultSetting = {
version: '1.0.36', version: '1.0.38',
player: { player: {
togglePlayMethod: 'listLoop', togglePlayMethod: 'listLoop',
highQuality: false, highQuality: false,
@ -88,6 +88,7 @@ const defaultSetting = {
sourceId: 'kw', sourceId: 'kw',
apiSource: 'temp', apiSource: 'temp',
sourceNameType: 'alias', sourceNameType: 'alias',
isShowAnimation: true,
randomAnimate: true, randomAnimate: true,
ignoreVersion: null, ignoreVersion: null,
isAgreePact: false, isAgreePact: false,

View File

@ -119,7 +119,6 @@ export default {
}, },
methods: { methods: {
handleUpdateConfig({ config, languageId, isShowLyricTransition }) { handleUpdateConfig({ config, languageId, isShowLyricTransition }) {
console.log(isShowLyricTransition)
this.lrcConfig = config this.lrcConfig = config
this.isShowLyricTransition = isShowLyricTransition this.isShowLyricTransition = isShowLyricTransition
if (this.$i18n.locale !== languageId && languageId != null) this.$i18n.locale = languageId if (this.$i18n.locale !== languageId && languageId != null) this.$i18n.locale = languageId

View File

@ -135,6 +135,20 @@ export default {
'windowSizeActive.fontSize'(n) { 'windowSizeActive.fontSize'(n) {
document.documentElement.style.fontSize = n document.documentElement.style.fontSize = n
}, },
'setting.isShowAnimation': {
handler(n) {
if (n) {
if (document.body.classList.contains('disableAnimation')) {
document.body.classList.remove('disableAnimation')
}
} else {
if (!document.body.classList.contains('disableAnimation')) {
document.body.classList.add('disableAnimation')
}
}
},
immediate: true,
},
}, },
methods: { methods: {
...mapActions(['getVersionInfo']), ...mapActions(['getVersionInfo']),
@ -354,6 +368,11 @@ body {
box-sizing: border-box; box-sizing: border-box;
} }
.disableAnimation * {
transition: none !important;
animation: none !important;
}
.transparent { .transparent {
padding: @shadow-app; padding: @shadow-app;
#container { #container {

View File

@ -526,7 +526,7 @@ export default {
padding: 8px 0; padding: 8px 0;
line-height: 1.2; line-height: 1.2;
overflow-wrap: break-word; overflow-wrap: break-word;
transition: @transition-theme; transition: @transition-theme !important;
transition-property: color, font-size; transition-property: color, font-size;
} }
} }

View File

@ -1,6 +1,7 @@
{ {
"basic": "General", "basic": "General",
"basic_theme": "Theme", "basic_theme": "Theme",
"basic_show_animation": "Show switching animation",
"basic_animation_title": "Animation effect of the pop-up layer", "basic_animation_title": "Animation effect of the pop-up layer",
"basic_animation": "Random pop-up animation", "basic_animation": "Random pop-up animation",
"basic_source_title": "Choose a music source", "basic_source_title": "Choose a music source",

View File

@ -3,6 +3,7 @@
"basic_theme": "主题颜色", "basic_theme": "主题颜色",
"basic_animation_title": "弹出层的动画效果", "basic_animation_title": "弹出层的动画效果",
"basic_animation": "弹出层随机动画", "basic_animation": "弹出层随机动画",
"basic_show_animation": "显示切换动画",
"basic_source_title": "选择音乐来源", "basic_source_title": "选择音乐来源",
"basic_source_test": "测试接口(几乎软件的所有功能都可用)", "basic_source_test": "测试接口(几乎软件的所有功能都可用)",
"basic_source_temp": "临时接口(软件的某些功能不可用,建议测试接口不可用再使用本接口)", "basic_source_temp": "临时接口(软件的某些功能不可用,建议测试接口不可用再使用本接口)",

View File

@ -3,6 +3,7 @@
"basic_theme": "主題顏色", "basic_theme": "主題顏色",
"basic_animation_title": "彈出層的動畫效果", "basic_animation_title": "彈出層的動畫效果",
"basic_animation": "彈出層隨機動畫", "basic_animation": "彈出層隨機動畫",
"basic_show_animation": "顯示切換動畫",
"basic_source_title": "選擇音樂來源", "basic_source_title": "選擇音樂來源",
"basic_source_test": "測試接口(幾乎軟件的所有功能都可用)", "basic_source_test": "測試接口(幾乎軟件的所有功能都可用)",
"basic_source_temp": "臨時接口(軟件的某些功能不可用,建議測試接口不可用再使用本接口)", "basic_source_temp": "臨時接口(軟件的某些功能不可用,建議測試接口不可用再使用本接口)",

View File

@ -78,7 +78,7 @@ export default {
return arr.join('、') return arr.join('、')
}, },
filterData(rawList) { filterData(rawList) {
console.log(rawList) // console.log(rawList)
let ids = new Set() let ids = new Set()
const list = [] const list = []
rawList.forEach(songData => { rawList.forEach(songData => {

View File

@ -10,6 +10,11 @@ div.scroll(:class="$style.setting")
span span
label {{$t('store.state.theme_' + theme.class)}} label {{$t('store.state.theme_' + theme.class)}}
dd
h3 {{$t('view.setting.basic_show_animation')}}
div
material-checkbox(id="setting_show_animate" v-model="current_setting.isShowAnimation" :label="$t('view.setting.is_show')")
dd(:title="$t('view.setting.basic_animation_title')") dd(:title="$t('view.setting.basic_animation_title')")
h3 {{$t('view.setting.basic_animation')}} h3 {{$t('view.setting.basic_animation')}}
div div
@ -454,6 +459,7 @@ export default {
langId: 'cns', langId: 'cns',
themeId: 0, themeId: 0,
sourceId: 0, sourceId: 0,
isShowAnimation: true,
randomAnimate: true, randomAnimate: true,
isAgreePact: false, isAgreePact: false,
controlBtnPosition: 'left', controlBtnPosition: 'left',