github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

更新ts类型导入导出语法

pull/1066/head
lyswhut 2022-11-25 23:01:39 +08:00
parent 5e9b3a16fa
commit 77ea6d3748
19 changed files with 527 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

931
src/common/types/app_setting.d.ts vendored
View File

@ -1,466 +1,469 @@
import type { I18n } from '@/lang/i18n'
declare namespace LX { declare global {
type AddMusicLocationType = 'top' | 'bottom'
declare namespace LX {
interface AppSetting { type AddMusicLocationType = 'top' | 'bottom'
version: string
interface AppSetting {
/** version: string
* 窗口大小id
*/ /**
'common.windowSizeId': number * 窗口大小id
*/
/** 'common.windowSizeId': number
* 窗口大小id
*/ /**
'common.fontSize': number * 窗口大小id
*/
/** 'common.fontSize': number
* 是否以全屏启动
*/ /**
'common.startInFullscreen': boolean * 是否以全屏启动
*/
/** 'common.startInFullscreen': boolean
* 语言id
*/ /**
'common.langId': string | null * 语言id
*/
/** 'common.langId': I18n['locale'] | null
* api id
*/ /**
'common.apiSource': string * api id
*/
/** 'common.apiSource': string
* 音源名称类型，原名、别名
*/ /**
'common.sourceNameType': 'alias' | 'real' * 音源名称类型，原名、别名
*/
/** 'common.sourceNameType': 'alias' | 'real'
* 显示的字体
*/ /**
'common.font': string * 显示的字体
*/
/** 'common.font': string
* 是否启用动画
*/ /**
'common.isShowAnimation': boolean * 是否启用动画
*/
/** 'common.isShowAnimation': boolean
* 是否启用随机弹窗动画
*/ /**
'common.randomAnimate': boolean * 是否启用随机弹窗动画
*/
/** 'common.randomAnimate': boolean
* 是否同意软件协议
*/ /**
'common.isAgreePact': boolean * 是否同意软件协议
*/
/** 'common.isAgreePact': boolean
* 控制按钮位置，左边、右边
*/ /**
'common.controlBtnPosition': 'left' | 'right' * 控制按钮位置，左边、右边
*/
/** 'common.controlBtnPosition': 'left' | 'right'
* 启动时自动播放歌曲
*/ /**
'player.startupAutoPlay': boolean * 启动时自动播放歌曲
*/
/** 'player.startupAutoPlay': boolean
* 切歌模式
*/ /**
'player.togglePlayMethod': 'listLoop' | 'random' | 'list' | 'singleLoop' | 'none' * 切歌模式
*/
/** 'player.togglePlayMethod': 'listLoop' | 'random' | 'list' | 'singleLoop' | 'none'
* 是否优先播放320k音质
*/ /**
'player.highQuality': boolean * 是否优先播放320k音质
*/
/** 'player.highQuality': boolean
* 是否显示任务栏进度条
*/ /**
'player.isShowTaskProgess': boolean * 是否显示任务栏进度条
*/
/** 'player.isShowTaskProgess': boolean
* 音量大小
*/ /**
'player.volume': number * 音量大小
*/
/** 'player.volume': number
* 是否静音
*/ /**
'player.isMute': boolean * 是否静音
*/
/** 'player.isMute': boolean
* 音频输出设备id
*/ /**
'player.mediaDeviceId': string * 音频输出设备id
*/
/** 'player.mediaDeviceId': string
* 是否在音频输出设备更改时暂停播放
*/ /**
'player.isMediaDeviceRemovedStopPlay': boolean * 是否在音频输出设备更改时暂停播放
*/
/** 'player.isMediaDeviceRemovedStopPlay': boolean
* 是否显示歌词翻译
*/ /**
'player.isShowLyricTranslation': boolean * 是否显示歌词翻译
*/
/** 'player.isShowLyricTranslation': boolean
* 是否显示歌词罗马音
*/ /**
'player.isShowLyricRoma': boolean * 是否显示歌词罗马音
*/
/** 'player.isShowLyricRoma': boolean
* 是否将歌词从简体转换为繁体
*/ /**
'player.isS2t': boolean * 是否将歌词从简体转换为繁体
*/
/** 'player.isS2t': boolean
* 是否播放卡拉OK歌词
*/ /**
'player.isPlayLxlrc': boolean * 是否播放卡拉OK歌词
*/
/** 'player.isPlayLxlrc': boolean
* 启动软件时是否恢复上次播放进度
*/ /**
'player.isSavePlayTime': boolean * 启动软件时是否恢复上次播放进度
*/
/** 'player.isSavePlayTime': boolean
* 是否启用音频可视化
*/ /**
'player.audioVisualization': boolean * 是否启用音频可视化
*/
/** 'player.audioVisualization': boolean
* 定时暂停播放-是否等待歌曲播放完毕再暂停
*/ /**
'player.waitPlayEndStop': boolean * 定时暂停播放-是否等待歌曲播放完毕再暂停
*/
/** 'player.waitPlayEndStop': boolean
* 定时暂停播放-倒计时时间
*/ /**
'player.waitPlayEndStopTime': string * 定时暂停播放-倒计时时间
*/
/** 'player.waitPlayEndStopTime': string
* 是否启用音频加载失败时自动切歌
*/ /**
'player.autoSkipOnError': boolean * 是否启用音频加载失败时自动切歌
*/
/** 'player.autoSkipOnError': boolean
* 播放详情页-是否缩放当前播放的歌词行
*/ /**
'playDetail.isZoomActiveLrc': boolean * 播放详情页-是否缩放当前播放的歌词行
*/
/** 'playDetail.isZoomActiveLrc': boolean
* 播放详情页-是否允许通过歌词调整播放进度
*/ /**
'playDetail.isShowLyricProgressSetting': boolean * 播放详情页-是否允许通过歌词调整播放进度
*/
/** 'playDetail.isShowLyricProgressSetting': boolean
* 播放详情页-歌词字体大小
*/ /**
'playDetail.style.fontSize': number * 播放详情页-歌词字体大小
*/
/** 'playDetail.style.fontSize': number
* 播放详情页-歌词对齐方式
*/ /**
'playDetail.style.align': 'center' | 'left' | 'right' * 播放详情页-歌词对齐方式
*/
'playDetail.style.align': 'center' | 'left' | 'right'
/**
* 是否启用桌面歌词
*/ /**
'desktopLyric.enable': boolean * 是否启用桌面歌词
*/
/** 'desktopLyric.enable': boolean
* 是否锁定桌面歌词
*/ /**
'desktopLyric.isLock': boolean * 是否锁定桌面歌词
*/
/** 'desktopLyric.isLock': boolean
* 是在置顶桌面
*/ /**
'desktopLyric.isAlwaysOnTop': boolean * 是在置顶桌面
*/
/** 'desktopLyric.isAlwaysOnTop': boolean
* 是否自动刷新歌词置顶
*/ /**
'desktopLyric.isAlwaysOnTopLoop': boolean * 是否自动刷新歌词置顶
*/
/** 'desktopLyric.isAlwaysOnTopLoop': boolean
* 是否启用音频可视化
*/ /**
'desktopLyric.audioVisualization': boolean * 是否启用音频可视化
*/
/** 'desktopLyric.audioVisualization': boolean
* 桌面歌词窗口宽度
*/ /**
'desktopLyric.width': number * 桌面歌词窗口宽度
*/
/** 'desktopLyric.width': number
* 桌面歌词窗口高度
*/ /**
'desktopLyric.height': number * 桌面歌词窗口高度
*/
/** 'desktopLyric.height': number
* 桌面歌词窗口x坐标
*/ /**
'desktopLyric.x': number | null * 桌面歌词窗口x坐标
*/
/** 'desktopLyric.x': number | null
* 桌面歌词窗口y坐标
*/ /**
'desktopLyric.y': number | null * 桌面歌词窗口y坐标
*/
/** 'desktopLyric.y': number | null
* 是否允许桌面歌词窗口拖出主屏幕之外
*/ /**
'desktopLyric.isLockScreen': boolean * 是否允许桌面歌词窗口拖出主屏幕之外
*/
/** 'desktopLyric.isLockScreen': boolean
* 是否延迟桌面歌词滚动
*/ /**
'desktopLyric.isDelayScroll': boolean * 是否延迟桌面歌词滚动
*/
/** 'desktopLyric.isDelayScroll': boolean
* 歌词滚动位置
*/ /**
'desktopLyric.scrollAlign': 'top' | 'center' * 歌词滚动位置
*/
/** 'desktopLyric.scrollAlign': 'top' | 'center'
* 是否在鼠标划过桌面歌词窗口时降低歌词透明度
*/ /**
'desktopLyric.isHoverHide': boolean * 是否在鼠标划过桌面歌词窗口时降低歌词透明度
*/
/** 'desktopLyric.isHoverHide': boolean
* 歌词方向
*/ /**
'desktopLyric.direction': 'horizontal' | 'vertical' * 歌词方向
*/
/** 'desktopLyric.direction': 'horizontal' | 'vertical'
* 歌词对齐方式
*/ /**
'desktopLyric.style.align': 'center' | 'left' | 'right' * 歌词对齐方式
*/
/** 'desktopLyric.style.align': 'center' | 'left' | 'right'
* 桌面歌词字体
*/ /**
'desktopLyric.style.font': string * 桌面歌词字体
*/
/** 'desktopLyric.style.font': string
* 桌面歌词字体大小
*/ /**
'desktopLyric.style.fontSize': number * 桌面歌词字体大小
*/
/** 'desktopLyric.style.fontSize': number
* 歌词间距大小
*/ /**
'desktopLyric.style.lineGap': number * 歌词间距大小
*/
/** 'desktopLyric.style.lineGap': number
* 桌面歌词未播放字体颜色
*/ /**
'desktopLyric.style.lyricUnplayColor': string * 桌面歌词未播放字体颜色
*/
/** 'desktopLyric.style.lyricUnplayColor': string
* 桌面歌词已播放字体颜色
*/ /**
'desktopLyric.style.lyricPlayedColor': string * 桌面歌词已播放字体颜色
*/
/** 'desktopLyric.style.lyricPlayedColor': string
* 桌面歌词字体阴影颜色
*/ /**
'desktopLyric.style.lyricShadowColor': string * 桌面歌词字体阴影颜色
*/
/** 'desktopLyric.style.lyricShadowColor': string
* 桌面歌词加粗字体
*/ /**
// 'desktopLyric.style.fontWeight': boolean * 桌面歌词加粗字体
*/
/** // 'desktopLyric.style.fontWeight': boolean
* 桌面歌词字体透明度
*/ /**
'desktopLyric.style.opacity': number * 桌面歌词字体透明度
*/
/** 'desktopLyric.style.opacity': number
* 桌面歌词是否允许换行
*/ /**
'desktopLyric.style.ellipsis': boolean * 桌面歌词是否允许换行
*/
/** 'desktopLyric.style.ellipsis': boolean
* 是否缩放当前正在播放的桌面歌词
*/ /**
'desktopLyric.style.isZoomActiveLrc': boolean * 是否缩放当前正在播放的桌面歌词
*/
/** 'desktopLyric.style.isZoomActiveLrc': boolean
* 是否启用双击列表里的歌曲时自动切换到当前列表播放（仅对歌单、排行榜有效）
*/ /**
'list.isClickPlayList': boolean * 是否启用双击列表里的歌曲时自动切换到当前列表播放（仅对歌单、排行榜有效）
*/
/** 'list.isClickPlayList': boolean
* 是否显示歌曲来源（仅对我的列表有效）
*/ /**
'list.isShowSource': boolean * 是否显示歌曲来源（仅对我的列表有效）
*/
/** 'list.isShowSource': boolean
* 是否自动恢复列表滚动位置（仅对我的列表有效）
*/ /**
'list.isSaveScrollLocation': boolean * 是否自动恢复列表滚动位置（仅对我的列表有效）
*/
/** 'list.isSaveScrollLocation': boolean
* 添加歌曲到我的列表时的方式
*/ /**
'list.addMusicLocationType': LX.AddMusicLocationType * 添加歌曲到我的列表时的方式
*/
/** 'list.addMusicLocationType': LX.AddMusicLocationType
* 是否显示列表操作按钮列
*/ /**
'list.actionButtonsVisible': boolean * 是否显示列表操作按钮列
*/
/** 'list.actionButtonsVisible': boolean
* 是否启用下载功能
*/ /**
'download.enable': boolean * 是否启用下载功能
*/
/** 'download.enable': boolean
* 下载路径
*/ /**
'download.savePath': string * 下载路径
*/
/** 'download.savePath': string
* 文件命名方式
*/ /**
'download.fileName': '歌名 - 歌手' | '歌手 - 歌名' | '歌名' * 文件命名方式
*/
/** 'download.fileName': '歌名 - 歌手' | '歌手 - 歌名' | '歌名'
* 最大并发下载数
*/ /**
'download.maxDownloadNum': number * 最大并发下载数
*/
/** 'download.maxDownloadNum': number
* 是否下载lrc文件
*/ /**
'download.isDownloadLrc': boolean * 是否下载lrc文件
*/
/** 'download.isDownloadLrc': boolean
* 是否下载翻译歌词文件
*/ /**
'download.isDownloadTLrc': boolean * 是否下载翻译歌词文件
*/
/** 'download.isDownloadTLrc': boolean
* 是否下载罗马音歌词文件
*/ /**
'download.isDownloadRLrc': boolean * 是否下载罗马音歌词文件
*/
/** 'download.isDownloadRLrc': boolean
* 保存lrc时的文本编码格式
*/ /**
'download.lrcFormat': 'utf8' | 'gbk' * 保存lrc时的文本编码格式
*/
/** 'download.lrcFormat': 'utf8' | 'gbk'
* 是否在音频文件中嵌入歌曲封面
*/ /**
'download.isEmbedPic': boolean * 是否在音频文件中嵌入歌曲封面
*/
/** 'download.isEmbedPic': boolean
* 是否在音频文件中嵌入歌词
*/ /**
'download.isEmbedLyric': boolean * 是否在音频文件中嵌入歌词
*/
/** 'download.isEmbedLyric': boolean
* 歌曲源不可用时，是否启用换源下载
*/ /**
'download.isUseOtherSource': boolean * 歌曲源不可用时，是否启用换源下载
*/
/** 'download.isUseOtherSource': boolean
* 主题id
*/ /**
'theme.id': string * 主题id
*/
/** 'theme.id': string
* 亮色主题id
*/ /**
'theme.lightId': string * 亮色主题id
*/
/** 'theme.lightId': string
* 暗色主题id
*/ /**
'theme.darkId': string * 暗色主题id
*/
/** 'theme.darkId': string
* 是否显示热门搜索
*/ /**
'search.isShowHotSearch': boolean * 是否显示热门搜索
*/
/** 'search.isShowHotSearch': boolean
* 是否显示搜索历史
*/ /**
'search.isShowHistorySearch': boolean * 是否显示搜索历史
*/
/** 'search.isShowHistorySearch': boolean
* 软件启动时是否自动聚焦搜索框
*/ /**
'search.isFocusSearchBox': boolean * 软件启动时是否自动聚焦搜索框
*/
/** 'search.isFocusSearchBox': boolean
* 是否启用代理
*/ /**
'network.proxy.enable': boolean * 是否启用代理
*/
/** 'network.proxy.enable': boolean
* 代理服务器地址
*/ /**
'network.proxy.host': string * 代理服务器地址
*/
/** 'network.proxy.host': string
* 代理服务器端口号
*/ /**
'network.proxy.port': string * 代理服务器端口号
*/
/** 'network.proxy.port': string
* 代理服务器用户名
*/ /**
'network.proxy.username': string * 代理服务器用户名
*/
/** 'network.proxy.username': string
* 代理服务器密码
*/ /**
'network.proxy.password': string * 代理服务器密码
*/
/** 'network.proxy.password': string
* 是否启用托盘
*/ /**
'tray.enable': boolean * 是否启用托盘
*/
/** 'tray.enable': boolean
* 是否关闭时是否最小化到托盘
*/ /**
// 'tray.isToTray': boolean * 是否关闭时是否最小化到托盘
*/
/** // 'tray.isToTray': boolean
* 托盘主题id
*/ /**
'tray.themeId': number * 托盘主题id
*/
/** 'tray.themeId': number
* 是否启用同步服务
*/ /**
'sync.enable': boolean * 是否启用同步服务
*/
/** 'sync.enable': boolean
* 同步服务端口号
*/ /**
'sync.port': '23332' | string * 同步服务端口号
*/
/** 'sync.port': '23332' | string
* 是否在离开搜索界面时自动清空搜索框
*/ /**
'odc.isAutoClearSearchInput': boolean * 是否在离开搜索界面时自动清空搜索框
*/
/** 'odc.isAutoClearSearchInput': boolean
* 是否在离开搜索界面时自动清空搜索结果列表
*/ /**
'odc.isAutoClearSearchList': boolean * 是否在离开搜索界面时自动清空搜索结果列表
*/
'odc.isAutoClearSearchList': boolean
}
} }
}
}

