diff --git a/packages/canvas/container/src/CanvasContainer.vue b/packages/canvas/container/src/CanvasContainer.vue
index 9da26ae258..194b565896 100644
--- a/packages/canvas/container/src/CanvasContainer.vue
+++ b/packages/canvas/container/src/CanvasContainer.vue
@@ -1,9 +1,9 @@
 <template>
-  <div v-for="multiState in multiSelectedStates" :key="multiState.id">
+  <div v-for="state in multiSelectedStates" :key="state.id">
     <canvas-action
       :hoverState="hoverState"
       :inactiveHoverState="inactiveHoverState"
-      :selectState="multiState"
+      :selectState="state"
       :lineState="lineState"
       :windowGetClickEventTarget="target"
       :resize="canvasState.type === 'absolute'"
@@ -14,8 +14,8 @@
   </div>
   <canvas-router-jumper :hoverState="hoverState" :inactiveHoverState="inactiveHoverState"></canvas-router-jumper>
   <canvas-viewer-switcher :hoverState="hoverState" :inactiveHoverState="inactiveHoverState"></canvas-viewer-switcher>
-  <canvas-divider :selectState="selectState"></canvas-divider>
-  <canvas-resize-border :iframe="iframe"></canvas-resize-border>
+  <canvas-divider :selectState="computedSelectState"></canvas-divider>
+  <canvas-resize-border :selectState="computedSelectState" :iframe="iframe"></canvas-resize-border>
   <canvas-resize>
     <template v-if="!loading">
       <iframe
