zdg #101

Merged
zhengdegang merged 3 commits from zdg into main 2024-08-05 17:49:45 +08:00
3 changed files with 20 additions and 23 deletions
Showing only changes of commit 19901d802f - Show all commits

View File

@ -5,21 +5,9 @@ import { defineStore } from 'pinia'
export const useToolState = defineStore('tool', { export const useToolState = defineStore('tool', {
state: () => ({ state: () => ({
// 窗口状态 model: 'select', // 悬浮球-当前模式
windowState: { showBoardAll: false, // 全屏画板-是否显示
// 窗口是否最小化
isMinimize: false,
// 窗口是否最大化
isMaximize: false,
// 窗口是否关闭
isClose: false,
test: ''
}
}), }),
actions: { actions: {
// 设置窗口状态
setWindowState(payload) {
if(!!payload)this.windowState = payload
}
} }
}) })

View File

@ -1,6 +1,8 @@
<template> <template>
<canvas ref="canvasRef" /> <div>
<slot></slot> <canvas ref="canvasRef" />
<slot></slot>
</div>
</template> </template>
<script setup> <script setup>
// //

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="warp-all"> <div class="warp-all">
<board-vue v-model="tabActive"></board-vue> <board-vue v-model="tabActive" v-show="isShow"></board-vue>
<!-- 底部工具栏 :style="dataPos.style"--> <!-- 底部工具栏 :style="dataPos.style"-->
<div class="tool-bottom-all" <div class="tool-bottom-all"
@mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)"> @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
@ -27,7 +27,7 @@
<script setup> <script setup>
// electron // electron
import { onMounted, ref, reactive } from 'vue' import { onMounted, ref, reactive, watchEffect } from 'vue'
import logo from '@root/resources/icon.png' // logo import logo from '@root/resources/icon.png' // logo
import boardVue from './components/board.vue' // import boardVue from './components/board.vue' //
import vDrag from './directive/drag' // - import vDrag from './directive/drag' // -
@ -39,6 +39,7 @@ const tabActive = ref('select') // 工具栏当前选中项
const isFold = ref(false) // const isFold = ref(false) //
const isDrag = ref(false) // const isDrag = ref(false) //
const dragtime = ref(0) // - const dragtime = ref(0) // -
const isShow = ref(false)
const toolStore = useToolState() const toolStore = useToolState()
const btnList = [ // const btnList = [ //
{ label: '选择', value: 'select', icon: 'icon-mouse' }, { label: '选择', value: 'select', icon: 'icon-mouse' },
@ -50,14 +51,16 @@ const btnList = [ // 工具栏按钮列表
// { label: '', value: 'more', icon: 'icon-xiazai9' }, // { label: '', value: 'more', icon: 'icon-xiazai9' },
] ]
onMounted(() => { onMounted(() => {
// console.log('xxx: ', JSON.stringify(toolStore.windowState)) // isShow.value = toolStore.showBoardAll // -
setTimeout(() => { // console.log('xxx: ', toolStore.model)
toolStore.windowState.test = '测试成功' // setTimeout(() => {
}, 2000); // toolStore.windowState.test = ''
// }, 2000);
}) })
// ==== === // ==== ===
const tabChange = (val) => { // tab-change const tabChange = (val) => { // tab-change
// console.log(val) // console.log('xxxx:', val)
toolStore.showBoardAll = true
switch (val) { switch (val) {
case 'brush': // case 'brush': //
break break
@ -75,6 +78,7 @@ const tabChange = (val) => { // 切换tab-change
default: default:
break break
} }
toolStore.model = val // tab
} }
const logoHandle = (e,t) => { // logo - | const logoHandle = (e,t) => { // logo - |
if (Date.now() - dragtime.value < 200) { if (Date.now() - dragtime.value < 200) {
@ -87,6 +91,9 @@ const mouseChange = (bool) => { // 鼠标移入工具栏 是否穿透
if (tabActive.value == 'select') resBool = !!bool if (tabActive.value == 'select') resBool = !!bool
ipcRenderer.send('tool-sphere:set:ignore', resBool) ipcRenderer.send('tool-sphere:set:ignore', resBool)
} }
watchEffect(() => { //
isShow.value = toolStore.showBoardAll // -
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>