优化代码逻辑，修复潜在播放问题

src/renderer/components/common/ProgressBar.vue

@@ -56,7 +56,7 @@ export default {
     }
     const handleMsMove = event => {
       if (!msEvent.isMsDown) return
-      if (!dragging.value) dragging.value = true
+      dragging.value ||= true
 
       let progress = msEvent.msDownProgress + (event.clientX - msEvent.msDownX) / dom_progress.value.clientWidth
       if (progress > 1) progress = 1

src/renderer/components/layout/PlayDetail/components/LyricMenu.vue

@@ -125,14 +125,14 @@ export default {
       let lxlyric = props.lyricInfo.lxlyric
       if (offsetTagRxp.test(lyric)) {
         lyric = lyric.replace(offsetTagAllRxp, `$1[offset:${offset}]`)
-        if (tlyric) tlyric = tlyric.replace(offsetTagAllRxp, `$1[offset:${offset}]`)
-        if (lxlyric) lxlyric = lxlyric.replace(offsetTagAllRxp, `$1[offset:${offset}]`)
-        if (rlyric) rlyric = rlyric.replace(offsetTagAllRxp, `$1[offset:${offset}]`)
+        tlyric &&= tlyric.replace(offsetTagAllRxp, `$1[offset:${offset}]`)
+        lxlyric &&= lxlyric.replace(offsetTagAllRxp, `$1[offset:${offset}]`)
+        rlyric &&= rlyric.replace(offsetTagAllRxp, `$1[offset:${offset}]`)
       } else {
-        lyric = `[offset:${offset}]\n` + lyric
-        if (tlyric) tlyric = `[offset:${offset}]\n` + tlyric
-        if (lxlyric) lxlyric = `[offset:${offset}]\n` + lxlyric
-        if (rlyric) rlyric = `[offset:${offset}]\n` + rlyric
+        lyric &&= `[offset:${offset}]\n` + lyric
+        tlyric &&= `[offset:${offset}]\n` + tlyric
+        lxlyric &&= `[offset:${offset}]\n` + lxlyric
+        rlyric &&= `[offset:${offset}]\n` + rlyric
       }
 
       const musicInfo = 'progress' in props.lyricInfo.musicInfo ? props.lyricInfo.musicInfo.meta.musicInfo : props.lyricInfo.musicInfo

src/renderer/components/layout/Toolbar/SearchInput.vue

@@ -64,7 +64,7 @@ export default {
     }
 
     const handleSearch = () => {
-      if (visibleList.value) visibleList.value = false
+      visibleList.value &&= false
       if (!searchText.value && route.path != '/search') {
         setSearchText('')
         return
@@ -83,13 +83,13 @@ export default {
       switch (action) {
         case 'focus':
           isFocused = true
-          if (!visibleList.value) visibleList.value = true
+          visibleList.value ||= true
           if (searchText.value) handleTipSearch()
           break
         case 'blur':
           isFocused = false
           setTimeout(() => {
-            if (visibleList.value) visibleList.value = false
+            visibleList.value &&= false
           }, 50)
           break
         case 'submit':

src/renderer/components/material/OnlineList/useList.ts

@@ -12,16 +12,16 @@ const useKeyEvent = ({ handleSelectAllData }: {
   }
 
   const handle_key_shift_down = () => {
-    if (!keyEvent.isShiftDown) keyEvent.isShiftDown = true
+    keyEvent.isShiftDown ||= true
   }
   const handle_key_shift_up = () => {
-    if (keyEvent.isShiftDown) keyEvent.isShiftDown = false
+    keyEvent.isShiftDown &&= false
   }
   const handle_key_mod_down = () => {
-    if (!keyEvent.isModDown) keyEvent.isModDown = true
+    keyEvent.isModDown ||= true
   }
   const handle_key_mod_up = () => {
-    if (keyEvent.isModDown) keyEvent.isModDown = false
+    keyEvent.isModDown &&= false
   }
   const handle_key_mod_a_down = ({ event }: LX.KeyDownEevent) => {
     if (!event || (event.target as HTMLElement).tagName == 'INPUT') return

src/renderer/core/player/action.ts

@@ -19,7 +19,7 @@ import { requestMsg } from '@renderer/utils/message'
 import { getRandom } from '@renderer/utils/index'
 // import { checkMusicFileAvailable } from '@renderer/utils/music'
 
-let isGettingUrl = false
+let gettingUrlId = ''
 const createDelayNextTimeout = (delay: number) => {
   let timeout: NodeJS.Timeout | null
   const clearDelayNextTimeout = () => {
@@ -86,7 +86,7 @@ const getMusicPlayUrl = async(musicInfo: LX.Music.MusicInfo | LX.Download.ListIt
 
 export const setMusicUrl = (musicInfo: LX.Music.MusicInfo | LX.Download.ListItem, isRefresh?: boolean) => {
   if (appSetting['player.autoSkipOnError']) addLoadTimeout()
-  isGettingUrl = true
+  gettingUrlId = musicInfo.id
   void getMusicPlayUrl(musicInfo, isRefresh).then((url) => {
     if (!url) return
     setResource(url)
@@ -96,8 +96,10 @@ export const setMusicUrl = (musicInfo: LX.Music.MusicInfo | LX.Download.ListItem
     window.app_event.error()
     if (appSetting['player.autoSkipOnError']) addDelayNextTimeout()
   }).finally(() => {
-    clearLoadTimeout()
-    if (musicInfo === playMusicInfo.musicInfo) isGettingUrl = false
+    if (musicInfo === playMusicInfo.musicInfo) {
+      gettingUrlId = ''
+      clearLoadTimeout()
+    }
   })
 }
 
@@ -139,14 +141,17 @@ const handleRestorePlay = async(restorePlayInfo: LX.Player.SavedPlayInfo) => {
 
 // 处理音乐播放
 const handlePlay = () => {
-  if (window.lx.isPlayedStop) window.lx.isPlayedStop = false
-  if (isGettingUrl) isGettingUrl = false
+  window.lx.isPlayedStop &&= false
 
   if (window.lx.restorePlayInfo) {
     void handleRestorePlay(window.lx.restorePlayInfo)
     window.lx.restorePlayInfo = null
     return
   }
+  const musicInfo = playMusicInfo.musicInfo
+
+  if (!musicInfo || gettingUrlId == musicInfo.id) return
+  gettingUrlId &&= ''
 
   setStop()
   window.app_event.pause()
@@ -154,9 +159,6 @@ const handlePlay = () => {
   clearDelayNextTimeout()
   clearLoadTimeout()
 
-  const musicInfo = playMusicInfo.musicInfo
-
-  if (!musicInfo) return
 
   if (appSetting['player.togglePlayMethod'] == 'random' && playMusicInfo.listId) addPlayedList({ ...(playMusicInfo as LX.Player.PlayMusicInfo) })
 
@@ -414,7 +416,7 @@ export const playPrev = async(isAutoToggle = false): Promise<void> => {
 export const play = () => {
   if (playMusicInfo.musicInfo == null) return
   if (isEmpty()) {
-    setMusicUrl(playMusicInfo.musicInfo)
+    if (playMusicInfo.musicInfo.id != gettingUrlId) setMusicUrl(playMusicInfo.musicInfo)
     return
   }
   setPlay()
@@ -441,7 +443,7 @@ export const stop = () => {
  * 播放、暂停播放切换
  */
 export const togglePlay = () => {
-  if (window.lx.isPlayedStop) window.lx.isPlayedStop = false
+  window.lx.isPlayedStop &&= false
   if (isPlay.value) {
     pause()
   } else {

src/renderer/core/player/timeoutStop.ts

@@ -67,12 +67,12 @@ const timeoutTools: {
 }
 
 export const startTimeoutStop = (time: number) => {
-  if (window.lx.isPlayedStop) window.lx.isPlayedStop = false
+  window.lx.isPlayedStop &&= false
   timeoutTools.start(time)
 }
 export const stopTimeoutStop = () => {
   console.warn('stopTimeoutStop')
-  if (window.lx.isPlayedStop) window.lx.isPlayedStop = false
+  window.lx.isPlayedStop &&= false
   timeoutTools.clearTimeout()
 }
 

src/renderer/core/useApp/usePlayer/useMediaDevice.ts

@@ -60,9 +60,9 @@ export default () => {
     let mediaDeviceId = appSetting['player.mediaDeviceId']
     const devices = await getDevices()
     let device = devices.find(device => device.deviceId === mediaDeviceId)
-    if (!device) device = devices.find(device => device.deviceId === 'default')
+    device ??= devices.find(device => device.deviceId === 'default')
     // @ts-expect-error
-    if (!device) device = { label: '', deviceId: '' }
+    device ??= { label: '', deviceId: '' }
 
     // @ts-expect-error
     handleDeviceChangeStopPlay(device, mediaDeviceId)

src/renderer/core/useApp/usePlayer/usePlayProgress.ts

@@ -33,7 +33,7 @@ export default () => {
       if (window.lx.isPlayedStop) return
       const currentTime = getCurrentTime()
 
-      if (!mediaBuffer.playTime) mediaBuffer.playTime = currentTime
+      mediaBuffer.playTime ||= currentTime
       let skipTime = currentTime + getRandom(3, 6)
       if (skipTime > playProgress.maxPlayTime) skipTime = (playProgress.maxPlayTime - currentTime) / 2
       if (skipTime - mediaBuffer.playTime < 1 || playProgress.maxPlayTime - skipTime < 1) {
@@ -97,7 +97,7 @@ export default () => {
   }
 
   const handleError = () => {
-    if (!restorePlayTime) restorePlayTime = getCurrentTime() // 记录出错的播放时间
+    restorePlayTime ||= getCurrentTime() // 记录出错的播放时间
     console.log('handleError')
     prevProgressStatus = 'error'
     handleSetTaskBarState(playProgress.progress, prevProgressStatus)

src/renderer/core/useApp/usePlayer/usePlayStatus.ts

@@ -32,18 +32,18 @@ export default () => {
   }
 
   const handlePlay = () => {
-    if (buttons.empty) buttons.empty = false
+    buttons.empty &&= false
     buttons.play = true
     setButtons()
   }
   const handlePause = () => {
-    if (buttons.empty) buttons.empty = false
+    buttons.empty &&= false
     buttons.play = false
     setButtons()
   }
   const handleStop = () => {
     if (playMusicInfo.musicInfo != null) return
-    if (buttons.collect) buttons.collect = false
+    buttons.collect &&= false
     buttons.empty = true
     setButtons()
   }

src/renderer/main.ts

@@ -53,7 +53,7 @@ void getSetting().then(setting => {
           break
         }
       }
-      if (langId == null) langId = 'en-us'
+      langId ??= 'en-us'
     }
     setting['common.langId'] = langId
     void updateSetting({ 'common.langId': langId })

src/renderer/store/list/listManage/rendererListManage.ts

@@ -191,12 +191,12 @@ export const registerListAction = (appSetting: LX.AppSetting, onListChanged: (li
     userListsUpdatePosition(position, ids)
   }
   const list_music_add = ({ params: { id, musicInfos, addMusicLocationType } }: LX.IpcRendererEventParams<LX.List.ListActionMusicAdd>) => {
-    if (!addMusicLocationType) addMusicLocationType = appSetting['list.addMusicLocationType']
+    addMusicLocationType ??= appSetting['list.addMusicLocationType']
     const updatedListIds = listMusicAdd(id, musicInfos, addMusicLocationType)
     if (updatedListIds.length) onListChanged(updatedListIds)
   }
   const list_music_move = ({ params: { fromId, toId, musicInfos, addMusicLocationType } }: LX.IpcRendererEventParams<LX.List.ListActionMusicMove>) => {
-    if (!addMusicLocationType) addMusicLocationType = appSetting['list.addMusicLocationType']
+    addMusicLocationType ??= appSetting['list.addMusicLocationType']
     const updatedListIds = listMusicMove(fromId, toId, musicInfos, addMusicLocationType)
     if (updatedListIds.length) onListChanged(updatedListIds)
   }

src/renderer/utils/compositions/useKeyDown.ts

@@ -21,7 +21,7 @@ export default (name: string) => {
   }
 
   const handle_key_up = () => {
-    if (keyDown.value) keyDown.value = false
+    keyDown.value &&= false
   }
 
   onMounted(() => {

src/renderer/utils/compositions/useLyric.js

@@ -128,7 +128,7 @@ export default ({ isPlay, lyric, playProgress, isShowLyricProgressSetting, offse
   }
   const handleMove = (y) => {
     if (isMsDown.value) {
-      if (!isStopScroll.value) isStopScroll.value = true
+      isStopScroll.value ||= true
       if (cancelScrollFn) {
         cancelScrollFn()
         cancelScrollFn = null
@@ -150,7 +150,7 @@ export default ({ isPlay, lyric, playProgress, isShowLyricProgressSetting, offse
 
   const handleWheel = (event) => {
     console.log(event.deltaY)
-    if (!isStopScroll.value) isStopScroll.value = true
+    isStopScroll.value ||= true
     if (cancelScrollFn) {
       cancelScrollFn()
       cancelScrollFn = null
@@ -197,7 +197,7 @@ export default ({ isPlay, lyric, playProgress, isShowLyricProgressSetting, offse
   const scrollLine = (line, oldLine) => {
     if (line < 0) return
     if (line == 0 && isSetedLines) return isSetedLines = false
-    if (isSetedLines) isSetedLines = false
+    isSetedLines &&= false
     if (oldLine == null || line - oldLine != 1) return handleScrollLrc()
 
     delayScrollTimeout = setTimeout(() => {

src/renderer/utils/data.ts

@@ -44,7 +44,7 @@ const saveViewPrevStateThrottle = throttle((state) => {
 }, 1000)
 
 const initPosition = async() => {
-  if (listPosition == null) listPosition = await getListPositionInfoFromData() ?? {}
+  listPosition ??= await getListPositionInfoFromData() ?? {}
 }
 export const getListPosition = async(id: string): Promise<number> => {
   await initPosition()
@@ -74,7 +74,7 @@ const saveListPrevSelectIdThrottle = throttle(() => {
   saveListPrevSelectIdFromData(listPrevSelectId)
 }, 200)
 export const getListPrevSelectId = async() => {
-  if (listPrevSelectId == null) listPrevSelectId = await getListPrevSelectIdFromData() ?? LIST_IDS.DEFAULT
+  listPrevSelectId ??= await getListPrevSelectIdFromData() ?? LIST_IDS.DEFAULT
   return listPrevSelectId ?? LIST_IDS.DEFAULT
 }
 export const saveListPrevSelectId = (id: string) => {
@@ -138,7 +138,7 @@ export const overwriteListUpdateInfo = async(ids: string[]) => {
 
 
 export const getSearchSetting = async() => {
-  if (!searchSetting) searchSetting = await getSearchSettingFromData()
+  searchSetting ??= await getSearchSettingFromData()
   return { ...searchSetting }
 }
 export const setSearchSetting = async(setting: Partial<typeof DEFAULT_SETTING['search']>) => {
@@ -154,7 +154,7 @@ export const setSearchSetting = async(setting: Partial<typeof DEFAULT_SETTING['s
 }
 
 export const getSongListSetting = async() => {
-  if (!songListSetting) songListSetting = await getSongListSettingFromData()
+  songListSetting ??= await getSongListSettingFromData()
   return { ...songListSetting }
 }
 export const setSongListSetting = async(setting: Partial<typeof DEFAULT_SETTING['songList']>) => {
@@ -164,7 +164,7 @@ export const setSongListSetting = async(setting: Partial<typeof DEFAULT_SETTING[
 }
 
 export const getLeaderboardSetting = async() => {
-  if (!leaderboardSetting) leaderboardSetting = await getLeaderboardSettingFromData()
+  leaderboardSetting ??= await getLeaderboardSettingFromData()
   return { ...leaderboardSetting }
 }
 export const setLeaderboardSetting = async(setting: Partial<typeof DEFAULT_SETTING['leaderboard']>) => {

src/renderer/utils/index.ts

@@ -27,7 +27,7 @@ export const dateFormat2 = (time: number): string => {
  */
 let dom_title = document.getElementsByTagName('title')[0]
 export const setTitle = (title: string | null) => {
-  if (!title) title = '洛雪音乐助手'
+  title ||= '洛雪音乐助手'
   dom_title.innerText = title
 }
 

src/renderer/views/Download/useList.js

@@ -10,16 +10,16 @@ const useKeyEvent = ({ handleSelectAllData }) => {
   }
 
   const handle_key_shift_down = () => {
-    if (!keyEvent.isShiftDown) keyEvent.isShiftDown = true
+    keyEvent.isShiftDown ||= true
   }
   const handle_key_shift_up = () => {
-    if (keyEvent.isShiftDown) keyEvent.isShiftDown = false
+    keyEvent.isShiftDown &&= false
   }
   const handle_key_mod_down = () => {
-    if (!keyEvent.isModDown) keyEvent.isModDown = true
+    keyEvent.isModDown ||= true
   }
   const handle_key_mod_up = () => {
-    if (keyEvent.isModDown) keyEvent.isModDown = false
+    keyEvent.isModDown &&= false
   }
   const handle_key_mod_a_down = ({ event }) => {
     if (event.target.tagName == 'INPUT') return

src/renderer/views/List/MusicList/components/SearchList.vue

@@ -137,10 +137,10 @@ export default {
     },
     handle_key_mod_down() {
       console.log('handle_key_mod_down')
-      if (!this.isModDown) this.isModDown = true
+      this.isModDown ||= true
     },
     handle_key_mod_up() {
-      if (this.isModDown) this.isModDown = false
+      this.isModDown &&= false
     },
     handle_key_mod_f_down() {
       if (this.visible) this.$refs.dom_input.focus()

src/renderer/views/List/MusicList/useList.js

@@ -10,16 +10,16 @@ const useKeyEvent = ({ handleSelectAllData }) => {
   }
 
   const handle_key_shift_down = () => {
-    if (!keyEvent.isShiftDown) keyEvent.isShiftDown = true
+    keyEvent.isShiftDown ||= true
   }
   const handle_key_shift_up = () => {
-    if (keyEvent.isShiftDown) keyEvent.isShiftDown = false
+    keyEvent.isShiftDown &&= false
   }
   const handle_key_mod_down = () => {
-    if (!keyEvent.isModDown) keyEvent.isModDown = true
+    keyEvent.isModDown ||= true
   }
   const handle_key_mod_up = () => {
-    if (keyEvent.isModDown) keyEvent.isModDown = false
+    keyEvent.isModDown &&= false
   }
   const handle_key_mod_a_down = ({ event }) => {
     if (event.target.tagName == 'INPUT') return

src/renderer/views/List/MyList/components/Menu.vue

@@ -1,259 +0,0 @@
-<!-- <template>
-  <teleport to="#root">
-    <div ref="dom_menu" :class="$style.container" :style="menuStyles" :aria-hidden="!modelValue">
-      <div :class="$style.group">
-        <div :class="$style.subGroup">
-          <button :class="$style.btn" :disabled="!itemMenuControl.rename" ignore-tip :aria-label="$t('lists__rename')" @click="menuClick('rename')">{{ $t('lists__rename') }}</button>
-          <button :class="$style.btn" :disabled="offsetDisabled" ignore-tip :aria-label="$t('lists__sync')" @click="menuClick('sync')">{{ $t('lists__sync') }}</button>
-        </div>
-        <div :class="$style.subGroup">
-          <button :class="$style.btn" :disabled="offsetDisabled" ignore-tip :aria-label="$t('lists__sort_list')" @click="menuClick('sort')">{{ $t('lists__sort_list') }}</button>
-          <button :class="$style.btn" :disabled="offsetDisabled" ignore-tip :aria-label="$t('lyric_menu__offset_dec_100')" @click="menuClick(-100)">- 100ms</button>
-        </div>
-      </div>
-    </div>
-  </teleport>
-</template>
-
-<script>
-import { computed, useRefGetter, ref, useCommit, watch } from '@common/utils/vueTools'
-import useMenuLocation from '@renderer/utils/compositions/useMenuLocation'
-import { setLyricEdited, removeLyricEdited, debounce } from '@renderer/utils'
-
-const offsetTagRxp = /(?:^|\n)\s*\[offset:\s*(\S+(?:\d+)*)\s*\]/
-const offsetTagAllRxp = /(?:^|\n)\s*\[offset:\s*(\S+(?:\d+)*)\s*\]/g
-
-const saveLyric = debounce((musicInfo, lyricInfo) => {
-  setLyricEdited(musicInfo, lyricInfo)
-})
-const removeLyric = debounce(musicInfo => {
-  removeLyricEdited(musicInfo)
-})
-
-const getOffset = lrc => {
-  let offset = offsetTagRxp.exec(lrc)
-  if (offset) {
-    offset = parseInt(offset[1])
-    if (Number.isNaN(offset)) offset = 0
-  } else offset = 0
-  return offset
-}
-
-export default {
-  name: 'LyricMenu',
-  props: {
-    modelValue: Boolean,
-    xy: Object,
-    lyricInfo: Object,
-  },
-  emits: ['updateLyric', 'update:modelValue'],
-  setup(props, { emit }) {
-    const setting = useRefGetter('setting')
-    const playDetailSetting = useRefGetter('playDetailSetting')
-    const setPlayDetailLyricAlign = useCommit('setPlayDetailLyricAlign')
-    const setPlayDetailLyricFont = useCommit('setPlayDetailLyricFont')
-
-    const offset = ref(0)
-    const offsetDisabled = ref(true)
-    const originOffset = ref(0)
-
-    const visible = computed(() => props.modelValue)
-    const musicInfo = computed(() => props.lyricInfo.musicInfo)
-    const location = computed(() => props.xy)
-
-    const onHide = () => {
-      emit('update:modelValue', false)
-    }
-
-    const setFontAlign = val => {
-      if (playDetailSetting.value.style.align == val) return
-      setPlayDetailLyricAlign(val)
-    }
-
-    const fontSizeUp = step => {
-      if (setting.value.playDetail.style.fontSize >= 200) return
-      setPlayDetailLyricFont(Math.min(setting.value.playDetail.style.fontSize + step, 200))
-    }
-    const fontSizeDown = step => {
-      if (setting.value.playDetail.style.fontSize <= 70) return
-      setPlayDetailLyricFont(Math.max(setting.value.playDetail.style.fontSize - step, 70))
-    }
-    const fontSizeReset = () => {
-      setPlayDetailLyricFont(100)
-    }
-
-    const updateLyric = offset => {
-      let lyric = props.lyricInfo.lyric
-      let tlyric = props.lyricInfo.tlyric
-      let rlyric = props.lyricInfo.rlyric
-      let lxlyric = props.lyricInfo.lxlyric
-      if (offsetTagRxp.test(lyric)) {
-        lyric = lyric.replace(offsetTagAllRxp, `[offset:${offset}]`)
-        if (tlyric) tlyric = tlyric.replace(offsetTagAllRxp, `[offset:${offset}]`)
-        if (lxlyric) lxlyric = lxlyric.replace(offsetTagAllRxp, `[offset:${offset}]`)
-        if (rlyric) rlyric = rlyric.replace(offsetTagAllRxp, `[offset:${offset}]`)
-      } else {
-        lyric = `[offset:${offset}]\n` + lyric
-        if (tlyric) tlyric = `[offset:${offset}]\n` + tlyric
-        if (lxlyric) lxlyric = `[offset:${offset}]\n` + lxlyric
-        if (rlyric) rlyric = `[offset:${offset}]\n` + rlyric
-      }
-
-      if (offset == originOffset.value) {
-        removeLyric(props.lyricInfo.musicInfo)
-      } else {
-        saveLyric(props.lyricInfo.musicInfo, {
-          lyric,
-          tlyric,
-          rlyric,
-          lxlyric,
-        })
-      }
-
-      emit('updateLyric', {
-        lyric,
-        tlyric,
-        rlyric,
-        lxlyric,
-        offset,
-      })
-    }
-    const setOffset = step => {
-      offset.value += step
-      updateLyric(offset.value)
-    }
-    const offsetReset = () => {
-      if (offset.value == originOffset.value) return
-      offset.value = originOffset.value
-      updateLyric(originOffset.value)
-    }
-
-    const parseLrcOffset = () => {
-      offset.value = getOffset(props.lyricInfo.lyric)
-      originOffset.value = getOffset(props.lyricInfo.rawlyric)
-      offsetDisabled.value = !props.lyricInfo.lyric
-    }
-
-
-    const { dom_menu, menuStyles } = useMenuLocation({
-      visible,
-      location,
-      onHide,
-    })
-
-    watch(musicInfo, () => {
-      if (!props.modelValue) return
-      parseLrcOffset()
-    })
-    watch(visible, val => {
-      if (!val) return
-      parseLrcOffset()
-    })
-
-    return {
-      dom_menu,
-      menuStyles,
-      playDetailSetting,
-      offset,
-      originOffset,
-      fontSizeUp,
-      fontSizeDown,
-      fontSizeReset,
-      setOffset,
-      offsetReset,
-      setFontAlign,
-      offsetDisabled,
-    }
-  },
-}
-</script>
-
-<style lang="less" module>
-@import '@renderer/assets/styles/layout.less';
-
-.container {
-  font-size: 12px;
-  position: absolute;
-  opacity: 0;
-  transform: scale(0);
-  transform-origin: 0 0 0;
-  transition: .25s ease;
-  transition-property: transform, opacity;
-  border-radius: @radius-border;
-  background-color: var(--color-main-background);
-  box-shadow: 0 1px 8px 0 rgba(0,0,0,.2);
-  z-index: 10;
-  overflow: hidden;
-}
-
-.group {
-  display: flex;
-  flex-direction: column;
-}
-.title {
-  flex: auto;
-  padding: 10px 0 10px 10px;
-  color: var(--color-font-label);
-  white-space: nowrap;
-  min-width: 120px;
-}
-
-.subGroup {
-  display: flex;
-  flex-flow: row nowrap;
-}
-
-.btn {
-  flex: auto;
-  white-space: nowrap;
-  cursor: pointer;
-  min-width: 60px;
-  height: 34px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  // color: var(--color-button-font);
-  padding: 0 10px;
-  outline: none;
-  transition: @transition-normal;
-  transition-property: background-color, opacity;
-  box-sizing: border-box;
-  .mixin-ellipsis-1;
-  background-color: var(--color-main-background);
-  border: none;
-
-  &:hover {
-    opacity: .7;
-    background-color: @color-theme_2-hover;
-  }
-  &:active {
-    background-color: @color-theme_2-active;
-  }
-  &.active {
-    background-color: var(--color-main-background);
-    color: var(--color-button-background-active);
-    cursor: default;
-    opacity: 1;
-  }
-
-  &[disabled] {
-    cursor: default;
-    opacity: .4;
-    &:hover {
-      background: none !important;
-    }
-  }
-}
-.titleBtn {
-  flex: none;
-  padding: 0 10;
-  min-width: 40px;
-  opacity: .7;
-
-  &[disabled] {
-    opacity: .3;
-  }
-}
-
-</style>
- -->

src/renderer/views/Search/index.vue

@@ -35,8 +35,8 @@ const verifyQueryParams = async(to, from, next) => {
 
   if (_source == null || _type == null) {
     const setting = await getSearchSetting()
-    if (!_source) _source = setting.source
-    if (!_type) _type = setting.type
+    _source ??= setting.source
+    _type ??= setting.type
 
     next({
       path: to.path,

src/renderer/views/Setting/components/SettingBasic.vue

@@ -127,9 +127,9 @@ export default {
     const autoTheme = reactive({})
     const updateAutoTheme = (info) => {
       let light = findTheme(info, appSetting['theme.lightId'])
-      if (!light) light = info.themes.find(theme => theme.id == 'green')
+      light ??= info.themes.find(theme => theme.id == 'green')
       let dark = findTheme(info, appSetting['theme.darkId'])
-      if (!dark) dark = info.themes.find(theme => theme.id == 'black')
+      dark ??= info.themes.find(theme => theme.id == 'black')
       autoTheme['--color-primary-theme-light'] = light.config.themeColors['--color-theme']
       autoTheme['--background-image-theme-light'] = light.isCustom
         ? light.config.extInfo['--background-image'] == 'none'

src/renderer/worker/main/list.ts

@@ -172,7 +172,7 @@ export const filterDuplicateMusic = async(list: LX.Music.MusicInfo[], isFilterVa
   if (isFilterVariant) {
     list.forEach((musicInfo, index) => {
       let musicInfoName = musicInfo.name.toLowerCase().replace(variantRxp, '').replace(variantRxp2, '')
-      if (!musicInfoName) musicInfoName = musicInfo.name.toLowerCase().replace(/\s+/g, '')
+      musicInfoName ||= musicInfo.name.toLowerCase().replace(/\s+/g, '')
       handleFilter(musicInfoName, index, musicInfo)
     })
   } else {