[fix]ISVJ-6815 数据源和数据集节点标签不显示 review by qiw

luoxiao-supermap · luoxiao-supermap · commit ca23f2335e2d · 2023-09-14T11:05:27.000+08:00
diff --git a/src/common/overlay/knowledge-graph/format.js b/src/common/overlay/knowledge-graph/format.js
@@ -159,7 +159,8 @@ function getNodeLabel(entity, captionField) {
       const { name, entityTypes, entityIds } = data[i];
       const ids = JSON.parse(entityIds || '[]');
       const types = JSON.parse(entityTypes || '[]');
-      if (ids.includes(id) || types.includes(labels[0])) {
+      const labelStr = labels && labels.join('&');
+      if (ids.includes(id) || types.includes(labelStr)) {
         return properties[name] || '';
       }
     }
diff --git a/test/common/iServer/KnowledgeGraphServiceSpec.js b/test/common/iServer/KnowledgeGraphServiceSpec.js
@@ -49,7 +49,7 @@ describe('KnowledgeGraphService', () => {
         expect(res).not.toBeNull();
         expect(res.type).toBe('processCompleted');
         expect(res.result).not.toBeNull();
-        expect(res.result.length).toEqual(5);
+        expect(res.result.length).toEqual(6);
         knowledgeGraphService.destroy();
         done();
       } catch (exception) {
diff --git a/test/resources/knowledgeGraphService.js b/test/resources/knowledgeGraphService.js

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ function getNodeLabel(entity, captionField) {`
`159`	`159`	`const { name, entityTypes, entityIds } = data[i];`
`160`	`160`	`const ids = JSON.parse(entityIds \|\| '[]');`
`161`	`161`	`const types = JSON.parse(entityTypes \|\| '[]');`
`162`		`- if (ids.includes(id) \|\| types.includes(labels[0])) {`
	`162`	`+ const labelStr = labels && labels.join('&');`
	`163`	`+ if (ids.includes(id) \|\| types.includes(labelStr)) {`
`163`	`164`	`return properties[name] \|\| '';`
`164`	`165`	`}`
`165`	`166`	`}`