[fix]知识图谱ISVJ-7577 review by qiwei

Author: luoxiao-supermap

src/common/overlay/knowledge-graph/format.js

@@ -1,8 +1,9 @@
 import uniqBy from 'lodash.uniqby';
 
 export function transformGraphMap(data, graphMap) {
-  const style = graphMap && graphMap.styles && graphMap.styles.style;
-  const captionField = graphMap && graphMap.captionFields && graphMap.captionFields.captionField;
+  graphMap = graphMap || {};
+  const style = graphMap.styles && graphMap.styles.style;
+  const captionField = graphMap.captionFields && graphMap.captionFields.captionField;
 
   const rst = { nodes: [], edges: [] };
   data.forEach((item) => {
@@ -51,7 +52,7 @@ export function nodeFromGraphMap(entity, style, captionField) {
   const fillColor = styleData.fillColor || '';
   const node = {
     id: id + '',
-    label: label,
+    label: label === undefined ? '' : label + '',
     properties,
     lables
   };
@@ -161,11 +162,11 @@ function getNodeLabel(entity, captionField) {
       const types = JSON.parse(entityTypes || '[]');
       const labelStr = labels && labels.join('&');
       if (ids.includes(id) || types.includes(labelStr)) {
-        return properties[name] || '';
+        return properties[name];
       }
     }
   }
-  return properties[properties._labelfieldname] || '';
+  return properties[properties._labelfieldname];
 }
 
 function formatFontStyle(fontStyle) {

test/common/overlay/KnowledgeGraphSpec.js

@@ -91,6 +91,84 @@ describe('KnowledgeGraph', () => {
     done();
   });
 
+  it('node label 0', (done) => {
+    var graphData = [
+      {
+        path: [
+          {
+            id: 17732923532771331,
+            properties: {
+              server: 0
+            },
+            labels: ['面1']
+          },
+          {
+            start: 17732923532771331,
+            end: 18014398509481990,
+            id: 20547673299877890,
+            type: '邻接',
+            properties: {}
+          },
+          {
+            id: 18014398509481990,
+            properties: {
+              server: '0'
+            },
+            labels: ['面2']
+          }
+        ]
+      },
+      {
+        id: 177329231,
+        properties: {
+          server: 0
+        },
+        labels: ['面1']
+      },
+      {
+        start: 177329231,
+        end: 17732923,
+        id: 20547673890,
+        type: '邻接1',
+        properties: {}
+      }
+    ];
+    var style = [
+      {
+        type: 'entity',
+        color: '#ffc454',
+        textColor: '#ffffff',
+        font: {
+          fontName: 'Microsoft Yahei UI',
+          fontSize: 13,
+          fontStyle: 0
+        },
+        size: 20,
+        entityIds: '[12,16,18,21,23,25,28,29]'
+      },
+      {
+        type: 'entity',
+        color: '#c990c0',
+        textColor: '#595959',
+        font: {
+          fontName: 'Microsoft Yahei UI',
+          fontSize: 6,
+          fontStyle: 0
+        },
+        size: 20,
+        entityTypes: '["地籍子区"]'
+      }
+    ];
+    var captionField = { entityTypes: '["面1"]', name: 'server' };
+    var data = KnowledgeGraph.dataFromGraphMap(graphData, {
+      styles: { style },
+      captionFields: { captionField: [captionField] }
+    });
+    expect(data.nodes[0].label).toBe('0');
+    expect(data.edges).not.toBeNull();
+    done();
+  });
+
   it('dataFromGraphMap', (done) => {
     var graphData = [
       {
@@ -162,6 +240,7 @@ describe('KnowledgeGraph', () => {
     var data = KnowledgeGraph.dataFromGraphMap(graphData, { styles: { style } });
     expect(data.nodes).not.toBeNull();
     expect(data.edges).not.toBeNull();
+    expect(data.edges[0].label).toBe('邻接');
     done();
   });