@visactor/vtable 0.21.4-alpha.4 → 0.22.0

package/es/core/row-series-number-helper.d.ts

@@ -0,0 +1,8 @@
+import { type ColumnIconOption, type SvgIcon } from '../ts-types';
+import type { BaseTableAPI } from '../ts-types/base-table';
+export declare class RowSeriesNumberHelper {
+    dragReorderIconName: SvgIcon;
+    _table: BaseTableAPI;
+    constructor(_table: BaseTableAPI);
+    getIcons(col: number, row: number): ColumnIconOption[];
+}

package/es/core/row-series-number-helper.js

@@ -0,0 +1,14 @@
+import { InternalIconName } from "../ts-types";
+
+import * as registerIcons from "../icons";
+
+export class RowSeriesNumberHelper {
+    constructor(_table) {
+        this._table = _table;
+        const regedIcons = registerIcons.get();
+        this.dragReorderIconName = regedIcons[InternalIconName.dragReorderIconName];
+    }
+    getIcons(col, row) {
+        return [ this.dragReorderIconName ];
+    }
+}

package/es/core/row-series-number-helper.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/core/row-series-number-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAOjB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,aAAa,MAAM,UAAU,CAAC;AAI1C,MAAM,OAAO,qBAAqB;IAIhC,YAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,EAAE,CAAC;QAEvC,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC,gBAAgB,CAAC,mBAAmB,CAAY,CAAC;IACzF,CAAC;IAED,QAAQ,CAAC,GAAW,EAAE,GAAW;QAC/B,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpC,CAAC;CACF","file":"row-series-number-helper.js","sourcesContent":["import {\n  InternalIconName,\n  type ColumnIconOption,\n  type ListTableAPI,\n  type PivotTableAPI,\n  type RectProps,\n  type SortOrder,\n  type SvgIcon\n} from '../ts-types';\nimport * as registerIcons from '../icons';\n\nimport { isValid } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nexport class RowSeriesNumberHelper {\n  dragReorderIconName: SvgIcon;\n\n  _table: BaseTableAPI;\n  constructor(_table: BaseTableAPI) {\n    this._table = _table;\n    const regedIcons = registerIcons.get();\n\n    this.dragReorderIconName = regedIcons[InternalIconName.dragReorderIconName] as SvgIcon;\n  }\n\n  getIcons(col: number, row: number): ColumnIconOption[] {\n    return [this.dragReorderIconName];\n  }\n}\n"]}

package/es/core/style.js

@@ -5,4 +5,5 @@ export function importStyle() {
     const styleElement = document.createElement("style");
     styleElement.id = "vtable-style-styleSheet", styleElement.textContent = "\n.vtable .input-container {\n\tposition: absolute;\n\ttop:0px;\n}\n.vtable .table-scrollable {\n\tposition: absolute;\n\toverflow: scroll;\n}\n.vtable .table-scrollable::-webkit-scrollbar-button{\n\tbackground-color: transparent;\n}\n.vtable .table-scrollable::-webkit-scrollbar-track-piece{\n\tbackground-color: transparent;\n}\n.vtable .table-scrollable::-webkit-scrollbar-corner {\n\tbackground-color: transparent;\n}\n.vtable .table-scrollable::-webkit-scrollbar-thumb {\n\tborder-radius      : 4px;\n\tbackground-color   : rgba(100, 100, 100, .5);\n}\n\n.vtable .table-scroll-end-point {\n\topacity: 0;\n\tposition: relative;\n}\n.vtable {\n\t/* 设置overflow: auto 应该是为了滚动条的某个问题 但设置了auto之后 dom的下拉菜单只能显示在vtable节点中 超出会截断;现在去掉auto 暂时滚动条的问题没有发现 */\n\t/* overflow: auto; */\n\tposition: relative;\n\twidth: 100%;\n\theight: 100%;\n\ttext-align: left;\n  -webkit-font-smoothing:auto;\n}\n.vtable > canvas {\n\tposition: absolute;\n\twidth: 0;\n\theight: 0;\n}\n.vtable .table-focus-control {\n\tposition: relative !important;\n\twidth: 1px;\n\theight: 1px;\n\topacity: 0;\n\tpadding: 0;\n\tmargin: 0;\n\tbox-sizing: border-box;\n\tpointer-events: none;\n\tmax-width: 500px;\n\tmax-height: 500px;\n\tfloat: none !important;\n}\n.vtable input.table-focus-control::-ms-clear {\n\tvisibility: hidden;\n}\n.vtable input.table-focus-control.composition {\n\topacity: 1;\n\tmax-width: none;\n\tmax-height: none;\n}\n", 
     document.head.appendChild(styleElement);
-}
+}
+//# sourceMappingURL=style.js.map

package/es/core/tableHelper.js

@@ -42,7 +42,7 @@ export function _setRecords(table, records = []) {
         var _a, _b;
         const data = records;
         table.internalProps.records = records;
-        const newDataSource = table.internalProps.dataSource = CachedDataSource.ofArray(data, table.internalProps.dataConfig, table.pagination, table.internalProps.layoutMap.columnObjects, null !== (_a = table.options.hierarchyExpandLevel) && void 0 !== _a ? _a : (null === (_b = table._hasHierarchyTreeHeader) || void 0 === _b ? void 0 : _b.call(table)) ? 1 : void 0);
+        const newDataSource = table.internalProps.dataSource = CachedDataSource.ofArray(data, table.internalProps.dataConfig, table.pagination, table.internalProps.layoutMap.columnObjects, table.internalProps.layoutMap.rowHierarchyType, null !== (_a = table.options.hierarchyExpandLevel) && void 0 !== _a ? _a : (null === (_b = table._hasHierarchyTreeHeader) || void 0 === _b ? void 0 : _b.call(table)) ? 1 : void 0);
         table.addReleaseObj(newDataSource);
     }));
 }

