@visactor/vtable 0.25.4-alpha.0 → 0.25.4-alpha.1

package/cjs/scenegraph/group-creater/column-helper.js

@@ -11,7 +11,7 @@ function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, merge
     columnGroup.lastChild && columnGroup.lastChild.row === rowStart - 1 ? y = columnGroup.lastChild.attribute.y + columnGroup.lastChild.attribute.height : columnGroup.colHeight && (y = columnGroup.colHeight);
     for (let j = rowStart; j <= rowEnd; j++) {
         const row = j;
-        let range, isMerge, customStyle, customResult, value = table.getCellValue(col, row), cellWidth = colWidth, cellHeight = table.getRowHeight(row);
+        let range, isMerge, customStyle, customResult, value = table.getCellValue(col, row), cellWidth = colWidth, cellHeight = Math.round(table.getRowHeight(row));
         if (table.internalProps.customMergeCell) {
             const customMerge = table.getCustomMerge(col, row);
             if (customMerge) {

package/cjs/scenegraph/group-creater/column-helper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from './../../vrender';\nimport type { CellLocation, CellRange, ColumnDefine, IRowSeriesNumber, TextColumnDefine } from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport { createCell, dealWithMergeCellSize, resizeCellGroup } from './cell-helper';\nimport type { BaseTableAPI, HeaderData } from '../../ts-types/base-table';\nimport { getCellCornerRadius, getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { dealWithCustom } from '../component/custom';\n/**\n * 创建复合列 同一列支持创建不同类型单元格\n * @param columnGroup 列Group\n * @param col\n * @param colWidth 配置列宽\n * @param rowStart\n * @param rowEnd\n * @param mergeMap merge单元格信息\n * @param defaultRowHeight\n * @param table\n * @param cellLocation\n * @param rowLimit\n * @param customRender\n * @param customLayout\n * @returns\n */\nexport function createComplexColumn(\n  columnGroup: Group,\n  col: number,\n  colWidth: number,\n  rowStart: number,\n  rowEnd: number,\n  mergeMap: MergeMap,\n  defaultRowHeight: number | number[],\n  table: BaseTableAPI,\n  cellLocation: CellLocation,\n  rowLimit?: number\n) {\n  let padding;\n  let textAlign;\n  let textBaseline;\n  /** useColumnTheme 判断是否可以使用columnTheme */\n  // insert cell into column group top\n  let y = 0;\n  // if (columnGroup.colHeight) {\n  //   // insert cell into column group bottom\n  //   y = columnGroup.colHeight;\n  // }\n  if (columnGroup.lastChild && (columnGroup.lastChild as Group).row === rowStart - 1) {\n    y = (columnGroup.lastChild as Group).attribute.y + (columnGroup.lastChild as Group).attribute.height;\n  } else if (columnGroup.colHeight) {\n    y = columnGroup.colHeight;\n  }\n\n  for (let j = rowStart; j <= rowEnd; j++) {\n    const row = j;\n    let value = table.getCellValue(col, row);\n\n    // 处理单元格合并\n    let cellWidth = colWidth;\n    // let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n    let cellHeight = table.getRowHeight(row);\n    let range;\n    let isMerge;\n    let customStyle;\n    let customResult;\n    if (table.internalProps.customMergeCell) {\n      const customMerge = table.getCustomMerge(col, row);\n      if (customMerge) {\n        const {\n          range: customMergeRange,\n          text: customMergeText,\n          style: customMergeStyle,\n          customLayout,\n          customRender\n        } = customMerge;\n        range = customMergeRange;\n        isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n        if (isMerge) {\n          const needUpdateRange = rowStart > range.start.row;\n          const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n          cellWidth = mergeSize.cellWidth;\n          cellHeight = mergeSize.cellHeight;\n        }\n        value = customMergeText;\n        customStyle = customMergeStyle;\n\n        if (customLayout || customRender) {\n          customResult = dealWithCustom(\n            customLayout,\n            customRender,\n            customMergeRange.start.col,\n            customMergeRange.start.row,\n            table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col),\n            table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row),\n            false,\n            // table.heightMode === 'autoHeight',\n            table.isAutoRowHeight(row),\n            [0, 0, 0, 0],\n            table\n          );\n        }\n      }\n    }\n\n    let colForDefine = col;\n    let rowForDefine = row;\n    if (range) {\n      colForDefine = range.start.col;\n      rowForDefine = range.start.row;\n    }\n    const define =\n      cellLocation !== 'body'\n        ? table.getHeaderDefine(colForDefine, rowForDefine)\n        : table.getBodyColumnDefine(colForDefine, rowForDefine);\n    const mayHaveIcon =\n      cellLocation !== 'body'\n        ? true\n        : (define as IRowSeriesNumber)?.dragOrder || !!define?.icon || !!(define as ColumnDefine)?.tree;\n\n    if (!range && (cellLocation !== 'body' || (define as TextColumnDefine)?.mergeCell)) {\n      // 只有表头或者column配置合并单元格后再进行信息获取\n      range = table.getCellRange(col, row);\n      isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      // 所有Merge单元格，只保留左上角一个真实的单元格，其他使用空Group占位\n      if (isMerge) {\n        const needUpdateRange = rowStart > range.start.row;\n        const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n        cellWidth = mergeSize.cellWidth;\n        cellHeight = mergeSize.cellHeight;\n      }\n    }\n\n    const cellStyle = customStyle || table._getCellStyle(col, row);\n    const cellTheme = getStyleTheme(\n      cellStyle,\n      table,\n      range ? range.start.col : col,\n      range ? range.start.row : row,\n      getProp\n    ).theme;\n    cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);\n    cellTheme.group.width = colWidth;\n    cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;\n    if (cellTheme._vtable.padding) {\n      padding = cellTheme._vtable.padding;\n    }\n    if (cellTheme.text.textAlign) {\n      textAlign = cellTheme.text.textAlign;\n    }\n    if (cellTheme.text.textBaseline) {\n      textBaseline = cellTheme.text.textBaseline;\n    }\n\n    // enable clip body\n    if (cellLocation !== 'body' && !cellTheme.group.fill) {\n      cellTheme.group.fill = '#fff';\n    }\n    // margin = getProp('margin', headerStyle, col, 0, table)\n\n    const type =\n      (table.isHeader(col, row)\n        ? (table._getHeaderLayoutMap(col, row) as HeaderData).headerType\n        : table.getBodyColumnType(col, row)) || 'text';\n\n    // deal with promise data\n    if (isPromise(value)) {\n      createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);\n      dealPromiseData(\n        value,\n        table,\n        createCell.bind(\n          null,\n          type,\n          value,\n          define,\n          table,\n          col,\n          row,\n          colWidth,\n          cellWidth,\n          cellHeight,\n          columnGroup,\n          y,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          cellTheme,\n          range,\n          customResult\n        )\n      );\n      columnGroup.updateColumnRowNumber(row);\n      const height = table.getRowHeight(row);\n      columnGroup.updateColumnHeight(height);\n      y += height;\n    } else {\n      const cellGroup = createCell(\n        type,\n        value,\n        define as ColumnDefine,\n        table,\n        col,\n        row,\n        colWidth,\n        cellWidth,\n        cellHeight,\n        columnGroup,\n        y,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        cellTheme,\n        range,\n        customResult\n      );\n      columnGroup.updateColumnRowNumber(row);\n      if (isMerge) {\n        const rangeHeight = table.getRowHeight(row);\n        const rangeWidth = table.getColWidth(col);\n\n        const { width: contentWidth } = cellGroup.attribute;\n        const { height: contentHeight } = cellGroup.attribute;\n        cellGroup.contentWidth = contentWidth;\n        cellGroup.contentHeight = contentHeight;\n\n        // resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table);\n        dealWithMergeCellSize(range, contentWidth, contentHeight, padding, textAlign, textBaseline, table);\n        columnGroup.updateColumnHeight(rangeHeight);\n        y += rangeHeight;\n      } else {\n        columnGroup.updateColumnHeight(cellGroup.attribute.height);\n        y += cellGroup.attribute.height;\n      }\n    }\n    if (rowLimit && row > rowLimit) {\n      break;\n    }\n  }\n\n  columnGroup.setAttribute('width', colWidth);\n  return {\n    width: colWidth,\n    height: y\n  };\n}\n\n/**\n * 获取列分组主题\n * @param col 列索引\n * @param colWidth 列宽\n * @param table 表格实例\n * @returns 列分组主题\n */\nexport function getColumnGroupTheme(\n  col: number,\n  colWidth: number,\n  table: BaseTableAPI\n): { theme: IThemeSpec & { _vtable: any }; hasFunctionPros: boolean } {\n  const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n  const { theme: columnTheme, hasFunctionPros } = getStyleTheme(\n    style,\n    table,\n    col,\n    table.columnHeaderLevelCount,\n    getRawProp\n  );\n\n  // get column header style\n  columnTheme.group.width = colWidth;\n  columnTheme.group.height = 0;\n  return { theme: columnTheme, hasFunctionPros };\n}\n\nfunction dealMerge(range: CellRange, mergeMap: MergeMap, table: BaseTableAPI, forceUpdate: boolean) {\n  let cellWidth = 0;\n  let cellHeight = 0;\n  const mergeResult = mergeMap.get(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`);\n  if (!mergeResult || forceUpdate) {\n    for (let col = range.start.col; col <= range.end.col; col++) {\n      cellWidth += table.getColWidth(col);\n    }\n\n    // let cellHeight = 0;\n    for (let i = range.start.row; i <= range.end.row; i++) {\n      cellHeight += table.getRowHeight(i);\n    }\n\n    mergeMap.set(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`, {\n      cellWidth,\n      cellHeight\n    });\n  } else {\n    cellWidth = mergeResult.cellWidth;\n    cellHeight = mergeResult.cellHeight;\n  }\n  return {\n    cellWidth,\n    cellHeight\n  };\n}\n\nfunction createEmptyCellGroup(\n  col: number,\n  row: number,\n  x: number,\n  y: number,\n  width: number,\n  height: number,\n  columnGroup: Group\n) {\n  const cellGroup = new Group({\n    x,\n    y,\n    width,\n    height\n  });\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  columnGroup.addChild(cellGroup);\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/group-creater/column-helper.ts"],"names":[],"mappings":"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","file":"column-helper.js","sourcesContent":["/* eslint-disable no-undef */\nimport type { IThemeSpec } from './../../vrender';\nimport type { CellLocation, CellRange, ColumnDefine, IRowSeriesNumber, TextColumnDefine } from '../../ts-types';\nimport { Group } from '../graphic/group';\nimport { getProp, getRawProp } from '../utils/get-prop';\nimport type { MergeMap } from '../scenegraph';\nimport { createCell, dealWithMergeCellSize, resizeCellGroup } from './cell-helper';\nimport type { BaseTableAPI, HeaderData } from '../../ts-types/base-table';\nimport { getCellCornerRadius, getStyleTheme } from '../../core/tableHelper';\nimport { isPromise } from '../../tools/helper';\nimport { dealPromiseData } from '../utils/deal-promise-data';\nimport { dealWithCustom } from '../component/custom';\n/**\n * 创建复合列 同一列支持创建不同类型单元格\n * @param columnGroup 列Group\n * @param col\n * @param colWidth 配置列宽\n * @param rowStart\n * @param rowEnd\n * @param mergeMap merge单元格信息\n * @param defaultRowHeight\n * @param table\n * @param cellLocation\n * @param rowLimit\n * @param customRender\n * @param customLayout\n * @returns\n */\nexport function createComplexColumn(\n  columnGroup: Group,\n  col: number,\n  colWidth: number,\n  rowStart: number,\n  rowEnd: number,\n  mergeMap: MergeMap,\n  defaultRowHeight: number | number[],\n  table: BaseTableAPI,\n  cellLocation: CellLocation,\n  rowLimit?: number\n) {\n  let padding;\n  let textAlign;\n  let textBaseline;\n  /** useColumnTheme 判断是否可以使用columnTheme */\n  // insert cell into column group top\n  let y = 0;\n  // if (columnGroup.colHeight) {\n  //   // insert cell into column group bottom\n  //   y = columnGroup.colHeight;\n  // }\n  if (columnGroup.lastChild && (columnGroup.lastChild as Group).row === rowStart - 1) {\n    y = (columnGroup.lastChild as Group).attribute.y + (columnGroup.lastChild as Group).attribute.height;\n  } else if (columnGroup.colHeight) {\n    y = columnGroup.colHeight;\n  }\n\n  for (let j = rowStart; j <= rowEnd; j++) {\n    const row = j;\n    let value = table.getCellValue(col, row);\n\n    // 处理单元格合并\n    let cellWidth = colWidth;\n    // let cellHeight = table.internalProps.autoRowHeight ? 0 : table.getRowHeight(row);\n    let cellHeight = Math.round(table.getRowHeight(row));\n    // let cellHeight = table.getRowHeight(row);\n    let range;\n    let isMerge;\n    let customStyle;\n    let customResult;\n    if (table.internalProps.customMergeCell) {\n      const customMerge = table.getCustomMerge(col, row);\n      if (customMerge) {\n        const {\n          range: customMergeRange,\n          text: customMergeText,\n          style: customMergeStyle,\n          customLayout,\n          customRender\n        } = customMerge;\n        range = customMergeRange;\n        isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n        if (isMerge) {\n          const needUpdateRange = rowStart > range.start.row;\n          const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n          cellWidth = mergeSize.cellWidth;\n          cellHeight = mergeSize.cellHeight;\n        }\n        value = customMergeText;\n        customStyle = customMergeStyle;\n\n        if (customLayout || customRender) {\n          customResult = dealWithCustom(\n            customLayout,\n            customRender,\n            customMergeRange.start.col,\n            customMergeRange.start.row,\n            table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col),\n            table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row),\n            false,\n            // table.heightMode === 'autoHeight',\n            table.isAutoRowHeight(row),\n            [0, 0, 0, 0],\n            table\n          );\n        }\n      }\n    }\n\n    let colForDefine = col;\n    let rowForDefine = row;\n    if (range) {\n      colForDefine = range.start.col;\n      rowForDefine = range.start.row;\n    }\n    const define =\n      cellLocation !== 'body'\n        ? table.getHeaderDefine(colForDefine, rowForDefine)\n        : table.getBodyColumnDefine(colForDefine, rowForDefine);\n    const mayHaveIcon =\n      cellLocation !== 'body'\n        ? true\n        : (define as IRowSeriesNumber)?.dragOrder || !!define?.icon || !!(define as ColumnDefine)?.tree;\n\n    if (!range && (cellLocation !== 'body' || (define as TextColumnDefine)?.mergeCell)) {\n      // 只有表头或者column配置合并单元格后再进行信息获取\n      range = table.getCellRange(col, row);\n      isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      // 所有Merge单元格，只保留左上角一个真实的单元格，其他使用空Group占位\n      if (isMerge) {\n        const needUpdateRange = rowStart > range.start.row;\n        const mergeSize = dealMerge(range, mergeMap, table, needUpdateRange);\n        cellWidth = mergeSize.cellWidth;\n        cellHeight = mergeSize.cellHeight;\n      }\n    }\n\n    const cellStyle = customStyle || table._getCellStyle(col, row);\n    const cellTheme = getStyleTheme(\n      cellStyle,\n      table,\n      range ? range.start.col : col,\n      range ? range.start.row : row,\n      getProp\n    ).theme;\n    cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);\n    cellTheme.group.width = colWidth;\n    cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;\n    if (cellTheme._vtable.padding) {\n      padding = cellTheme._vtable.padding;\n    }\n    if (cellTheme.text.textAlign) {\n      textAlign = cellTheme.text.textAlign;\n    }\n    if (cellTheme.text.textBaseline) {\n      textBaseline = cellTheme.text.textBaseline;\n    }\n\n    // enable clip body\n    if (cellLocation !== 'body' && !cellTheme.group.fill) {\n      cellTheme.group.fill = '#fff';\n    }\n    // margin = getProp('margin', headerStyle, col, 0, table)\n\n    const type =\n      (table.isHeader(col, row)\n        ? (table._getHeaderLayoutMap(col, row) as HeaderData).headerType\n        : table.getBodyColumnType(col, row)) || 'text';\n\n    // deal with promise data\n    if (isPromise(value)) {\n      createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);\n      dealPromiseData(\n        value,\n        table,\n        createCell.bind(\n          null,\n          type,\n          value,\n          define,\n          table,\n          col,\n          row,\n          colWidth,\n          cellWidth,\n          cellHeight,\n          columnGroup,\n          y,\n          padding,\n          textAlign,\n          textBaseline,\n          mayHaveIcon,\n          cellTheme,\n          range,\n          customResult\n        )\n      );\n      columnGroup.updateColumnRowNumber(row);\n      const height = table.getRowHeight(row);\n      columnGroup.updateColumnHeight(height);\n      y += height;\n    } else {\n      const cellGroup = createCell(\n        type,\n        value,\n        define as ColumnDefine,\n        table,\n        col,\n        row,\n        colWidth,\n        cellWidth,\n        cellHeight,\n        columnGroup,\n        y,\n        padding,\n        textAlign,\n        textBaseline,\n        mayHaveIcon,\n        cellTheme,\n        range,\n        customResult\n      );\n      columnGroup.updateColumnRowNumber(row);\n      if (isMerge) {\n        const rangeHeight = table.getRowHeight(row);\n        const rangeWidth = table.getColWidth(col);\n\n        const { width: contentWidth } = cellGroup.attribute;\n        const { height: contentHeight } = cellGroup.attribute;\n        cellGroup.contentWidth = contentWidth;\n        cellGroup.contentHeight = contentHeight;\n\n        // resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table);\n        dealWithMergeCellSize(range, contentWidth, contentHeight, padding, textAlign, textBaseline, table);\n        columnGroup.updateColumnHeight(rangeHeight);\n        y += rangeHeight;\n      } else {\n        columnGroup.updateColumnHeight(cellGroup.attribute.height);\n        y += cellGroup.attribute.height;\n      }\n    }\n    if (rowLimit && row > rowLimit) {\n      break;\n    }\n  }\n\n  columnGroup.setAttribute('width', colWidth);\n  return {\n    width: colWidth,\n    height: y\n  };\n}\n\n/**\n * 获取列分组主题\n * @param col 列索引\n * @param colWidth 列宽\n * @param table 表格实例\n * @returns 列分组主题\n */\nexport function getColumnGroupTheme(\n  col: number,\n  colWidth: number,\n  table: BaseTableAPI\n): { theme: IThemeSpec & { _vtable: any }; hasFunctionPros: boolean } {\n  const style = table._getCellStyle(col, table.columnHeaderLevelCount); // to be fixed\n  const { theme: columnTheme, hasFunctionPros } = getStyleTheme(\n    style,\n    table,\n    col,\n    table.columnHeaderLevelCount,\n    getRawProp\n  );\n\n  // get column header style\n  columnTheme.group.width = colWidth;\n  columnTheme.group.height = 0;\n  return { theme: columnTheme, hasFunctionPros };\n}\n\nfunction dealMerge(range: CellRange, mergeMap: MergeMap, table: BaseTableAPI, forceUpdate: boolean) {\n  let cellWidth = 0;\n  let cellHeight = 0;\n  const mergeResult = mergeMap.get(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`);\n  if (!mergeResult || forceUpdate) {\n    for (let col = range.start.col; col <= range.end.col; col++) {\n      cellWidth += table.getColWidth(col);\n    }\n\n    // let cellHeight = 0;\n    for (let i = range.start.row; i <= range.end.row; i++) {\n      cellHeight += table.getRowHeight(i);\n    }\n\n    mergeMap.set(`${range.start.col},${range.start.row};${range.end.col},${range.end.row}`, {\n      cellWidth,\n      cellHeight\n    });\n  } else {\n    cellWidth = mergeResult.cellWidth;\n    cellHeight = mergeResult.cellHeight;\n  }\n  return {\n    cellWidth,\n    cellHeight\n  };\n}\n\nfunction createEmptyCellGroup(\n  col: number,\n  row: number,\n  x: number,\n  y: number,\n  width: number,\n  height: number,\n  columnGroup: Group\n) {\n  const cellGroup = new Group({\n    x,\n    y,\n    width,\n    height\n  });\n  cellGroup.role = 'cell';\n  cellGroup.col = col;\n  cellGroup.row = row;\n  columnGroup.addChild(cellGroup);\n}\n"]}

package/cjs/scenegraph/scenegraph.js

@@ -752,4 +752,4 @@ class Scenegraph {
 }
 
 exports.Scenegraph = Scenegraph;
-//# sourceMappingURL=scenegraph.js.map
+//# sourceMappingURL=scenegraph.js.map

package/cjs/themes/component.js

@@ -44,4 +44,4 @@ exports.defalutPoptipStyle = {
         space: 12
     }
 };
-//# sourceMappingURL=component.js.map
+//# sourceMappingURL=component.js.map

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,yDAAqE;AACrE,yDAmBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IACd,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,8BAAe,GAAE,CAAC;IAClB,IAAA,gCAAiB,GAAE,CAAC;IACpB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,+BAAgB,GAAE,CAAC;AACrB,CAAC;AA/BD,gDA+BC;AAED,yDAAuC;AACvC,yDAAuC","file":"vrender.js","sourcesContent":["import '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"0.25.4-alpha.0\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  registerArc3d();\n  registerArea();\n  registerCircle();\n  registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  registerPath();\n  registerPolygon();\n  registerPyramid3d();\n  registerRect();\n  registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerWrapText();\n}\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kCAAgC;AAChC,yDAA8F;AAC9F,yDAAqE;AACrE,yDAmBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IACd,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,8BAAe,GAAE,CAAC;IAClB,IAAA,gCAAiB,GAAE,CAAC;IACpB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,+BAAgB,GAAE,CAAC;AACrB,CAAC;AA/BD,gDA+BC;AAED,yDAAuC;AACvC,yDAAuC","file":"vrender.js","sourcesContent":["import '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule } from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"0.25.4-alpha.1\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  registerArc3d();\n  registerArea();\n  registerCircle();\n  registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  registerPath();\n  registerPolygon();\n  registerPyramid3d();\n  registerRect();\n  registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerWrapText();\n}\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/vtable.js

@@ -45125,7 +45125,7 @@
             const row = j;
             let value = table.getCellValue(col, row);
             let cellWidth = colWidth;
-            let cellHeight = table.getRowHeight(row);
+            let cellHeight = Math.round(table.getRowHeight(row));
             let range;
             let isMerge;
             let customStyle;
@@ -58244,7 +58244,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.25.4-alpha.0";
+        version = "0.25.4-alpha.1";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -64971,6 +64971,7 @@
             }
             this.handleRowSeriesNumber(table.internalProps.rowSeriesNumber);
             this.setColumnWidths();
+            this.clearCellIds();
         }
         handleRowSeriesNumber(rowSeriesNumber) {
             if (rowSeriesNumber) {
@@ -65577,7 +65578,7 @@
                 this.columnHeaderLevelCount = count;
                 return;
             }
-            this.columnHeaderLevelCount = 0;
+            this.columnHeaderLevelCount = !this.indicatorsAsCol ? 0 : this.hideIndicatorName ? 0 : 1;
             return;
         }
         resetRowHeaderLevelCount() {
@@ -67038,6 +67039,7 @@
                 return o;
             }, {});
             this.setPagination(this.pagination);
