Merge branch 'main' into zhuhao_dev

src/renderer/src/components/choose-textbook/index.vue

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

src/renderer/src/views/tool/sphere.vue

@@ -16,8 +16,7 @@
     <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()"
-        @v-drag-end="mouseChange(1)">
+        @v-drag-start="dragtime = Date.now()">
         <div class="c-logo" @click="logoHandle" title="拖动 | 折叠 | 展开">
           <el-image :src="logo" draggable="false" />
         </div>