package/es/core/tableHelper.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/tableHelper.ts"],"names":[],"mappings":"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","file":"tableHelper.js","sourcesContent":["import type { IThemeSpec } from './../vrender';\nimport type { BaseTable } from '../core';\nimport { CachedDataSource, DataSource } from '../data';\nimport { parseFont } from '../scenegraph/utils/font';\nimport { getQuadProps } from '../scenegraph/utils/padding';\nimport { Rect } from '../tools/Rect';\nimport * as calc from '../tools/calc';\nimport type { FullExtendStyle, ListTableAPI, SortState } from '../ts-types';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport { defaultOrderFn } from '../tools/util';\nimport type { ListTable } from '../ListTable';\n\nexport function createRootElement(padding: any): HTMLElement {\n  const element = document.createElement('div');\n  element.setAttribute('tabindex', '0');\n  element.classList.add('vtable');\n  element.style.outline = 'none';\n  element.style.margin = `${padding.top}px ${padding.right}px ${padding.bottom}px ${padding.left}px`;\n\n  const width = (element.offsetWidth || element.parentElement?.offsetWidth || 1) - 1;\n  const height = (element.offsetHeight || element.parentElement?.offsetHeight || 1) - 1;\n\n  element.style.width = (width && `${width - padding.left - padding.right}px`) || '0px';\n  element.style.height = (height && `${height - padding.top - padding.bottom}px`) || '0px';\n\n  return element;\n}\nexport function updateRootElementPadding(element: HTMLElement, padding: any): void {\n  element.style.margin = `${padding.top}px ${padding.right}px ${padding.bottom}px ${padding.left}px`;\n  const width = (element.offsetWidth || element.parentElement?.offsetWidth || 1) - 1;\n  const height = (element.offsetHeight || element.parentElement?.offsetHeight || 1) - 1;\n  element.style.width = (width && `${width - padding.left - padding.right}px`) || '0px';\n  element.style.height = (height && `${height - padding.top - padding.bottom}px`) || '0px';\n}\nexport function _dealWithUpdateDataSource(table: BaseTableAPI, fn: (table: BaseTableAPI) => void): void {\n  const { dataSourceEventIds } = table.internalProps;\n\n  if (dataSourceEventIds) {\n    dataSourceEventIds.forEach((id: any) => table.internalProps.handler.off(id));\n  }\n\n  fn(table);\n\n  table.internalProps.dataSourceEventIds = [\n    table.internalProps.handler.on(table.internalProps.dataSource, DataSource.EVENT_TYPE.CHANGE_ORDER, () => {\n      if (table.dataSource.hierarchyExpandLevel) {\n        table.refreshRowColCount();\n      }\n      table.render();\n    })\n  ];\n}\n/** @private */\nexport function _setRecords(table: ListTableAPI, records: any[] = []): void {\n  _dealWithUpdateDataSource(table, () => {\n    const data = records;\n    table.internalProps.records = records;\n    const newDataSource = (table.internalProps.dataSource = CachedDataSource.ofArray(\n      data,\n      table.internalProps.dataConfig,\n      table.pagination,\n      table.internalProps.layoutMap.columnObjects,\n      (table.options as any).hierarchyExpandLevel ?? (table._hasHierarchyTreeHeader?.() ? 1 : undefined)\n    ));\n    table.addReleaseObj(newDataSource);\n  });\n}\n\nexport function _setDataSource(table: BaseTableAPI, dataSource: DataSource): void {\n  _dealWithUpdateDataSource(table, () => {\n    if (dataSource) {\n      if (dataSource instanceof DataSource) {\n        table.internalProps.dataSource = dataSource;\n      } else {\n        const newDataSource = (table.internalProps.dataSource = new CachedDataSource(dataSource));\n        table.addReleaseObj(newDataSource);\n      }\n    } else {\n      table.internalProps.dataSource = DataSource.EMPTY;\n    }\n    table.internalProps.records = null;\n  });\n}\nexport function _getTargetFrozenRowAt(\n  table: BaseTable,\n  absoluteY: number\n): {\n  top: number;\n  row: number;\n  bottom: number;\n  height: number;\n} | null {\n  if (!table.internalProps.frozenRowCount) {\n    return null;\n  }\n  let { scrollTop } = table;\n  const rowCount = table.internalProps.frozenRowCount;\n  for (let row = 0; row < rowCount; row++) {\n    const height = table.getRowHeight(row);\n    const bottom = scrollTop + height;\n    if (bottom > absoluteY) {\n      return {\n        top: scrollTop,\n        row,\n        bottom,\n        height\n      };\n    }\n    scrollTop = bottom;\n  }\n  return null;\n}\n\nexport function _getTargetFrozenColAt(\n  table: BaseTable,\n  absoluteX: number\n): {\n  left: number;\n  col: number;\n  right: number;\n  width: number;\n} | null {\n  if (!table.internalProps.frozenColCount) {\n    return null;\n  }\n  let { scrollLeft } = table;\n  const colCount = table.internalProps.frozenColCount;\n  for (let col = 0; col < colCount; col++) {\n    const width = table.getColWidth(col);\n    const right = scrollLeft + width;\n    if (right > absoluteX) {\n      return {\n        left: scrollLeft,\n        col,\n        right,\n        width\n      };\n    }\n    scrollLeft = right;\n  }\n  return null;\n}\n\nexport function _toPxWidth(table: BaseTable, width: string | number): number {\n  return Math.round(calc.toPx(width, table.internalProps.calcWidthContext));\n}\n\nexport function _applyColWidthLimits(limits: { min?: number; max?: number } | void | null, orgWidth: number): number {\n  if (!limits) {\n    return orgWidth;\n  }\n\n  if (limits.min) {\n    if (limits.min > orgWidth) {\n      return limits.min;\n    }\n  }\n  if (limits.max) {\n    if (limits.max < orgWidth) {\n      return limits.max;\n    }\n  }\n  return orgWidth;\n}\n/**\n * 检查设置的width是否为'auto'\n * @param {string|number} width width definition\n * @returns {boolean}\n */\nexport function isAutoDefine(width: string | number): width is 'auto' {\n  return Boolean(width && typeof width === 'string' && width.toLowerCase() === 'auto');\n}\n\nexport function _getScrollableVisibleRect(table: BaseTableAPI): Rect {\n  let frozenColsWidth = 0;\n  let rightFrozenColsWidth = 0;\n  if (table.frozenColCount > 0) {\n    //有固定列时绘制固定列\n    frozenColsWidth = table.getFrozenColsWidth();\n  }\n  if (table.rightFrozenColCount > 0) {\n    //有固定列时绘制固定列\n    rightFrozenColsWidth = table.getRightFrozenColsWidth();\n  }\n  let frozenRowsHeight = 0;\n  let bottomFrozenRowsHeight = 0;\n  if (table.frozenRowCount > 0) {\n    //有固定列时绘制固定列\n    frozenRowsHeight = table.getFrozenRowsHeight();\n  }\n  if (table.bottomFrozenRowCount > 0) {\n    //有固定列时绘制固定列\n    bottomFrozenRowsHeight = table.getBottomFrozenRowsHeight();\n  }\n  return new Rect(\n    table.scrollLeft + frozenColsWidth,\n    table.scrollTop + frozenRowsHeight,\n    table.tableNoFrameWidth - frozenColsWidth - rightFrozenColsWidth,\n    table.tableNoFrameHeight - frozenRowsHeight - bottomFrozenRowsHeight\n  );\n}\n/**\n * @description: 从style对象里获取theme所需要的属性\n * @param {FullExtendStyle} headerStyle\n * @param {BaseTableAPI} table\n * @param {number} col\n * @param {number} row\n * @param {any} getProp\n * @return {*}\n */\nexport function getStyleTheme(\n  headerStyle: FullExtendStyle,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  getProp: any,\n  needGetTheme = true\n) {\n  // 属性参考IStyleOption\n  const padding = getQuadProps(getProp('padding', headerStyle, col, row, table));\n  const bgColor = getProp('bgColor', headerStyle, col, row, table);\n\n  const font = getProp('font', headerStyle, col, row, table);\n  let fontFamily;\n  let fontSize;\n  let fontWeight;\n  let fontStyle;\n  let fontVariant;\n  if (font) {\n    // 后期会弃用直接设置font，而使用fontFamily fontSize fontWeight 等属性\n    const { family, size, weight, style, variant } = parseFont(font);\n    fontFamily = family.join(' ');\n    fontSize = size;\n    fontWeight = weight;\n    fontStyle = style;\n    fontStyle = variant;\n  } else {\n    fontFamily = getProp('fontFamily', headerStyle, col, row, table);\n    fontSize = getProp('fontSize', headerStyle, col, row, table);\n    fontWeight = getProp('fontWeight', headerStyle, col, row, table);\n    fontStyle = getProp('fontStyle', headerStyle, col, row, table);\n    fontVariant = getProp('fontVariant', headerStyle, col, row, table);\n  }\n\n  // const fontSize = getFontSize(font);\n  // const fontWeight = getFontWeight(font);\n\n  const textAlign = getProp('textAlign', headerStyle, col, row, table);\n  const textBaseline = getProp('textBaseline', headerStyle, col, row, table);\n  const color = getProp('color', headerStyle, col, row, table);\n\n  const lineHeight = getProp('lineHeight', headerStyle, col, row, table);\n  const underline = getProp('underline', headerStyle, col, row, table); // boolean\n  // const underlineColor = getProp('underlineColor', headerStyle, col, row, table);\n  const underlineDash = getProp('underlineDash', headerStyle, col, row, table);\n  const underlineOffset = getProp('underlineOffset', headerStyle, col, row, table);\n  const lineThrough = getProp('lineThrough', headerStyle, col, row, table); // boolean\n  // const lineThroughColor = getProp('lineThroughColor', headerStyle, col, row, table);\n  // const lineThroughDash = getProp('lineThroughDash', headerStyle, col, row, table);\n  const textDecorationWidth = Math.max(1, Math.floor(fontSize / 10));\n\n  const textOverflow = getProp('textOverflow', headerStyle, col, row, table); // 'clip' | 'ellipsis' | string\n  const borderColor = getProp('borderColor', headerStyle, col, row, table); // string | string[]\n  const borderLineWidth = getProp('borderLineWidth', headerStyle, col, row, table); // number | number[]\n  const borderLineDash = getProp('borderLineDash', headerStyle, col, row, table); // number[] | (number[] | null)[]\n\n  const marked = getProp('marked', headerStyle, col, row, table); // boolean\n  const cursor = getProp('cursor', headerStyle, col, row, table); // boolean\n\n  const hasFunctionPros =\n    !padding ||\n    !bgColor ||\n    !font ||\n    !textAlign ||\n    !textBaseline ||\n    !color ||\n    !textOverflow ||\n    !borderColor ||\n    !borderLineWidth ||\n    !borderLineDash ||\n    typeof underline !== 'boolean' ||\n    typeof lineThrough !== 'boolean' ||\n    typeof marked !== 'boolean';\n  if (!needGetTheme) {\n    return { hasFunctionPros };\n  }\n  const theme: IThemeSpec & { _vtable: any } = {\n    text: {\n      fontFamily,\n      fontSize,\n      fontWeight,\n      fontStyle,\n      fontVariant,\n      fill: color,\n      textAlign,\n      textBaseline,\n      lineHeight: lineHeight ?? fontSize,\n      underline: underline ? textDecorationWidth : undefined,\n      underlineDash,\n      underlineOffset,\n      lineThrough: lineThrough ? textDecorationWidth : undefined,\n      ellipsis:\n        !textOverflow || textOverflow === 'clip' ? undefined : textOverflow === 'ellipsis' ? '...' : textOverflow\n    },\n    group: {\n      fill: bgColor,\n      lineDash: borderLineDash,\n      lineWidth: borderLineWidth,\n      stroke: borderColor,\n      cursor: cursor === 'auto' || cursor === 'default' ? undefined : cursor\n      // cornerRadius: getCellCornerRadius(col, row, table)\n    },\n    _vtable: {\n      padding,\n      marked\n    }\n  };\n\n  if (Array.isArray(borderLineWidth)) {\n    (theme.group as any).strokeArrayWidth = getQuadProps(borderLineWidth);\n  }\n  if (Array.isArray(borderColor)) {\n    const strokeColors = getQuadProps(borderColor);\n    (theme.group as any).stroke = strokeColors.every(color => !color) ? false : strokeColors; // deal width strokeColor: [null, null, null, null]\n    (theme.group as any).strokeArrayColor = getQuadProps(borderColor);\n  }\n\n  return {\n    theme,\n    hasFunctionPros\n  };\n}\n\nexport function sortRecords(table: ListTable) {\n  if ((table as any).sortState) {\n    let order: any;\n    let field: any;\n    if (Array.isArray((table as any).sortState)) {\n      if ((table as any).sortState.length !== 0) {\n        ({ order, field } = (table as any).sortState?.[0]);\n      }\n    } else {\n      ({ order, field } = (table as any).sortState as SortState);\n    }\n    // 根据sort规则进行排序\n    if (order && field && order !== 'normal') {\n      const sortFunc = table._getSortFuncFromHeaderOption(undefined, field);\n      // 如果sort传入的信息不能生成正确的sortFunc，直接更新表格，避免首次加载无法正常显示内容\n      const hd = table.internalProps.layoutMap.headerObjects.find((col: any) => col && col.field === field);\n\n      // hd?.define?.sort && //如果这里也判断 那想要利用sortState来排序 但不显示排序图标就实现不了\n      table.dataSource.sort(hd.field, order, sortFunc ?? defaultOrderFn);\n    }\n  }\n}\n\nexport function getCellCornerRadius(col: number, row: number, table: BaseTableAPI) {\n  const tableCornerRadius = table.theme.frameStyle.cornerRadius;\n  if (tableCornerRadius) {\n    if (col === 0 && row === 0) {\n      return [tableCornerRadius, 0, 0, 0];\n    } else if (col === table.colCount - 1 && row === 0) {\n      return [0, tableCornerRadius, 0, 0];\n    } else if (col === 0 && row === table.rowCount - 1) {\n      return [0, 0, 0, tableCornerRadius];\n    } else if (col === table.colCount - 1 && row === table.rowCount - 1) {\n      return [0, 0, tableCornerRadius, 0];\n    }\n  }\n  return 0;\n}\n"]}
+{"version":3,"sources":["../src/core/tableHelper.ts"],"names":[],"mappings":"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","file":"tableHelper.js","sourcesContent":["import type { IThemeSpec } from './../vrender';\nimport type { BaseTable } from '../core';\nimport { CachedDataSource, DataSource } from '../data';\nimport { parseFont } from '../scenegraph/utils/font';\nimport { getQuadProps } from '../scenegraph/utils/padding';\nimport { Rect } from '../tools/Rect';\nimport * as calc from '../tools/calc';\nimport type { FullExtendStyle, ListTableAPI, SortState } from '../ts-types';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport { defaultOrderFn } from '../tools/util';\nimport type { ListTable } from '../ListTable';\n\nexport function createRootElement(padding: any): HTMLElement {\n  const element = document.createElement('div');\n  element.setAttribute('tabindex', '0');\n  element.classList.add('vtable');\n  element.style.outline = 'none';\n  element.style.margin = `${padding.top}px ${padding.right}px ${padding.bottom}px ${padding.left}px`;\n\n  const width = (element.offsetWidth || element.parentElement?.offsetWidth || 1) - 1;\n  const height = (element.offsetHeight || element.parentElement?.offsetHeight || 1) - 1;\n\n  element.style.width = (width && `${width - padding.left - padding.right}px`) || '0px';\n  element.style.height = (height && `${height - padding.top - padding.bottom}px`) || '0px';\n\n  return element;\n}\nexport function updateRootElementPadding(element: HTMLElement, padding: any): void {\n  element.style.margin = `${padding.top}px ${padding.right}px ${padding.bottom}px ${padding.left}px`;\n  const width = (element.offsetWidth || element.parentElement?.offsetWidth || 1) - 1;\n  const height = (element.offsetHeight || element.parentElement?.offsetHeight || 1) - 1;\n  element.style.width = (width && `${width - padding.left - padding.right}px`) || '0px';\n  element.style.height = (height && `${height - padding.top - padding.bottom}px`) || '0px';\n}\nexport function _dealWithUpdateDataSource(table: BaseTableAPI, fn: (table: BaseTableAPI) => void): void {\n  const { dataSourceEventIds } = table.internalProps;\n\n  if (dataSourceEventIds) {\n    dataSourceEventIds.forEach((id: any) => table.internalProps.handler.off(id));\n  }\n\n  fn(table);\n\n  table.internalProps.dataSourceEventIds = [\n    table.internalProps.handler.on(table.internalProps.dataSource, DataSource.EVENT_TYPE.CHANGE_ORDER, () => {\n      if (table.dataSource.hierarchyExpandLevel) {\n        table.refreshRowColCount();\n      }\n      table.render();\n    })\n  ];\n}\n/** @private */\nexport function _setRecords(table: ListTableAPI, records: any[] = []): void {\n  _dealWithUpdateDataSource(table, () => {\n    const data = records;\n    table.internalProps.records = records;\n    const newDataSource = (table.internalProps.dataSource = CachedDataSource.ofArray(\n      data,\n      table.internalProps.dataConfig,\n      table.pagination,\n      table.internalProps.layoutMap.columnObjects,\n      table.internalProps.layoutMap.rowHierarchyType,\n      (table.options as any).hierarchyExpandLevel ?? (table._hasHierarchyTreeHeader?.() ? 1 : undefined)\n    ));\n    table.addReleaseObj(newDataSource);\n  });\n}\n\nexport function _setDataSource(table: BaseTableAPI, dataSource: DataSource): void {\n  _dealWithUpdateDataSource(table, () => {\n    if (dataSource) {\n      if (dataSource instanceof DataSource) {\n        table.internalProps.dataSource = dataSource;\n      } else {\n        const newDataSource = (table.internalProps.dataSource = new CachedDataSource(dataSource));\n        table.addReleaseObj(newDataSource);\n      }\n    } else {\n      table.internalProps.dataSource = DataSource.EMPTY;\n    }\n    table.internalProps.records = null;\n  });\n}\nexport function _getTargetFrozenRowAt(\n  table: BaseTable,\n  absoluteY: number\n): {\n  top: number;\n  row: number;\n  bottom: number;\n  height: number;\n} | null {\n  if (!table.internalProps.frozenRowCount) {\n    return null;\n  }\n  let { scrollTop } = table;\n  const rowCount = table.internalProps.frozenRowCount;\n  for (let row = 0; row < rowCount; row++) {\n    const height = table.getRowHeight(row);\n    const bottom = scrollTop + height;\n    if (bottom > absoluteY) {\n      return {\n        top: scrollTop,\n        row,\n        bottom,\n        height\n      };\n    }\n    scrollTop = bottom;\n  }\n  return null;\n}\n\nexport function _getTargetFrozenColAt(\n  table: BaseTable,\n  absoluteX: number\n): {\n  left: number;\n  col: number;\n  right: number;\n  width: number;\n} | null {\n  if (!table.internalProps.frozenColCount) {\n    return null;\n  }\n  let { scrollLeft } = table;\n  const colCount = table.internalProps.frozenColCount;\n  for (let col = 0; col < colCount; col++) {\n    const width = table.getColWidth(col);\n    const right = scrollLeft + width;\n    if (right > absoluteX) {\n      return {\n        left: scrollLeft,\n        col,\n        right,\n        width\n      };\n    }\n    scrollLeft = right;\n  }\n  return null;\n}\n\nexport function _toPxWidth(table: BaseTable, width: string | number): number {\n  return Math.round(calc.toPx(width, table.internalProps.calcWidthContext));\n}\n\nexport function _applyColWidthLimits(limits: { min?: number; max?: number } | void | null, orgWidth: number): number {\n  if (!limits) {\n    return orgWidth;\n  }\n\n  if (limits.min) {\n    if (limits.min > orgWidth) {\n      return limits.min;\n    }\n  }\n  if (limits.max) {\n    if (limits.max < orgWidth) {\n      return limits.max;\n    }\n  }\n  return orgWidth;\n}\n/**\n * 检查设置的width是否为'auto'\n * @param {string|number} width width definition\n * @returns {boolean}\n */\nexport function isAutoDefine(width: string | number): width is 'auto' {\n  return Boolean(width && typeof width === 'string' && width.toLowerCase() === 'auto');\n}\n\nexport function _getScrollableVisibleRect(table: BaseTableAPI): Rect {\n  let frozenColsWidth = 0;\n  let rightFrozenColsWidth = 0;\n  if (table.frozenColCount > 0) {\n    //有固定列时绘制固定列\n    frozenColsWidth = table.getFrozenColsWidth();\n  }\n  if (table.rightFrozenColCount > 0) {\n    //有固定列时绘制固定列\n    rightFrozenColsWidth = table.getRightFrozenColsWidth();\n  }\n  let frozenRowsHeight = 0;\n  let bottomFrozenRowsHeight = 0;\n  if (table.frozenRowCount > 0) {\n    //有固定列时绘制固定列\n    frozenRowsHeight = table.getFrozenRowsHeight();\n  }\n  if (table.bottomFrozenRowCount > 0) {\n    //有固定列时绘制固定列\n    bottomFrozenRowsHeight = table.getBottomFrozenRowsHeight();\n  }\n  return new Rect(\n    table.scrollLeft + frozenColsWidth,\n    table.scrollTop + frozenRowsHeight,\n    table.tableNoFrameWidth - frozenColsWidth - rightFrozenColsWidth,\n    table.tableNoFrameHeight - frozenRowsHeight - bottomFrozenRowsHeight\n  );\n}\n/**\n * @description: 从style对象里获取theme所需要的属性\n * @param {FullExtendStyle} headerStyle\n * @param {BaseTableAPI} table\n * @param {number} col\n * @param {number} row\n * @param {any} getProp\n * @return {*}\n */\nexport function getStyleTheme(\n  headerStyle: FullExtendStyle,\n  table: BaseTableAPI,\n  col: number,\n  row: number,\n  getProp: any,\n  needGetTheme = true\n) {\n  // 属性参考IStyleOption\n  const padding = getQuadProps(getProp('padding', headerStyle, col, row, table));\n  const bgColor = getProp('bgColor', headerStyle, col, row, table);\n\n  const font = getProp('font', headerStyle, col, row, table);\n  let fontFamily;\n  let fontSize;\n  let fontWeight;\n  let fontStyle;\n  let fontVariant;\n  if (font) {\n    // 后期会弃用直接设置font，而使用fontFamily fontSize fontWeight 等属性\n    const { family, size, weight, style, variant } = parseFont(font);\n    fontFamily = family.join(' ');\n    fontSize = size;\n    fontWeight = weight;\n    fontStyle = style;\n    fontStyle = variant;\n  } else {\n    fontFamily = getProp('fontFamily', headerStyle, col, row, table);\n    fontSize = getProp('fontSize', headerStyle, col, row, table);\n    fontWeight = getProp('fontWeight', headerStyle, col, row, table);\n    fontStyle = getProp('fontStyle', headerStyle, col, row, table);\n    fontVariant = getProp('fontVariant', headerStyle, col, row, table);\n  }\n\n  // const fontSize = getFontSize(font);\n  // const fontWeight = getFontWeight(font);\n\n  const textAlign = getProp('textAlign', headerStyle, col, row, table);\n  const textBaseline = getProp('textBaseline', headerStyle, col, row, table);\n  const color = getProp('color', headerStyle, col, row, table);\n\n  const lineHeight = getProp('lineHeight', headerStyle, col, row, table);\n  const underline = getProp('underline', headerStyle, col, row, table); // boolean\n  // const underlineColor = getProp('underlineColor', headerStyle, col, row, table);\n  const underlineDash = getProp('underlineDash', headerStyle, col, row, table);\n  const underlineOffset = getProp('underlineOffset', headerStyle, col, row, table);\n  const lineThrough = getProp('lineThrough', headerStyle, col, row, table); // boolean\n  // const lineThroughColor = getProp('lineThroughColor', headerStyle, col, row, table);\n  // const lineThroughDash = getProp('lineThroughDash', headerStyle, col, row, table);\n  const textDecorationWidth = Math.max(1, Math.floor(fontSize / 10));\n\n  const textOverflow = getProp('textOverflow', headerStyle, col, row, table); // 'clip' | 'ellipsis' | string\n  const borderColor = getProp('borderColor', headerStyle, col, row, table); // string | string[]\n  const borderLineWidth = getProp('borderLineWidth', headerStyle, col, row, table); // number | number[]\n  const borderLineDash = getProp('borderLineDash', headerStyle, col, row, table); // number[] | (number[] | null)[]\n\n  const marked = getProp('marked', headerStyle, col, row, table); // boolean\n  const cursor = getProp('cursor', headerStyle, col, row, table); // boolean\n\n  const hasFunctionPros =\n    !padding ||\n    !bgColor ||\n    !font ||\n    !textAlign ||\n    !textBaseline ||\n    !color ||\n    !textOverflow ||\n    !borderColor ||\n    !borderLineWidth ||\n    !borderLineDash ||\n    typeof underline !== 'boolean' ||\n    typeof lineThrough !== 'boolean' ||\n    typeof marked !== 'boolean';\n  if (!needGetTheme) {\n    return { hasFunctionPros };\n  }\n  const theme: IThemeSpec & { _vtable: any } = {\n    text: {\n      fontFamily,\n      fontSize,\n      fontWeight,\n      fontStyle,\n      fontVariant,\n      fill: color,\n      textAlign,\n      textBaseline,\n      lineHeight: lineHeight ?? fontSize,\n      underline: underline ? textDecorationWidth : undefined,\n      underlineDash,\n      underlineOffset,\n      lineThrough: lineThrough ? textDecorationWidth : undefined,\n      ellipsis:\n        !textOverflow || textOverflow === 'clip' ? undefined : textOverflow === 'ellipsis' ? '...' : textOverflow\n    },\n    group: {\n      fill: bgColor,\n      lineDash: borderLineDash,\n      lineWidth: borderLineWidth,\n      stroke: borderColor,\n      cursor: cursor === 'auto' || cursor === 'default' ? undefined : cursor\n      // cornerRadius: getCellCornerRadius(col, row, table)\n    },\n    _vtable: {\n      padding,\n      marked\n    }\n  };\n\n  if (Array.isArray(borderLineWidth)) {\n    (theme.group as any).strokeArrayWidth = getQuadProps(borderLineWidth);\n  }\n  if (Array.isArray(borderColor)) {\n    const strokeColors = getQuadProps(borderColor);\n    (theme.group as any).stroke = strokeColors.every(color => !color) ? false : strokeColors; // deal width strokeColor: [null, null, null, null]\n    (theme.group as any).strokeArrayColor = getQuadProps(borderColor);\n  }\n\n  return {\n    theme,\n    hasFunctionPros\n  };\n}\n\nexport function sortRecords(table: ListTable) {\n  if ((table as any).sortState) {\n    let order: any;\n    let field: any;\n    if (Array.isArray((table as any).sortState)) {\n      if ((table as any).sortState.length !== 0) {\n        ({ order, field } = (table as any).sortState?.[0]);\n      }\n    } else {\n      ({ order, field } = (table as any).sortState as SortState);\n    }\n    // 根据sort规则进行排序\n    if (order && field && order !== 'normal') {\n      const sortFunc = table._getSortFuncFromHeaderOption(undefined, field);\n      // 如果sort传入的信息不能生成正确的sortFunc，直接更新表格，避免首次加载无法正常显示内容\n      const hd = table.internalProps.layoutMap.headerObjects.find((col: any) => col && col.field === field);\n\n      // hd?.define?.sort && //如果这里也判断 那想要利用sortState来排序 但不显示排序图标就实现不了\n      table.dataSource.sort(hd.field, order, sortFunc ?? defaultOrderFn);\n    }\n  }\n}\n\nexport function getCellCornerRadius(col: number, row: number, table: BaseTableAPI) {\n  const tableCornerRadius = table.theme.frameStyle.cornerRadius;\n  if (tableCornerRadius) {\n    if (col === 0 && row === 0) {\n      return [tableCornerRadius, 0, 0, 0];\n    } else if (col === table.colCount - 1 && row === 0) {\n      return [0, tableCornerRadius, 0, 0];\n    } else if (col === 0 && row === table.rowCount - 1) {\n      return [0, 0, 0, tableCornerRadius];\n    } else if (col === table.colCount - 1 && row === table.rowCount - 1) {\n      return [0, 0, tableCornerRadius, 0];\n    }\n  }\n  return 0;\n}\n"]}

package/es/data/CachedDataSource.d.ts

@@ -7,8 +7,8 @@ export declare class CachedDataSource extends DataSource {
     private _recordCache;
     private _fieldCache;
     static get EVENT_TYPE(): typeof DataSource.EVENT_TYPE;
-    static ofArray(array: any[], dataConfig?: IListTableDataConfig, pagination?: IPagination, columnObjs?: ColumnData[], hierarchyExpandLevel?: number): CachedDataSource;
-    constructor(opt?: DataSourceParam, dataConfig?: IListTableDataConfig, pagination?: IPagination, columnObjs?: ColumnData[], hierarchyExpandLevel?: number);
+    static ofArray(array: any[], dataConfig?: IListTableDataConfig, pagination?: IPagination, columnObjs?: ColumnData[], rowHierarchyType?: 'grid' | 'tree', hierarchyExpandLevel?: number): CachedDataSource;
+    constructor(opt?: DataSourceParam, dataConfig?: IListTableDataConfig, pagination?: IPagination, columnObjs?: ColumnData[], rowHierarchyType?: 'grid' | 'tree', hierarchyExpandLevel?: number);
     protected getOriginalRecord(index: number): MaybePromiseOrUndefined;
     protected getOriginalField<F extends FieldDef>(index: number, field: F, col?: number, row?: number, table?: BaseTableAPI): FieldData;
     clearCache(): void;

package/es/data/CachedDataSource.js

@@ -10,16 +10,16 @@ export class CachedDataSource extends DataSource {
     static get EVENT_TYPE() {
         return DataSource.EVENT_TYPE;
     }
-    static ofArray(array, dataConfig, pagination, columnObjs, hierarchyExpandLevel) {
+    static ofArray(array, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel) {
         return new CachedDataSource({
             get: index => Array.isArray(index) ? getValueFromDeepArray(array, index) : array[index],
             length: array.length,
             source: array
-        }, dataConfig, pagination, columnObjs, hierarchyExpandLevel);
+        }, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel);
     }
-    constructor(opt, dataConfig, pagination, columnObjs, hierarchyExpandLevel) {
-        super(opt, dataConfig, pagination, columnObjs, hierarchyExpandLevel), this._recordCache = {}, 
-        this._fieldCache = {};
+    constructor(opt, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel) {
+        super(opt, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel), 
+        this._recordCache = {}, this._fieldCache = {};
     }
     getOriginalRecord(index) {
         return this._recordCache && this._recordCache[index] ? this._recordCache[index] : super.getOriginalRecord(index);

package/es/data/CachedDataSource.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/CachedDataSource.ts"],"names":[],"mappings":"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","file":"CachedDataSource.js","sourcesContent":["import { getValueFromDeepArray } from '../tools/util';\nimport type {\n  FieldData,\n  FieldDef,\n  IListTableDataConfig,\n  IPagination,\n  MaybePromise,\n  MaybePromiseOrUndefined\n} from '../ts-types';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { ColumnData } from '../ts-types/list-table/layout-map/api';\nimport type { DataSourceParam } from './DataSource';\nimport { DataSource } from './DataSource';\n\n/** @private */\nfunction _setFieldCache(\n  fCache: { [index: number]: Map<FieldDef, any> },\n  index: number,\n  field: FieldDef,\n\n  value: any\n): void {\n  const recCache = fCache[index] || (fCache[index] = new Map());\n  recCache.set(field, value);\n}\n/**\n * table data source for caching Promise data\n *\n * @classdesc VTable.data.CachedDataSource\n * @memberof VTable.data\n */\nexport class CachedDataSource extends DataSource {\n  /**\n   * record cache 当用户定义的CachedDataSource.get为promise的时候 可以用rCache缓存已获取数据条目\n   */\n  private _recordCache: { [index: number]: any };\n  /**\n   * field cache 当用户定义field为promise的时候 可以用fCache缓存已获取值\n   */\n  private _fieldCache: { [index: number]: Map<FieldDef, any> };\n  static get EVENT_TYPE(): typeof DataSource.EVENT_TYPE {\n    return DataSource.EVENT_TYPE;\n  }\n  static ofArray(\n    array: any[],\n    dataConfig?: IListTableDataConfig,\n    pagination?: IPagination,\n    columnObjs?: ColumnData[],\n    hierarchyExpandLevel?: number\n  ): CachedDataSource {\n    return new CachedDataSource(\n      {\n        get: (index: number): any => {\n          if (Array.isArray(index)) {\n            return getValueFromDeepArray(array, index);\n          }\n          return array[index];\n        },\n        length: array.length,\n        source: array\n      },\n      dataConfig,\n      pagination,\n      columnObjs,\n      hierarchyExpandLevel\n    );\n  }\n  constructor(\n    opt?: DataSourceParam,\n    dataConfig?: IListTableDataConfig,\n    pagination?: IPagination,\n    columnObjs?: ColumnData[],\n    hierarchyExpandLevel?: number\n  ) {\n    super(opt, dataConfig, pagination, columnObjs, hierarchyExpandLevel);\n    this._recordCache = {};\n    this._fieldCache = {};\n  }\n  protected getOriginalRecord(index: number): MaybePromiseOrUndefined {\n    if (this._recordCache && this._recordCache[index]) {\n      return this._recordCache[index];\n    }\n    return super.getOriginalRecord(index);\n  }\n  protected getOriginalField<F extends FieldDef>(\n    index: number,\n    field: F,\n    col?: number,\n    row?: number,\n    table?: BaseTableAPI\n  ): FieldData {\n    const rowCache = this._fieldCache && this._fieldCache[index];\n    if (rowCache) {\n      const cache = rowCache.get(field);\n      if (cache) {\n        return cache;\n      }\n    }\n    return super.getOriginalField(index, field, col, row, table);\n  }\n\n  clearCache(): void {\n    if (this._recordCache) {\n      this._recordCache = {};\n    }\n    if (this._fieldCache) {\n      this._fieldCache = {};\n    }\n  }\n\n  protected fieldPromiseCallBack<F extends FieldDef>(index: number, field: F, value: MaybePromiseOrUndefined): void {\n    _setFieldCache(this._fieldCache, index, field, value);\n  }\n  protected recordPromiseCallBack(index: number, record: MaybePromiseOrUndefined): void {\n    this._recordCache[index] = record;\n  }\n\n  release(): void {\n    super.release?.();\n  }\n}\n"]}
+{"version":3,"sources":["../src/data/CachedDataSource.ts"],"names":[],"mappings":"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","file":"CachedDataSource.js","sourcesContent":["import { getValueFromDeepArray } from '../tools/util';\nimport type {\n  FieldData,\n  FieldDef,\n  IListTableDataConfig,\n  IPagination,\n  MaybePromise,\n  MaybePromiseOrUndefined\n} from '../ts-types';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { ColumnData } from '../ts-types/list-table/layout-map/api';\nimport type { DataSourceParam } from './DataSource';\nimport { DataSource } from './DataSource';\n\n/** @private */\nfunction _setFieldCache(\n  fCache: { [index: number]: Map<FieldDef, any> },\n  index: number,\n  field: FieldDef,\n\n  value: any\n): void {\n  const recCache = fCache[index] || (fCache[index] = new Map());\n  recCache.set(field, value);\n}\n/**\n * table data source for caching Promise data\n *\n * @classdesc VTable.data.CachedDataSource\n * @memberof VTable.data\n */\nexport class CachedDataSource extends DataSource {\n  /**\n   * record cache 当用户定义的CachedDataSource.get为promise的时候 可以用rCache缓存已获取数据条目\n   */\n  private _recordCache: { [index: number]: any };\n  /**\n   * field cache 当用户定义field为promise的时候 可以用fCache缓存已获取值\n   */\n  private _fieldCache: { [index: number]: Map<FieldDef, any> };\n  static get EVENT_TYPE(): typeof DataSource.EVENT_TYPE {\n    return DataSource.EVENT_TYPE;\n  }\n  static ofArray(\n    array: any[],\n    dataConfig?: IListTableDataConfig,\n    pagination?: IPagination,\n    columnObjs?: ColumnData[],\n    rowHierarchyType?: 'grid' | 'tree',\n    hierarchyExpandLevel?: number\n  ): CachedDataSource {\n    return new CachedDataSource(\n      {\n        get: (index: number): any => {\n          if (Array.isArray(index)) {\n            return getValueFromDeepArray(array, index);\n          }\n          return array[index];\n        },\n        length: array.length,\n        source: array\n      },\n      dataConfig,\n      pagination,\n      columnObjs,\n      rowHierarchyType,\n      hierarchyExpandLevel\n    );\n  }\n  constructor(\n    opt?: DataSourceParam,\n    dataConfig?: IListTableDataConfig,\n    pagination?: IPagination,\n    columnObjs?: ColumnData[],\n    rowHierarchyType?: 'grid' | 'tree',\n    hierarchyExpandLevel?: number\n  ) {\n    super(opt, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel);\n    this._recordCache = {};\n    this._fieldCache = {};\n  }\n  protected getOriginalRecord(index: number): MaybePromiseOrUndefined {\n    if (this._recordCache && this._recordCache[index]) {\n      return this._recordCache[index];\n    }\n    return super.getOriginalRecord(index);\n  }\n  protected getOriginalField<F extends FieldDef>(\n    index: number,\n    field: F,\n    col?: number,\n    row?: number,\n    table?: BaseTableAPI\n  ): FieldData {\n    const rowCache = this._fieldCache && this._fieldCache[index];\n    if (rowCache) {\n      const cache = rowCache.get(field);\n      if (cache) {\n        return cache;\n      }\n    }\n    return super.getOriginalField(index, field, col, row, table);\n  }\n\n  clearCache(): void {\n    if (this._recordCache) {\n      this._recordCache = {};\n    }\n    if (this._fieldCache) {\n      this._fieldCache = {};\n    }\n  }\n\n  protected fieldPromiseCallBack<F extends FieldDef>(index: number, field: F, value: MaybePromiseOrUndefined): void {\n    _setFieldCache(this._fieldCache, index, field, value);\n  }\n  protected recordPromiseCallBack(index: number, record: MaybePromiseOrUndefined): void {\n    this._recordCache[index] = record;\n  }\n\n  release(): void {\n    super.release?.();\n  }\n}\n"]}

package/es/data/DataSource.d.ts

@@ -36,7 +36,7 @@ export declare class DataSource extends EventTarget implements DataSourceAPI {
     _currentPagerIndexedData: (number | number[])[];
     hierarchyExpandLevel: number;
     static get EVENT_TYPE(): typeof EVENT_TYPE;
-    treeDataHierarchyState: Map<number | string, HierarchyState>;
+    hasHierarchyStateExpand: boolean;
     beforeChangedRecordsMap: Record<number, any>[];
     registedAggregators: {
         [key: string]: {
@@ -45,7 +45,7 @@ export declare class DataSource extends EventTarget implements DataSourceAPI {
     };
     fieldAggregators: Aggregator[];
     layoutColumnObjects: ColumnData[];
-    constructor(dataSourceObj?: DataSourceParam | DataSource, dataConfig?: IListTableDataConfig, pagination?: IPagination, columnObjs?: ColumnData[], hierarchyExpandLevel?: number);
+    constructor(dataSourceObj?: DataSourceParam | DataSource, dataConfig?: IListTableDataConfig, pagination?: IPagination, columnObjs?: ColumnData[], rowHierarchyType?: 'grid' | 'tree', hierarchyExpandLevel?: number);
     initTreeHierarchyState(): void;
     registerAggregator(type: string, aggregator: any): void;
     registerAggregators(): void;
@@ -100,5 +100,9 @@ export declare class DataSource extends EventTarget implements DataSourceAPI {
     protected fieldPromiseCallBack(_index: number | number[], _field: FieldDef | FieldFormat | number, _value: MaybePromiseOrUndefined): void;
     protected recordPromiseCallBack(_index: number | number[], _record: MaybePromiseOrUndefined): void;
     static EMPTY: DataSource;
+    isCanExchangeOrder(sourceIndex: number, targetIndex: number): boolean;
+    reorderRecord(sourceIndex: number, targetIndex: number): void;
+    restoreTreeHierarchyState(): void;
+    restoreChildrenNodeHierarchy(indexKey: number | number[], nodeData: any): number;
 }
 export {};

package/es/data/DataSource.js

@@ -66,9 +66,9 @@ export class DataSource extends EventTarget {
     static get EVENT_TYPE() {
         return EVENT_TYPE;
     }
-    constructor(dataSourceObj, dataConfig, pagination, columnObjs, hierarchyExpandLevel) {
+    constructor(dataSourceObj, dataConfig, pagination, columnObjs, rowHierarchyType, hierarchyExpandLevel) {
         var _a, _b;
-        super(), this.currentIndexedData = [], this.hierarchyExpandLevel = 0, this.treeDataHierarchyState = new Map, 
+        super(), this.currentIndexedData = [], this.hierarchyExpandLevel = 0, this.hasHierarchyStateExpand = !1, 
         this.beforeChangedRecordsMap = [], this.registedAggregators = {}, this.fieldAggregators = [], 
         this.layoutColumnObjects = [], this.registerAggregators(), this.dataSourceObj = dataSourceObj, 
         this.dataConfig = dataConfig, this._get = (null == dataSourceObj ? void 0 : dataSourceObj.get.bind(dataSourceObj)) || void 0, 
@@ -82,28 +82,23 @@ export class DataSource extends EventTarget {
         }, hierarchyExpandLevel >= 1 && (this.hierarchyExpandLevel = hierarchyExpandLevel), 
         this.currentIndexedData = Array.from({
             length: this._sourceLength
-        }, ((_, i) => i)), this.initTreeHierarchyState(), this.updatePagerData();
+        }, ((_, i) => i)), "tree" === rowHierarchyType && this.initTreeHierarchyState(), 
+        this.updatePagerData();
     }
     initTreeHierarchyState() {
         var _a;
-        if (this.hierarchyExpandLevel) {
-            this.treeDataHierarchyState = new Map;
-            for (let i = 0; i < this._sourceLength; i++) {
-                this.getOriginalRecord(i).children && this.treeDataHierarchyState.set(i, HierarchyState.collapse);
-            }
-            if (this.currentIndexedData = Array.from({
-                length: this._sourceLength
-            }, ((_, i) => i)), this.hierarchyExpandLevel > 1) {
-                let nodeLength = this._sourceLength;
-                for (let i = 0; i < nodeLength; i++) {
-                    const indexKey = this.currentIndexedData[i], nodeData = this.getOriginalRecord(indexKey);
-                    if ((null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) > 0) {
-                        this.treeDataHierarchyState.set(Array.isArray(indexKey) ? indexKey.join(",") : indexKey, HierarchyState.expand);
-                        const childrenLength = this.initChildrenNodeHierarchy(indexKey, this.hierarchyExpandLevel, 2, nodeData);
-                        i += childrenLength, nodeLength += childrenLength;
-                    }
-                }
-            }
+        this.currentIndexedData = Array.from({
+            length: this._sourceLength
+        }, ((_, i) => i));
+        let nodeLength = this._sourceLength;
+        for (let i = 0; i < nodeLength; i++) {
+            const indexKey = this.currentIndexedData[i], nodeData = this.getOriginalRecord(indexKey);
+            if ((null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) > 0) {
+                if (this.hierarchyExpandLevel > 1 ? !nodeData.hierarchyState && (nodeData.hierarchyState = HierarchyState.expand) : !nodeData.hierarchyState && (nodeData.hierarchyState = HierarchyState.collapse), 
+                this.hasHierarchyStateExpand = !0, nodeData.hierarchyState === HierarchyState.collapse) continue;
+                const childrenLength = this.initChildrenNodeHierarchy(indexKey, this.hierarchyExpandLevel, 2, nodeData);
+                i += childrenLength, nodeLength += childrenLength;
+            } else !0 === nodeData.children && !nodeData.hierarchyState && (nodeData.hierarchyState = HierarchyState.collapse);
         }
     }
     registerAggregator(type, aggregator) {
@@ -150,15 +145,15 @@ export class DataSource extends EventTarget {
     }
     initChildrenNodeHierarchy(indexKey, hierarchyExpandLevel, currentLevel, nodeData) {
         var _a, _b, _c;
-        if (currentLevel > hierarchyExpandLevel) return 0;
         let childTotalLength = 0;
         const nodeLength = null !== (_b = null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0;
         for (let j = 0; j < nodeLength; j++) {
-            childTotalLength += 1;
+            (currentLevel <= hierarchyExpandLevel || nodeData.hierarchyState === HierarchyState.expand) && (childTotalLength += 1);
             const childNodeData = nodeData.children[j], childIndexKey = Array.isArray(indexKey) ? indexKey.concat(j) : [ indexKey, j ];
-            this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexKey) + childTotalLength, 0, childIndexKey), 
-            (null === (_c = childNodeData.children) || void 0 === _c ? void 0 : _c.length) > 0 && (currentLevel < hierarchyExpandLevel ? this.treeDataHierarchyState.set(Array.isArray(childIndexKey) ? childIndexKey.join(",") : childIndexKey, HierarchyState.expand) : this.treeDataHierarchyState.set(Array.isArray(childIndexKey) ? childIndexKey.join(",") : childIndexKey, HierarchyState.collapse)), 
-            childTotalLength += this.initChildrenNodeHierarchy(childIndexKey, hierarchyExpandLevel, currentLevel + 1, childNodeData);
+            (currentLevel <= hierarchyExpandLevel || nodeData.hierarchyState === HierarchyState.expand) && this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexKey) + childTotalLength, 0, childIndexKey), 
+            (null === (_c = childNodeData.children) || void 0 === _c ? void 0 : _c.length) > 0 && (currentLevel < hierarchyExpandLevel || childNodeData.hierarchyState === HierarchyState.expand ? (!childNodeData.hierarchyState && (childNodeData.hierarchyState = HierarchyState.expand), 
+            this.hasHierarchyStateExpand = !0) : !childNodeData.hierarchyState && (childNodeData.hierarchyState = HierarchyState.collapse)), 
+            childNodeData.hierarchyState === HierarchyState.expand && (childTotalLength += this.initChildrenNodeHierarchy(childIndexKey, hierarchyExpandLevel, currentLevel + 1, childNodeData));
         }
         return childTotalLength;
     }
@@ -203,23 +198,23 @@ export class DataSource extends EventTarget {
     }
     getHierarchyState(index) {
         var _a;
-        const indexed = this.getIndexKey(index);
-        return null !== (_a = this.treeDataHierarchyState.get(Array.isArray(indexed) ? indexed.join(",") : indexed)) && void 0 !== _a ? _a : null;
+        const record = this.getOriginalRecord(this.currentIndexedData[index]);
+        return null !== (_a = null == record ? void 0 : record.hierarchyState) && void 0 !== _a ? _a : null;
     }
     toggleHierarchyState(index) {
         const oldIndexedData = this.currentIndexedData.slice(0), indexed = this.getIndexKey(index), state = this.getHierarchyState(index), data = this.getOriginalRecord(indexed);
-        if (this.clearSortedIndexMap(), state === HierarchyState.collapse) this.treeDataHierarchyState.set(Array.isArray(indexed) ? indexed.join(",") : indexed, HierarchyState.expand), 
-        this.pushChildrenNode(indexed, HierarchyState.expand, data); else if (state === HierarchyState.expand) {
+        if (this.clearSortedIndexMap(), state === HierarchyState.collapse) data.hierarchyState = HierarchyState.expand, 
+        this.pushChildrenNode(indexed, HierarchyState.expand, data), this.hasHierarchyStateExpand = !0; else if (state === HierarchyState.expand) {
             let childrenLength = 0;
             const computeChildrenNodeLength = (indexKey, hierarchyState, nodeData) => {
                 if (hierarchyState && hierarchyState !== HierarchyState.collapse && hierarchyState !== HierarchyState.none && nodeData.children) for (let i = 0; i < nodeData.children.length; i++) {
                     childrenLength += 1;
                     const childIndex = Array.isArray(indexKey) ? indexKey.concat([ i ]) : [ indexKey, i ];
-                    computeChildrenNodeLength(childIndex, this.treeDataHierarchyState.get(childIndex.join(",")), nodeData.children[i]);
+                    computeChildrenNodeLength(childIndex, nodeData.children[i].hierarchyState, nodeData.children[i]);
                 }
             };
             computeChildrenNodeLength(indexed, state, data), this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexed) + 1, childrenLength), 
-            this.treeDataHierarchyState.set(Array.isArray(indexed) ? indexed.join(",") : indexed, HierarchyState.collapse);
+            data.hierarchyState = HierarchyState.collapse;
         }
         this.updatePagerData();
         return calculateArrayDiff(oldIndexedData, this.currentIndexedData);
@@ -238,9 +233,9 @@ export class DataSource extends EventTarget {
                 childrenLength += 1;
                 const childIndex = Array.isArray(indexKey) ? indexKey.concat([ subNodeSortedIndexArray[i] ]) : [ indexKey, subNodeSortedIndexArray[i] ];
                 this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexKey) + childrenLength, 0, childIndex);
-                const preChildState = this.treeDataHierarchyState.get(childIndex.join(",")), childData = this.getOriginalRecord(childIndex);
-                !preChildState && childData.children && this.treeDataHierarchyState.set(childIndex.join(","), HierarchyState.collapse), 
-                childrenLength += this.pushChildrenNode(childIndex, this.treeDataHierarchyState.get(childIndex.join(",")), nodeData.children[subNodeSortedIndexArray[i]]);
+                const childData = this.getOriginalRecord(childIndex);
+                !nodeData.children[i].hierarchyState && childData.children && (nodeData.children[i].hierarchyState = HierarchyState.collapse), 
+                childrenLength += this.pushChildrenNode(childIndex, nodeData.children[i].hierarchyState, nodeData.children[subNodeSortedIndexArray[i]]);
             }
         }
         return childrenLength;
@@ -254,11 +249,7 @@ export class DataSource extends EventTarget {
             }
             if ("string" == typeof field || "number" == typeof field) {
                 const beforeChangedValue = this.beforeChangedRecordsMap[dataIndex][field], record = this.getOriginalRecord(dataIndex);
-                let formatValue = value;
-                "number" == typeof beforeChangedValue && isAllDigits(value) && (formatValue = parseFloat(value)), 
-                isPromise(record) ? record.then((record => {
-                    record[field] = formatValue;
-                })).catch((err => {})) : record[field] = formatValue;
+                "number" == typeof beforeChangedValue && isAllDigits(value) ? record[field] = parseFloat(value) : record[field] = value;
             }
         }
     }
@@ -358,7 +349,7 @@ export class DataSource extends EventTarget {
             let nodeLength = sortedIndexArray.length;
             window.performance.now();
             for (let i = 0; i < nodeLength; i++) {
-                const subNodeLength = this.pushChildrenNode(sortedIndexArray[i], this.treeDataHierarchyState.get(sortedIndexArray[i]), this.getOriginalRecord(sortedIndexArray[i]));
+                const record = this.getOriginalRecord(sortedIndexArray[i]), subNodeLength = this.pushChildrenNode(sortedIndexArray[i], record.hierarchyState, this.getOriginalRecord(sortedIndexArray[i]));
                 nodeLength += subNodeLength, i += subNodeLength;
             }
         }
@@ -472,6 +463,87 @@ export class DataSource extends EventTarget {
     }
     fieldPromiseCallBack(_index, _field, _value) {}
     recordPromiseCallBack(_index, _record) {}
+    isCanExchangeOrder(sourceIndex, targetIndex) {
+        if (this.hasHierarchyStateExpand) {
+            let sourceIndexs = this.currentPagerIndexedData[sourceIndex], targetIndexs = this.currentPagerIndexedData[targetIndex];
+            if (sourceIndexs = Array.isArray(sourceIndexs) ? [ ...sourceIndexs ] : [ sourceIndexs ], 
+            targetIndexs = Array.isArray(targetIndexs) ? [ ...targetIndexs ] : [ targetIndexs ], 
+            targetIndex > sourceIndex && targetIndexs.length > sourceIndexs.length) {
+                let targetNextIndexs = this.currentPagerIndexedData[targetIndex + 1];
+                targetNextIndexs = Array.isArray(targetNextIndexs) ? [ ...targetNextIndexs ] : [ targetNextIndexs ], 
+                targetNextIndexs.length < targetIndexs.length && targetIndexs.splice(targetIndexs.length - 1, 1);
+            }
+            if (sourceIndexs.length === targetIndexs.length) {
+                for (let i = 0; i <= sourceIndexs.length - 2; i++) if (sourceIndexs[i] !== targetIndexs[i]) return !1;
+                return !0;
+            }
+            return !1;
+        }
+        return !0;
+    }
+    reorderRecord(sourceIndex, targetIndex) {
+        if ("asc" !== this.lastOrder && "desc" !== this.lastOrder && this.isCanExchangeOrder(sourceIndex, targetIndex)) if (this.hasHierarchyStateExpand) {
+            let sourceI, targetI, sourceIndexs = this.currentPagerIndexedData[sourceIndex], targetIndexs = this.currentPagerIndexedData[targetIndex];
+            if (sourceIndexs = Array.isArray(sourceIndexs) ? [ ...sourceIndexs ] : [ sourceIndexs ], 
+            targetIndexs = Array.isArray(targetIndexs) ? [ ...targetIndexs ] : [ targetIndexs ], 
+            sourceIndexs.length > 1 || targetIndexs.length > 1) {
+                if (targetIndex > sourceIndex && targetIndexs.length > sourceIndexs.length) {
+                    let targetNextIndexs = this.currentPagerIndexedData[targetIndex + 1];
+                    targetNextIndexs = Array.isArray(targetNextIndexs) ? [ ...targetNextIndexs ] : [ targetNextIndexs ], 
+                    targetNextIndexs.length < targetIndexs.length && targetIndexs.splice(targetIndexs.length - 1, 1);
+                }
+                if (sourceI = sourceIndexs.splice(sourceIndexs.length - 1, 1)[0], targetI = targetIndexs.splice(targetIndexs.length - 1, 1)[0], 
+                sourceIndexs.length >= 1) {
+                    const parent = this.getOriginalRecord(sourceIndexs), sourceIds = parent.children.splice(sourceI, 1);
+                    sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(parent.children, sourceIds);
+                } else {
+                    const sourceIds = this.source.splice(sourceI, 1);
+                    sourceIds.unshift(targetI, 0), Array.prototype.splice.apply(this.source, sourceIds);
+                }
+            } else {
+                sourceI = this.currentPagerIndexedData[sourceIndex], targetI = this.currentPagerIndexedData[targetIndex];
+                const records = this.source.splice(sourceI, 1);
+                records.unshift(targetI, 0), Array.prototype.splice.apply(this.source, records);
+            }
+            this.restoreTreeHierarchyState(), this.updatePagerData();
+        } else {
+            const records = this.source.splice(sourceIndex, 1);
+            records.unshift(targetIndex, 0), Array.prototype.splice.apply(this.source, records);
+        }
+    }
+    restoreTreeHierarchyState() {
+        var _a;
+        if (this.hierarchyExpandLevel) {
+            for (let i = 0; i < this._sourceLength; i++) {
+                const nodeData = this.getOriginalRecord(i);
+                nodeData.children && !nodeData.hierarchyState && (nodeData.hierarchyState = HierarchyState.collapse);
+            }
+            this.currentIndexedData = Array.from({
+                length: this._sourceLength
+            }, ((_, i) => i));
+            let nodeLength = this._sourceLength;
+            for (let i = 0; i < nodeLength; i++) {
+                const indexKey = this.currentIndexedData[i], nodeData = this.getOriginalRecord(indexKey);
+                if ((null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) > 0 && nodeData.hierarchyState === HierarchyState.expand) {
+                    this.hasHierarchyStateExpand = !0;
+                    const childrenLength = this.restoreChildrenNodeHierarchy(indexKey, nodeData);
+                    i += childrenLength, nodeLength += childrenLength;
+                } else !0 === nodeData.children && !nodeData.hierarchyState && (nodeData.hierarchyState = HierarchyState.collapse);
+            }
+        }
+    }
+    restoreChildrenNodeHierarchy(indexKey, nodeData) {
+        var _a, _b;
+        let childTotalLength = 0;
+        const nodeLength = null !== (_b = null === (_a = nodeData.children) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0;
+        for (let j = 0; j < nodeLength; j++) {
+            nodeData.hierarchyState === HierarchyState.expand && (childTotalLength += 1);
+            const childNodeData = nodeData.children[j], childIndexKey = Array.isArray(indexKey) ? indexKey.concat(j) : [ indexKey, j ];
+            nodeData.hierarchyState === HierarchyState.expand && this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexKey) + childTotalLength, 0, childIndexKey), 
+            childTotalLength += this.restoreChildrenNodeHierarchy(childIndexKey, childNodeData);
+        }
+        return childTotalLength;
+    }
 }
 
 DataSource.EMPTY = new DataSource({