From 7d25ea01b4d46597fb3b0a686a3e761580f6b08c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=99=BA=E6=B4=B2?= <1543046129@qq.com>
Date: Sun, 8 May 2022 00:15:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                   |  1 +
 src/Model/SVNode.ts          |  1 -
 src/Model/SVNodeAppendage.ts |  1 +
 src/View/reconcile.ts        | 46 ++++++++++++++++++------------------
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62c1998..dd3ba36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 test
 dist
+资料
\ No newline at end of file
diff --git a/src/Model/SVNode.ts b/src/Model/SVNode.ts
index b736e45..9e07db5 100644
--- a/src/Model/SVNode.ts
+++ b/src/Model/SVNode.ts
@@ -16,7 +16,6 @@ export class SVNode extends SVModel {
 	};
 
 	private label: string | string[];
-	private disable: boolean;
 	public appendages: { [key: string]: SVNodeAppendage[] };
 
 	constructor(
diff --git a/src/Model/SVNodeAppendage.ts b/src/Model/SVNodeAppendage.ts
index a287f01..fcf29f8 100644
--- a/src/Model/SVNodeAppendage.ts
+++ b/src/Model/SVNodeAppendage.ts
@@ -196,6 +196,7 @@ export class SVMarker extends SVNodeAppendage {
 			label: this.label,
 			style: Util.objectClone<Style>(options.style),
 			labelCfg: Util.objectClone<NodeLabelOption>(options.labelOptions),
+            targetSourceNode: this.target.sourceNode
 		};
 	}
 
diff --git a/src/View/reconcile.ts b/src/View/reconcile.ts
index c171513..b1ddf46 100644
--- a/src/View/reconcile.ts
+++ b/src/View/reconcile.ts
@@ -23,7 +23,7 @@ export class Reconcile {
 	private engine: Engine;
 	private renderer: Renderer;
 	private isFirstPatch: boolean;
-  private prevUpdate: string[][] = [];
+	private prevUpdate: string[][] = [];
 
 	constructor(engine: Engine, renderer: Renderer) {
 		this.engine = engine;
@@ -168,13 +168,13 @@ export class Reconcile {
 		return removedModels;
 	}
 
-  private getModelsById(ids: string[], modelList: SVModel[]): SVModel[] {
+	private getModelsById(ids: string[], modelList: SVModel[]): SVModel[] {
 		return modelList.filter(item =>
 			ids?.find(id => {
 				return id === item.id;
 			})
 		);
-  }
+	}
 
 	/**
 	 * 找出重新指向的外部指针
@@ -240,9 +240,9 @@ export class Reconcile {
 		return freedNodes;
 	}
 
-  public setPrevUpdateId(prevUpdateId: string[]) {
-    this.prevUpdate.push(prevUpdateId);
-  }
+	public setPrevUpdateId(prevUpdateId: string[]) {
+		this.prevUpdate.push(prevUpdateId);
+	}
 
 	// ------------------------------------------------------------------------------------------------
 
@@ -406,29 +406,29 @@ export class Reconcile {
 		modelList: SVModel[],
 		accumulateLeakModels: SVModel[],
 		isDiffLeak: boolean,
-    hasTriggerLastStep: boolean
+		hasTriggerLastStep: boolean
 	): DiffResult {
-  if (hasTriggerLastStep) {
-    this.prevUpdate.pop();
-  }
+		if (hasTriggerLastStep) {
+			this.prevUpdate.pop();
+		}
 		const continuousModels: SVModel[] = this.getContinuousModels(prevModelList, modelList);
 		const leakModels: SVModel[] = isDiffLeak ? [] : this.getLeakModels(layoutGroupTable, prevModelList, modelList);
 		const appendModels: SVModel[] = this.getAppendModels(prevModelList, modelList, accumulateLeakModels);
 		const removeModels: SVModel[] = this.getRemoveModels(prevModelList, modelList, accumulateLeakModels);
-		const updateModels: SVModel[] = hasTriggerLastStep ? [...this.getModelsById(this.prevUpdate.pop(), modelList)]: [
-			...this.getReTargetMarkers(prevModelList, modelList),
-			...this.getLabelChangeModels(prevModelList, modelList),
-			...this.filterUnChangeModelsOfAppend(appendModels, prevModelList),
-			...leakModels,
-		];
+		const updateModels: SVModel[] = hasTriggerLastStep
+			? [...this.getModelsById(this.prevUpdate.pop(), modelList)]
+			: [
+					...this.getReTargetMarkers(prevModelList, modelList),
+					...this.getLabelChangeModels(prevModelList, modelList),
+					...this.filterUnChangeModelsOfAppend(appendModels, prevModelList),
+					...leakModels,
+			  ];
 
-    let UpdateModelsId: string [] =[];
-    for (let model of updateModels) {
-      UpdateModelsId.push(model.id);
-    }
-    this.prevUpdate?.push(UpdateModelsId);
-    console.log(this.prevUpdate);
-    
+		let UpdateModelsId: string[] = [];
+		for (let model of updateModels) {
+			UpdateModelsId.push(model.id);
+		}
+		this.prevUpdate?.push(UpdateModelsId);
 
 		const freedModels: SVNode[] = this.getFreedModels(prevModelList, modelList);