fix: disable cellInnerBorder when no frame border

VisActor · Oct 22, 2024 · 4ceedb2 · 4ceedb2
1 parent 691f646
commit 4ceedb2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/common/changes/@visactor/vtable/fix-cell-border_2024-10-22-06-58.json b/common/changes/@visactor/vtable/fix-cell-border_2024-10-22-06-58.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@visactor/vtable",
+      "comment": "fix: disable cellInnerBorder when no frame border ",
+      "type": "none"
+    }
+  ],
+  "packageName": "@visactor/vtable"
+}
diff --git a/packages/vtable/src/scenegraph/utils/cell-border-stroke-width.ts b/packages/vtable/src/scenegraph/utils/cell-border-stroke-width.ts
@@ -2,11 +2,16 @@ import type { IThemeSpec } from '@visactor/vrender-core';
 import type { BaseTableAPI } from '../../ts-types/base-table';
 import { style as utilStyle } from '../../tools/helper';
 import { isValid } from '@visactor/vutils';
+import { isValidStyle, isZeroStyle } from '../../tools/style';
 
 export function getCellBorderStrokeWidth(col: number, row: number, cellTheme: IThemeSpec, table: BaseTableAPI) {
   // const frameBorderLineWidths = utilStyle.toBoxArray(table.internalProps.theme.frameStyle?.borderLineWidth ?? [null]);
   let strokeArrayWidth = (cellTheme?.group as any)?.strokeArrayWidth ?? undefined;
-  if (table.theme.cellInnerBorder) {
+  if (
+    table.theme.cellInnerBorder ||
+    !isValidStyle(table.theme.frameStyle.borderLineWidth) ||
+    isZeroStyle(table.theme.frameStyle.borderLineWidth)
+  ) {
     return strokeArrayWidth;
   }
   if (col === 0) {

diff --git a/packages/vtable/src/tools/style.ts b/packages/vtable/src/tools/style.ts
@@ -1,3 +1,4 @@
+import { isArray, isValid } from '@visactor/vutils';
 import type { ScrollStyle } from '../ts-types';
 
 export function getHorizontalScrollBarSize(scrollStyle?: ScrollStyle): number {
@@ -21,3 +22,18 @@ export function getVerticalScrollBarSize(scrollStyle?: ScrollStyle): number {
   }
   return scrollStyle?.width ?? 7;
 }
+
+export function isValidStyle(style: (string | number) | (string | number)[]) {
+  if (!isValid(style)) {
+    return false;
+  }
+  if (isArray(style)) {
+    return style.some(s => isValid(s));
+  }
+
+  return true;
+}
+
+export function isZeroStyle(style: number | number[]) {
+  return style === 0 || (isArray(style) && style.every(s => s === 0));
+}