Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: insert logic and multi node insert issue #1148

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/canvas/DesignCanvas/src/api/useCanvas.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,14 +318,14 @@ const operationTypeMap = {
// 4. 根据position参数选择插入位置
let index = parentNode.children.indexOf(referenceNode)
if (index === -1 && referTargetNodeId) {
index = parentNode.children.length
index = 0
}

// 5. 插入节点的逻辑
const childrenNode = toRaw(referenceNode)
switch (position) {
case 'before':
parentNode.children.unshift(newNodeData)
referTargetNodeId ? parentNode.children.splice(index, 0, newNodeData) : parentNode.children.unshift(newNodeData)
break
case 'out':
if (childrenNode) {
Expand All @@ -337,7 +337,9 @@ const operationTypeMap = {
parentNode.children.splice(index + 1, 0, newNodeData)
break
default:
parentNode.children.push(newNodeData)
referTargetNodeId
? parentNode.children.splice(index + 1, 0, newNodeData)
: parentNode.children.push(newNodeData)
break
}

Expand Down
21 changes: 14 additions & 7 deletions packages/canvas/container/src/container.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,19 +328,26 @@ const getRect = (element) => {
}
return element.getBoundingClientRect()
}

const insertAfter = ({ parent, node, data }) => {
const insertAfter = ({ parent, node, data, target }) => {
if (!data.id) {
data.id = utils.guid()
}

useCanvas().operateNode({
const targetParentId = target ? target.id : parent.id

const operationParams = {
type: 'insert',
parentId: parent.id,
parentId: targetParentId,
newNodeData: data,
position: 'after',
referTargetNodeId: node.id
})
position: 'after'
}

// 如果没有 target 节点,传递 referTargetNodeId 参数
if (!target) {
operationParams.referTargetNodeId = node.id
}

useCanvas().operateNode(operationParams)
}

const insertBefore = ({ parent, node, data }) => {
Expand Down
38 changes: 26 additions & 12 deletions packages/canvas/container/src/keyboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,37 +103,51 @@ const handleClipboardCut = (event, schema) => {
}

const handleClipboardPaste = (node, schema, parent) => {
const multiSelectedNodes = JSON.parse(localStorage.getItem('multiSelectedNodes') || '[]')

if (multiSelectedNodes.length > 1) {
multiSelectedNodes.forEach(({ node, parent }) => {
if (allowInsert(getConfigure(schema.componentName), node)) {
insertNode({ parent, data: { ...node }, target: toRaw(schema) }, POSITION.RIGHT)
}
})
return
}

if (node?.componentName && schema?.componentName && allowInsert(getConfigure(schema.componentName), node)) {
insertNode({ parent, node: schema, data: { ...node } }, POSITION.IN)
} else {
insertNode({ parent, node: schema, data: { ...node } }, POSITION.BOTTOM)
}
}

const handleMultiNodesPaste = (node, schema, parent) => {
if (multiSelectedStates.value.length === 1) {
handleClipboardPaste(node, schema, parent)
const handleCopyEvent = (event, schema) => {
localStorage.setItem('multiSelectedNodes', JSON.stringify([]))

// 如果是多选状态,处理多个选中的节点
if (multiSelectedStates.value.length > 1) {
const selectedStates = multiSelectedStates.value.map(({ schema, parent }) => ({
node: copyObject(schema),
parent: toRaw(parent)
}))
localStorage.setItem('multiSelectedNodes', JSON.stringify(selectedStates))
return
}

const selectedStates = multiSelectedStates.value.map(({ schema, parent }) => {
return { node: copyObject(schema), schema: toRaw(schema), parent: toRaw(parent) }
})

selectedStates.forEach(({ node, schema, parent }) => {
handleClipboardPaste(node, schema, parent)
})
// 仅复制当前选中的单个节点
setClipboardSchema(event, copyObject(schema))
}

const handlerClipboardEvent = (event) => {
const { schema, parent } = getCurrent()
const node = getClipboardSchema(event)

switch (event.type) {
case 'copy':
setClipboardSchema(event, copyObject(schema))
handleCopyEvent(event, schema)
break
case 'paste':
handleMultiNodesPaste(node, schema, parent)
handleClipboardPaste(node, schema, parent)
break
case 'cut':
handleClipboardCut(event, schema)
Expand Down