zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

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
parent 59de30b6b2 c5075af2fc
commit 93a061ca78
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/renderer/src/views/tool/directive/drag.js
View File

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

13
src/renderer/src/views/tool/sphere.vue
View File

@ -13,9 +13,11 @@
<im-chat ref="imChatRef" @change="chatChange" group /> <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}" <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="拖动 | 折叠 | 展开"> <div class="c-logo" @click="logoHandle" title="拖动 | 折叠 | 展开">
<el-image :src="logo" draggable="false" /> <el-image :src="logo" draggable="false" />
</div> </div>
@ -106,7 +108,7 @@ const getClassInfo = async () => {
const tabChange = (val) => { const tabChange = (val) => {
const bool = !toolStore.isPdfWin && !toolStore.showBoardAll const bool = !toolStore.isPdfWin && !toolStore.showBoardAll
if(bool) toolStore.showBoardAll = true if(bool) toolStore.showBoardAll = true
console.log('tabChange:', val, bool) // console.log('tabChange:', val, bool)
toolStore.model = val // 存储当前tab toolStore.model = val // 存储当前tab
} }
// logo 点击-事件 折叠|展开 // logo 点击-事件 折叠|展开
@ -143,9 +145,12 @@ const mouseChange = (bool) => {
const isPdf = !resBool && toolStore.isPdfWin const isPdf = !resBool && toolStore.isPdfWin
if (isPdf) resBool = true if (isPdf) resBool = true
} }
// console.log('mouseChange:', bool, resBool) console.log('mouseChange:', bool, resBool)
setIgnore(resBool) setIgnore(resBool)
} }
const touchChange = (e) => {
console.log(e)
}
// im-chat: 聊天事件 {type, data} // im-chat: 聊天事件 {type, data}
const chatChange = (type, data, ...args) => { const chatChange = (type, data, ...args) => {
if (type == 'createGroup') { // 创建群-监听 if (type == 'createGroup') { // 创建群-监听