zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Compare commits

base: zhuhao:0b6039f9d845bae2609734a4fbb0797884d6d188
Branches Tags
zhuhao:main
zhuhao:zouyf_dev
zhuhao:lyc-dev
zhuhao:zdg_dev
zhuhao:zxl
zhuhao:baigl
zhuhao:yws_dev
zhuhao:zouyf_tmp
zhuhao:cys_dev
zhuhao:yangws_ws
zhuhao:2.5.9
zhuhao:2.5.7
zhuhao:2.5.5
..
compare: zhuhao:792ab3284f47f9ad849fc8f974bca9547bf67a95
Branches Tags
zhuhao:main
zhuhao:zouyf_dev
zhuhao:lyc-dev
zhuhao:zdg_dev
zhuhao:zxl
zhuhao:baigl
zhuhao:yws_dev
zhuhao:zouyf_tmp
zhuhao:cys_dev
zhuhao:yangws_ws
zhuhao:2.5.9
zhuhao:2.5.7
zhuhao:2.5.5

No commits in common. "0b6039f9d845bae2609734a4fbb0797884d6d188" and "792ab3284f47f9ad849fc8f974bca9547bf67a95" have entirely different histories.
0b6039f9d8 ... 792ab3284f

1 changed files with 2 additions and 5 deletions
Show Stats Expand all files Collapse all files

7
src/renderer/src/components/whiteboard/whiteboard.vue
View File

@ -15,7 +15,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div class="blockBox"> <div class="blockBox">
<el-button @click="currentType = 'selection'"><el-image :src="pointerImg" <el-button @click="currentType = 'selection'"><el-image src="../../../src/assets/images/mouse-pointer.png"
style="width: 14px; height: 14px; color: silver" /></el-button> style="width: 14px; height: 14px; color: silver" /></el-button>
</div> </div>
<template v-if="type == 'design'"> <template v-if="type == 'design'">
@ -145,7 +145,7 @@
<!-- 边框粗细 --> <!-- 边框粗细 -->
<div class="blockBox"> <div class="blockBox">
<el-dropdown @command="updateStyle('lineWidth', $event)" placement="top"> <el-dropdown @command="updateStyle('lineWidth', $event)" placement="top">
<el-button><el-image :src="borderImg" <el-button><el-image src="../../../src/assets/images/borderwidth.png"
style="width: 14px; height: 14px"></el-image></el-button> style="width: 14px; height: 14px"></el-image></el-button>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
@ -303,9 +303,6 @@ import {
import Contextmenu from './components/Contextmenu.vue' import Contextmenu from './components/Contextmenu.vue'
import { fontFamilyList, fontSizeList } from './constants' import { fontFamilyList, fontSizeList } from './constants'
const borderImg = new URL('../../../src/assets/images/borderwidth.png', import.meta.url).href
const pointerImg = new URL('../../../src/assets/images/mouse-pointer.png', import.meta.url).href
const props = defineProps({ const props = defineProps({
modelValue: { modelValue: {
type: Boolean, type: Boolean,