VisActor · fangsmile · Jul 17, 2023 · Jul 13, 2023 · Jul 13, 2023 · Jul 17, 2023
diff --git a/packages/vtable/examples/style/function.ts b/packages/vtable/examples/style/function.ts
@@ -1,6 +1,7 @@
 import * as VTable from '../../src';
 const PivotTable = VTable.PivotTable;
 const Table_CONTAINER_DOM_ID = 'vTable';
+import { bindDebugTool } from '../../src/scenegraph/debug-tool';
 
 function generatePivotDataSource(num, colCount) {
   const array = new Array(num);
@@ -478,7 +479,7 @@ export function createTable() {
     instance.updatePivotSortState([{ dimensions: e.dimensionInfo, order }]);
   });
 
-  VTable.bindDebugTool(instance.scenegraph.stage as any, {
+  bindDebugTool(instance.scenegraph.stage as any, {
     customGrapicKeys: ['role', '_updateTag']
   });
 

diff --git a/packages/vtable/site-demo/basic-functionality/auto-wrap-text.md b/packages/vtable/site-demo/basic-functionality/auto-wrap-text.md
@@ -4,6 +4,7 @@ group: Basic Features
 title: 自动换行
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/auto-wrap-text.gif
 order: 3-1
+link: '/guide/basic_function/auto_wrap_text'
 ---
 
 # 自动换行

diff --git a/packages/vtable/site-demo/basic-functionality/frozen-col.md b/packages/vtable/site-demo/basic-functionality/frozen-col.md
@@ -4,6 +4,7 @@ group: Basic Features
 title: 冻结列
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/frozen-col.gif
 order: 3-3
+link: '/guide/basic_function/frozen_column'
 ---
 
 # 冻结列

diff --git a/packages/vtable/site-demo/basic-functionality/sort.md b/packages/vtable/site-demo/basic-functionality/sort.md
@@ -4,6 +4,7 @@ group: Basic Features
 title: 排序
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/sort.gif
 order: 3-2
+link: '/guide/basic_function/sort'
 ---
 
 # 排序

diff --git a/packages/vtable/site-demo/basic-functionality/width-mode-adaptive.md b/packages/vtable/site-demo/basic-functionality/width-mode-adaptive.md
@@ -4,6 +4,7 @@ group: Basic Features
 title: 适应容器宽度
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/width-mode-adaptive.png
 order: 3-5
+link: '/guide/basic_function/row_height_column_width'
 ---
 
 # 列宽模式-适应容器宽度

diff --git a/packages/vtable/site-demo/basic-functionality/width-mode-autoWidth.md b/packages/vtable/site-demo/basic-functionality/width-mode-autoWidth.md
@@ -4,6 +4,7 @@ group: Basic Features
 title: 列宽适应内容
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/width-mode-autoWidth.png
 order: 3-6
+link: '/guide/basic_function/row_height_column_width'
 ---
 
 # 列宽模式-适应内容

diff --git a/packages/vtable/site-demo/cell-type/multi-type.md b/packages/vtable/site-demo/cell-type/multi-type.md
@@ -4,6 +4,7 @@ group: Cell Type
 title: 单元格内容类型
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/multi-type.png
 order: 2-1
+link: '/guide/column_type/columnType'
 ---
 
 # 单元格内容类型

diff --git a/packages/vtable/site-demo/cell-type/progressbar.md b/packages/vtable/site-demo/cell-type/progressbar.md
@@ -4,6 +4,7 @@ group: Cell Type
 title: 数据条类型
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/progressbar.png
 order: 2-2
+link: '/guide/column_type/progressbar'
 ---
 
 # 数据条类型

diff --git a/packages/vtable/site-demo/component/scrollbar.md b/packages/vtable/site-demo/component/scrollbar.md
@@ -4,6 +4,7 @@ group: Component
 title: 滚动条
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/scrollbar.png
 order: 8-3
+link: '/guide/interaction_and_event/scroll'
 ---
 
 # 滚动条

diff --git a/packages/vtable/site-demo/custom-render/custom-cell-layout.md b/packages/vtable/site-demo/custom-render/custom-cell-layout.md
@@ -4,6 +4,7 @@ group: Custom
 title: 单元格自定义布局
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/custom-cell-layout.png
 order: 7-1
+link: '/guide/custom_define/custom_layout'
 ---
 
 # 单元格自定义布局

diff --git a/packages/vtable/site-demo/custom-render/custom-icon.md b/packages/vtable/site-demo/custom-render/custom-icon.md
@@ -4,6 +4,7 @@ group: Custom
 title: 自定义图标
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/custom-icon.png
 order: 7-2
+link: '/guide/custom_define/custom_icon'
 ---
 
 # 自定义图标

diff --git a/packages/vtable/site-demo/custom-render/custom-render-global.md b/packages/vtable/site-demo/custom-render/custom-render-global.md
@@ -4,6 +4,7 @@ group: Custom
 title: 单元格自定义内容
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/custom-render-global.png
 order: 7-3
+link: '/guide/custom_define/custom_render'
 ---
 
 # 单元格自定义内容

diff --git a/packages/vtable/site-demo/custom-render/custom-render.md b/packages/vtable/site-demo/custom-render/custom-render.md
@@ -4,6 +4,7 @@ group: Custom
 title: 单元格自定义内容
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/custom-render.png
 order: 7-4
+link: '/guide/custom_define/custom_render'
 ---
 
 # 单元格自定义内容

diff --git a/packages/vtable/site-demo/interaction/hover-inline-cross.md b/packages/vtable/site-demo/interaction/hover-inline-cross.md
@@ -4,6 +4,7 @@ group: Interaction
 title: hover行列十字高亮
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/hover-cross.png
 order: 4-3
+link: '/guide/interaction_and_event/hover_cell'
 ---
 
 # hover行列十字高亮

diff --git a/packages/vtable/site-demo/interaction/hover-inline-row.md b/packages/vtable/site-demo/interaction/hover-inline-row.md
@@ -4,6 +4,7 @@ group: Interaction
 title: hover高亮整行
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/hover-row.png
 order: 4-2
+link: '/guide/interaction_and_event/hover_cell'
 ---
 
 # hover高亮整行

diff --git a/packages/vtable/site-demo/interaction/move-header-position.md b/packages/vtable/site-demo/interaction/move-header-position.md
@@ -4,6 +4,7 @@ group: Interaction
 title: 移动表头位置
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/move-header-position.gif
 order: 4-5
+link: '/guide/interaction_and_event/drag_header'
 ---
 
 # 移动表头位置

diff --git a/packages/vtable/site-demo/interaction/resize-col-width.md b/packages/vtable/site-demo/interaction/resize-col-width.md
@@ -4,6 +4,7 @@ group: Interaction
 title: 调整列宽
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/resize-col-width.gif
 order: 4-4
+link: '/guide/interaction_and_event/resize_column_width'
 ---
 
 # 调整列宽

diff --git a/packages/vtable/site-demo/interaction/select.md b/packages/vtable/site-demo/interaction/select.md
@@ -4,6 +4,7 @@ group: Interaction
 title: 选择单元格
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/select.png
 order: 4-1
+link: '/guide/interaction_and_event/select'
 ---
 
 # 选择单元格

diff --git a/packages/vtable/site-demo/style/style.md b/packages/vtable/site-demo/style/style.md
@@ -1,9 +1,10 @@
 ---
 category: examples
-group: table-type pivot-table
+group: Style
 title: 样式
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/style.png
 order: 5-1
+link: '/guide/theme_and_style/style'
 ---
 
 # 样式

diff --git a/packages/vtable/site-demo/table-type/list-table-tree.md b/packages/vtable/site-demo/table-type/list-table-tree.md
@@ -4,6 +4,7 @@ group: table-type
 title: 基本表格树形展示
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/list-tree.png
 order: 1-2
+link: '/guide/table_type/List_table/tree_list'
 ---
 
 # 基本表格树形展示

diff --git a/packages/vtable/site-demo/table-type/list-table.md b/packages/vtable/site-demo/table-type/list-table.md
@@ -4,6 +4,7 @@ group: table-type
 title: 基本表格
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/list-table.png
 order: 1-1
+link: '/guide/table_type/List_table/list_table_define_and_generate'
 ---
 
 # 基本表格

diff --git a/packages/vtable/site-demo/table-type/pivot-table-tree.md b/packages/vtable/site-demo/table-type/pivot-table-tree.md
@@ -4,6 +4,7 @@ group: table-type
 title: 透视表格树形展示
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/pivot-tree.png
 order: 1-5
+link: '/guide/table_type/Pivot_table/pivot_table_tree'
 ---
 
 # 透视表格

diff --git a/packages/vtable/site-demo/table-type/pivot-table.md b/packages/vtable/site-demo/table-type/pivot-table.md
@@ -4,6 +4,7 @@ group: table-type
 title: 透视表格
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/pivot-table.png
 order: 1-4
+link: '/guide/table_type/Pivot_table/pivot_table_useage'
 ---
 
 # 透视表格

diff --git a/packages/vtable/site-demo/table-type/transpose-table.md b/packages/vtable/site-demo/table-type/transpose-table.md
@@ -4,6 +4,7 @@ group: table-type
 title: 转置表格
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/transpose.png
 order: 1-3
+link: '/guide/table_type/List_table/list_table_transpose'
 ---
 
 # 转置表格

diff --git a/packages/vtable/site-demo/theme/arco.md b/packages/vtable/site-demo/theme/arco.md
@@ -4,6 +4,7 @@ group: Theme
 title: 表格主题-ARCO
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/arco.png
 order: 6-1
+link: '/guide/theme_and_style/theme'
 ---
 
 # 表格主题-ARCO

diff --git a/packages/vtable/site-demo/theme/bright.md b/packages/vtable/site-demo/theme/bright.md
@@ -4,6 +4,7 @@ group: Theme
 title: 表格主题-BIGTHT
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/bright.png
 order: 6-2
+link: '/guide/theme_and_style/theme'
 ---
 
 # 表格主题-BIGTHT

diff --git a/packages/vtable/site-demo/theme/custom.md b/packages/vtable/site-demo/theme/custom.md
@@ -4,6 +4,7 @@ group: Theme
 title: 表格主题-custom
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/custom.png
 order: 6-6
+link: '/guide/theme_and_style/theme'
 ---
 
 # 表格主题-custom

diff --git a/packages/vtable/site-demo/theme/dark.md b/packages/vtable/site-demo/theme/dark.md
@@ -4,6 +4,7 @@ group: Theme
 title: 表格主题-DARK
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/dark.png
 order: 6-3
+link: '/guide/theme_and_style/theme'
 ---
 
 # 表格主题-DARK

diff --git a/packages/vtable/site-demo/theme/default.md b/packages/vtable/site-demo/theme/default.md
@@ -4,6 +4,7 @@ group: Theme
 title: 表格主题-DEFAULT
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/default.png
 order: 6-0
+link: '/guide/theme_and_style/theme'
 ---
 
 # 表格主题-DEFAULT

diff --git a/packages/vtable/site-demo/theme/extend.md b/packages/vtable/site-demo/theme/extend.md
@@ -4,6 +4,7 @@ group: Theme
 title: 表格主题-extends
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/extend.png
 order: 6-5
+link: '/guide/theme_and_style/theme'
 ---
 
 # 表格主题-extends

diff --git a/packages/vtable/site-demo/theme/register.md b/packages/vtable/site-demo/theme/register.md
@@ -4,6 +4,7 @@ group: Theme
 title: 表格主题-register
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/register.png
 order: 6-7
+link: '/guide/theme_and_style/theme'
 ---
 
 # 表格主题-register

diff --git a/packages/vtable/site-demo/theme/simplify.md b/packages/vtable/site-demo/theme/simplify.md
@@ -4,6 +4,7 @@ group: Theme
 title: 表格主题-SIMPLIFY
 cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/VTable/preview/simplify.png
 order: 6-4
+link: '/guide/theme_and_style/theme'
 ---
 
 # 表格主题-SIMPLIFY

diff --git a/packages/vtable/src/scenegraph/group-creater/cell-helper.ts b/packages/vtable/src/scenegraph/group-creater/cell-helper.ts
@@ -353,8 +353,6 @@ export function updateCell(col: number, row: number, table: BaseTableAPI, addNew
           col,
           row,
           bgColorFunc,
-          customRender,
-          customLayout,
           cellWidth,
           cellHeight,
           oldCellGroup,

diff --git a/packages/vtable/src/scenegraph/group-creater/column-helper.ts b/packages/vtable/src/scenegraph/group-creater/column-helper.ts
@@ -72,7 +72,7 @@ export function createComplexColumn(
   for (let j = rowStart; j <= rowEnd; j++) {
     const row = j;
     const define = cellType !== 'body' ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row);
-    const mayHaveIcon = cellType !== 'body' ? true : !!define?.icon;
+    const mayHaveIcon = cellType !== 'body' ? true : !!define?.icon || !!define?.tree;
     const headerStyle = table._getCellStyle(col, row);
     const cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;
     cellTheme.group.width = colWidth;

diff --git a/packages/vtable/src/scenegraph/group-creater/progress/proxy.ts b/packages/vtable/src/scenegraph/group-creater/progress/proxy.ts
@@ -613,6 +613,9 @@ export class SceneProxy {
     if (row < rowStart || row > rowEnd) {
       return emptyGroup;
     }
+    if (row < this.rowStart || row > this.rowEnd || col < this.colStart || col > this.colEnd) {
+      return emptyGroup;
+    }
     if (this.cellCache.get(col)) {
       const cacheCellGoup = this.cellCache.get(col);
       if ((cacheCellGoup._next || cacheCellGoup._prev) && Math.abs(cacheCellGoup.row - row) < row) {

diff --git a/packages/vtable/src/scenegraph/layout/compute-row-height.ts b/packages/vtable/src/scenegraph/layout/compute-row-height.ts
@@ -194,7 +194,8 @@ function computeTextHeight(col: number, row: number, table: BaseTableAPI): numbe
   let iconInlineFrontHeight = 0;
   const iconInlineEnd: ColumnIconOption[] = [];
   let iconInlineEndHeight = 0;
-  const mayHaveIcon = table.getCellType(col, row) !== 'body' ? true : !!table.getBodyColumnDefine(col, row)?.icon;
+  const define = table.getBodyColumnDefine(col, row);
+  const mayHaveIcon = table.getCellType(col, row) !== 'body' ? true : !!define?.icon || !!define?.tree;
   if (mayHaveIcon) {
     const icons = table.getCellIcons(col, row);
     icons?.forEach(icon => {

diff --git a/packages/vtable/src/scenegraph/scenegraph.ts b/packages/vtable/src/scenegraph/scenegraph.ts
@@ -670,10 +670,14 @@ export class Scenegraph {
     computeColsWidth(this.table, 0, this.table.colCount - 1, true);
   }
 
+  recalculateRowHeights() {
+    computeRowsHeight(this.table, 0, this.table.rowCount - 1);
+  }
+
   resize() {
     this.recalculateColWidths();
     if (this.table.internalProps.autoRowHeight) {
-      updateAutoRowHeight(this, true);
+      this.recalculateRowHeights();
     }
     this.dealWidthMode();
     this.dealFrozen();
@@ -1349,7 +1353,7 @@ export class Scenegraph {
     // update column width and row height
     this.recalculateColWidths();
     if (this.table.internalProps.autoRowHeight) {
-      updateAutoRowHeight(this, true);
+      this.recalculateRowHeights();
     }
 
     // check frozen status