Merge pull request #223 from yhlchao/master

feat: add createId API

Author: towersxu

package.json

@@ -28,6 +28,7 @@
     "@typescript-eslint/eslint-plugin": "^3.6.1",
     "@typescript-eslint/parser": "^3.2.0",
     "@vuepress-reco/vuepress-plugin-back-to-top": "^1.6.0",
+    "commitizen": "^4.2.4",
     "cz-lerna-changelog": "^2.0.3",
     "eslint": "^7.0.0",
     "eslint-config-airbnb-typescript": "^9.0.0",

packages/core/src/model/GraphModel.ts

@@ -37,6 +37,7 @@ class GraphModel {
   topElement: BaseNodeModel | BaseEdgeModel; // 当前位于顶部的元素
   selectElement: BaseNodeModel | BaseEdgeModel; // 当前位于顶部的元素
   selectElements = new Map<string, BaseElementModel>(); // 多选
+  idGenerator: () => number | string;
   @observable selectElementSize = 0;
   @observable edgeType: string;
   @observable nodes: BaseNodeModel[] = [];
@@ -61,6 +62,7 @@ class GraphModel {
       grid: { size = 1 } = {},
       isSilentMode = false,
       eventCenter,
+      idGenerator,
     } = config;
     this.background = background;
     this.isSlient = isSilentMode;
@@ -73,6 +75,7 @@ class GraphModel {
     this.width = config.width;
     this.height = config.height;
     this.partial = config.partial;
+    this.idGenerator = idGenerator;
   }
   @computed get nodesMap(): { [key: string]: { index: number, model: BaseNodeModel } } {
     return this.nodes.reduce((nMap, model, index) => {

packages/core/src/model/edge/BaseEdgeModel.ts

@@ -90,9 +90,22 @@ class BaseEdgeModel implements IBaseModel {
     if (!data.properties) {
       data.properties = {};
     }
+
+    if (!data.id) {
+      const { idGenerator } = this.graphModel;
+      const globalId = idGenerator && idGenerator();
+      if (globalId) data.id = globalId;
+      const nodeId = this.createId();
+      if (nodeId) data.id = nodeId;
+    }
+
     assign(this, pickEdgeConfig(data));
   }
 
+  createId() {
+    return null;
+  }
+
   setAttributes() { }
 
   @computed get sourceNode() {

packages/core/src/model/node/BaseNodeModel.ts

@@ -104,10 +104,23 @@ export default class BaseNodeModel implements IBaseModel {
     if (!data.properties) {
       data.properties = {};
     }
+
+    if (!data.id) {
+      const { idGenerator } = this.graphModel;
+      const globalId = idGenerator && idGenerator();
+      if (globalId) data.id = globalId;
+      const nodeId = this.createId();
+      if (nodeId) data.id = nodeId;
+    }
+
     this.formatText(data);
     assign(this, pickNodeConfig(data));
   }
 
+  createId() {
+    return null;
+  }
+
   // 格式化text参数，未修改observable不作为action
   formatText(data): void {
     if (!data.text) {

packages/core/src/options.ts

@@ -54,6 +54,8 @@ export type Definition = {
   hideAnchors?: boolean; // 是否隐藏anchor
 
   hoverOutline?: boolean; // 是否显示节点hover时的outline
+
+  idGenerator?: () => number | string; // 元素id生成器
 };
 
 export interface GuardsTypes {