From fefbcfbbee7eefc45565f4c28678f954038abeb9 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Mon, 18 Sep 2023 16:30:45 +0800 Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E6=94=B9=E4=B8=BA=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E8=8A=82=E7=82=B9uid=E6=AF=94=E5=AF=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/layouts/CatalogOrganization.js | 4 ++-- simple-mind-map/src/layouts/Fishbone.js | 2 +- simple-mind-map/src/layouts/FishboneBottom.js | 2 +- simple-mind-map/src/layouts/FishboneTop.js | 2 +- simple-mind-map/src/layouts/LogicalStructure.js | 4 ++-- simple-mind-map/src/layouts/MindMap.js | 2 +- simple-mind-map/src/layouts/OrganizationStructure.js | 2 +- simple-mind-map/src/layouts/Timeline.js | 2 +- simple-mind-map/src/layouts/VerticalTimeline.js | 6 +++--- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/simple-mind-map/src/layouts/CatalogOrganization.js b/simple-mind-map/src/layouts/CatalogOrganization.js index 1438c5e2..0162434c 100644 --- a/simple-mind-map/src/layouts/CatalogOrganization.js +++ b/simple-mind-map/src/layouts/CatalogOrganization.js @@ -160,7 +160,7 @@ class CatalogOrganization extends Base { if (node.parent) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition() || _index <= index) { @@ -183,7 +183,7 @@ class CatalogOrganization extends Base { if (node.parent && !node.parent.isRoot) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition()) { diff --git a/simple-mind-map/src/layouts/Fishbone.js b/simple-mind-map/src/layouts/Fishbone.js index 481d918d..fff92a49 100644 --- a/simple-mind-map/src/layouts/Fishbone.js +++ b/simple-mind-map/src/layouts/Fishbone.js @@ -194,7 +194,7 @@ class Fishbone extends Base { if (node.parent && !node.parent.isRoot) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition()) { diff --git a/simple-mind-map/src/layouts/FishboneBottom.js b/simple-mind-map/src/layouts/FishboneBottom.js index e0bca450..c267d62e 100644 --- a/simple-mind-map/src/layouts/FishboneBottom.js +++ b/simple-mind-map/src/layouts/FishboneBottom.js @@ -238,7 +238,7 @@ class Fishbone extends Base { if (node.parent && !node.parent.isRoot) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition()) { diff --git a/simple-mind-map/src/layouts/FishboneTop.js b/simple-mind-map/src/layouts/FishboneTop.js index a27fcbde..fb31e5e6 100644 --- a/simple-mind-map/src/layouts/FishboneTop.js +++ b/simple-mind-map/src/layouts/FishboneTop.js @@ -207,7 +207,7 @@ class Fishbone extends Base { if (node.parent && !node.parent.isRoot) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition()) { diff --git a/simple-mind-map/src/layouts/LogicalStructure.js b/simple-mind-map/src/layouts/LogicalStructure.js index 038ed5e3..88da77fe 100644 --- a/simple-mind-map/src/layouts/LogicalStructure.js +++ b/simple-mind-map/src/layouts/LogicalStructure.js @@ -125,10 +125,10 @@ class LogicalStructure extends Base { if (node.parent) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { - if (item === node || item.hasCustomPosition()) { + if (item.uid === node.uid || item.hasCustomPosition()) { // 适配自定义位置 return } diff --git a/simple-mind-map/src/layouts/MindMap.js b/simple-mind-map/src/layouts/MindMap.js index 4f9455c3..3e1b1fbd 100644 --- a/simple-mind-map/src/layouts/MindMap.js +++ b/simple-mind-map/src/layouts/MindMap.js @@ -172,7 +172,7 @@ class MindMap extends Base { return item.dir === node.dir }) let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition()) { diff --git a/simple-mind-map/src/layouts/OrganizationStructure.js b/simple-mind-map/src/layouts/OrganizationStructure.js index 85daf271..ba41a454 100644 --- a/simple-mind-map/src/layouts/OrganizationStructure.js +++ b/simple-mind-map/src/layouts/OrganizationStructure.js @@ -126,7 +126,7 @@ class OrganizationStructure extends Base { if (node.parent) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition()) { diff --git a/simple-mind-map/src/layouts/Timeline.js b/simple-mind-map/src/layouts/Timeline.js index a3f166fa..ee1c0f9b 100644 --- a/simple-mind-map/src/layouts/Timeline.js +++ b/simple-mind-map/src/layouts/Timeline.js @@ -209,7 +209,7 @@ class Timeline extends Base { if (node.parent && !node.parent.isRoot) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition()) { diff --git a/simple-mind-map/src/layouts/VerticalTimeline.js b/simple-mind-map/src/layouts/VerticalTimeline.js index d7e24829..a8079944 100644 --- a/simple-mind-map/src/layouts/VerticalTimeline.js +++ b/simple-mind-map/src/layouts/VerticalTimeline.js @@ -156,13 +156,13 @@ class VerticalTimeline extends Base { if (node.parent) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { // 自定义节点位置 if (item.hasCustomPosition()) return // 三级或三级以下节点自身位置不需要动 - if (!node.parent.isRoot && item === node) return + if (!node.parent.isRoot && item.uid === node.uid) return let _offset = 0 // 二级节点上面的兄弟节点不需要移动，自身需要往下移动 if (node.parent.isRoot) { @@ -202,7 +202,7 @@ class VerticalTimeline extends Base { if (node.parent && !node.parent.isRoot) { let childrenList = node.parent.children let index = childrenList.findIndex(item => { - return item === node + return item.uid === node.uid }) childrenList.forEach((item, _index) => { if (item.hasCustomPosition()) {