ion/Melo
1
0
Fork 0
Code Issues Pull Requests Actions 11 Packages Projects Releases Wiki Activity

我的列表新增拖动调整位置功能

Browse Source
This commit is contained in:
lyswhut
2021-12-27 18:14:43 +08:00
parent b783c0c227
commit 028c2f9f03
12 changed files with 177 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lang/en-us.json
+1 -3
View File
@@ -110,15 +110,13 @@
"lists__import_part_button_confirm": "Overwrite",
"lists__import_part_confirm": "The imported list ({importName}) has the same ID as the local list ({localName}). Do you overwrite the local list?",
"lists__import_part_desc": "Select list file",
"lists__movedown": "Move Down",
"lists__moveup": "Move Up",
"lists__new_list_btn": "Create list",
"lists__new_list_input": "New list...",
"lists__remove": "Remove",
"lists__remove_tip": "Do you really want to remove {name}?",
"lists__remove_tip_button": "Yes, that's right",
"lists__rename": "Rename",
"lists__sort_list": "Sort",
"lists__sort_list": "Sort songs",
"lists__sync": "Update",
"load_list_file_error_detail": "We have helped you back up the old list file to {path}\nIt is stored in JSON format, you can try to repair and restore it manually\n\nError details: {detail}",
"load_list_file_error_title": "Error loading playlist data",
src/lang/zh-cn.json
+1 -3
View File
@@ -110,15 +110,13 @@
"lists__import_part_button_confirm": "覆盖掉",
"lists__import_part_confirm": "导入的列表（{importName}）与本地列表（{localName}）的ID相同，是否覆盖本地列表？",
"lists__import_part_desc": "选择列表文件",
"lists__movedown": "下移",
"lists__moveup": "上移",
"lists__new_list_btn": "新建列表",
"lists__new_list_input": "新列表...",
"lists__remove": "删除",
"lists__remove_tip": "你真的想要移除 {name} 吗？",
"lists__remove_tip_button": "是的 没错",
"lists__rename": "重命名",
"lists__sort_list": "排序",
"lists__sort_list": "排序歌曲",
"lists__sync": "更新",
"load_list_file_error_detail": "我们已经帮你把旧的列表文件备份到{path}\n它以 JSON 格式存储，你可以尝试手动修复并恢复它\n\n错误详情：{detail}",
"load_list_file_error_title": "播放列表数据加载错误（建议到GitHub或加群反馈）",
src/lang/zh-tw.json
+1 -3
View File
@@ -110,15 +110,13 @@
"lists__import_part_button_confirm": "覆蓋掉",
"lists__import_part_confirm": "導入的列表（{importName}）與本地列表（{localName}）的ID相同，是否覆蓋本地列表？",
"lists__import_part_desc": "選擇列表文件",
"lists__movedown": "下移",
"lists__moveup": "上移",
"lists__new_list_btn": "新建列表",
"lists__new_list_input": "新列表...",
"lists__remove": "刪除",
"lists__remove_tip": "你真的想要移除 {name} 嗎？",
"lists__remove_tip_button": "是的 沒錯",
"lists__rename": "重命名",
"lists__sort_list": "排序",
"lists__sort_list": "排序歌曲",
"lists__sync": "更新",
"load_list_file_error_detail": "我們已經幫你把舊的列表文件備份到{path}\n它以 JSON 格式存儲，你可以嘗試手動修復並恢復它\n\n錯誤詳情：{detail}",
"load_list_file_error_title": "播放列表數據加載錯誤",
src/renderer/event/index.js
+4
View File
@@ -50,10 +50,14 @@ const registerMin = () => rendererSend(NAMES.mainWindow.min)
const registerMinToggle = () => rendererSend(NAMES.mainWindow.min_toggle)
const registerHideToggle = () => rendererSend(NAMES.mainWindow.hide_toggle)
const setClearDownKeys = () => keyBind.clearDownKeys()
eventHub.on(baseName.min, registerMin)
eventHub.on(baseName.max, () => rendererSend(NAMES.mainWindow.max))
eventHub.on(baseName.close, () => rendererSend(NAMES.mainWindow.close))
eventHub.on(baseName.setClearDownKeys, setClearDownKeys)
const registerCommonEvents = () => {
eventHub.on(hotKeyNamesCommon.close.action, registerQuit)
eventHub.on(hotKeyNamesCommon.min.action, registerMin)
src/renderer/event/names.js
+3
View File
@@ -3,6 +3,9 @@ const names = {
key_down: 'key_down',
bindKey: 'bindKey',
unbindKey: 'unbindKey',
dragStart: 'dragStart',
dragEnd: 'dragEnd',
setClearDownKeys: 'setClearDownKeys',
focus: 'focus',
min: 'min',
max: 'max',
src/renderer/plugins/Tips/index.js
+14 -1
View File
@@ -1,10 +1,12 @@
import tips from './Tips'
import { debounce } from '../../utils'
import { base as eventBaseName } from '@renderer/event/names'
let instance
let prevTips
let prevX = 0
let prevY = 0
let isDraging = false
const getTips = el =>
el
@@ -16,6 +18,7 @@ const getTips = el =>
: null
const showTips = debounce(event => {
if (isDraging) return
let msg = getTips(event.target)
if (!msg) return
prevTips = msg
@@ -46,6 +49,7 @@ const setTips = tips => {
}
const updateTips = event => {
if (isDraging) return
if (!instance) return showTips(event)
setTimeout(() => {
let msg = getTips(event.target)
@@ -56,7 +60,7 @@ const updateTips = event => {
}
document.body.addEventListener('mousemove', event => {
if (event.x == prevX && event.y == prevY) return
if ((event.x == prevX && event.y == prevY) || isDraging) return
prevX = event.x
prevY = event.y
hideTips()
@@ -66,3 +70,12 @@ document.body.addEventListener('mousemove', event => {
document.body.addEventListener('click', updateTips)
document.body.addEventListener('contextmenu', updateTips)
window.eventHub.on(eventBaseName.dragStart, () => {
isDraging = true
hideTips()
})
window.eventHub.on(eventBaseName.dragEnd, () => {
isDraging = false
})
src/renderer/store/modules/list.js
-10
View File
@@ -352,16 +352,6 @@ const mutations = {
list.name = name
window.eventHub.emit(eventListNames.listChange, [id])
},
moveupUserList(state, { id, isSync }) {
const index = userLists.findIndex(l => l.id == id)
if (index < 0) return
this.commit('list/setUserListPosition', { id, position: index - 1 })
},
movedownUserList(state, { id, isSync }) {
const index = userLists.findIndex(l => l.id == id)
if (index < 0) return
this.commit('list/setUserListPosition', { id, position: index + 1 })
},
setUserListPosition(state, { id, position, isSync }) {
if (!isSync) {
window.eventHub.emit(eventSyncName.send_action_list, {
src/renderer/utils/compositions/useDrag.js
+48
View File
@@ -0,0 +1,48 @@
import Sortable, { AutoScroll } from 'sortablejs/modular/sortable.core.esm'
import { onMounted } from '@renderer/utils/vueTools'
import { base as eventBaseName } from '@renderer/event/names'
Sortable.mount(new AutoScroll())
const noop = () => {}
export default ({ dom_list, dragingItemClassName, filter, onUpdate, onStart = noop, onEnd = noop }) => {
let sortable
onMounted(() => {
sortable = Sortable.create(dom_list.value, {
animation: 150,
disabled: true,
forceFallback: false,
filter: filter ? '.' + filter : null,
ghostClass: dragingItemClassName,
onUpdate(event) {
onUpdate(event.newIndex, event.oldIndex)
},
onMove(event) {
return filter ? !event.related.classList.contains(filter) : true
},
onChoose() {
onStart()
},
onUnchoose() {
onEnd()
// 处于拖动状态期间，键盘事件无法监听，拖动结束手动清理按下的键
window.eventHub.emit(eventBaseName.setClearDownKeys)
},
onStart(event) {
window.eventHub.emit(eventBaseName.dragStart)
},
onEnd(event) {
window.eventHub.emit(eventBaseName.dragEnd)
},
})
})
return {
setDisabled(enable) {
if (!sortable) return
sortable.option('disabled', enable)
},
}
}
src/renderer/views/list/components/MyLists.vue
+86 -43
View File
@@ -8,18 +8,18 @@
</svg>
</button>
</div>
<ul class="scroll" :class="$style.listsContent" ref="dom_lists_list">
<li :class="[$style.listsItem, {[$style.active]: defaultList.id == listId}]" :tips="defaultList.name"
<ul class="scroll" :class="[$style.listsContent, { [$style.sortable]: keyEvent.isModDown }]" ref="dom_lists_list">
<li class="default-list" :class="[$style.listsItem, {[$style.active]: defaultList.id == listId}]" :tips="defaultList.name"
@contextmenu="handleListsItemRigthClick($event, -2)" @click="handleListToggle(defaultList.id)"
>
<span :class="$style.listsLabel">{{defaultList.name}}</span>
</li>
<li :class="[$style.listsItem, {[$style.active]: loveList.id == listId}]" :tips="loveList.name"
<li class="default-list" :class="[$style.listsItem, {[$style.active]: loveList.id == listId}]" :tips="loveList.name"
@contextmenu="handleListsItemRigthClick($event, -1)" @click="handleListToggle(loveList.id)">
<span :class="$style.listsLabel">{{loveList.name}}</span>
</li>
<li class="user-list"
:class="[$style.listsItem, {[$style.active]:item.id == listId}, {[$style.clicked]: listsData.rightClickItemIndex == index}, {[$style.fetching]: fetchingListStatus[item.id]}]"
:class="[$style.listsItem, {[$style.active]:item.id == listId}, {[$style.clicked]: listsData.rightClickItemIndex == index}, {[$style.fetching]: fetchingListStatus[item.id]}]" :data-index="index"
@contextmenu="handleListsItemRigthClick($event, index)" :tips="item.name" v-for="(item, index) in userLists" :key="item.id"
>
<span :class="$style.listsLabel" @click="handleListToggle(item.id, index + 2)">{{item.name}}</span>
@@ -46,8 +46,9 @@ import musicSdk from '@renderer/utils/music'
import DuplicateMusicModal from './DuplicateMusicModal'
import ListSortModal from './ListSortModal'
import { defaultList, loveList, userLists } from '@renderer/core/share/list'
import { computed } from '@renderer/utils/vueTools'
import { ref, computed, useCommit, useCssModule } from '@renderer/utils/vueTools'
import { getList } from '@renderer/core/share/utils'
import useDarg from '@renderer/utils/compositions/useDrag'
export default {
name: 'MyLists',
@@ -62,12 +63,27 @@ export default {
ListSortModal,
},
setup() {
const dom_lists_list = ref(null)
const lists = computed(() => [defaultList, loveList, ...userLists])
const setUserListPosition = useCommit('list', 'setUserListPosition')
const styles = useCssModule()
const { setDisabled } = useDarg({
dom_list: dom_lists_list,
dragingItemClassName: styles.dragingItem,
filter: 'default-list',
onUpdate(newIndex, oldIndex) {
setUserListPosition({ id: lists.value[oldIndex].id, position: newIndex - 2 })
},
})
return {
defaultList,
loveList,
userLists,
lists,
dom_lists_list,
setDisabledSort: setDisabled,
}
},
emits: ['show-menu'],
@@ -84,8 +100,6 @@ export default {
import: true,
export: true,
sync: false,
moveup: true,
movedown: true,
remove: true,
},
rightClickItemIndex: -1,
@@ -99,6 +113,9 @@ export default {
fetchingListStatus: {},
selectedDuplicateListInfo: {},
selectedSortListInfo: {},
keyEvent: {
isModDown: false,
},
}
},
computed: {
@@ -114,16 +131,16 @@ export default {
action: 'sync',
disabled: !this.listsData.itemMenuControl.sync,
},
{
name: this.$t('lists__duplicate'),
action: 'duplicate',
disabled: !this.listsData.itemMenuControl.duplicate,
},
{
name: this.$t('lists__sort_list'),
action: 'sort',
disabled: !this.listsData.itemMenuControl.sort,
},
{
name: this.$t('lists__duplicate'),
action: 'duplicate',
disabled: !this.listsData.itemMenuControl.duplicate,
},
{
name: this.$t('lists__import'),
action: 'import',
@@ -134,16 +151,6 @@ export default {
action: 'export',
disabled: !this.listsData.itemMenuControl.export,
},
{
name: this.$t('lists__moveup'),
action: 'moveup',
disabled: !this.listsData.itemMenuControl.moveup,
},
{
name: this.$t('lists__movedown'),
action: 'movedown',
disabled: !this.listsData.itemMenuControl.movedown,
},
{
name: this.$t('lists__remove'),
action: 'remove',
@@ -171,13 +178,17 @@ export default {
},
mounted() {
this.setListsScroll()
window.eventHub.on('key_mod_down', this.handle_key_mod_down)
window.eventHub.on('key_mod_up', this.handle_key_mod_up)
},
beforeUnmount() {
window.eventHub.off('key_mod_down', this.handle_key_mod_down)
window.eventHub.off('key_mod_up', this.handle_key_mod_up)
},
methods: {
...mapMutations('list', [
'setUserListName',
'createUserList',
'moveupUserList',
'movedownUserList',
'removeUserList',
'setPrevSelectListId',
'setList',
@@ -186,20 +197,37 @@ export default {
...mapActions('leaderboard', {
getBoardListAll: 'getListAll',
}),
handle_key_mod_down() {
if (!this.keyEvent.isModDown) {
this.keyEvent.isModDown = true
this.setDisabledSort(false)
const dom_target = this.dom_lists_list.querySelector('.' + this.$style.editing)
if (dom_target) this.handleListsSave(dom_target.dataset.index)
}
if (this.listsData.isShowItemMenu) this.hideListsMenu()
},
handle_key_mod_up() {
if (this.keyEvent.isModDown) {
this.keyEvent.isModDown = false
this.setDisabledSort(true)
}
},
setListsScroll() {
let target = this.$refs.dom_lists_list.querySelector('.' + this.$style.active)
let target = this.dom_lists_list.querySelector('.' + this.$style.active)
if (!target) return
let offsetTop = target.offsetTop
let location = offsetTop - 150
if (location > 0) this.$refs.dom_lists_list.scrollTop = location
if (location > 0) this.dom_lists_list.scrollTop = location
},
handleListsSave(index, event) {
let dom_target = this.$refs.dom_lists_list.querySelector('.' + this.$style.editing)
if (dom_target) dom_target.classList.remove(this.$style.editing)
let name = event.target.value.trim()
handleListsSave(index) {
let dom_target = this.dom_lists_list.querySelector('.' + this.$style.editing)
if (!dom_target) return
dom_target.classList.remove(this.$style.editing)
const dom_input = dom_target.querySelector('.' + this.$style.listsInput)
let name = dom_input.value.trim()
const targetList = userLists[index]
if (name.length) return this.setUserListName({ id: targetList.id, name })
event.target.value = targetList.name
dom_input.value = targetList.name
},
handleListsCreate(event) {
if (event.target.readonly) return
@@ -242,22 +270,18 @@ export default {
this.listsData.itemMenuControl.rename = false
this.listsData.itemMenuControl.remove = false
this.listsData.itemMenuControl.sync = false
this.listsData.itemMenuControl.moveup = false
this.listsData.itemMenuControl.movedown = false
break
default:
this.listsData.itemMenuControl.rename = true
this.listsData.itemMenuControl.remove = true
source = userLists[index].source
this.listsData.itemMenuControl.sync = !!source && !!musicSdk[source]?.songList
this.listsData.itemMenuControl.moveup = index > 0
this.listsData.itemMenuControl.movedown = index < userLists.length - 1
break
}
this.listsData.itemMenuControl.sort = !!getList(this.getTargetListInfo(index)?.id).length
this.listsData.rightClickItemIndex = index
this.listsData.menuLocation.x = event.currentTarget.offsetLeft + event.offsetX
this.listsData.menuLocation.y = event.currentTarget.offsetTop + event.offsetY - this.$refs.dom_lists_list.scrollTop
this.listsData.menuLocation.y = event.currentTarget.offsetTop + event.offsetY - this.dom_lists_list.scrollTop
this.$emit('show-menu')
this.$nextTick(() => {
this.listsData.isShowItemMenu = true
@@ -275,7 +299,7 @@ export default {
let dom
switch (action && action.action) {
case 'rename':
dom = this.$refs.dom_lists_list.querySelectorAll('.user-list')[index]
dom = this.dom_lists_list.querySelectorAll('.user-list')[index]
this.$nextTick(() => {
dom.classList.add(this.$style.editing)
dom.querySelector('input').focus()
@@ -298,12 +322,6 @@ export default {
case 'sync':
this.handleSyncSourceList(index)
break
case 'moveup':
this.moveupUserList({ id: userLists[index].id })
break
case 'movedown':
this.movedownUserList({ id: userLists[index].id })
break
case 'remove':
this.$dialog.confirm({
message: this.$t('lists__remove_tip', { name: userLists[index].name }),
@@ -475,6 +493,22 @@ export default {
min-width: 0;
overflow-y: scroll !important;
// border-right: 1px solid rgba(0, 0, 0, 0.12);
&.sortable {
* {
-webkit-user-drag: element;
}
.listsItem {
&:hover, &.active, &.selected, &.clicked {
background-color: transparent !important;
}
&.dragingItem {
background-color: @color-theme_2-hover !important;
}
}
}
}
.listsItem {
position: relative;
@@ -565,6 +599,15 @@ each(@themes, {
background-color: ~'@{color-@{value}-theme_2-hover}';
}
}
.listsContent {
&.sortable {
.listsItem {
&.dragingItem {
background-color: ~'@{color-@{value}-theme_2-hover}' !important;
}
}
}
}
.listsNew {
background-color: ~'@{color-@{value}-theme_2-hover}';
}