fix: prevent the addition of duplicate data.

Author: CorvusYe

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.4+2
+- fix: prevent the addition of duplicate data.
+
 ## 1.0.4+1
 - fix: vertex text style `background` not working.
 

example/lib/demos/decorator_demo.dart

@@ -27,6 +27,19 @@ class DecoratorDemo extends StatelessWidget {
         },
       );
     }
+    for (var i = 0; i < 50; i++) {
+      vertexes.add(
+        {
+          'id': 'node$i',
+          'tag': 'tag${r.nextInt(9)}',
+          'tags': [
+            'tag${r.nextInt(9)}',
+            if (r.nextBool()) 'tag${r.nextInt(4)}',
+            if (r.nextBool()) 'tag${r.nextInt(8)}'
+          ],
+        },
+      );
+    }
     var edges = <Map>{};
 
     for (var i = 0; i < 50; i++) {

lib/core/convertor/map_convertor.dart

@@ -23,7 +23,6 @@ class MapConvertor extends DataConvertor<Map, Map> {
     vertex.id = v['id'];
     vertex.tag = v['tag'];
     vertex.tags = v['tags'];
-    vertexAsGraphComponse(v, g, vertex);
     return vertex;
   }
 
@@ -45,8 +44,6 @@ class MapConvertor extends DataConvertor<Map, Map> {
     result.start = g.keyCache[e['srcId']]!;
     result.end = g.keyCache[e['dstId']];
 
-    edgeAsGraphComponse(e, g, result);
-
     return result;
   }
 
@@ -66,12 +63,10 @@ class MapConvertor extends DataConvertor<Map, Map> {
       var edgeDataList = data['edges'] as Iterable;
       var vertexDataList = data['vertexes'] as Iterable;
       for (var v in vertexDataList) {
-        Vertex vertex = convertVertex(v, result);
-        result.vertexes.add(vertex);
+        addVertex(v, result);
       }
       for (var e in edgeDataList) {
-        Edge edge = convertEdge(e, result);
-        result.edges.add(edge);
+        addEdge(e, result);
       }
     }
     return result;

lib/core/data_convertor.dart

@@ -77,18 +77,52 @@ abstract class DataConvertor<V, E> {
       };
     } else {
       if (g.edgesBetween[start] != null) {
-        if (g.edgesBetween[start]![end] != null) {
+        if (g.edgesBetween[start]![end] != null &&
+            !g.edgesBetween[start]![end]!.contains(result)) {
           g.edgesBetween[start]![end]!.add(result);
         } else {
           g.edgesBetween[start]![end] = [result];
         }
       } else if (g.edgesBetween[end] != null) {
-        if (g.edgesBetween[end]![start] != null) {
+        if (g.edgesBetween[end]![start] != null &&
+            !g.edgesBetween[end]![start]!.contains(result)) {
           g.edgesBetween[end]![start]!.add(result);
         } else {
           g.edgesBetween[end]![start] = [result];
         }
       }
     }
   }
+
+  /// Add data and component when absent.
+  ///
+  /// 提供边的去重方法，当不存在时添加
+  Edge addEdge(E e, Graph graph) {
+    var sameEdge = graph.edges.where((edgeIn) => edgeIn == e).toList();
+    Edge edge;
+    if (sameEdge.isEmpty) {
+      edge = convertEdge(e, graph);
+      edgeAsGraphComponse(e, graph, edge);
+      graph.edges.add(edge);
+    } else {
+      edge = sameEdge.first;
+    }
+    return edge;
+  }
+
+  /// Add data and component when absent.
+  ///
+  /// 提供边的去重方法，当不存在时添加
+  Vertex addVertex(V v, Graph graph) {
+    Vertex vertex = convertVertex(v, graph);
+    var sameVertex =
+        graph.vertexes.where((edgeIn) => edgeIn == vertex).toList();
+    if (sameVertex.isEmpty) {
+      vertexAsGraphComponse(v, graph, vertex);
+      graph.vertexes.add(vertex);
+    } else {
+      vertex = sameVertex.first;
+    }
+    return vertex;
+  }
 }

lib/model/edge.dart

@@ -97,4 +97,18 @@ class Edge {
     var idx = edgeList.indexOf(this);
     return idx;
   }
+
+  /// Uniqueness based on primary key of triple.
+  ///
+  /// 只取三元组主键作为唯一性的依据
+  @override
+  int get hashCode => Object.hash(start, ranking, end);
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is Edge &&
+          other.ranking == ranking &&
+          other.start == start &&
+          other.end == end);
 }

lib/model/vertex.dart

@@ -118,4 +118,14 @@ class Vertex<I> {
   String toString() {
     return '$position';
   }
+
+  /// Uniqueness based on primary key
+  ///
+  /// 只取主键作为唯一性的依据
+  @override
+  int get hashCode => id.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) || (other is Vertex && other.id == id);
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_graph_view
 description: Widgets for beautiful graphic data structures, such as force-oriented diagrams.
-version: 1.0.4+1
+version: 1.0.4+2
 repository: https://github.com/dudu-ltd/flutter_graph_view
 homepage: https://graph-cn.github.io/flutter_graph_view