fix: ci and bench (#5880)

antvis · Dec 5, 2023 · 046ea5f · 046ea5f
1 parent c78da52
commit 046ea5f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 29 deletions.
diff --git a/scripts/bench/chart.ts b/scripts/bench/chart.ts
@@ -1,4 +1,4 @@
-import { render } from '@antv/g2v5';
+import { render, stdlib } from '@antv/g2v5';
 import { html } from 'htl';
 import * as _cases from './tests/chart';
 
@@ -162,14 +162,14 @@ async function launch(container: HTMLDivElement) {
         end: (node: any) => {
           const result = performance.measure(key, key);
           results.push(result);
-          renderPrefResultEach(container, node, key, result, false);
+          renderPrefResultEach(container, node, key, result, true);
           resolve();
         },
       });
     });
   }
 
-  renderPreResultAll(container, results);
+  // renderPreResultAll(container, results);
 
   renderReportUpload(container, results);
 
@@ -212,26 +212,29 @@ function renderPreResultAll(
   const dashboard = document.createElement('div');
   dashboard.id = id;
   container.appendChild(dashboard);
-  const node = render({
-    type: 'interval',
-    width: 1000,
-    data: results,
-    encode: { x: 'name', y: 'duration' },
-    style: { fill: 'black' },
-    transform: [{ type: 'sortX', by: 'y', reverse: true }],
-    scale: {
-      y: { nice: true },
+  const node = render(
+    {
+      type: 'interval',
+      width: 1000,
+      data: results,
+      encode: { x: 'name', y: 'duration' },
+      style: { fill: 'black' },
+      transform: [{ type: 'sortX', by: 'y', reverse: true }],
+      scale: {
+        y: { nice: true },
+      },
+      axis: {
+        x: { labelAutoRotate: false, title: 'library + env' },
+        y: { title: 'duration(ms)' },
+      },
+      labels: [{ text: 'duration', position: 'inside', formatter: '.1f' }],
     },
-    axis: {
-      x: { labelAutoRotate: false, title: 'library + env' },
-      y: { title: 'duration(ms)' },
-    },
-    labels: [{ text: 'duration', position: 'inside', formatter: '.1f' }],
-  });
+    { library: stdlib() },
+  );
   dashboard.appendChild(node);
 }
 
-function clearNodes(className: string = 'chart') {
+function clearNodes(className = 'chart') {
   const charts = document.getElementsByClassName(className);
   Array.from(charts).forEach((d) => d.remove());
 }

diff --git a/scripts/bench/tests/chart/point-temperatures/g2-v4-canvas.ts b/scripts/bench/tests/chart/point-temperatures/g2-v4-canvas.ts
@@ -14,6 +14,8 @@ export const g2V4Canvas: ChartType = (data, { start, end }) => {
 
   chart.point().position('date*value').style({ stroke: 'black' });
 
+  chart.animate(false);
+
   chart.render();
 
   end(node);

diff --git a/scripts/bench/tests/chart/point-temperatures/g2-v5-canvas-spec.ts b/scripts/bench/tests/chart/point-temperatures/g2-v5-canvas-spec.ts
@@ -1,10 +1,9 @@
-import { render } from '@antv/g2v5';
+import { render, stdlib } from '@antv/g2v5';
 import type { Chart } from '../types';
 
 export const g2V5CanvasSpec: Chart = (data, { start, end }) => {
-  let node: HTMLElement;
   start();
-  node = render(
+  const node = render(
     {
       type: 'point',
       data,
@@ -18,7 +17,7 @@ export const g2V5CanvasSpec: Chart = (data, { start, end }) => {
       },
       animate: false,
     },
-    undefined,
+    { library: stdlib() },
     () => end(node),
   );
 };
diff --git a/src/runtime/library.ts b/src/runtime/library.ts
@@ -15,7 +15,7 @@ export function useLibrary<
 >(
   namespace: G2ComponentNamespaces,
   publicLibrary: G2Library,
-): [(options: O, context?: G2Context) => V, (type: O['type']) => C] {
+): [(options: O, context?) => V, (type: O['type']) => C] {
   const library = { ...builtinlib(), ...publicLibrary };
 
   const create = (type: O['type']) => {
@@ -24,12 +24,9 @@ export function useLibrary<
     return library[key] || error(`Unknown Component: ${key}`);
   };
 
-  const use = (options: O, context?: G2Context) => {
+  const use = (options: O, context?) => {
     const { type, ...rest } = options;
-    if (!type) {
-      error(`Plot type is required!`);
-    }
-
+    if (!type) error(`Plot type is required!`);
     const currentLibrary = create(type);
     return currentLibrary?.(rest, context);
   };