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

Merge branch 'main' into zhuhao_dev

This commit is contained in:
朱浩 2024-09-20 16:56:44 +08:00
parent ef9fe838a3 9ff824e082
commit 3cced30959
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/renderer/src/components/choose-textbook/index.vue
View File

@ -98,6 +98,8 @@ const emitChangeBook = async () => {
let curData = cloneDeep(toRaw(curNode.data)) let curData = cloneDeep(toRaw(curNode.data))
let parentNode = findParentByChildId(treeData.value, curData.id) let parentNode = findParentByChildId(treeData.value, curData.id)
curData.parentNode = toRaw(parentNode) curData.parentNode = toRaw(parentNode)
//怎加一个label 之前取的label
curData.label = curData.itemtitle
const data = { const data = {
textBook: { textBook: {
curBookId: curBook.data.id, curBookId: curBook.data.id,
@ -160,7 +162,9 @@ const handleNodeClick = (data, node) => {
* data : 当前节点数据 * data : 当前节点数据
* node : 当前节点对象 包含当前节点所有数据 parent属性 指向父节点Node对象 * node : 当前节点对象 包含当前节点所有数据 parent属性 指向父节点Node对象
*/ */
const nodeData = cloneDeep(toRaw(data)); let nodeData = cloneDeep(toRaw(data));
//怎加一个label 之前取的label
nodeData.label = nodeData.itemtitle
const parentNode = node.parent.data; const parentNode = node.parent.data;
// parentNode 为数组 则点击的是一级节点 // parentNode 为数组 则点击的是一级节点
if (Array.isArray(parentNode)) { if (Array.isArray(parentNode)) {

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

@ -16,8 +16,7 @@
<div class="tool-bottom-all" <div class="tool-bottom-all"
@mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)"> @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>