fix: refactor splice method to remove and purge nodes***

liujuping · JackLian · commit 0d7ae43b79f7 · 2024-03-07T14:49:46.000+08:00
diff --git a/packages/designer/src/document/node/node-children.ts b/packages/designer/src/document/node/node-children.ts
@@ -307,10 +307,16 @@ export class NodeChildren implements Omit<IPublicModelNodeChildren<INode>,
    *
    */
   splice(start: number, deleteCount: number, node?: INode): INode[] {
+    let removedNode;
     if (node) {
-      return this.children.splice(start, deleteCount, node);
+      removedNode = this.children.splice(start, deleteCount, node);
+    } else {
+      removedNode = this.children.splice(start, deleteCount);
     }
-    return this.children.splice(start, deleteCount);
+
+    removedNode.forEach(d => d?.purge());
+
+    return removedNode;
   }
 
   /**
diff --git a/packages/shell/src/model/node-children.ts b/packages/shell/src/model/node-children.ts
@@ -97,8 +97,9 @@ export class NodeChildren implements IPublicModelNodeChildren {
    * @param deleteCount
    * @param node
    */
-  splice(start: number, deleteCount: number, node?: IPublicModelNode): any {
-    this[nodeChildrenSymbol].splice(start, deleteCount, (node as any)?.[nodeSymbol]);
+  splice(start: number, deleteCount: number, node?: IPublicModelNode): IPublicModelNode[] {
+    const removedNode = this[nodeChildrenSymbol].splice(start, deleteCount, (node as any)?.[nodeSymbol]);
+    return removedNode.map((item: InnerNode) => ShellNode.create(item)!);
   }
 
   /**
diff --git a/packages/types/src/shell/model/node-children.ts b/packages/types/src/shell/model/node-children.ts
@@ -78,7 +78,7 @@ export interface IPublicModelNodeChildren<
    * @param deleteCount
    * @param node
    */
-  splice(start: number, deleteCount: number, node?: Node): any;
+  splice(start: number, deleteCount: number, node?: Node): Node[];
 
   /**
    * 返回指定下标的节点

Original file line number	Diff line number	Diff line change
`@@ -307,10 +307,16 @@ export class NodeChildren implements Omit<IPublicModelNodeChildren<INode>,`
`307`	`307`	`*`
`308`	`308`	`*/`
`309`	`309`	`splice(start: number, deleteCount: number, node?: INode): INode[] {`
	`310`	`+ let removedNode;`
`310`	`311`	`if (node) {`
`311`		`- return this.children.splice(start, deleteCount, node);`
	`312`	`+ removedNode = this.children.splice(start, deleteCount, node);`
	`313`	`+ } else {`
	`314`	`+ removedNode = this.children.splice(start, deleteCount);`
`312`	`315`	`}`
`313`		`- return this.children.splice(start, deleteCount);`
	`316`	`+`
	`317`	`+ removedNode.forEach(d => d?.purge());`
	`318`	`+`
	`319`	`+ return removedNode;`
`314`	`320`	`}`
`315`	`321`
`316`	`322`	`/**`