From 653cb98045f7216a3857428f043e4a186ee092a5 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 4 Feb 2026 11:13:15 +0800 Subject: [PATCH] fix --- src/assets/css/style.css | 9 +- src/views/home/versionTree/tree/index.vue | 28 ++----- .../home/versionTree/tree/view2/index.vue | 84 +++++++++++++------ 3 files changed, 69 insertions(+), 52 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 5bf4519..1588c2c 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -1,9 +1,12 @@ body, html, -p, +div, ul, -ol, -li { +li, +h1, +h2, +h3, +p { margin: 0; padding: 0; } diff --git a/src/views/home/versionTree/tree/index.vue b/src/views/home/versionTree/tree/index.vue index bd3936e..7444d7a 100644 --- a/src/views/home/versionTree/tree/index.vue +++ b/src/views/home/versionTree/tree/index.vue @@ -25,28 +25,9 @@ watch(()=>props.treeState,(newVal,oldVal)=>{ const view2Ref = ref(null) const pushView2Item = (item)=>{ - // if(node)view2Ref.value.pushNode(node) - // if(edge)view2Ref.value.pushEdge(edge) view2Ref.value.push(item) } -function traverseArray(items, callback) { - for (let i = 0; i < items.length; i++) { - const item = items[i] - callback(item, i) - if (item.children && Array.isArray(item.children) && item.children.length > 0) { - traverseArray(item.children, callback) - } - } -} - -const addView2Item = ()=>{ - traverseArray(versionsList, (item, index) => { - pushView2Item(item) - }) - -} - const view1List = ref([ { name:'P1', @@ -57,7 +38,8 @@ const view1List = ref([ } ]) onMounted(()=>{ - addView2Item() + // addView2Item() + view2Ref.value.init(versionsList) }) onUnmounted(()=>{ }) @@ -66,11 +48,11 @@ const {} = toRefs(data); diff --git a/src/views/home/versionTree/tree/view2/index.vue b/src/views/home/versionTree/tree/view2/index.vue index 5ecc989..4943773 100644 --- a/src/views/home/versionTree/tree/view2/index.vue +++ b/src/views/home/versionTree/tree/view2/index.vue @@ -16,23 +16,24 @@ const props = defineProps({ //]) let selectId = ref(2) +const isLoad = ref(false) // 节点类型：input、output、default、custom // input:开始点，output：结尾点，default：普通节点，custom：自定义节点 const position = { x: 0, y: 0 } const nodes = ref([ - { id: '1', type: 'input', label: 'Node 1', class: 'custom-node start', position, sourcePosition: 'bottom' }, - { id: '2', type: 'PrimaryNode', class: 'custom-node', data: { id: '主 1' }, position }, - { id: '2-1', type: 'SecondaryNode', class: 'custom-node', data: { id: '分 1-1' }, position }, - { id: '3', type: 'PrimaryNode', class: 'custom-node', data: { id: '主 2' }, position }, +// { id: '1', type: 'input', label: 'Node 1', class: 'custom-node start', position, sourcePosition: 'bottom' }, +// { id: '2', type: 'PrimaryNode', class: 'custom-node', data: { id: '主 1' }, position }, +// { id: '2-1', type: 'SecondaryNode', class: 'custom-node', data: { id: '分 1-1' }, position }, +// { id: '3', type: 'PrimaryNode', class: 'custom-node', data: { id: '主 2' }, position }, ]) // 边类型：custom、default // custom：自定义边，default：普通边，step：直角边，smoothstep：平滑边 const edges = ref([ - { id: 'e1-2', source: '1', target: '2', type: 'smoothstep' }, - { id: 'e1-3', source: '2', target: '2-1', type: 'smoothstep', sourceHandle:'right',}, - { id: 'e1-4', source: '2', target: '3', type: 'smoothstep',sourceHandle:'bottom', animated: true }, +// { id: 'e1-2', source: '1', target: '2', type: 'smoothstep' }, +// { id: 'e1-3', source: '2', target: '2-1', type: 'smoothstep', sourceHandle:'right',}, +// { id: 'e1-4', source: '2', target: '3', type: 'smoothstep',sourceHandle:'bottom', animated: true }, ]) const { fitView } = useVueFlow() const { layout } = useLayout() @@ -51,8 +52,32 @@ const push = (item)=>{ if(nodes.value.length == 0){ nodes.value.push({ id: '0', type: 'input', label: 'Node 1', class: 'custom-node start', position, sourcePosition: 'bottom' }) } - let id = item.id.split('-')[0] - nodes.value.push(item) + let className = 'custom-node' + let id = item.id + let target = edges.value.length == 0?'0':item.id.slice(0, -2) + nodes.value.push({id,type:'SecondaryNode',class:className,position,data:item}) + edges.value.push({ id, source: id, target, type: 'smoothstep' }) + console.log() +} + +function traverseArray(items, callback) { + for (let i = 0; i < items.length; i++) { + const item = items[i] + callback(item, i) + if (item.child && Array.isArray(item.child) && item.child.length > 0) { + traverseArray(item.child, callback) + } + } +} + +const init = (list)=>{ + isLoad.value = false + traverseArray(list, (item, index) => { + console.log() + push(item) + }) + isLoad.value = true + console.log(nodes.value,edges.value) } //是否可拖动节点 @@ -69,27 +94,30 @@ onMounted(()=>{ }) onUnmounted(()=>{ }) -defineExpose({push}) +defineExpose({init,push}) // const {} = toRefs(data);