@@ -62,9 +62,9 @@ import {
   onMouseUp,
   dragMove,
   dragState,
+  initialRectState,
   hoverState,
   inactiveHoverState,
-  selectState,
   lineState,
   removeNodeById,
   syncNodeScroll,
@@ -107,7 +107,17 @@ export default {
     const containerPanel = ref(null)
     const insertContainer = ref(false)
 
-    const { multiSelectedStates, multiStateLength, toggleMultiSelection } = useMultiSelect()
+    const { multiSelectedStates } = useMultiSelect()
+
+    const multiStateLength = computed(() => multiSelectedStates.value.length)
+
+    const computedSelectState = computed(() => {
+      if (multiSelectedStates.value.length === 1) {
+        return multiSelectedStates.value[0]
+      }
+
+      return initialRectState
+    })
 
     const setCurrentNode = async (event) => {
       const { clientX, clientY } = event
@@ -119,11 +129,12 @@ export default {
         const currentElement = querySelectById(getCurrent().schema?.id)
 
         if (!currentElement?.contains(element) || event.button === 0) {
+          const isCtrlKey = event.ctrlKey || event.metaKey
           const loopId = element.getAttribute(NODE_LOOP)
           if (loopId) {
-            node = await selectNode(element.getAttribute(NODE_UID), `loop-id=${loopId}`)
+            node = await selectNode(element.getAttribute(NODE_UID), `loop-id=${loopId}`, isCtrlKey)
           } else {
-            node = await selectNode(element.getAttribute(NODE_UID))
+            node = await selectNode(element.getAttribute(NODE_UID), undefined, isCtrlKey)
           }
         }
 
@@ -205,8 +216,6 @@ export default {
               return
             }
 
-            toggleMultiSelection(event, element)
-
             insertPosition.value = false
             insertContainer.value = false
             setCurrentNode(event)
@@ -300,16 +309,6 @@ export default {
       hoverState.slot = slotName
     }
 
-    watch(
-      () => multiStateLength.value,
-      (newVal) => {
-        if (newVal > 1) {
-          // 清空属性面板
-          selectNode(null)
-        }
-      }
-    )
-
     onMounted(() => run(iframe))
     onUnmounted(() => {
       if (iframe.value?.contentDocument) {
@@ -326,7 +325,7 @@ export default {
       dragState,
       hoverState,
       inactiveHoverState,
-      selectState,
+      computedSelectState,
       lineState,
       multiSelectedStates,
       multiStateLength,
diff --git a/packages/canvas/container/src/components/CanvasAction.vue b/packages/canvas/container/src/components/CanvasAction.vue
index 572f7dbe6d..029a4375e0 100644
--- a/packages/canvas/container/src/components/CanvasAction.vue
+++ b/packages/canvas/container/src/components/CanvasAction.vue
@@ -484,6 +484,11 @@ export default {
     watchPostEffect(async () => {
       const { left, top, width, height, doc } = props.selectState
 
+      // template上虽然已经判断了showQuickAction，这里再加上主要是为了watchPostEffect能够监听它，然后刷新action
+      if (!showQuickAction.value) {
+        return
+      }
+
       // nextTick后ref才能获取到元素。需要把监听的依赖放在await之前，否则无法监听变化
       await nextTick()
 
diff --git a/packages/canvas/container/src/components/CanvasDivider.vue b/packages/canvas/container/src/components/CanvasDivider.vue
index 9ec9f73ad7..ae9cc028d3 100644
--- a/packages/canvas/container/src/components/CanvasDivider.vue
+++ b/packages/canvas/container/src/components/CanvasDivider.vue
@@ -181,6 +181,7 @@ export default {
         state.dividerStyle = {
           width: '1px',
           height: `${height}px`,
+          // FIXME verLeft自带了px
           left: `${state.verLeft}px`,
           top: `${top}px`
         }
diff --git a/packages/canvas/container/src/components/CanvasResizeBorder.vue b/packages/canvas/container/src/components/CanvasResizeBorder.vue
index d15d733529..1e075d1333 100644
--- a/packages/canvas/container/src/components/CanvasResizeBorder.vue
+++ b/packages/canvas/container/src/components/CanvasResizeBorder.vue
@@ -9,13 +9,16 @@
 <script>
 import { reactive, watch } from 'vue'
 import { useLayout, useCanvas } from '@opentiny/tiny-engine-meta-register'
-import { getCurrent, updateRect, selectState, querySelectById } from '../container'
+import { getCurrent, updateRect, querySelectById } from '../container'
 
 export default {
   props: {
     iframe: {
       type: Object,
       default: () => ({})
+    },
+    selectState: {
+      type: Object
     }
   },
   setup(props) {
@@ -118,7 +121,7 @@ export default {
     }
 
     const handleResizeStart = () => {
-      const { top, left, width, height } = selectState
+      const { top, left, width, height } = props.selectState
       const { parent, schema } = getCurrent()
 
       let startX = left
@@ -146,8 +149,8 @@ export default {
     }
 
     watch(
-      () => selectState,
-      () => {
+      () => props.selectState,
+      (selectState) => {
         const { top, left, width, height, componentName } = selectState
         const { parent, schema } = getCurrent()
 
diff --git a/packages/canvas/container/src/composables/useMultiSelect.js b/packages/canvas/container/src/composables/useMultiSelect.js
index e8761a4b42..abb78e39a2 100644
--- a/packages/canvas/container/src/composables/useMultiSelect.js
+++ b/packages/canvas/container/src/composables/useMultiSelect.js
@@ -1,119 +1,65 @@
-import { ref, computed, toRaw } from 'vue'
-import { useCanvas } from '@opentiny/tiny-engine-meta-register'
-import { NODE_TAG, NODE_UID } from '../../../common'
-import { getRect, getDocument } from '../container'
+import { ref } from 'vue'
+import { getDocument, getRect, querySelectById } from '../container'
 
 // 初始化多选节点
 const multiSelectedStates = ref([])
 
-// 节点位置缓存
-let nodeRectCache = new WeakMap()
-
-// 获取带缓存的节点位置
-const getCachedRect = (element) => {
-  if (nodeRectCache.has(element)) {
-    return nodeRectCache.get(element)
-  }
-  const rect = getRect(element)
-  nodeRectCache.set(element, rect)
-  return rect
-}
-
 export const useMultiSelect = () => {
-  // 记录最后选择的节点
-  const lastSelectedNode = ref(null)
-
-  const multiStateLength = computed(() => multiSelectedStates.value.length)
-
-  // 设置多选节点
-  const setMultiSelection = (nodes) => {
-    if (Array.isArray(nodes)) {
-      multiSelectedStates.value = nodes
-    } else if (nodes && typeof nodes === 'object') {
-      multiSelectedStates.value = [nodes]
-    } else {
-      multiSelectedStates.value = []
+  /**
+   * 添加state到多选列表
+   * @param {*} selectState
+   * @param {boolean} isMultiple 是否多选
+   * @returns {boolean} 添加成功返回true，否则返回false
+   */
+  const toggleMultiSelection = (selectState, isMultiple = false) => {
+    if (!selectState || typeof selectState !== 'object') {
+      return false
     }
-  }
 
-  // 添加节点到多选列表
-  const addMultiSelection = (node) => {
-    if (!node || typeof node !== 'object') return
+    // 多选
+    if (isMultiple) {
+      const isExistNode = multiSelectedStates.value.some((state) => state.id === selectState.id)
+      // 如果多选列表已经存在选中的state，则将选中的state移出多选列表
+      if (isExistNode) {
+        multiSelectedStates.value = multiSelectedStates.value.filter((state) => state.id !== selectState.id)
+      } else {
+        multiSelectedStates.value = multiSelectedStates.value.concat(selectState)
+      }
 
-    if (!multiSelectedStates.value.some((state) => state.id === node.id)) {
-      multiSelectedStates.value.push(node)
+      return !isExistNode
     }
-  }
 
-  // 获取多选节点（带缓存）
-  const getMultiSelectionState = (element) => {
-    if (!element) {
-      return null
-    }
+    // 单选
+    multiSelectedStates.value = [selectState]
 
-    // 使用缓存的位置信息
-    const { top, left, width, height } = getCachedRect(element)
-    const nodeTag = element?.getAttribute(NODE_TAG)
-    const nodeId = element?.getAttribute(NODE_UID) || 'body'
+    return true
+  }
 
-    // 获取节点信息
-    const { node } = useCanvas().getNodeWithParentById(nodeId) || {}
-    lastSelectedNode.value = nodeId
+  const refreshSelectionState = () => {
+    multiSelectedStates.value = multiSelectedStates.value.map((state) => {
+      const element = querySelectById(state.id) || getDocument().body
+      const { top, left, width, height } = getRect(element)
+
+      return {
+        ...state,
+        top,
+        left,
+        width,
+        height
+      }
+    })
 
-    return {
-      id: nodeId,
-      componentName: nodeTag,
-      doc: getDocument(element),
-      top,
-      left,
-      width,
-      height,
-      schema: toRaw(node)
-    }
+    return multiSelectedStates.value
   }
 
   const clearMultiSelection = () => {
     multiSelectedStates.value = []
-    lastSelectedNode.value = null
-    nodeRectCache = new WeakMap() // 清空缓存
-  }
-
-  // 处理多选节点
-  const toggleMultiSelection = (event, element) => {
-    const isCtrlKey = event.ctrlKey || event.metaKey
-    const selectState = getMultiSelectionState(element)
-
-    if (!selectState) {
-      return
-    }
-
-    const nodeId = selectState?.id
-    const isExistNode = multiSelectedStates.value.some((state) => state.id === nodeId)
-    const isBodyState = selectState?.id === 'body'
-
-    if (isCtrlKey && event.button === 0) {
-      if (isBodyState) return
-      // 按住Ctrl或Meta键时，切换多选状态
-      if (isExistNode && nodeId) {
-        const exList = toRaw(multiSelectedStates.value).filter((state) => state.id !== nodeId)
-        if (!exList.length) return
-        setMultiSelection(exList)
-      } else {
-        addMultiSelection(selectState)
-      }
-    } else {
-      // 没有按住Ctrl或Meta键时，清除所有多选状态并添加当前节点
-      clearMultiSelection()
-      addMultiSelection(selectState)
-    }
   }
 
   return {
     multiSelectedStates,
-    multiStateLength,
-    setMultiSelection,
-    getMultiSelectionState,
     toggleMultiSelection,
+    refreshSelectionState,
     clearMultiSelection
   }
 }
diff --git a/packages/canvas/container/src/container.js b/packages/canvas/container/src/container.js
index fc35e3c43b..1d7d46e25c 100644
--- a/packages/canvas/container/src/container.js
+++ b/packages/canvas/container/src/container.js
@@ -105,11 +105,6 @@ const initialLineState = {
   doc: null
 }
 
-// 选中画布中元素时的状态
-export const selectState = reactive({
-  ...initialRectState
-})
-
 // 鼠标移入画布中元素时的状态
 export const hoverState = reactive({
   ...initialRectState
@@ -124,6 +119,8 @@ export const lineState = reactive({
   ...initialLineState
 })
 
+const { multiSelectedStates, toggleMultiSelection, refreshSelectionState, clearMultiSelection } = useMultiSelect()
+
 export const clearHover = () => {
   Object.assign(hoverState, initialRectState, { slot: null })
   Object.assign(inactiveHoverState, initialRectState, { slot: null })
@@ -132,7 +129,7 @@ export const clearHover = () => {
 export const clearSelect = () => {
   canvasState.current = null
   canvasState.parent = null
-  Object.assign(selectState, initialRectState)
+  clearMultiSelection()
   // 临时借用 remote 事件出发 currentSchema 更新
   canvasState?.emit?.('remove')
 }
@@ -355,8 +352,7 @@ export const querySelectById = (id) => {
   let element = doc.querySelector(selector)
   const loopId = element?.getAttribute('loop-id')
   if (element && loopId) {
-    const currentLoopId = getCurrent().loopId
-    selector = `[${NODE_UID}="${id}"][${NODE_LOOP}="${currentLoopId}"]`
+    selector = `[${NODE_UID}="${id}"][${NODE_LOOP}="${loopId}"]`
     element = doc.querySelector(selector)
   }
   return element
@@ -394,50 +390,56 @@ export const scrollToNode = (element) => {
   return nextTick()
 }
 
-const { clearMultiSelection, setMultiSelection, multiSelectedStates, multiStateLength } = useMultiSelect()
+const setSelectRect = (id, element, options) => {
+  clearHover()
 
-const setSelectRect = (element, multiNodeId) => {
-  element = element || getDocument().body
+  const { type, schema, isMultiple = false } = options || {}
+  element = element || querySelectById(id) || getDocument().body
 
   const { left, height, top, width } = getRect(element)
-  const elementBounds = { left, top, width, height }
-  const componentName = getCurrent().schema?.componentName || ''
-  clearHover()
-  Object.assign(selectState, elementBounds, {
-    componentName,
-    doc: getDocument()
-  })
+  const componentName = (schema || getCurrent().schema)?.componentName || ''
+  const { node, parent } = useCanvas().getNodeWithParentById(id) || {}
 
-  if (multiNodeId) {
-    multiSelectedStates.value.map((state) => {
-      if (state.id === multiNodeId) {
-        return Object.assign(state, elementBounds)
-      }
-    })
-  }
+  return toggleMultiSelection(
+    {
+      id,
+      left,
+      height,
+      top,
+      width,
+      componentName,
+      doc: getDocument(),
+      schema: node,
+      parent,
+      type
+    },
+    isMultiple
+  )
 }
 
 export const updateRect = (id) => {
   id = (typeof id === 'string' && id) || getCurrent().schema?.id
   clearHover()
 
-  if (id) {
-    setTimeout(() => setSelectRect(querySelectById(id)))
+  // 多选场景直接调用 refreshSelectionState
+  if (multiSelectedStates.value.length > 1) {
+    refreshSelectionState()
+    setTimeout(() => refreshSelectionState())
+    return
+  }
+
+  const selectState = multiSelectedStates.value[0] || initialRectState
+  const isBodySelected = !selectState.componentName && selectState.width > 0
+
+  if (id || isBodySelected) {
+    setTimeout(() => setSelectRect(id))
   } else {
-    // 如果选中的是body，不清除选中框
-    if (!selectState.componentName && selectState.width > 0) {
-      return
-    }
     clearSelect()
   }
 }
 
 export const syncNodeScroll = () => {
-  multiSelectedStates.value.forEach((state) => {
-    const multiNodeId = state.id
-    const element = querySelectById(multiNodeId)
-    setTimeout(() => setSelectRect(element, multiNodeId))
-  })
+  refreshSelectionState()
 }
 
 export const getConfigure = (targetName) => {
@@ -729,39 +731,48 @@ export const dragMove = (event, isHover) => {
 }
 
 // type == clickTree, 为点击大纲; type == loop-id=xxx ,为点击循环数据
-export const selectNode = async (id, type) => {
-  if (type && type.indexOf('loop-id') > -1) {
-    const loopId = type.split('=')[1]
-    canvasState.loopId = loopId
-  }
-
-  if (type !== 'clickTree' && multiStateLength.value === 1) {
-    id = multiSelectedStates.value[0]?.id
-  }
-
-  const { node, parent } = useCanvas().getNodeWithParentById(id) || {}
+export const selectNode = async (id, type, isMultiple = false) => {
+  const { node } = useCanvas().getNodeWithParentById(id) || {}
 
-  let element = querySelectById(id, type)
+  let element = querySelectById(id)
 
   if (element && node) {
     const { rootSelector } = getConfigure(node.componentName)
     element = rootSelector ? element.querySelector(rootSelector) : element
   }
 
-  canvasState.current = node
-  canvasState.parent = parent
+  const nodeIsSelected = setSelectRect(id, element, { isMultiple, type, schema: node })
 
-  await scrollToNode(element)
-  setSelectRect(element)
-
-  if (type === 'clickTree') {
-    clearMultiSelection()
-    setMultiSelection(selectState)
+  // 执行setSelectRect之后再去判断multiSelectedStates的长度
+  if (multiSelectedStates.value.length === 1) {
+    const { schema: node, parent, type } = multiSelectedStates.value[0]
+    const loopId = type?.includes('loop-id') ? type.split('=')[1] : null
+    Object.assign(canvasState, {
+      loopId,
+      current: node,
+      parent
+    })
+  } else {
+    // 没有选中或者有多选，则重置canvasState部份数据
+    Object.assign(canvasState, {
+      loopId: null,
+      current: null,
+      parent: null
+    })
   }
 
-  canvasState.emit('selected', node, parent, type, id)
+  if (nodeIsSelected) {
+    await scrollToNode(element)
+  }
 
-  return node
+  if (multiSelectedStates.value.length === 1) {
+    const { schema: node, parent, type, id } = multiSelectedStates.value[0]
+    canvasState.emit('selected', node, parent, type, id)
+    return node
+  } else {
+    canvasState.emit('selected')
+    return null
+  }
 }
 
 export const hoverNode = (id, data) => {
diff --git a/packages/canvas/container/src/keyboard.js b/packages/canvas/container/src/keyboard.js
index 6fdcab0e3e..26bb630ab1 100644
--- a/packages/canvas/container/src/keyboard.js
+++ b/packages/canvas/container/src/keyboard.js
@@ -115,8 +115,20 @@ const handleClipboardCut = (event) => {
   clearMultiSelection()
 }
 
-const handleClipboardPaste = (nodeList, schema, parent) => {
-  if (!nodeList.length) return
+const handleClipboardPaste = (event) => {
+  const nodeList = getClipboardSchema(event)
+
+  if (!nodeList.length) {
+    return
+  }
+
+  const lastSelected = multiSelectedStates.value.slice(-1)[0]
+
+  if (!lastSelected) {
+    return
+  }
+
+  const { schema, parent } = lastSelected
 
   nodeList.forEach((node) => {
     if (node?.componentName && schema?.componentName && allowInsert(getConfigure(schema.componentName), node)) {
@@ -135,15 +147,12 @@ const handleCopyEvent = (event) => {
 }
 
 const handlerClipboardEvent = (event) => {
-  const { schema, parent } = getCurrent()
-  const nodeList = getClipboardSchema(event)
-
   switch (event.type) {
     case 'copy':
       handleCopyEvent(event)
       break
     case 'paste':
-      handleClipboardPaste(nodeList, schema, parent)
+      handleClipboardPaste(event)
       break
     case 'cut':
       handleClipboardCut(event)