From a9e5bcd224043ddcd617f94f609b65ea0d3972b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=96=E5=A8=81=E6=95=AC?= <2667902230@qq.com>
Date: Wed, 6 Apr 2022 11:59:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8A=9B=E5=AF=BC=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/Layouter/Force.js |   5 +-
 demo/data.js           | 136 +++++++++++++++++++++++++++++++++++++++++
 demo/demo.html         |  14 +++--
 src/View/renderer.ts   |   5 +-
 src/engine.ts          |  10 ---
 5 files changed, 150 insertions(+), 20 deletions(-)

diff --git a/demo/Layouter/Force.js b/demo/Layouter/Force.js
index 3a5fb4a..92c264c 100644
--- a/demo/Layouter/Force.js
+++ b/demo/Layouter/Force.js
@@ -62,10 +62,7 @@ SV.registerLayout('Force', {
     },
 
     layout(e) {
-        console.log("here is the layout of Force")
-        // e.forEach((item, index) => {
-        //     console.log(item.getBound());
-        // })
+        
     }
 });
 
diff --git a/demo/data.js b/demo/data.js
index 2804eef..9b9bd21 100644
--- a/demo/data.js
+++ b/demo/data.js
@@ -289,4 +289,140 @@ const SOURCES_DATA = [{
         "isEnterFunction": false,
         "isFirstDebug": false
     }
+}, {
+    "force0": {
+        "data": [
+            {
+                "id": "0x617eb1",
+                "data": "A",
+                "next": "0x617eb2"
+            },
+            {
+                "id": "0x617eb2",
+                "data": "B",
+                "next": "0x617eb3"
+            },
+            {
+                "id": "0x617eb3",
+                "data": "C",
+                "next": "0x617eb5"
+            },
+            {
+                "id": "0x617eb5",
+                "data": "D",
+                "next": "0x617eb3" 
+            },
+            {
+                "id": "0x617eb6",
+                "data": "D",
+                "next": "0x617eb5" 
+            },
+            {
+                "id": "0x617eb7",
+                "data": "D",
+                "next": "0x617eb6" 
+            },
+            {
+                "id": "0x617eb8",
+                "data": "D",
+                "next": "0x617eb7" 
+            },
+            {
+                "id": "0x617eb9",
+                "data": "D",
+                "next": "0x617eb8" 
+            },
+            {
+                "id": "0x617eba",
+                "data": "D",
+                "next": "0x617eb9" 
+            },
+            {
+                "id": "0x617ebb",
+                "data": "D",
+                "next": "0x617eba" 
+            },
+            {
+                "id": "0x617ebc",
+                "data": "D",
+                "next": "0x617ebb" 
+            },
+            {
+                "id": "0x617ebd",
+                "data": "D",
+                "next": "0x617ebc" 
+            },
+            {
+                "id": "0x617ebe",
+                "data": "D",
+                "next": "0x617ebd" 
+            },
+            {
+                "id": "0x627ebe",
+                "data": "D",
+                "next": "0x617ebe" 
+            },
+            {
+                "id": "0x637ebe",
+                "data": "D",
+                "next": "0x627ebe" 
+            },
+            {
+                "id": "0x647ebe",
+                "data": "D",
+                "next": "0x637ebe" 
+            },
+            {
+                "id": "0x657ebe",
+                "data": "D",
+                "next": "0x647ebe" 
+            },
+            {
+                "id": "0x667ebe",
+                "data": "D",
+                "next": "0x657ebe" 
+            },
+            {
+                "id": "0x677ebe",
+                "data": "D",
+                "next": "0x667ebe" 
+            },
+            {
+                "id": "0x687ebe",
+                "data": "D",
+                "next": "0x677ebe" 
+            },
+            {
+                "id": "0x697ebe",
+                "data": "D",
+                "next": "0x687ebe" 
+            },
+            {
+                "id": "0x6a7ebe",
+                "data": "D",
+                "next": "0x697ebe" 
+            },
+            {
+                "id": "0x6b7ebe",
+                "data": "D",
+                "next": "0x6a7ebe" 
+            },
+            {
+                "id": "0x6c7ebe",
+                "data": "D",
+                "next": "0x6b7ebe" 
+            },
+            {
+                "id": "0x6d7ebe",
+                "data": "X",
+                "next": "0x6c7ebe" 
+            },
+            {
+                "id": "0x6e7ebe",
+                "data": "Y",
+                "next": "0x6d7ebe" 
+            },
+        ],
+        "layouter": "Force"
+    }
 }];
\ No newline at end of file
diff --git a/demo/demo.html b/demo/demo.html
index e4fbadd..a2a37f4 100644
--- a/demo/demo.html
+++ b/demo/demo.html
@@ -86,18 +86,24 @@
     <script src="./Layouter/SqQueue.js"></script>
     <script src="./Layouter/PTree.js"></script>
     <script src="./Layouter/PCTree.js"></script>
+    <script src="./Layouter/Force.js"></script>
     <script src="./data.js"></script>
 
     <script>
+        let isForce = false;
+
+        let dataIndex = 3;
+        curData = SOURCES_DATA[dataIndex];
+        // 判断是否需要力导向布局
+        Object.keys(curData).forEach(key => {
+            if(curData[key].layouter === "Force")    isForce = true;
+        });
         let cur = SV(document.getElementById('container'), {
             view: {
                 leakAreaHeight: 130,
                 groupPadding: 40,
             },
-        });
-
-        let dataIndex = 0,
-            curData = SOURCES_DATA[dataIndex];
+        }, isForce);
 
         let enableBrushSelect = false;
 
diff --git a/src/View/renderer.ts b/src/View/renderer.ts
index d8c3548..cc227df 100644
--- a/src/View/renderer.ts
+++ b/src/View/renderer.ts
@@ -38,7 +38,7 @@ export class Renderer {
         this.shadowG6Instance = new Graph({
             container: DOMContainer.cloneNode() as HTMLElement
         });
-
+        // 力导向的配置选项
         const forceOption = {
             type: 'force',
             linkDistance: 100,         // 边长
@@ -51,6 +51,7 @@ export class Renderer {
             },
             center: [DOMContainer.offsetWidth / 2, DOMContainer.offsetHeight / 3],
         };
+        // 布局配置
         const layout = isForce ? forceOption : null;
         // 初始化g6实例
         this.g6Instance = new Graph({
@@ -65,7 +66,7 @@ export class Renderer {
             },
             modes: behaviorsModes,
             plugins: [tooltip],
-            layout,
+            layout, // 布局配置
         });
         /**
          * 固定被拖拽节点
diff --git a/src/engine.ts b/src/engine.ts
index 2f8f064..4d3e6c3 100644
--- a/src/engine.ts
+++ b/src/engine.ts
@@ -53,15 +53,6 @@ export class Engine {
      * @param prevStep
      */
     public render(source: Sources) {
-<<<<<<< HEAD
-        if (source === undefined || source === null) {
-            return;
-        }
-        ``
-        let stringSource = JSON.stringify(source);
-        if (this.prevStringSource === stringSource) {
-            return;
-=======
         let isSameSources: boolean = false,
             layoutGroupTable: LayoutGroupTable;
 
@@ -74,7 +65,6 @@ export class Engine {
             
         if (this.prevStringSource === stringSource) {
             isSameSources = true;
->>>>>>> eac9d007bcc1b52fe573ddf6cb97030c9b2d3a6d
         }
 
         this.prevStringSource = stringSource;