Merge pull request #1389 from VisActor/develop

release 0.22.2
VisActor · Mar 27, 2024 · 8a8fc4d · 8a8fc4d
2 parents 6a35e3d + 64168f9
commit 8a8fc4d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -33,6 +33,6 @@ jobs:
       - name: Build
         env:
           NODE_OPTIONS: "--max_old_space_size=4096"
-        run: node common/scripts/install-run-rush.js build --only tag:package
+        run: node common/scripts/install-run-rush.js build -t @visactor/vtable
       - name: Test
-        run: node common/scripts/install-run-rush.js test --only tag:package
+        run: node common/scripts/install-run-rush.js test -t @visactor/vtable
diff --git a/packages/vtable/src/scenegraph/group-creater/cell-type/progress-bar-cell.ts b/packages/vtable/src/scenegraph/group-creater/cell-type/progress-bar-cell.ts
@@ -6,11 +6,12 @@ import { getProp } from '../../utils/get-prop';
 import { getQuadProps } from '../../utils/padding';
 import type { BaseTableAPI } from '../../../ts-types/base-table';
 import { isNumber } from '@visactor/vutils';
+import type { StylePropertyFunctionArg } from '../../../ts-types';
 
 export function createProgressBarCell(
   progressBarDefine: {
-    min?: number;
-    max?: number;
+    min?: number | ((args: StylePropertyFunctionArg) => number);
+    max?: number | ((args: StylePropertyFunctionArg) => number);
     barType?: 'default' | 'negative' | 'negative_no_axis'; // 进度图类型
     dependField?: string; // 指定其他列数据（风神使用）,
   },
@@ -34,18 +35,18 @@ export function createProgressBarCell(
       col,
       row,
       table,
-      context: null,
       value,
-      dataValue
+      dataValue,
+      cellHeaderPaths: undefined
     }) ?? 0;
   progressBarDefine.max =
     getOrApply(progressBarDefine.max, {
       col,
       row,
       table,
-      context: null,
       value,
-      dataValue
+      dataValue,
+      cellHeaderPaths: undefined
     }) ?? progressBarDefine.min + 100;
   const height = table.getRowHeight(row);
   let contentWidth = width;

diff --git a/packages/vtable/src/themes/theme.ts b/packages/vtable/src/themes/theme.ts
@@ -52,9 +52,9 @@ import { defalutPoptipStyle, getAxisStyle } from './component';
 
 function getProp(obj: PartialTableThemeDefine, superObj: ITableThemeDefine, names: string[], defNames?: string[]): any {
   return (
-    getChainSafe(obj, ...names) ||
-    getChainSafe(superObj, ...names) ||
-    (defNames && getChainSafe(obj, ...defNames)) ||
+    getChainSafe(obj, ...names) ??
+    getChainSafe(superObj, ...names) ??
+    (defNames && getChainSafe(obj, ...defNames)) ??
     (defNames && getChainSafe(superObj, ...defNames))
   );
 }
@@ -105,7 +105,7 @@ export class TableTheme implements ITableThemeDefine {
 
   get cellInnerBorder(): boolean {
     const { obj, superTheme } = this.internalTheme;
-    return !!getProp(obj, superTheme, ['cellInnerBorder']) ?? true;
+    return getProp(obj, superTheme, ['cellInnerBorder']) ?? true;
   }
 
   get cellBorderClipDirection(): 'top-left' | 'bottom-right' {