Merge branch 'main' of https://gitlab.com/phenomLi/StructV2 into main

src/View/layoutProvider.ts

@@ -146,7 +146,7 @@ export class LayoutProvider {
             },
             left: (nodeBound: BoundingRect, labelBound: BoundingRect, offset: number) => {
                 return {
-                    x: nodeBound.x - labelBound.width - 2 * offset,
+                    x: nodeBound.x - labelBound.width - offset,
                     y: nodeBound.y + nodeBound.height / 2
                 };
             }
@@ -227,8 +227,11 @@ export class LayoutProvider {
             containerHeight = this.viewContainer.getG6Instance().getHeight(),
             leakAreaHeight = this.engine.viewOptions.leakAreaHeight,
             leakAreaY = containerHeight - leakAreaHeight,
-            xOffset = 50;
+            xOffset = 60;
 
+        let prevBound: BoundingRect;
+
+        // 避免在泄漏前拖拽节点导致的位置变化，先把节点位置重置为布局后的标准位置
         leakModels.forEach(item => {
             item.set({
                 x: item.layoutX,
@@ -236,17 +239,26 @@ export class LayoutProvider {
             });
         });
 
-        group.add(...leakModels);
-        const currentLeakGroupBound: BoundingRect = group.getBound(),
-            globalLeakGroupBound: BoundingRect = accumulateLeakModels.length ?
-                Bound.union(...accumulateLeakModels.map(item => item.getBound())) :
-                { x: 0, y: leakAreaY, width: 0, height: 0 };
+        const globalLeakGroupBound: BoundingRect = accumulateLeakModels.length ?
+            Bound.union(...accumulateLeakModels.map(item => item.getBound())) :
+            { x: 0, y: leakAreaY, width: 0, height: 0 };
 
-        const { x: groupX, y: groupY } = currentLeakGroupBound,
-            dx = globalLeakGroupBound.x + globalLeakGroupBound.width + xOffset - groupX,
-            dy = globalLeakGroupBound.y - groupY;
+        const layoutGroups = Util.groupBy(leakModels, 'group');
+        Object.keys(layoutGroups).forEach(key => {
+            group.add(...layoutGroups[key]);
 
-        group.translate(dx, dy);
+            const currentBound: BoundingRect = group.getBound(),
+                prevBoundEnd = prevBound? prevBound.x + prevBound.width: 0,
+                { x: groupX, y: groupY } = currentBound,
+                dx = globalLeakGroupBound.x + globalLeakGroupBound.width + prevBoundEnd + xOffset - groupX,
+                dy = globalLeakGroupBound.y - groupY;
+
+            group.translate(dx, dy);
+            group.clear();
+            Bound.translate(currentBound, dx, dy);
+
+            prevBound = currentBound;
+        });
     }
 
     /**

src/View/reconcile.ts

@@ -1,6 +1,7 @@
 import { EventBus } from "../Common/eventBus";
 import { Util } from "../Common/util";
 import { Engine } from "../engine";
+import { LayoutGroupTable } from "../Model/modelConstructor";
 import { SVLink } from "../Model/SVLink";
 import { SVModel } from "../Model/SVModel";
 import { SVNode } from "../Model/SVNode";
@@ -66,16 +67,31 @@ export class Reconcile {
 
     /**
      * 获取被泄露的节点
+     * @param layoutGroupTable 
      * @param prevModelList 
      * @param modelList 
      * @returns 
      */
-    private getLeakModels(prevModelList: SVModel[], modelList: SVModel[]): SVModel[] {
-        const potentialLeakModels: SVModel[] = prevModelList.filter(item =>
+    private getLeakModels(layoutGroupTable: LayoutGroupTable, prevModelList: SVModel[], modelList: SVModel[]): SVModel[] {
+        let potentialLeakModels: SVModel[] = prevModelList.filter(item =>
             !modelList.find(model => model.id === item.id) && !item.freed
         );
         const leakModels: SVModel[] = [];
 
+        // 先把节点拿出来
+        const potentialLeakNodes = potentialLeakModels.filter(item => item.isNode()) as SVNode[],
+              groups = Util.groupBy<SVNode>(potentialLeakNodes, 'group');
+
+        // 再把非节点的model拿出来
+        potentialLeakModels = potentialLeakModels.filter(item => item.isNode() === false);
+        
+        Object.keys(groups).forEach(key => {
+            const leakRule = layoutGroupTable.get(key).layoutCreator.defineLeakRule;
+            if(leakRule && typeof leakRule === 'function') {
+                potentialLeakModels.push(...leakRule(groups[key]));
+            }
+        });
+
         potentialLeakModels.forEach(item => {
             if (item instanceof SVNode) {
                 item.leaked = true;
@@ -345,14 +361,15 @@ export class Reconcile {
 
     /**
      * 进行diff
-     * @param prevLayoutGroupTable 
      * @param layoutGroupTable 
-     * @param accumulateLeakModels
+     * @param prevModelList 
+     * @param modelList 
+     * @param accumulateLeakModels 
      * @returns 
      */
-    public diff(prevModelList: SVModel[], modelList: SVModel[], accumulateLeakModels: SVModel[]): DiffResult {
+    public diff(layoutGroupTable: LayoutGroupTable, prevModelList: SVModel[], modelList: SVModel[], accumulateLeakModels: SVModel[]): DiffResult {
         const continuousModels: SVModel[] = this.getContinuousModels(prevModelList, modelList);
-        const leakModels: SVModel[] = this.getLeakModels(prevModelList, modelList);
+        const leakModels: SVModel[] = this.getLeakModels(layoutGroupTable, prevModelList, modelList);
         const appendModels: SVModel[] = this.getAppendModels(prevModelList, modelList, accumulateLeakModels);
         const removeModels: SVModel[] = this.getRemoveModels(prevModelList, modelList);
         const updateModels: SVModel[] = [

src/View/viewContainer.ts

@@ -20,7 +20,7 @@ export class ViewContainer {
     private reconcile: Reconcile;
     public renderer: Renderer;
 
-    private prevLayoutGroupTable: LayoutGroupTable;
+    private layoutGroupTable: LayoutGroupTable;
     private prevModelList: SVModel[];
     private accumulateLeakModels: SVModel[];
 
@@ -37,7 +37,7 @@ export class ViewContainer {
         this.layoutProvider = new LayoutProvider(engine, this);
         this.renderer = new Renderer(engine, DOMContainer, behaviorsModes);
         this.reconcile = new Reconcile(engine, this.renderer);
-        this.prevLayoutGroupTable = new Map();
+        this.layoutGroupTable = new Map();
         this.prevModelList = [];
         this.accumulateLeakModels = [];
         this.hasLeak = false; // 判断是否已经发生过泄漏
@@ -75,7 +75,7 @@ export class ViewContainer {
             g6Instance.translate(-dx, -dy);
         }
 
-        this.layoutProvider.layoutAll(this.prevLayoutGroupTable, this.accumulateLeakModels, []);
+        this.layoutProvider.layoutAll(this.layoutGroupTable, this.accumulateLeakModels, []);
         g6Instance.refresh();
     }
 
@@ -99,7 +99,7 @@ export class ViewContainer {
      * 
      */
     getLayoutGroupTable(): LayoutGroupTable {
-        return this.prevLayoutGroupTable;
+        return this.layoutGroupTable;
     }
 
     /**
@@ -142,7 +142,7 @@ export class ViewContainer {
      */
     render(layoutGroupTable: LayoutGroupTable) {
         const modelList = Util.convertGroupTable2ModelList(layoutGroupTable),
-            diffResult = this.reconcile.diff(this.prevModelList, modelList, this.accumulateLeakModels),
+            diffResult = this.reconcile.diff(this.layoutGroupTable, this.prevModelList, modelList, this.accumulateLeakModels),
             renderModelList = [
                 ...modelList,
                 ...diffResult.REMOVE,
@@ -176,7 +176,7 @@ export class ViewContainer {
 
         this.accumulateLeakModels.push(...diffResult.LEAKED);  // 对泄漏节点进行累积
 
-        this.prevLayoutGroupTable = layoutGroupTable;
+        this.layoutGroupTable = layoutGroupTable;
         this.prevModelList = modelList;
     }
 
@@ -187,9 +187,10 @@ export class ViewContainer {
         this.renderer.destroy();
         this.reconcile.destroy();
         this.layoutProvider = null;
-        this.prevLayoutGroupTable = null;
+        this.layoutGroupTable = null;
         this.prevModelList.length = 0;
         this.accumulateLeakModels.length = 0;
+        this.brushSelectedModels.length = 0;
     }