+            this.clearCellIds();
         }
         isSeriesNumberInHeader(col, row) {
             if (this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && row >= 0 && col < this.leftRowSeriesNumberColumnCount) {
@@ -67121,6 +67123,32 @@
             const id = this.getCellId(col, row);
             this._headerObjectMap[id].title = value;
         }
+        clearCellIds() {
+            if (!this.showColumnHeader) {
+                if (this.indicatorsAsCol && !this.hideIndicatorName) {
+                    const indicatorIndex = this.colDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
+                    this._columnHeaderCellIds = this._columnHeaderCellIds.splice(indicatorIndex, 1);
+                }
+                else {
+                    this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
+                }
+            }
+            if (!this.showRowHeader) {
+                if (!this.indicatorsAsCol && !this.hideIndicatorName) {
+                    const indicatorIndex = this.rowDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
+                    this._rowHeaderCellIds_FULL.forEach((cellIds) => {
+                        const indicator = cellIds.splice(indicatorIndex, 1);
+                        cellIds.splice(0, cellIds.length);
+                        cellIds.push(indicator[0]);
+                    });
+                }
+                else {
+                    this._rowHeaderCellIds_FULL.forEach((cellIds) => {
+                        cellIds.splice(0, cellIds.length);
+                    });
+                }
+            }
+        }
     }
     function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
         if (paddingInner === 1) {
@@ -70907,7 +70935,7 @@
     }
 
     registerForVrender();
-    const version = "0.25.4-alpha.0";
+    const version = "0.25.4-alpha.1";
     function getIcons() {
         return get$2();
     }