Merge pull request #5107 from antvis/bugfix-1026

chore: refine demo and test data

packages/g6/src/stdlib/data/mapNodeSize.ts

@@ -58,11 +58,11 @@ const handler = (
   const sizeMap = scaleNodeProp(nodes, field, valueRange, range);
   sizeMap.forEach((val, id) => {
     let value = val;
-    if (isNaN(val)) value = range[0];
+    if (isNaN(val) || !val) value = range[0];
     const node = nodeMap.get(id);
     node.data.keyShape = {
       ...node.data.keyShape,
-      r: value / 2,
+      r: Math.round(value / 2),
       width: value,
       height: value,
     };

packages/g6/tests/demo/demo/demo.ts

@@ -1,8 +1,7 @@
 import { initThreads, supportsThreads, ForceLayout } from '@antv/layout-wasm';
-// import G6, { Graph, GraphData } from '../../../esm';
 import { labelPropagation } from '@antv/algorithm';
 import Stats from 'stats.js';
-import G6, { Graph, Extensions, extend } from '../../../src/index';
+import G6, { Graph, Extensions, extend, GraphData } from '../../../src/index';
 
 import { container, height, width } from '../../datasets/const';
 import { RendererName } from '../../../src/types/render';
@@ -11,12 +10,59 @@ import data from './data.json';
 import data3d from './data3d';
 
 let graph: typeof Graph;
-let degrees = {};
 let dataFor2D: GraphData = { nodes: [], edges: [] };
 let dataFor3D: GraphData = { nodes: [], edges: [] };
 let colorSelects = [];
 const { nodes, edges } = data;
-export { nodes, edges, degrees };
+export { nodes, edges };
+
+const dataFormat = (dataAUR, options = {}, graphCore) => {
+  const { dataAdded, dataUpdated, dataRemoved } = dataAUR;
+  return {
+    dataAdded: dataFormatHandler(dataAdded, options, graphCore),
+    dataUpdated: dataFormatHandler(dataUpdated, options, graphCore),
+    dataRemoved,
+  };
+};
+
+const dataFormatHandler = (data, options = {}, graphCore) => {
+  if (!data.nodes || !data.edges) return {};
+  const map = new Map();
+  const nodes = [];
+  data.nodes?.forEach((node) => {
+    if (map.has(node.id)) return;
+    nodes.push(node);
+    map.set(node.id, 0);
+  });
+  data.edges?.forEach((edge) => {
+    const sourceDegree = map.get(edge.source) || 0;
+    map.set(edge.source, sourceDegree + 1);
+    const targetDegree = map.get(edge.target) || 0;
+    map.set(edge.target, targetDegree + 1);
+  });
+  return {
+    nodes: nodes.map((node) => {
+      const { id, x, y, z, olabel, data } = node;
+      return {
+        id,
+        data: {
+          x,
+          y,
+          z,
+          label: olabel,
+          ...data,
+          degree: map.get(id),
+        },
+      };
+    }),
+    edges:
+      data.edges?.map((edge) => ({
+        id: `edge-${Math.random()}`,
+        source: edge.source,
+        target: edge.target,
+      })) || [],
+  };
+};
 
 const getDefaultNodeAnimates = (delay?: number) => ({
   buildIn: [
@@ -129,6 +175,9 @@ const create2DGraph = (
     layouts: {
       'force-wasm': Extensions.ForceLayout,
     },
+    transforms: {
+      'data-format': dataFormat,
+    },
   });
   const graph = new ExtGraph({
     container: container as HTMLElement,
@@ -139,6 +188,14 @@ const create2DGraph = (
     renderer: 'webgl',
     rendererType,
     data: dataFor2D,
+    transforms: [
+      'data-format',
+      {
+        type: 'map-node-size',
+        field: 'degree',
+        range: [3, 24],
+      },
+    ],
     modes: {
       default: [
         {
@@ -170,13 +227,13 @@ const create2DGraph = (
     },
     // 节点配置
     node: (innerModel) => {
-      const degree = degrees[innerModel.id] || 0;
+      const { degree } = innerModel.data;
-      let labelLod = 3;
+      let iconLod = 3;
-      if (degree > 40) labelLod = -2;
+      if (degree > 40) iconLod = -2;
-      else if (degree > 20) labelLod = -1;
+      else if (degree > 20) iconLod = -1;
-      else if (degree > 10) labelLod = 0;
+      else if (degree > 10) iconLod = 0;
-      else if (degree > 5) labelLod = 1;
+      else if (degree > 5) iconLod = 1;
-      else if (degree > 2) labelLod = 2;
+      else if (degree > 2) iconLod = 2;
       return {
         ...innerModel,
         data: {
@@ -199,28 +256,25 @@ const create2DGraph = (
                   text: innerModel.data.label,
                   maxWidth: '400%',
                   offsetY: 8,
-                  lod: 'auto', // labelLod,
+                  lod: 'auto',
                 }
               : undefined,
 
           labelBackgroundShape:
             degree !== 0
               ? {
-                  lod: 'auto', // labelLod,
+                  lod: 'auto',
                 }
               : undefined,
           iconShape:
             degree !== 0
               ? {
                   img: 'https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*7g4nSbYrg6cAAAAAAAAAAAAADmJ7AQ/original',
-                  fontSize: 12 + degree / 4,
+                  fontSize: innerModel.data.keyShape?.r || 12,
                   opacity: 0.8,
-                  lod: labelLod + 2,
+                  lod: iconLod,
                 }
               : undefined,
-          keyShape: {
-            r: 12 + degree / 4,
-          },
         },
       };
     },
@@ -252,6 +306,14 @@ const create3DGraph = async () => {
     height: 1400,
     renderer: 'webgl-3d',
     data: dataFor3D,
+    transforms: [
+      'data-format',
+      {
+        type: 'map-node-size',
+        field: 'degree',
+        range: [40, 150],
+      },
+    ],
     // layout: {
     //   type: 'force-wasm',
     //   threads,
@@ -323,11 +385,8 @@ const create3DGraph = async () => {
         data: {
           ...innerModel.data,
           type: 'sphere-node',
-          keyShape: {
-            r: 12 + degrees[innerModel.id] / 2,
-          },
           labelShape:
-            degrees[innerModel.id] > 20
+            degree > 20
               ? {
                   text: innerModel.data.label,
                   fontSize: 100,
@@ -724,16 +783,7 @@ const getDataFor2D = (inputData) => {
   //   delete node.data.y;
   //   delete node.data.z;
   // });
-  const degrees = {};
+  return inputData;
-  inputData.edges.forEach((edge) => {
-    const { source, target } = edge;
-    degrees[source] = degrees[source] || 0;
-    degrees[target] = degrees[target] || 0;
-    degrees[source]++;
-    degrees[target]++;
-  });
-  inputData.nodes.forEach((node) => delete node.data.z);
-  return { degrees, data: inputData };
 };
 
 const getDataFor3D = (inputData) => {
@@ -755,10 +805,8 @@ const getDataFor3D = (inputData) => {
 };
 
 export default async () => {
-  const result2d = getDataFor2D(data);
+  dataFor2D = getDataFor2D(data);
-  degrees = result2d.degrees;
+  dataFor3D = getDataFor3D(data3d);
-  dataFor2D = result2d.data;
-  dataFor3D = result2d.data; //getDataFor3D(data3d);
 
   graph = create2DGraph();
   const { rendererSelect, themeSelect, customThemeSelect, zoomIn, zoomOut } =

packages/site/examples/feature/features/demo/rendererSwitch.js

@@ -61,16 +61,16 @@ const getDefaultEdgeAnimates = (delay) => ({
   ],
 });
 
-const lodStrategyLevels = [
+const lodLevels = [
-  { zoomRange: [0, 0.16] }, // -2
+  { zoomRange: [0, 0.16] }, // -4
-  { zoomRange: [0.16, 0.2] }, // -1
+  { zoomRange: [0.16, 0.2] }, // -3
-  { zoomRange: [0.2, 0.3], primary: true }, // 0
+  { zoomRange: [0.2, 0.3] }, // -2
-  { zoomRange: [0.3, 0.5] }, // 1
+  { zoomRange: [0.3, 0.5] }, // -1
-  { zoomRange: [0.5, 0.8] }, // 2
+  { zoomRange: [0.5, 0.8], primary: true }, // 0
-  { zoomRange: [0.8, 1.5] }, // 3
+  { zoomRange: [0.8, 1.5] }, // 1
-  { zoomRange: [1.5, 1.8] }, // 4
+  { zoomRange: [1.5, 2.5] }, // 2
-  { zoomRange: [1.8, 2] }, // 5
+  { zoomRange: [2.5, 5] }, // 3
-  { zoomRange: [2, Infinity] }, // 6
+  { zoomRange: [5, Infinity] }, // 4
 ];
 
 const defaultTheme = {
@@ -99,7 +99,7 @@ const dataFormatHandler = (data, options = {}, graphCore) => {
   data.nodes?.forEach((node) => {
     if (map.has(node.id)) return;
     nodes.push(node);
-    map.set(node.id, true);
+    map.set(node.id, 0);
   });
   data.edges?.forEach((edge) => {
     const sourceDegree = map.get(edge.source) || 0;
@@ -142,7 +142,7 @@ const create3DGraph = async (data) => {
       {
         type: 'map-node-size',
         field: 'degree',
-        range: [40, 100],
+        range: [40, 200],
       },
     ],
     data,
@@ -234,7 +234,7 @@ const create2DGraph = (renderer, data) => {
       {
         type: 'map-node-size',
         field: 'degree',
-        range: [2, 24],
+        range: [3, 24],
       },
     ],
     modes: {
@@ -264,14 +264,16 @@ const create2DGraph = (renderer, data) => {
     // 节点配置
     node: (innerModel) => {
       const { degree } = innerModel.data;
-      let iconLod = 3;
+      let iconLod = 4;
-      if (degree > 40) iconLod = -1;
+      if (degree > 40) iconLod = -2;
       else if (degree > 20) iconLod = 0;
       else if (degree > 10) iconLod = 1;
       else if (degree > 5) iconLod = 2;
+      else if (degree > 2) iconLod = 3;
       return {
         ...innerModel,
         data: {
+          lodLevels,
           animates: getDefaultNodeAnimates(),
           ...innerModel.data,
           labelShape:
@@ -294,7 +296,7 @@ const create2DGraph = (renderer, data) => {
             degree !== 0
               ? {
                   img: 'https://mdn.alipayobjects.com/huamei_qa8qxu/afts/img/A*7g4nSbYrg6cAAAAAAAAAAAAADmJ7AQ/original',
-                  fontSize: innerModel.data.keyShape.r,
+                  fontSize: innerModel.data.keyShape?.r || 12,
                   opacity: 0.8,
                   lod: iconLod,
                 }