zdg #383

Merged
zhengdegang merged 2 commits from zdg into main 2024-10-31 15:07:51 +08:00
2 changed files with 25 additions and 7 deletions
Showing only changes of commit d44516226e - Show all commits

View File

@ -34,7 +34,7 @@
</div>
</template>
<script setup>
import { computed, defineProps, ref, reactive, watchEffect, onMounted } from 'vue'
import { computed, defineProps, ref, reactive, watchEffect, onMounted} from 'vue'
import { sessionStore } from '@/utils/store'
import homework from './homework.vue';
@ -100,10 +100,10 @@ const clickHandel = (o, e) => {
}
emit('change', o)
}
const closeActive = () =>{
isVisible.value = false
}
defineExpose({closeActive})
</script>
<style lang="scss" scoped>
.warp{
@ -115,7 +115,13 @@ const closeActive = () =>{
//min-height: 40vh;
min-width: 4em;
border-radius: 4em;
background-color: #121212;
background-color: rgba(18,18,18,0.3);
border-color: rgba(1, 1, 1, 0.1);
&:hover{
opacity: 1;
background-color: rgba(18,18,18,1);
border-color: rgba(1, 1, 1, 1);
}
.el-space{margin: 20px 0 0;}
.c-btn{
color: #d9dce3;

View File

@ -4,7 +4,7 @@
<board-vue v-model="tabActive" v-show="isShow" ref="boardVueRef"></board-vue>
<!-- 侧边工具栏 -->
<side-vue v-ignore @ignore-mounted="sideMouse" @change="sideChange"></side-vue>
<side-vue ref="sideVueRef" v-ignore @ignore-mounted="sideMouse" @change="sideChange"></side-vue>
<!-- 点赞组件 -->
<upvote-vue ref="upvoteRef" type="2"></upvote-vue>
@ -13,7 +13,7 @@
<im-chat ref="imChatRef" @change="chatChange" group />
<!-- 底部工具栏 -->
<div class="tool-bottom-all"
<!-- <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()">
@ -34,7 +34,7 @@
</el-segmented>
</div>
</transition>
</div>
</div> -->
</div>
</template>
@ -67,6 +67,7 @@ const toolStore = useToolState() // 状态管理
const boardVueRef=ref(null) // ref
const upvoteRef = ref(null) // ref
const imChatRef = ref(null) // im-chat ref
const sideVueRef = ref(null) // ref
const classObj = reactive({ //
id: route.query.reservId, // id
data: {} //
@ -83,6 +84,8 @@ const btnList = [ // 工具栏按钮列表
// { label: '', value: 'focus', icon: 'icon-jujiao' },
// { label: '', value: 'more', icon: 'icon-xiazai9' },
]
let timingSide = null // -
// === ===
onMounted(async() => {
if (!electron) return //
@ -140,7 +143,8 @@ const logoHandle = (e,t) => {
// -穿
const mouseChange = (bool) => {
let resBool = false
if (bool == 0) return setIgnore(resBool) // 穿
console.log('mouseChange:', bool, resBool)
if (!bool) return setIgnore(resBool) // 穿
if (tabActive.value == 'select') resBool = !!bool
else {
if (!isShow.value) resBool = !!bool
@ -203,6 +207,14 @@ const sideMouse = e => {
return
}
mouseChange(type == 'mouseleave')
//
if (type == 'mouseleave') {
timingSide = setTimeout(() => {
sideVueRef.value.closeActive()
}, 500)
} else { //
if (!!timingSide) clearTimeout(timingSide)
}
}
// :
const sideChange = async o => {