diff --git a/web/src/pages/Edit/components/Outline.vue b/web/src/pages/Edit/components/Outline.vue
index 0b24cb43..ca7e119c 100644
--- a/web/src/pages/Edit/components/Outline.vue
+++ b/web/src/pages/Edit/components/Outline.vue
@@ -1,22 +1,32 @@
 <template>
   <el-tree
+    ref="tree"
     class="outlineTree"
+    node-key="uid"
+    draggable
+    default-expand-all
     :class="{ isDark: isDark }"
     :data="data"
     :props="defaultProps"
+    :highlight-current="true"
     :expand-on-click-node="false"
-    default-expand-all
+    :allow-drag="checkAllowDrag"
+    @node-drop="onNodeDrop"
+    @current-change="onCurrentChange"
+    @mouseenter.native="isInTreArea = true"
+    @mouseleave.native="isInTreArea = false"
   >
     <span
       class="customNode"
       slot-scope="{ node, data }"
-      @click="onClick($event, node)"
+      :data-id="data.uid"
+      @click="onClick($event, data)"
     >
       <span
         class="nodeEdit"
-        :key="getKey()"
         contenteditable="true"
-        @keydown.stop="onKeydown($event, node)"
+        :key="getKey()"
+        @keydown.stop="onNodeInputKeydown($event, node)"
         @keyup.stop
         @blur="onBlur($event, node)"
         @paste="onPaste($event, node)"
@@ -31,7 +41,8 @@ import { mapState } from 'vuex'
 import {
   nodeRichTextToTextWithWrap,
   textToNodeRichTextWithWrap,
-  getTextFromHtml
+  getTextFromHtml,
+  createUid
 } from 'simple-mind-map/src/utils'
 
 // 大纲树