9
src/common/utils/vueTools.ts
View File

@ -75,9 +75,6 @@ export {
unref, unref,
onMounted, onMounted,
markRaw, markRaw,
ComputedRef,
Ref,
ShallowRef,
defineProps, defineProps,
defineEmits, defineEmits,
defineComponent, defineComponent,
@ -85,3 +82,9 @@ export {
defineExpose, defineExpose,
withDefaults, withDefaults,
} }
export type {
ComputedRef,
Ref,
ShallowRef,
}

24
src/lang/i18n.ts
View File

@ -1,22 +1,24 @@
import { App, ref } from 'vue' import { App, ref } from 'vue'
import { messages, Messages, Message } from './index' import { messages } from './index'
import type { Messages, Message } from './index'
type TranslateValues = Record<string, string | number | boolean> type TranslateValues = Record<string, string | number | boolean>
type Langs = keyof Messages
export declare interface I18n { export declare interface I18n {
locale: keyof Messages locale: Langs
fallbackLocale: keyof Messages fallbackLocale: Langs
availableLocales: Array<keyof Messages> availableLocales: Langs[]
messages: Messages messages: Messages
message: Message message: Message
setLanguage: (locale: string) => void setLanguage: (locale: Langs) => void
fillMessage: (message: string, val: TranslateValues) => string fillMessage: (message: string, val: TranslateValues) => string
getMessage: (key: keyof Message, val?: TranslateValues) => string getMessage: (key: keyof Message, val?: TranslateValues) => string
t: (key: keyof Message, val?: TranslateValues) => string t: (key: keyof Message, val?: TranslateValues) => string
} }
const locale = ref('zh-cn') const locale = ref<Langs>('zh-cn')
let i18n: I18n let i18n: I18n
@ -47,7 +49,7 @@ const useI18n = () => {
} }
} }
const setLanguage = (lang: string) => { const setLanguage = (lang: Langs) => {
i18n.setLanguage(lang) i18n.setLanguage(lang)
} }
@ -55,10 +57,10 @@ const createI18n = (): I18n => {
return i18n = { return i18n = {
locale: locale.value, locale: locale.value,
fallbackLocale: 'zh-cn', fallbackLocale: 'zh-cn',
availableLocales: Object.keys(messages), availableLocales: Object.keys(messages) as Langs[],
messages, messages,
message: messages[locale.value], message: messages[locale.value],
setLanguage(_locale: string) { setLanguage(_locale: Langs) {
this.locale = _locale this.locale = _locale
this.message = messages[_locale] this.message = messages[_locale]
locale.value = _locale locale.value = _locale
@ -74,7 +76,7 @@ const createI18n = (): I18n => {
return val ? this.fillMessage(targetMessage, val) : targetMessage return val ? this.fillMessage(targetMessage, val) : targetMessage
}, },
t(key: keyof Message, val?: TranslateValues): string { t(key: keyof Message, val?: TranslateValues): string {
trackReactivityValues() // trackReactivityValues()
return this.getMessage(key, val) return this.getMessage(key, val)
}, },
} }

26
src/lang/index.ts
View File

@ -6,20 +6,13 @@ type Message = Record<keyof typeof zh_cn, string>
| Record<keyof typeof zh_tw, string> | Record<keyof typeof zh_tw, string>
| Record<keyof typeof en_us, string> | Record<keyof typeof en_us, string>
interface Lang { type Messages = Record<(typeof langs)[number]['locale'], Message>
name: string
locale: string
alternate?: string
country: string
fallback?: boolean
message: Message
}
const langs: Lang[] = [ const langs = [
{ {
name: '简体中文', name: '简体中文',
locale: 'zh-cn', locale: 'zh-cn',
alternate: 'zh-hans', // alternate: 'zh-hans',
country: 'cn', country: 'cn',
fallback: true, fallback: true,
message: zh_cn, message: zh_cn,
@ -27,7 +20,7 @@ const langs: Lang[] = [
{ {
name: '繁体中文', name: '繁体中文',
locale: 'zh-tw', locale: 'zh-tw',
alternate: 'zh-hk', // alternate: 'zh-hk',
country: 'cn', country: 'cn',
message: zh_tw, message: zh_tw,
}, },
@ -37,20 +30,20 @@ const langs: Lang[] = [
country: 'us', country: 'us',
message: en_us, message: en_us,
}, },
] ] as const
const langList: Array<{ const langList: Array<{
name: string name: string
locale: string locale: keyof Messages
alternate?: string alternate?: string
}> = [] }> = []
type Messages = Record<string, Message> // @ts-expect-error
const messages: Messages = {} const messages: Messages = {}
langs.forEach(item => { langs.forEach(item => {
langList.push({ langList.push({
name: item.name, name: item.name,
locale: item.locale, locale: item.locale,
alternate: item.alternate, // alternate: item.alternate,
}) })
messages[item.locale] = item.message messages[item.locale] = item.message
}) })
@ -58,6 +51,9 @@ langs.forEach(item => {
export { export {
langList, langList,
messages, messages,
}
export type {
Messages, Messages,
Message, Message,
} }

2
src/main/event/index.ts
View File

@ -1,7 +1,7 @@
import { Event as App, Type as AppType } from './AppEvent' import { Event as App, Type as AppType } from './AppEvent'
import { Event as List, Type as ListType } from './ListEvent' import { Event as List, Type as ListType } from './ListEvent'
export { export type {
AppType, AppType,
ListType, ListType,
} }

6
src/renderer-lyric/plugins/i18n.ts
View File

@ -1,9 +1,11 @@
import { createI18n, i18nPlugin, useI18n, I18n } from '@/lang' import type { I18n } from '@/lang'
import { createI18n, i18nPlugin, useI18n } from '@/lang'
window.i18n = createI18n() window.i18n = createI18n()
export { export {
i18nPlugin, i18nPlugin,
useI18n, useI18n,
I18n,
} }
export type { I18n }

1
src/renderer/components/base/useVirtualizedList.ts
View File

@ -225,3 +225,4 @@
// getScrollTop, // getScrollTop,
// } // }
// } // }
export {}

2
src/renderer/core/useApp/useDataInit.ts
View File

@ -14,7 +14,7 @@ const initPrevPlayInfo = async() => {
window.lx.restorePlayInfo = null window.lx.restorePlayInfo = null
if (!info?.listId || info.index < 0) return if (!info?.listId || info.index < 0) return
const list = await getListMusics(info.listId) const list = await getListMusics(info.listId)
if (!list?.[info.index]) return if (!list[info.index]) return
window.lx.restorePlayInfo = info window.lx.restorePlayInfo = info
playList(info.listId, info.index) playList(info.listId, info.index)

6
src/renderer/event/index.ts
View File

@ -39,7 +39,9 @@ export const registerEvents = () => {
// // unregisterRendererEvents() // // unregisterRendererEvents()
// } // }
export { AppEventTypes } from './appEvent' export { clearDownKeys } from './keyEvent'
export { KeyEventTypes, clearDownKeys } from './keyEvent'
export type { AppEventTypes } from './appEvent'
export type { KeyEventTypes } from './keyEvent'
registerEvents() registerEvents()

6
src/renderer/main.ts
View File

@ -19,6 +19,8 @@ import router from './router'
import { getSetting, updateSetting } from './utils/ipc' import { getSetting, updateSetting } from './utils/ipc'
import { langList } from '@/lang' import { langList } from '@/lang'
import type { I18n } from '@/lang/i18n'
import { initSetting } from './store/setting' import { initSetting } from './store/setting'
// import { bubbleCursor } from './utils/cursor-effects/bubbleCursor' // import { bubbleCursor } from './utils/cursor-effects/bubbleCursor'
@ -40,8 +42,8 @@ void getSetting().then(setting => {
// window.lx.appSetting = setting // window.lx.appSetting = setting
// Set language automatically // Set language automatically
if (!setting['common.langId'] || !window.i18n.availableLocales.includes(setting['common.langId'])) { if (!setting['common.langId'] || !window.i18n.availableLocales.includes(setting['common.langId'])) {
let langId = null let langId: I18n['locale'] | null = null
let locale = window.navigator.language.toLocaleLowerCase() let locale = window.navigator.language.toLocaleLowerCase() as I18n['locale']
if (window.i18n.availableLocales.includes(locale)) { if (window.i18n.availableLocales.includes(locale)) {
langId = locale langId = locale
} else { } else {

6
src/renderer/plugins/i18n.ts
View File

@ -1,9 +1,11 @@
import { createI18n, i18nPlugin, useI18n, I18n } from '@/lang' import type { I18n } from '@/lang'
import { createI18n, i18nPlugin, useI18n } from '@/lang'
window.i18n = createI18n() window.i18n = createI18n()
export { export {
i18nPlugin, i18nPlugin,
useI18n, useI18n,
I18n,
} }
export type { I18n }

2
src/renderer/store/list/listManage/action.ts
View File

@ -17,7 +17,7 @@ export const setUserLists = (lists: LX.List.UserListInfo[]) => {
export const setMusicList = (listId: string, musicList: LX.Music.MusicInfo[]) => { export const setMusicList = (listId: string, musicList: LX.Music.MusicInfo[]) => {
const list = shallowReactive(markRawList(musicList)) const list = shallowReactive(markRawList(musicList))
allMusicList.set(listId, shallowReactive(musicList)) allMusicList.set(listId, list)
return list return list
} }

3
src/renderer/store/search/songlist/action.ts
View File

@ -2,7 +2,8 @@ import { markRawList } from '@common/utils/vueTools'
import music from '@renderer/utils/musicSdk' import music from '@renderer/utils/musicSdk'
import { sortInsert, similar } from '@common/utils/common' import { sortInsert, similar } from '@common/utils/common'
import { sources, maxPages, listInfos, ListInfoItem, SearchListInfo } from './state' import type { ListInfoItem, SearchListInfo } from './state'
import { sources, maxPages, listInfos } from './state'
interface SearchResult { interface SearchResult {
list: ListInfoItem[] list: ListInfoItem[]

2
src/renderer/store/search/songlist/state.ts
View File

@ -5,7 +5,7 @@ import music from '@renderer/utils/musicSdk'
import { ListInfo } from '@renderer/store/songList/state' import { ListInfo } from '@renderer/store/songList/state'
export { ListInfoItem } from '@renderer/store/songList/state' export type { ListInfoItem } from '@renderer/store/songList/state'
export const sources: Array<LX.OnlineSource | 'all'> = markRaw([]) export const sources: Array<LX.OnlineSource | 'all'> = markRaw([])

4
src/renderer/store/songList/action.ts
View File

@ -2,14 +2,12 @@
import { deduplicationList, toNewMusicInfo } from '@renderer/utils' import { deduplicationList, toNewMusicInfo } from '@renderer/utils'
import musicSdk from '@renderer/utils/musicSdk' import musicSdk from '@renderer/utils/musicSdk'
import { markRaw, markRawList } from '@common/utils/vueTools' import { markRaw, markRawList } from '@common/utils/vueTools'
import type { ListDetailInfo, ListInfoItem, ListInfo } from './state'
import { import {
tags, tags,
TagInfo, TagInfo,
listInfo, listInfo,
listDetailInfo, listDetailInfo,
ListDetailInfo,
ListInfoItem,
ListInfo,
selectListInfo, selectListInfo,
isVisibleListDetail, isVisibleListDetail,
openSongListInputInfo, openSongListInputInfo,

2
src/renderer/utils/index.ts
View File

@ -53,7 +53,7 @@ export const getFontSizeWithScreen = (screenWidth: number = window.innerWidth):
export const deduplicationList = <T extends LX.Music.MusicInfo>(list: T[]): T[] => { export const deduplicationList = <T extends LX.Music.MusicInfo>(list: T[]): T[] => {
const ids: Set<string | number> = new Set() const ids: Set<string> = new Set()
return list.filter(s => { return list.filter(s => {
if (ids.has(s.id)) return false if (ids.has(s.id)) return false
ids.add(s.id) ids.add(s.id)

3
src/renderer/views/Search/SongListList/useList.ts
View File

@ -3,7 +3,8 @@ import { ref, nextTick } from '@common/utils/vueTools'
import { addHistoryWord } from '@renderer/store/search/action' import { addHistoryWord } from '@renderer/store/search/action'
// import { useI18n } from '@renderer/plugins/i18n' // import { useI18n } from '@renderer/plugins/i18n'
// import { } from '@renderer/store/search/state' // import { } from '@renderer/store/search/state'
import { search as searchSongList, listInfos, SearchListInfo, ListInfoItem } from '@renderer/store/search/songlist' import type { SearchListInfo, ListInfoItem } from '@renderer/store/search/songlist'
import { search as searchSongList, listInfos } from '@renderer/store/search/songlist'
export declare type SearchSource = LX.OnlineSource | 'all' export declare type SearchSource = LX.OnlineSource | 'all'

2
src/renderer/views/songList/List/components/SongList.vue
View File

@ -34,7 +34,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, defineEmits, defineExpose } from '@common/utils/vueTools' import { ref, defineEmits, defineExpose } from '@common/utils/vueTools'
import { ListInfo, ListInfoItem } from '@renderer/store/songList/state' import type { ListInfo, ListInfoItem } from '@renderer/store/songList/state'
// import LX from '@renderer/types/lx' // import LX from '@renderer/types/lx'
import { useRoute, useRouter } from '@common/utils/vueRouter' import { useRoute, useRouter } from '@common/utils/vueRouter'

3
tsconfig.json
View File

@ -1,4 +1,5 @@
{ {
"$schema": "https://json.schemastore.org/tsconfig",
"compilerOptions": { "compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */ /* Visit https://aka.ms/tsconfig to read more about this file */
@ -82,7 +83,7 @@
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
/* Interop Constraints */ /* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
"allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": false, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ "esModuleInterop": false, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */