Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript into master

Author: MyShallowTime

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

@@ -100,10 +100,9 @@ function getEdgeStyle(entity, style) {
     const types = JSON.parse(relationTypes || '[]');
     if (ids.includes(id) || types.includes(type)) {
       return {
-        fontSize: compileFontSize(font.fontSize),
-        fontFamily: font.fontName,
+        fontSize: font.fontSize,
         fill: textColor,
-
+        ...formatFontName(font.fontName),
         ...formatFontStyle(font.fontStyle)
       };
     }
@@ -124,11 +123,10 @@ function getNodeStyle(entity, style) {
     if (ids.includes(id) || types.includes(labels[0])) {
       return {
         fillColor: color,
-        fontSize: compileFontSize(font.fontSize),
-        fontFamily: font.fontName,
+        fontSize: font.fontSize,
         fill: textColor,
         size: size,
-        // stroke: color,
+        ...formatFontName(font.fontName),
         ...formatFontStyle(font.fontStyle)
       };
     }
@@ -153,18 +151,30 @@ function getNodeLabel(entity, captionField) {
 }
 
 function formatFontStyle(fontStyle) {
-  if (fontStyle === 1) {
-    return { fontWeight: 600 };
+  //TODO: fontStyle为0是plain
+  if (fontStyle === 1 || fontStyle === 'bold') {
+    return { fontWeight: 'bold' };
   }
-  if (fontStyle === 2) {
+  if (fontStyle === 2 || fontStyle === 'italic') {
     return { fontStyle: 'italic' };
   }
+  if (fontStyle === 'bolditalic') {
+    return { fontWeight: 'bold', fontStyle: 'italic' };
+  }
   return {};
 }
 
-function compileFontSize(fontSize) {
-  return fontSize * 0.8;
+function formatFontName(fontName) {
+  if (!fontName) {
+    return {};
+  }
+  const arrs = fontName.split('.');
+  return {
+    fontFamily: arrs[0],
+    ...formatFontStyle(arrs[1])
+  };
 }
+
 // 处理graphMap数据的展开 折叠 隐藏的实体数据
 export function transformExpandCollapseHiddenData(graphMap) {
   const { expand, collapse, hidden } = graphMap.dataContent;

test/common/iServer/KnowledgeGraphServiceSpec.js

@@ -47,7 +47,7 @@ describe('KnowledgeGraphService', () => {
         expect(result).not.toBeNull();
         expect(result.type).toBe('processCompleted');
         expect(result.result).not.toBeNull();
-        expect(result.result.length).toEqual(2);
+        expect(result.result.length).toEqual(4);
         knowledgeGraphService.destroy();
         done();
       } catch (exception) {

test/leaflet/services/KnowledgeGraphServiceSpec.js

@@ -42,7 +42,7 @@ describe('KnowledgeGraphService', () => {
         expect(result).not.toBeNull();
         expect(result.type).toBe('processCompleted');
         expect(result.result).not.toBeNull();
-        expect(result.result.length).toEqual(2);
+        expect(result.result.length).toEqual(4);
         done();
       } catch (exception) {
         console.log("'query'案例失败：" + exception.name + ':' + exception.message);

test/mapboxgl/services/KnowledgeGraphServiceSpec.js

@@ -42,7 +42,7 @@ describe('KnowledgeGraphService', () => {
         expect(result).not.toBeNull();
         expect(result.type).toBe('processCompleted');
         expect(result.result).not.toBeNull();
-        expect(result.result.length).toEqual(2);
+        expect(result.result.length).toEqual(4);
         done();
       } catch (exception) {
         console.log("'query'案例失败：" + exception.name + ':' + exception.message);

test/maplibregl/services/KnowledgeGraphServiceSpec.js

@@ -42,7 +42,7 @@ describe('KnowledgeGraphService', () => {
         expect(result).not.toBeNull();
         expect(result.type).toBe('processCompleted');
         expect(result.result).not.toBeNull();
-        expect(result.result.length).toEqual(2);
+        expect(result.result.length).toEqual(4);
         done();
       } catch (exception) {
         console.log("'query'案例失败：" + exception.name + ':' + exception.message);

test/openlayers/services/KnowledgeGraphServiceSpec.js

@@ -42,7 +42,7 @@ describe('KnowledgeGraphService', () => {
         expect(result).not.toBeNull();
         expect(result.type).toBe('processCompleted');
         expect(result.result).not.toBeNull();
-        expect(result.result.length).toEqual(2);
+        expect(result.result.length).toEqual(4);
         done();
       } catch (exception) {
         console.log("'query'案例失败：" + exception.name + ':' + exception.message);