fix: resolve conflict

src/behavior/drag-node-with-group.ts

@@ -1,4 +1,4 @@
-import { IG6GraphEvent, Item, G6Event } from '../types';
+import { IG6GraphEvent, Item, G6Event, NodeConfig } from '../types';
 
 /*
  * @Author: moyee
@@ -167,7 +167,7 @@ export default {
     const { graph } = this;
     const { item } = evt;
 
-    const model = item.getModel();
+    const model = item.getModel() as NodeConfig;
     // 节点所在的GroupId
     const { groupId, id } = model;
 

src/graph/controller/customGroup.ts

@@ -11,7 +11,7 @@ import ShapeBase from '@antv/g-canvas/lib/shape/base';
 import { Point } from '@antv/g-canvas/lib/types';
 import deepMix from '@antv/util/lib/deep-mix';
 import isString from '@antv/util/lib/is-string';
-import { GraphData, IG6GraphEvent, Item } from '../../types';
+import { GraphData, IG6GraphEvent, Item, NodeConfig } from '../../types';
 import { IGraph } from '../../interface/graph';
 import { IEdge, INode } from '../../interface/item';
 import { traverseTree } from '../../util/graphic';
@@ -634,7 +634,7 @@ export default class CustomGroup {
     // 隐藏群组中的所有节点
     nodesInGroup.forEach(nodeId => {
       const node = graph.findById(nodeId);
-      const model = node.getModel();
+      const model = node.getModel() as NodeConfig;
       const { groupId } = model;
       if (groupId && groupId !== id) {
         // 存在群组，则隐藏
@@ -812,7 +812,7 @@ export default class CustomGroup {
     setTimeout(() => {
       nodesInGroup.forEach(nodeId => {
         const node = graph.findById(nodeId);
-        const model = node.getModel();
+        const model = node.getModel() as NodeConfig;
         const { groupId } = model;
         if (groupId && groupId !== id) {
           // 存在群组，则显示
@@ -1224,7 +1224,7 @@ export default class CustomGroup {
   public dynamicChangeGroupSize(evt: IG6GraphEvent, currentGroup: IGroup, keyShape: ShapeBase) {
     const { item } = evt;
 
-    const model = item.getModel();
+    const model = item.getModel() as NodeConfig;
     // 节点所在的GroupId
     const { groupId } = model;
 

src/graph/controller/item.ts

@@ -12,9 +12,6 @@ import Combo from '../../item/combo';
 import { EdgeConfig, Item, ITEM_TYPE, ModelConfig, NodeConfig, NodeMap, ComboTree, ComboConfig } from '../../types';
 import Graph from '../graph';
 
-import { mix } from '@antv/util';
-import { IGraph } from '../../interface/graph';
-import { IGroup } from '@antv/g-base';
 import { IEdge, INode, ICombo } from '../../interface/item';
 import { traverseTreeUp, traverseTree, getComboBBox } from '../../util/graphic';
 

src/graph/tree-graph.ts

@@ -345,7 +345,7 @@ export default class TreeGraph extends Graph implements ITreeGraph {
       return;
     }
 
-    const parentModel = self.findById(parent).getModel();
+    const parentModel = self.findById(parent).getModel() as NodeConfig;
 
     const current = self.findById(data.id);
 

src/shape/edge.ts

@@ -173,7 +173,7 @@ const singleEdge: ShapeOptions = {
     if (cfg.startPoint!.x === cfg.endPoint!.x && cfg.startPoint!.y === cfg.endPoint!.y) {
       style.x = cfg.startPoint!.x + offsetX;
       style.y = cfg.startPoint!.y + offsetY;
-      style.text = cfg.label;
+      style.text = cfg.label as string;
       return style;
     }
 
@@ -189,7 +189,7 @@ const singleEdge: ShapeOptions = {
     style.y = offsetStyle.y;
     style.rotate = offsetStyle.rotate;
     style.textAlign = this._getTextAlign!(labelPosition as string, offsetStyle.angle as number);
-    style.text = cfg.label;
+    style.text = cfg.label as string;
     return style;
   },
   getLabelBgStyleByPosition(

src/shape/edges/polyline.ts

@@ -1,7 +1,7 @@
 import { Point } from '@antv/g-base/lib/types';
 import Group from '@antv/g-canvas/lib/group';
-import { mix, each, isNumber, isArray, isString } from '@antv/util';
+import { mix, each, isArray, isString } from '@antv/util';
-import { ModelConfig, ShapeStyle } from '../../types';
+import { ShapeStyle, EdgeConfig } from '../../types';
 import { pointsToPolygon } from '../../util/path';
 import Global from '../../global';
 import Shape from '../shape';
@@ -33,7 +33,7 @@ Shape.registerEdge(
     shapeType: 'polyline',
     // 文本位置
     labelPosition: 'center',
-    drawShape(cfg: ModelConfig, group: Group) {
+    drawShape(cfg: EdgeConfig, group: Group) {
       const shapeStyle = (this as any).getShapeStyle(cfg);
       const keyShape = group.addShape('path', {
         className: 'edge-shape',
@@ -42,8 +42,8 @@ Shape.registerEdge(
       });
       return keyShape;
     },
-    getShapeStyle(cfg: ModelConfig): ShapeStyle {
+    getShapeStyle(cfg: EdgeConfig): ShapeStyle {
-      const { style: defaultStyle } = this.options as ModelConfig;
+      const { style: defaultStyle } = this.options as EdgeConfig;
 
       const strokeStyle: ShapeStyle = {
         stroke: cfg.color,

src/shape/node.ts

@@ -53,7 +53,7 @@ const singleNode: ShapeOptions = {
 
     // 默认的位置（最可能的情形），所以放在最上面
     if (labelPosition === 'center') {
-      return { x: 0, y: 0, text: cfg!.label };
+      return { x: 0, y: 0, text: cfg!.label as string };
     }
 
     let { offset } = labelCfg;
@@ -330,9 +330,9 @@ const singleNode: ShapeOptions = {
       (this as any).updateIcon(cfg, item);
     }
   },
-  updateIcon(cfg: ModelConfig, item: Item) {
+  updateIcon(cfg: NodeConfig, item: Item) {
     const group = item.getContainer();
-    const { icon: defaultIcon } = this.options as ModelConfig;
+    const { icon: defaultIcon } = this.options as NodeConfig;
     const icon = mix({}, defaultIcon, cfg.icon);
     const { show } = cfg.icon ? cfg.icon : { show: undefined };
     const iconShape = group.find(element => element.get('className') === `${this.type}-icon`);

src/shape/shapeBase.ts

@@ -5,10 +5,10 @@
 import GGroup from '@antv/g-canvas/lib/group';
 import { IShape, IElement } from '@antv/g-canvas/lib/interfaces';
 import { ShapeOptions, ILabelConfig } from '../interface/shape';
-import { IPoint, Item, LabelStyle, ShapeStyle, ModelConfig } from '../types';
+import { IPoint, Item, LabelStyle, ShapeStyle, ModelConfig, EdgeConfig } from '../types';
 import Global from '../global';
 import { mat3, transform } from '@antv/matrix-util';
-import { deepMix, each, mix, isString, isBoolean, isPlainObject, clone, indexOf } from '@antv/util';
+import { deepMix, each, mix, isBoolean, isPlainObject, clone } from '@antv/util';
 
 const CLS_SHAPE_SUFFIX = '-shape';
 const CLS_LABEL_SUFFIX = '-label';
@@ -125,7 +125,7 @@ export const shapeBase: ShapeOptions = {
     return rect;
   },
   getLabelStyleByPosition(cfg: ModelConfig, labelCfg?: ILabelConfig, group?: GGroup): LabelStyle {
-    return { text: cfg.label };
+    return { text: cfg.label as string };
   },
   getLabelBgStyleByPosition(
     label: IElement,
@@ -415,7 +415,7 @@ export const shapeBase: ShapeOptions = {
    * @param  {Object} cfg 节点、边的配置项
    * @return {Array|null} 控制点的数组,如果为 null，则没有控制点
    */
