[fix]知识图谱对接边线颜色和线宽 review by qiw

Author: luoxiao-supermap

src/common/iServer/KnowledgeGraphService.js

@@ -42,7 +42,7 @@ export class KnowledgeGraphService extends CommonServiceBase {
    */
   query(params, callback) {
     const paramKey = 'cypherQuery';
-    const url = Util.urlAppend(this.url + '/query.json', `${paramKey}=${params}`);
+    const url = Util.urlAppend(this.url + '/query.json', `${paramKey}=${encodeURI(params)}`);
     this.processAsync({ url, method: 'GET', callback });
   }
 

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

@@ -153,7 +153,8 @@ export class G6Render {
     };
     const defaultEdgeHighlightStyle = {
       stroke: hoverColor,
-      lineWidth: 2,
+      shadowColor: hoverColor,
+      shadowBlur: 5,
       endArrow: {
         path: 'M 0,0 L 2,1 L 2,-1 Z',
         fill: hoverColor

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

@@ -76,16 +76,27 @@ export function nodeFromGraphMap(entity, style, captionField) {
 export function edgeFromGraphMap(entity, style) {
   const { start, end, id, type, properties } = entity;
   const styleData = style ? getEdgeStyle(entity, style) : {};
-  return {
+  const edge = {
     source: start + '',
     target: end + '',
     edgeId: id + '',
     label: type,
-    labelCfg: {
-      style: styleData
-    },
+    style: {},
+    labelCfg: {},
     properties
   };
+  if (styleData.stroke) {
+    edge.style.stroke = styleData.stroke;
+    delete styleData.stroke;
+  }
+  if (styleData.lineWidth) {
+    edge.style.lineWidth = styleData.lineWidth;
+    delete styleData.lineWidth;
+  }
+  edge.labelCfg = {
+    style: styleData
+  };
+  return edge;
 }
 
 function getEdgeStyle(entity, style) {
@@ -95,11 +106,13 @@ function getEdgeStyle(entity, style) {
   const { id, type } = entity;
   const data = style.filter((item) => item.type === 'relationShip');
   for (let i = 0; i < data.length; i++) {
-    const { textColor, font, relationTypes, relationIds } = data[i];
+    const { color, width, textColor, font, relationTypes, relationIds } = data[i];
     const ids = JSON.parse(relationIds || '[]');
     const types = JSON.parse(relationTypes || '[]');
     if (ids.includes(id) || types.includes(type)) {
       return {
+        stroke: color,
+        lineWidth: Number(width) * 1.4,
         fontSize: font.fontSize,
         fill: textColor,
         ...formatFontName(font.fontName),