Merge pull request 'zdg' (#228) from zdg into main

Reviewed-on: #228
This commit is contained in:
zhengdegang 2024-09-19 16:37:45 +08:00
commit 93a061ca78
2 changed files with 12 additions and 4 deletions

View File

@ -57,6 +57,8 @@ class Drag {
document.removeEventListener('mouseup', this.up);
document.addEventListener('touchmove', this.move);
document.addEventListener('touchend', this.up);
// 手动-触发事件 v-drag-start
this.el.dispatchEvent(new CustomEvent('v-drag-end', {detail:{drag: this}}))
}
// 业务逻辑
updatePosition(e) {
@ -108,6 +110,7 @@ export default {
// const { style } = binding.value
const drag = new Drag(el, binding)
const dragStart = (e) => {
// console.log('start', e)
drag.down(e)
document.addEventListener('mousemove', drag.move);
document.addEventListener('mouseup', drag.up);

View File

@ -13,9 +13,11 @@
<im-chat ref="imChatRef" @change="chatChange" group />
<!-- 底部工具栏 -->
<div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
<div class="tool-bottom-all"
@mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
<div v-drag="{handle:'.tool-bottom-all', dragtime}"
@v-drag-start="dragtime = Date.now()">
@v-drag-start="dragtime = Date.now()"
@v-drag-end="mouseChange(1)">
<div class="c-logo" @click="logoHandle" title="拖动 | 折叠 | 展开">
<el-image :src="logo" draggable="false" />
</div>
@ -106,7 +108,7 @@ const getClassInfo = async () => {
const tabChange = (val) => {
const bool = !toolStore.isPdfWin && !toolStore.showBoardAll
if(bool) toolStore.showBoardAll = true
console.log('tabChange:', val, bool)
// console.log('tabChange:', val, bool)
toolStore.model = val // tab
}
// logo - |
@ -143,9 +145,12 @@ const mouseChange = (bool) => {
const isPdf = !resBool && toolStore.isPdfWin
if (isPdf) resBool = true
}
// console.log('mouseChange:', bool, resBool)
console.log('mouseChange:', bool, resBool)
setIgnore(resBool)
}
const touchChange = (e) => {
console.log(e)
}
// im-chat: {type, data}
const chatChange = (type, data, ...args) => {
if (type == 'createGroup') { // -