test: 修复单测

antvis · Feb 28, 2024 · a1477ae · a1477ae
1 parent 3921d92
commit a1477ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/s2-core/src/utils/cell/cell.ts b/packages/s2-core/src/utils/cell/cell.ts
@@ -1,4 +1,5 @@
 import type { LineStyleProps } from '@antv/g';
+import { isEmpty } from 'lodash';
 import type { SimpleBBox } from '../../engine';
 import {
   CellClipBox,
@@ -199,6 +200,11 @@ export const getBorderPositionAndStyle = (
     borderDash,
   } = style;
 
+  // 如果是空数组 G 底层绘制会报错
+  const lineDash: LineStyleProps['lineDash'] = isEmpty(borderDash)
+    ? ''
+    : borderDash;
+
   const borderStyle: Partial<LineStyleProps> = [
     CellBorderPosition.TOP,
     CellBorderPosition.BOTTOM,
@@ -207,13 +213,13 @@ export const getBorderPositionAndStyle = (
         lineWidth: horizontalBorderWidth,
         stroke: horizontalBorderColor,
         strokeOpacity: horizontalBorderColorOpacity,
-        lineDash: borderDash,
+        lineDash,
       }
     : {
         lineWidth: verticalBorderWidth,
         stroke: verticalBorderColor,
         strokeOpacity: verticalBorderColorOpacity,
-        lineDash: borderDash,
+        lineDash,
       };
 
   let x1 = 0;

diff --git a/s2-site/examples/custom/custom-icon/demo/custom-header-action-icon.ts b/s2-site/examples/custom/custom-icon/demo/custom-header-action-icon.ts
@@ -79,13 +79,13 @@ fetch(
               displayCondition: (meta) => meta.rowIndex > 2,
               onHover: (options) => {
                 const { meta, event } = options;
-                const div = document.createElement('div');
+                const content = document.createElement('div');
 
-                div.innerHTML = '我是 RowTooltip 自定义内容';
+                content.innerHTML = '我是 RowTooltip 自定义内容';
 
                 meta.spreadsheet.tooltip.show({
                   position: { x: event.clientX, y: event.clientY },
-                  content: div,
+                  content,
                 });
               },
             },