@@ -46,47 +57,114 @@ export default {
     return {
       data: [],
       defaultProps: {
-        label(data) {
-          const text = (data.data.richText
-            ? nodeRichTextToTextWithWrap(data.data.text)
-            : data.data.text
-          ).replaceAll(/\n/g, '<br>')
-          data.data.textCache = text
-          return text
-        }
+        label: 'label'
       },
-      notHandleDataChange: false
+      currentData: null,
+      notHandleDataChange: false,
+      handleNodeTreeRenderEnd: false,
+      beInsertNodeUid: '',
+      isInTreArea: false
     }
   },
   computed: {
-    ...mapState(['isDark','isOutlineEdit'])
+    ...mapState(['isDark', 'isOutlineEdit'])
   },
   created() {
-    this.$bus.$on('data_change', data => {
+    window.addEventListener('keydown', this.onKeyDown)
+    this.$bus.$on('data_change', () => {
       // 激活节点会让当前大纲失去焦点
       if (this.notHandleDataChange) {
         this.notHandleDataChange = false
         return
       }
-      this.data = [this.mindMap.renderer.renderTree]
+      this.refresh()
+    })
+    this.$bus.$on('node_tree_render_end', () => {
+      // 激活节点会让当前大纲失去焦点
+      if (this.handleNodeTreeRenderEnd) {
+        this.handleNodeTreeRenderEnd = false
+        this.notHandleDataChange = false
+        this.refresh()
+        this.$nextTick(() => {
+          this.afterCreateNewNode()
+        })
+      }
     })
   },
+  mounted() {
+    this.refresh()
+  },
+  beforeDestroy() {
+    window.removeEventListener('keydown', this.onKeyDown)
+  },
   methods: {
+    // 刷新树数据
     refresh() {
-      this.data = [this.mindMap.renderer.renderTree]
+      let data = this.mindMap.getData()
+      data.root = true // 标记根节点
+      let walk = root => {
+        const text = (root.data.richText
+          ? nodeRichTextToTextWithWrap(root.data.text)
+          : root.data.text
+        ).replaceAll(/\n/g, '<br>')
+        root.textCache = text // 保存一份修改前的数据，用于对比是否修改了
+        root.label = text
+        root.uid = root.data.uid
+        if (root.children && root.children.length > 0) {
+          root.children.forEach(item => {
+            walk(item)
+          })
+        }
+      }
+      walk(data)
+      this.data = [data]
     },
 
+    // 插入了新节点之后
+    afterCreateNewNode() {
+      // 如果是新插入节点，那么需要手动高亮该节点、定位该节点及聚焦
+      let id = this.beInsertNodeUid
+      if (id && this.$refs.tree) {
+        // 高亮树节点
+        this.$refs.tree.setCurrentKey(id)
+        let node = this.$refs.tree.getNode(id)
+        this.onCurrentChange(node.data)
+        // 定位该节点
+        this.onClick(null, node.data)
+        // 聚焦该树节点的编辑框
+        const el = document.querySelector(
+          `.customNode[data-id="${id}"] .nodeEdit`
+        )
+        if (el) {
+          let selection = window.getSelection()
+          let range = document.createRange()
+          range.selectNodeContents(el)
+          selection.removeAllRanges()
+          selection.addRange(range)
+          let offsetTop = el.offsetTop
+          this.$emit('scrollTo', offsetTop)
+        }
+      }
+    },
+
+    // 根节点不允许拖拽
+    checkAllowDrag(node) {
+      return !node.data.root
+    },
+
+    // 失去焦点更新节点文本
     onBlur(e, node) {
-      if (node.data.data.textCache === e.target.innerHTML) {
+      if (node.data.textCache === e.target.innerHTML) {
         return
       }
-      delete node.data.data.textCache
       const richText = node.data.data.richText
       const text = richText ? e.target.innerHTML : e.target.innerText
+      const targetNode = this.mindMap.renderer.findNodeByUid(node.data.uid)
+      if (!targetNode) return
       if (richText) {
-        node.data._node.setText(textToNodeRichTextWithWrap(text), true, true)
+        targetNode.setText(textToNodeRichTextWithWrap(text), true, true)
       } else {
-        node.data._node.setText(text)
+        targetNode.setText(text)
       }
     },
 
@@ -106,11 +184,13 @@ export default {
       selection.collapseToEnd()
     },
 
+    // 生成唯一的key
     getKey() {
       return Math.random()
     },
 
-    onKeydown(e) {
+    // 节点输入区域按键事件
+    onNodeInputKeydown(e) {
       if (e.keyCode === 13 && !e.shiftKey) {
         e.preventDefault()
         this.insertNode()
@@ -123,25 +203,76 @@ export default {
 
     // 插入兄弟节点
     insertNode() {
-      this.notHandleDataChange = false
-      this.mindMap.execCommand('INSERT_NODE', false)
+      this.notHandleDataChange = true
+      this.handleNodeTreeRenderEnd = true
+      this.beInsertNodeUid = createUid()
+      this.mindMap.execCommand('INSERT_NODE', false, [], {
+        uid: this.beInsertNodeUid
+      })
     },
 
     // 插入下级节点
     insertChildNode() {
-      this.notHandleDataChange = false
-      this.mindMap.execCommand('INSERT_CHILD_NODE', false)
+      this.notHandleDataChange = true
+      this.handleNodeTreeRenderEnd = true
+      this.beInsertNodeUid = createUid()
+      this.mindMap.execCommand('INSERT_CHILD_NODE', false, [], {
+        uid: this.beInsertNodeUid
+      })
     },
 
     // 激活当前节点且移动当前节点到画布中间
-    onClick(e, node) {
+    onClick(e, data) {
       this.notHandleDataChange = true
-      let targetNode = node.data._node
+      const targetNode = this.mindMap.renderer.findNodeByUid(data.uid)
       if (targetNode && targetNode.nodeData.data.isActive) return
       this.mindMap.renderer.textEdit.stopFocusOnNodeActive()
-      this.mindMap.execCommand('GO_TARGET_NODE', node.data.data.uid, () => {
+      this.mindMap.execCommand('GO_TARGET_NODE', data.uid, () => {
         this.mindMap.renderer.textEdit.openFocusOnNodeActive()
       })
+    },
+
+    // 拖拽结束事件
+    onNodeDrop(data, target, postion) {
+      this.notHandleDataChange = true
+      const node = this.mindMap.renderer.findNodeByUid(data.data.uid)
+      const targetNode = this.mindMap.renderer.findNodeByUid(target.data.uid)
+      if (!node || !targetNode) {
+        return
+      }
+      switch (postion) {
+        case 'before':
+          this.mindMap.execCommand('INSERT_BEFORE', node, targetNode)
+          break
+        case 'after':
+          this.mindMap.execCommand('INSERT_AFTER', node, targetNode)
+          break
+        case 'inner':
+          this.mindMap.execCommand('MOVE_NODE_TO', node, targetNode)
+          break
+        default:
+          break
+      }
+    },
+
+    // 当前选中的树节点变化事件
+    onCurrentChange(data) {
+      this.currentData = data
+    },
+
+    // 删除节点
+    onKeyDown(e) {
+      if (!this.isInTreArea) return
+      if ([46, 8].includes(e.keyCode) && this.currentData) {
+        e.stopPropagation()
+        this.mindMap.renderer.textEdit.hideEditTextBox()
+        const node = this.mindMap.renderer.findNodeByUid(this.currentData.uid)
+        if (node && !node.isRoot) {
+          this.notHandleDataChange = true
+          this.$refs.tree.remove(this.currentData)
+          this.mindMap.execCommand('REMOVE_NODE', [node])
+        }
+      }
     }
   }
 }
@@ -153,26 +284,10 @@ export default {
   color: rgba(0, 0, 0, 0.85);
   font-weight: bold;
 
-  &::-webkit-scrollbar {
-    width: 7px;
-    height: 7px;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    border-radius: 7px;
-    background-color: rgba(0, 0, 0, 0.3);
-    cursor: pointer;
-  }
-
-  &::-webkit-scrollbar-track {
-    box-shadow: none;
-    background: transparent;
-    display: none;
-  }
-
   .nodeEdit {
     outline: none;
     white-space: normal;
+    padding-right: 20px;
   }
 }
 
diff --git a/web/src/pages/Edit/components/OutlineEdit.vue b/web/src/pages/Edit/components/OutlineEdit.vue
index 47864593..57d3017f 100644
--- a/web/src/pages/Edit/components/OutlineEdit.vue
+++ b/web/src/pages/Edit/components/OutlineEdit.vue
@@ -8,7 +8,7 @@
       <span class="icon iconfont iconguanbi"></span>
     </div>
     <div class="outlineEdit">
-      <Outline :mindMap="mindMap" ref="outline"></Outline>
+      <Outline :mindMap="mindMap" @scrollTo="onScrollTo"></Outline>
     </div>
   </div>
 </template>
@@ -35,7 +35,6 @@ export default {
     isOutlineEdit(val) {
         if (val) {
             this.$nextTick(() => {
-                this.$refs.outline.refresh()
                 document.body.appendChild(this.$refs.outlineEditContainer)
             })
         }
@@ -46,6 +45,16 @@ export default {
 
     onClose() {
       this.setIsOutlineEdit(false)
+    },
+
+    onScrollTo(y) {
+      let container = this.$refs.outlineEditContainer
+      let height = container.offsetHeight
+      let top = container.scrollTop
+      y += 50
+      if (y > top + height) {
+        container.scrollTo(0, y - height / 2)
+      }
     }
   }
 }
@@ -63,7 +72,6 @@ export default {
   justify-content: center;
   background-color: #fff;
   overflow-y: auto;
-  padding: 50px 0;
 
   .closeBtn {
     position: absolute;
@@ -80,6 +88,7 @@ export default {
     width: 1000px;
     height: max-content;
     overflow: hidden;
+    padding: 50px 0;
 
     /deep/ .customNode {
       .nodeEdit {
diff --git a/web/src/pages/Edit/components/OutlineSidebar.vue b/web/src/pages/Edit/components/OutlineSidebar.vue
index 1414d702..bf482657 100644
--- a/web/src/pages/Edit/components/OutlineSidebar.vue
+++ b/web/src/pages/Edit/components/OutlineSidebar.vue
@@ -3,7 +3,11 @@
     <div class="changeBtn" @click="onChangeToOutlineEdit">
       <span class="icon iconfont iconquanping1"></span>
     </div>
-    <Outline :mindMap="mindMap"></Outline>
+    <Outline
+      :mindMap="mindMap"
+      v-if="activeSidebar === 'outline'"
+      @scrollTo="onScrollTo"
+    ></Outline>
   </Sidebar>
 </template>
 
@@ -37,10 +41,20 @@ export default {
     }
   },
   methods: {
-    ...mapMutations(['setIsOutlineEdit']),
+    ...mapMutations(['setIsOutlineEdit', 'setActiveSidebar']),
 
     onChangeToOutlineEdit() {
+      this.setActiveSidebar('')
       this.setIsOutlineEdit(true)
+    },
+
+    onScrollTo(y) {
+      let container = this.$refs.sidebar.getEl()
+      let height = container.offsetHeight
+      let top = container.scrollTop
+      if (y > top + height) {
+        container.scrollTo(0, y - height / 2)
+      }
     }
   }
 }
diff --git a/web/src/pages/Edit/components/Sidebar.vue b/web/src/pages/Edit/components/Sidebar.vue
index d82b5153..377a93c0 100644
--- a/web/src/pages/Edit/components/Sidebar.vue
+++ b/web/src/pages/Edit/components/Sidebar.vue
@@ -9,7 +9,7 @@
     <div class="sidebarHeader" v-if="title">
       {{ title }}
     </div>
-    <div class="sidebarContent">
+    <div class="sidebarContent" ref="sidebarContent">
       <slot></slot>
     </div>
   </div>
@@ -59,6 +59,10 @@ export default {
     close() {
       this.show = false
       this.setActiveSidebar('')
+    },
+
+    getEl() {
+      return this.$refs.sidebarContent
     }
   }
 }