优化列表全选机制,修复列表未获得焦点时仍然可以全选的问题
This commit is contained in:
@@ -164,7 +164,7 @@ export default {
|
||||
listItemHeight,
|
||||
handleSelectData,
|
||||
removeAllSelect,
|
||||
} = useList({ list })
|
||||
} = useList({ listRef, list })
|
||||
|
||||
const {
|
||||
handlePlayMusic,
|
||||
|
||||
@@ -3,7 +3,7 @@ import { isFullscreen } from '@renderer/store'
|
||||
import { getFontSizeWithScreen } from '@renderer/utils'
|
||||
import { appSetting } from '@renderer/store/setting'
|
||||
|
||||
const useKeyEvent = ({ handleSelectAllData }) => {
|
||||
const useKeyEvent = ({ handleSelectAllData, listRef }) => {
|
||||
const keyEvent = {
|
||||
isShiftDown: false,
|
||||
isModDown: false,
|
||||
@@ -22,7 +22,7 @@ const useKeyEvent = ({ handleSelectAllData }) => {
|
||||
keyEvent.isModDown &&= false
|
||||
}
|
||||
const handle_key_mod_a_down = ({ event }) => {
|
||||
if (event.target.tagName == 'INPUT') return
|
||||
if (event.target.tagName == 'INPUT' || document.activeElement != listRef.value?.$el) return
|
||||
event.preventDefault()
|
||||
if (event.repeat) return
|
||||
keyEvent.isModDown = false
|
||||
@@ -45,7 +45,7 @@ const useKeyEvent = ({ handleSelectAllData }) => {
|
||||
return keyEvent
|
||||
}
|
||||
|
||||
export default ({ list }) => {
|
||||
export default ({ listRef, list }) => {
|
||||
const selectedList = ref([])
|
||||
|
||||
let lastSelectIndex = -1
|
||||
@@ -60,7 +60,7 @@ export default ({ list }) => {
|
||||
removeAllSelect()
|
||||
selectedList.value = [...list.value]
|
||||
}
|
||||
const keyEvent = useKeyEvent({ handleSelectAllData })
|
||||
const keyEvent = useKeyEvent({ listRef, handleSelectAllData })
|
||||
|
||||
const handleSelectData = clickIndex => {
|
||||
if (keyEvent.isShiftDown) {
|
||||
|
||||
Reference in New Issue
Block a user