feat: 增加判断节点是否同组的方法

src/Model/SVModel.ts

@@ -4,6 +4,7 @@ import { BoundingRect } from "../Common/boundingRect";
 import { EdgeConfig, Item, NodeConfig } from "@antv/g6-core";
 import { Graph } from "@antv/g6-pc";
 import merge from 'merge';
+import { ModelConstructor } from "./modelConstructor";
 
 
 
@@ -198,8 +199,6 @@ export class SVModel {
     isNode(): boolean {
         return false;
     }
-
-
 }
 
 

src/Model/SVNode.ts

@@ -1,101 +1,113 @@
-import { INode, NodeConfig } from "@antv/g6-core";
-import { Util } from "../Common/util";
-import { NodeLabelOption, NodeOption, Style } from "../options";
-import { SourceNode } from "../sources";
-import { SVLink } from "./SVLink";
-import { SVModel } from "./SVModel";
-import { SVAddressLabel, SVFreedLabel, SVIndexLabel, SVMarker, SVNodeAppendage } from "./SVNodeAppendage";
-
-
-
+import { INode, NodeConfig } from '@antv/g6-core';
+import { Util } from '../Common/util';
+import { NodeLabelOption, NodeOption, Style } from '../options';
+import { SourceNode } from '../sources';
+import { ModelConstructor } from './modelConstructor';
+import { SVLink } from './SVLink';
+import { SVModel } from './SVModel';
+import { SVAddressLabel, SVFreedLabel, SVIndexLabel, SVMarker, SVNodeAppendage } from './SVNodeAppendage';
 
 export class SVNode extends SVModel {
-    public sourceId: string;
-    public sourceNode: SourceNode;
-    public links: {
-        inDegree: SVLink[];
-        outDegree: SVLink[];
-    };
+	public sourceId: string;
+	public sourceNode: SourceNode;
+	public links: {
+		inDegree: SVLink[];
+		outDegree: SVLink[];
+	};
 
-    private label: string | string[];
-    private disable: boolean;
+	private label: string | string[];
+	private disable: boolean;
 
-    public shadowG6Item: INode;
-    public G6Item: INode;
+	public shadowG6Item: INode;
+	public G6Item: INode;
 
-    public marker: SVMarker;
-    public freedLabel: SVFreedLabel;
-    public indexLabel: SVIndexLabel;
-    public addressLabel: SVAddressLabel;
-    public appendages: SVNodeAppendage[];
+	public marker: SVMarker;
+	public freedLabel: SVFreedLabel;
+	public indexLabel: SVIndexLabel;
+	public addressLabel: SVAddressLabel;
+	public appendages: SVNodeAppendage[];
 
-    constructor(id: string, type: string, group: string, layout: string, sourceNode: SourceNode, label: string | string[], options: NodeOption) {
-        super(id, type, group, layout, 'node');
+    public modelConstructor: ModelConstructor;
 
-        this.group = group;
-        this.layout = layout;
+	constructor(
+		id: string,
+		type: string,
+		group: string,
+		layout: string,
+		sourceNode: SourceNode,
+		label: string | string[],
+		options: NodeOption
+	) {
+		super(id, type, group, layout, 'node');
 
-        Object.keys(sourceNode).map(prop => {
-            if (prop !== 'id') {
-                this[prop] = sourceNode[prop];
-            }
-        });
+		this.group = group;
+		this.layout = layout;
 
-        this.sourceNode = sourceNode;
-        this.sourceId = sourceNode.id.toString();
+		Object.keys(sourceNode).map(prop => {
+			if (prop !== 'id') {
+				this[prop] = sourceNode[prop];
+			}
+		});
 
-        this.links = { inDegree: [], outDegree: [] };
-        this.appendages = [];
-        this.sourceNode = sourceNode;
-        this.label = label;
-        this.G6ModelProps = this.generateG6ModelProps(options);
+		this.sourceNode = sourceNode;
+		this.sourceId = sourceNode.id.toString();
+
+		this.links = { inDegree: [], outDegree: [] };
+		this.appendages = [];
+		this.sourceNode = sourceNode;
+		this.label = label;
+		this.G6ModelProps = this.generateG6ModelProps(options);
+	}
+
+	generateG6ModelProps(options: NodeOption): NodeConfig {
+		const style = Util.objectClone<Style>(options.style);
+
+		return {
+			...this.sourceNode,
+			id: this.id,
+			x: 0,
+			y: 0,
+			rotation: options.rotation || 0,
+			type: options.type,
+			size: options.size || [60, 30],
+			anchorPoints: options.anchorPoints,
+			label: this.label as string,
+			style: {
+				...style,
+				fill: this.disable ? '#ccc' : style.fill,
+			},
+			labelCfg: Util.objectClone<NodeLabelOption>(options.labelOptions),
+		};
+	}
+
+	isNode(): boolean {
+		return true;
+	}
+
+	/**
+	 * 设置是否被选中的状态
+	 * @param isSelected
+	 */
+	setSelectedState(isSelected: boolean) {
+		if (this.G6Item === null) {
+			return;
+		}
+
+		this.G6Item.setState('selected', isSelected);
+		this.appendages.forEach(item => {
+			item.setSelectedState(isSelected);
+		});
+	}
+
+	getSourceId(): string {
+		return this.sourceId;
+	}
+
+	/**
+	 * 判断这个节点是否来自相同group
+	 * @param node
+	 */
+	isSameGroup(node: SVNode): boolean {
+        return this.modelConstructor.isSameGroup(this, node);
     }
-
-    generateG6ModelProps(options: NodeOption): NodeConfig {
-        const style = Util.objectClone<Style>(options.style);
-
-        return {
-            ...this.sourceNode,
-            id: this.id,
-            x: 0,
-            y: 0,
-            rotation: options.rotation || 0,
-            type: options.type,
-            size: options.size || [60, 30],
-            anchorPoints: options.anchorPoints,
-            label: this.label as string,
-            style: {
-                ...style,
-                fill: this.disable ? '#ccc' : style.fill
-            },
-            labelCfg: Util.objectClone<NodeLabelOption>(options.labelOptions)
-        };
-    }
-
-    isNode(): boolean {
-        return true;
-    }
-
-    /**
-     * 设置是否被选中的状态
-     * @param isSelected 
-     */
-    setSelectedState(isSelected: boolean) {
-        if (this.G6Item === null) {
-            return;
-        }
-
-        this.G6Item.setState('selected', isSelected);
-        this.appendages.forEach(item => {
-            item.setSelectedState(isSelected);
-        });
-    }
-
-    getSourceId(): string {
-        return this.sourceId;
-    }
-};
-
-
-
-
+}

src/Model/modelConstructor.ts

@@ -314,6 +314,8 @@ export class ModelConstructor {
             node.freedLabel = new SVFreedLabel(`${id}-freed-label`, sourceNodeType, group, layout, node);
         }
 
+        node.modelConstructor = this;
+
         return node;
     }
 
@@ -430,10 +432,20 @@ export class ModelConstructor {
         return this.layoutGroupTable;
     }
 
+    /**
+	 * 判断这个节点是否来自相同group
+	 * @param node1
+     * @param node2
+	 */
+	public isSameGroup(node1: SVNode, node2: SVNode): boolean {
+        const layoutGroup = this.layoutGroupTable.get(node1.group);
+        return layoutGroup.node.find(item => item.id === node2.id) !== undefined;
+    }
+
     /**
      * 销毁
      */
-    destroy() {
+    public destroy() {
         this.layoutGroupTable = null;
         this.prevSourcesStringMap = null;
     }