diff --git a/postcss.config.js b/postcss.config.js index 0345089b..50a10650 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -7,21 +7,14 @@ module.exports = { rootValue: 16, unitPrecision: 5, propList: [ - 'font', - 'font-size', + 'font', 'font-size', 'line-height', 'letter-spacing', 'padding', 'margin', - 'height', - 'width', - 'max-width', - 'max-height', - 'min-width', - 'min-height', - 'top', - 'left', - 'bottom', - 'right', + 'height', 'width', + 'max-width', 'max-height', + 'min-width', 'min-height', + 'top', 'left', 'bottom', 'right', 'border-radius', ], selectorBlackList: ['html'], diff --git a/publish/changeLog.md b/publish/changeLog.md index b9c5c31a..1714aeef 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -5,6 +5,7 @@ - 新增启动参数`search`,使用例子:`.\lx-music-desktop.exe -search="突然的自我 - 伍佰"` - 新增音频输出设置 - 新增软件内的包括字体在内的界面内容大小调整,现在当窗口大小切换到“较小/大/较大”时,软件内的元素将会适当减小或加大,窗口大小的“小”与“中”内的元素将保持之前的大小暂不做改变 +- 新增音源别名,默认将显示别名,想要显示回原名可到设置切换(免责声明:别名仅是本软件用于描述各音源的标签,其名字归版权方所有) ### 优化 diff --git a/src/renderer/components/material/Select.vue b/src/renderer/components/material/Select.vue index 97481211..8fb93542 100644 --- a/src/renderer/components/material/Select.vue +++ b/src/renderer/components/material/Select.vue @@ -95,6 +95,7 @@ export default { .list { position: absolute; + width: 100%; top: 100%; left: 0; border-bottom: 2px solid @color-tab-border-bottom; diff --git a/src/renderer/lang/cns/store/state.json b/src/renderer/lang/cns/store/state.json index 5d4d039e..05bf9ff8 100644 --- a/src/renderer/lang/cns/store/state.json +++ b/src/renderer/lang/cns/store/state.json @@ -17,5 +17,14 @@ "source_mg": "咪咕音乐", "source_bd": "百度音乐", - "source_all": "聚合搜索" + "source_all": "聚合搜索", + + "source_alias_kw": "小蜗音乐", + "source_alias_kg": "小枸音乐", + "source_alias_tx": "小秋音乐", + "source_alias_wy": "小芸音乐", + "source_alias_mg": "小蜜音乐", + "source_alias_bd": "小杜音乐", + + "source_alias_all": "聚合大会" } diff --git a/src/renderer/lang/cns/view/setting.json b/src/renderer/lang/cns/view/setting.json index cab151a1..ba5b0ea6 100644 --- a/src/renderer/lang/cns/view/setting.json +++ b/src/renderer/lang/cns/view/setting.json @@ -7,6 +7,10 @@ "basic_source_test": "测试接口(几乎软件的所有功能都可用)", "basic_source_temp": "临时接口(软件的某些功能不可用,建议测试接口不可用再使用本接口)", "basic_source": "音乐来源", + "basic_sourcename_title": "选择音源名字类型", + "basic_sourcename_real": "原名", + "basic_sourcename_alias": "别名", + "basic_sourcename": "音源名字", "basic_window_size_title": "设置软件窗口尺寸", "basic_window_size": "窗口尺寸", "basic_window_size_smaller": "较小", diff --git a/src/renderer/lang/cnt/store/state.json b/src/renderer/lang/cnt/store/state.json index 75fe7391..4e6f68c7 100644 --- a/src/renderer/lang/cnt/store/state.json +++ b/src/renderer/lang/cnt/store/state.json @@ -15,5 +15,12 @@ "source_wy": "網易音樂", "source_mg": "咪咕音樂", "source_bd": "百度音樂", - "source_all": "聚合搜索" + "source_all": "聚合搜索", + "source_alias_kw": "小蝸音樂", + "source_alias_kg": "小枸音樂", + "source_alias_tx": "小秋音樂", + "source_alias_wy": "小芸音樂", + "source_alias_mg": "小蜜音樂", + "source_alias_bd": "小杜音樂", + "source_alias_all": "聚合大會" } diff --git a/src/renderer/lang/cnt/view/setting.json b/src/renderer/lang/cnt/view/setting.json index 5f039c9e..8e84c792 100644 --- a/src/renderer/lang/cnt/view/setting.json +++ b/src/renderer/lang/cnt/view/setting.json @@ -7,6 +7,10 @@ "basic_source_test": "測試接口(幾乎軟件的所有功能都可用)", "basic_source_temp": "臨時接口(軟件的某些功能不可用,建議測試接口不可用再使用本接口)", "basic_source": "音樂來源", + "basic_sourcename_title": "選擇音源名字類型", + "basic_sourcename_real": "原名", + "basic_sourcename_alias": "別名", + "basic_sourcename": "音源名字", "basic_window_size_title": "設置軟件窗口尺寸", "basic_window_size": "窗口尺寸", "basic_window_size_smaller": "較小", diff --git a/src/renderer/lang/en/store/state.json b/src/renderer/lang/en/store/state.json index 65ba615b..93538104 100644 --- a/src/renderer/lang/en/store/state.json +++ b/src/renderer/lang/en/store/state.json @@ -16,5 +16,14 @@ "source_wy": "Netease", "source_mg": "Migu", "source_bd": "Baidu", - "source_all": "Aggregated" + "source_all": "Aggregated", + + "source_alias_kw": "KW Music", + "source_alias_kg": "KG Music", + "source_alias_tx": "TX Music", + "source_alias_wy": "WY Music", + "source_alias_mg": "MG Music", + "source_alias_bd": "BD Music", + + "source_alias_all": "Aggregated" } diff --git a/src/renderer/lang/en/view/setting.json b/src/renderer/lang/en/view/setting.json index 3c94abd9..bad0c775 100644 --- a/src/renderer/lang/en/view/setting.json +++ b/src/renderer/lang/en/view/setting.json @@ -7,6 +7,10 @@ "basic_source_test": "test interface (almost all functions of the software are available)", "basic_source_temp": "temp interface (some functions are not available, it is recommended to use this interface if the test interface is unavailable)", "basic_source": "Music source", + "basic_sourcename_title": "Select the source name type", + "basic_sourcename_real": "Original", + "basic_sourcename_alias": "Alias", + "basic_sourcename": "Source Name", "basic_window_size_title": "Set software window size", "basic_window_size": "Window size", "basic_window_size_smaller": "smaller", diff --git a/src/renderer/store/getters.js b/src/renderer/store/getters.js index 22debe9a..f8db3cf1 100644 --- a/src/renderer/store/getters.js +++ b/src/renderer/store/getters.js @@ -12,20 +12,22 @@ export default { }, source(state) { const source = music.sources.find(s => s.id === state.setting.sourceId) || music.sources[0] - return { id: source.id, name: window.i18n.t('store.state.source_' + source.id) } + return source }, sources(state) { return { active: state.setting.sourceId, - list: music.sources.map(item => ({ id: item.id, name: window.i18n.t('store.state.source_' + item.id) })), + list: music.sources, } }, - sourceNames() { + sourceNames(state) { + let prefix = 'store.state.source_' + if (state.setting.sourceNameType == 'alias') prefix += 'alias_' const sources = {} for (const source of music.sources) { - sources[source.id] = window.i18n.t('store.state.source_' + source.id) + sources[source.id] = window.i18n.t(prefix + source.id) } - sources.all = window.i18n.t('store.state.source_all') + sources.all = window.i18n.t(prefix + 'all') return sources }, userInfo(state) { diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js index 7ccd3450..1e7f60c2 100644 --- a/src/renderer/utils/index.js +++ b/src/renderer/utils/index.js @@ -177,7 +177,7 @@ export const isChildren = (parent, children) => { * @param {*} setting */ export const updateSetting = (setting, version) => { - const defaultVersion = '1.0.17' + const defaultVersion = '1.0.18' if (!version) { if (setting) { version = setting.version @@ -241,6 +241,7 @@ export const updateSetting = (setting, version) => { langId: 'cns', sourceId: 'kw', apiSource: 'temp', + sourceNameType: 'alias', randomAnimate: true, ignoreVersion: null, } diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue index c51ae6be..6b76bb15 100644 --- a/src/renderer/views/Setting.vue +++ b/src/renderer/views/Setting.vue @@ -35,6 +35,12 @@ div.scroll(:class="$style.setting") @change="handleLangChange(item.locale)" :class="$style.gapLeft" need v-model="current_setting.langId" :value="item.locale" :label="item.name") + dd(:title="$t('view.setting.basic_sourcename_title')") + h3 {{$t('view.setting.basic_sourcename')}} + div + material-checkbox(v-for="item in sourceNameTypes" :key="item.id" :class="$style.gapLeft" :id="`setting_abasic_sourcename_${item.id}`" + name="setting_basic_sourcename" need v-model="current_setting.sourceNameType" :value="item.id" :label="item.label") + dt {{$t('view.setting.play')}} dd(:title="$t('view.setting.play_toggle_title')") h3 {{$t('view.setting.play_toggle')}} @@ -268,6 +274,18 @@ export default { }, ] }, + sourceNameTypes() { + return [ + { + id: 'real', + label: this.$t('view.setting.basic_sourcename_real'), + }, + { + id: 'alias', + label: this.$t('view.setting.basic_sourcename_alias'), + }, + ] + }, musicNames() { return [ {