-  getControlPoints(cfg: ModelConfig): IPoint[] | undefined {
+  getControlPoints(cfg: EdgeConfig): IPoint[] | undefined {
     return cfg.controlPoints;
   },
   /**

src/types/index.ts

@@ -334,6 +334,7 @@ export interface ModelConfig extends ModelStyle {
 export interface NodeConfig extends ModelConfig {
   id: string;
   groupId?: string;
+  comboId?: string;
   children?: TreeGraphData[];
   description?: string;
   descriptionCfg?: {
@@ -416,21 +417,6 @@ export interface ComboConfig extends ModelConfig {
   }>
 }
 
-export interface ComboConfig {
-  id: string;
-  parentId?: string;
-  // Combo 类型，默认 rect，值为定义的 combo 的名称
-  type: string;
-  // Combo 标题
-  title: string | LabelStyle;
-  style: ShapeStyle;
-  stateStyles: {
-    [key: string]: ShapeStyle | {
-      [key: string]: ShapeStyle
-    }
-  };
-}
-
 export interface EdgeConfig extends ModelConfig {
   id?: string;
   source?: string;
@@ -442,8 +428,8 @@ export interface EdgeConfig extends ModelConfig {
   controlPoints?: IPoint[];
   curveOffset?: number;
   // loop edge config
-  loopCfg: LoopConfig;
+  loopCfg?: LoopConfig;
-  labelCfg: ILabelConfig;
+  labelCfg?: ILabelConfig;
 }
 
 export type EdgeData = EdgeConfig & {
@@ -506,7 +492,7 @@ export interface TreeGraphData {
 
 export interface ComboTree {
   id: string;
-  label?: string;
+  label?: string | LabelStyle;
   children?: ComboTree[];
   depth?: number;
   parentId?: string;

stories/Shape/component/default-shape.tsx

@@ -1,13 +1,14 @@
 import React, { useEffect } from 'react';
 import G6 from '../../../src';
 import { IGraph } from '../../../src/interface/graph';
+import { NodeConfig, EdgeConfig } from '../../../src/types';
 
 let graph: IGraph = null;
 
 G6.registerNode(
   'file-node',
   {
-    draw(cfg, group) {
+    draw(cfg: NodeConfig, group) {
       const keyShape = group.addShape('rect', {
         attrs: {
           x: cfg.x - 4,
@@ -69,7 +70,7 @@ G6.registerNode(
 G6.registerEdge(
   'step-line',
   {
-    getControlPoints: function getControlPoints(cfg) {
+    getControlPoints: function getControlPoints(cfg: EdgeConfig) {
       const startPoint = cfg.startPoint;
       const endPoint = cfg.endPoint;
       return [

stories/Tree/component/file-system.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
 import G6 from '../../../src';
 import { IGraph } from '../../../src/interface/graph';
+import { NodeConfig, EdgeConfig } from '../../../src/types';
 
 let graph: IGraph = null;
 
@@ -9,7 +10,7 @@ const MoveViewPort = () => {
   useEffect(() => {
     if (!graph) {
       G6.registerNode('file-node', {
-        draw: function draw(cfg, group) {
+        draw: function draw(cfg: NodeConfig, group) {
           const keyShape = group.addShape('rect', {
             attrs: {
               x: cfg.x - 4,
@@ -60,7 +61,7 @@ const MoveViewPort = () => {
       G6.registerEdge(
         'step-line',
         {
-          getControlPoints: function getControlPoints(cfg) {
+          getControlPoints: function getControlPoints(cfg: EdgeConfig) {
             const startPoint = cfg.startPoint;
             const endPoint = cfg.endPoint;
             return [