k-vtable 1.0.0 → 1.0.2

package/cjs/ListTable.d.ts

@@ -3,6 +3,7 @@ import { HierarchyState } from './ts-types';
 import { BaseTable } from './core';
 import type { ListTableProtected } from './ts-types/base-table';
 import type { IEditor } from '@visactor/vtable-editors';
+import type { ColumnDefine } from './ts-types/list-table/layout-map/api';
 import type { ListTreeStickCellPlugin } from './plugins/list-tree-stick-cell';
 export declare class ListTable extends BaseTable implements ListTableAPI {
     internalProps: ListTableProtected;
@@ -18,6 +19,7 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
     get records(): any[];
     get recordsCount(): number;
     updateColumns(columns: ColumnsDefine): void;
+    addColumn(column: ColumnDefine): void;
     get columns(): ColumnsDefine;
     get header(): ColumnsDefine;
     set header(header: ColumnsDefine);
@@ -77,7 +79,7 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
     getEditor(col: number, row: number): IEditor<any, any>;
     isHasEditorDefine(col: number, row: number): boolean;
     changeCellValue(col: number, row: number, value: string | number | null, workOnEditableCell?: boolean, triggerEvent?: boolean): void;
-    changeCellValues(startCol: number, startRow: number, values: (string | number)[][], workOnEditableCell?: boolean, triggerEvent?: boolean): void;
+    changeCellValues(startCol: number, startRow: number, values: (string | number)[][], workOnEditableCell?: boolean, triggerEvent?: boolean): boolean[][];
     addRecord(record: any, recordIndex?: number | number[]): void;
     addRecords(records: any[], recordIndex?: number | number[]): void;
     deleteRecords(recordIndexs: number[] | number[][]): void;

package/cjs/ListTable.js

@@ -29,14 +29,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ListTable = void 0;
 
-const ts_types_1 = require("./ts-types"), layout_1 = require("./layout"), vutils_1 = require("@visactor/vutils"), tableHelper_1 = require("./core/tableHelper"), core_1 = require("./core"), TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE"), env_1 = require("./tools/env"), editors = __importStar(require("./edit/editors")), edit_manager_1 = require("./edit/edit-manager"), compute_row_height_1 = require("./scenegraph/layout/compute-row-height"), util_1 = require("./tools/util"), radio_1 = require("./state/radio/radio"), vutils_extension_1 = require("@visactor/vutils-extension"), checkbox_1 = require("./state/checkbox/checkbox"), factory_1 = require("./core/factory"), group_helper_1 = require("./core/group-helper"), record_helper_1 = require("./core/record-helper"), update_row_1 = require("./tools/update-row"), chart_render_helper_1 = require("./scenegraph/graphic/contributions/chart-render-helper");
+const ts_types_1 = require("./ts-types"), layout_1 = require("./layout"), vutils_1 = require("@visactor/vutils"), tableHelper_1 = require("./core/tableHelper"), core_1 = require("./core"), TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE"), env_1 = require("./tools/env"), editors = __importStar(require("./edit/editors")), edit_manager_1 = require("./edit/edit-manager"), compute_row_height_1 = require("./scenegraph/layout/compute-row-height"), util_1 = require("./tools/util"), radio_1 = require("./state/radio/radio"), vutils_extension_1 = require("@visactor/vutils-extension"), checkbox_1 = require("./state/checkbox/checkbox"), factory_1 = require("./core/factory"), group_helper_1 = require("./core/group-helper"), data_1 = require("./data"), record_helper_1 = require("./core/record-helper"), update_row_1 = require("./tools/update-row"), chart_render_helper_1 = require("./scenegraph/graphic/contributions/chart-render-helper");
 
 class ListTable extends core_1.BaseTable {
     constructor(container, options) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        "node" === env_1.Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
-        container = container.container ? container.container : null), super(container, options), 
-        this.showHeader = !0;
+        super(container, options), this.showHeader = !0, options = this.options;
         const internalProps = this.internalProps;
         if (internalProps.frozenColDragHeaderMode = null !== (_b = null === (_a = options.dragOrder) || void 0 === _a ? void 0 : _a.frozenColDragHeaderMode) && void 0 !== _b ? _b : options.frozenColDragHeaderMode, 
         this.pagination = options.pagination, internalProps.sortState = options.sortState, 
@@ -87,6 +85,7 @@ class ListTable extends core_1.BaseTable {
     }
     updateColumns(columns) {
         var _a, _b, _c, _d;
+        this.scenegraph.clearCells();
         const oldHoverState = {
             col: this.stateManager.hover.cellPos.col,
             row: this.stateManager.hover.cellPos.row
@@ -96,11 +95,15 @@ class ListTable extends core_1.BaseTable {
         this.internalProps.headerHelper.setTableColumnsEditor(), this._hasAutoImageColumn = void 0, 
         this.refreshHeader(), null === (_b = (_a = this.dataSource).updateColumns) || void 0 === _b || _b.call(_a, this.internalProps.columns), 
         this.records && (0, tableHelper_1.checkHasAggregationOnColumnDefine)(columns) && this.dataSource.processRecords(null !== (_d = null === (_c = this.dataSource.dataSourceObj) || void 0 === _c ? void 0 : _c.records) && void 0 !== _d ? _d : this.dataSource.dataSourceObj), 
-        this.internalProps.useOneRowHeightFillAll = !1, this.scenegraph.clearCells(), this.headerStyleCache = new Map, 
+        this.internalProps.useOneRowHeightFillAll = !1, this.headerStyleCache = new Map, 
         this.bodyStyleCache = new Map, this.bodyBottomStyleCache = new Map, this.scenegraph.createSceneGraph(), 
         this.stateManager.updateHoverPos(oldHoverState.col, oldHoverState.row), this.renderAsync(), 
         this.eventManager.updateEventBinder();
     }
+    addColumn(column) {
+        const columns = this.options.columns;
+        columns.push(column), this.updateColumns(columns);
+    }
     get columns() {
         return this.internalProps.layoutMap.columnTree.getCopiedTree();
     }
@@ -137,7 +140,7 @@ class ListTable extends core_1.BaseTable {
             if (this.options.groupBy) {
                 const record = table.getCellRawRecord(col, row);
                 if (null == record ? void 0 : record.vtableMerge) return "";
-                value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount);
+                table.internalProps.layoutMap.isAggregation(col, row) || (value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount));
             } else value = row - this.columnHeaderLevelCount + 1;
             const {format: format} = table.internalProps.layoutMap.getSeriesNumberBody(col, row);
             return "function" == typeof format ? format(col, row, this, value) : value;
@@ -241,7 +244,7 @@ class ListTable extends core_1.BaseTable {
         return ifCan;
     }
     updateOption(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const internalProps = this.internalProps;
         if (super.updateOption(options), internalProps.frozenColDragHeaderMode = null !== (_b = null === (_a = options.dragOrder) || void 0 === _a ? void 0 : _a.frozenColDragHeaderMode) && void 0 !== _b ? _b : options.frozenColDragHeaderMode, 
         this.pagination = options.pagination, internalProps.sortState = options.sortState, 
@@ -253,21 +256,23 @@ class ListTable extends core_1.BaseTable {
         vutils_1.isValid)(options.groupBy)) && void 0 !== _e && _e, this.internalProps.headerHelper.setTableColumnsEditor(), 
         this.transpose = null !== (_f = options.transpose) && void 0 !== _f && _f, this.refreshHeader(), 
         this.internalProps.useOneRowHeightFillAll = !1, this.internalProps.columnWidthConfig = options.columnWidthConfig, 
-        internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
-            var _a;
-            return null === (_a = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _a ? void 0 : _a.call(releaseObj);
-        })), internalProps.releaseList = null), options.dataSource ? this.dataSource = options.dataSource : options.records ? this.setRecords(options.records, {
+        internalProps.releaseList) for (let i = internalProps.releaseList.length - 1; i >= 0; i--) {
+            const releaseObj = internalProps.releaseList[i];
+            releaseObj instanceof data_1.DataSource ? releaseObj.updateColumns(this.internalProps.columns) : (null === (_g = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _g || _g.call(releaseObj), 
+            internalProps.releaseList.splice(i, 1));
+        }
+        if (options.dataSource && this.dataSource !== options.dataSource ? this.dataSource = options.dataSource : options.records ? this.setRecords(options.records, {
             sortState: options.sortState
-        }) : (this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), this.render()), 
-        options.title) {
+        }) : (this.refreshRowColCount(), this._resetFrozenColCount(), this.scenegraph.createSceneGraph(), 
+        this.render()), options.title) {
             const Title = factory_1.Factory.getComponent("title");
             internalProps.title = new Title(options.title, this), this.scenegraph.resize();
         }
-        if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_g = this.internalProps.emptyTip) || void 0 === _g || _g.resetVisible(); else {
+        if (this.options.emptyTip) if (this.internalProps.emptyTip) null === (_h = this.internalProps.emptyTip) || void 0 === _h || _h.resetVisible(); else {
             const EmptyTip = factory_1.Factory.getComponent("emptyTip");
-            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_h = this.internalProps.emptyTip) || void 0 === _h || _h.resetVisible();
+            this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_j = this.internalProps.emptyTip) || void 0 === _j || _j.resetVisible();
         }
-        return new Promise((resolve => {
+        return this.pluginManager.updatePlugins(options.plugins), new Promise((resolve => {
             setTimeout(resolve, 0);
         }));
     }
@@ -290,7 +295,7 @@ class ListTable extends core_1.BaseTable {
         const table = this, {layoutMap: layoutMap} = table.internalProps;
         if (!layoutMap) return;
         const dataCount = null !== (_b = null === (_a = table.internalProps.dataSource) || void 0 === _a ? void 0 : _a.length) && void 0 !== _b ? _b : 0;
-        layoutMap.recordsCount = dataCount + (dataCount > 0 ? layoutMap.hasAggregationOnTopCount + layoutMap.hasAggregationOnBottomCount : 0), 
+        layoutMap.recordsCount = dataCount + (dataCount > 0 || this.options.showAggregationWhenEmpty ? layoutMap.hasAggregationOnTopCount + layoutMap.hasAggregationOnBottomCount : 0), 
         table.transpose ? (table.rowCount = null !== (_c = layoutMap.rowCount) && void 0 !== _c ? _c : 0, 
         table.colCount = null !== (_d = layoutMap.colCount) && void 0 !== _d ? _d : 0, this.internalProps.frozenColCount = Math.max((null !== (_e = layoutMap.headerLevelCount) && void 0 !== _e ? _e : 0) + layoutMap.leftRowSeriesNumberColumnCount, null !== (_f = this.options.frozenColCount) && void 0 !== _f ? _f : 0), 
         this.internalProps.frozenRowCount = null !== (_g = this.options.frozenRowCount) && void 0 !== _g ? _g : 0, 
@@ -374,6 +379,8 @@ class ListTable extends core_1.BaseTable {
         return null;
     }
     getHierarchyState(col, row) {
+        var _a;
+        if (this.isHeader(col, row)) return null === (_a = this._getHeaderLayoutMap(col, row)) || void 0 === _a ? void 0 : _a.hierarchyState;
         if (!this.options.groupBy || (0, vutils_1.isArray)(this.options.groupBy) && 0 === this.options.groupBy.length) {
             if (!this.getBodyColumnDefine(col, row).tree) return ts_types_1.HierarchyState.none;
         }
@@ -383,7 +390,23 @@ class ListTable extends core_1.BaseTable {
     toggleHierarchyState(col, row, recalculateColWidths = !0) {
         this.stateManager.updateHoverIcon(col, row, void 0, void 0);
         const hierarchyState = this.getHierarchyState(col, row);
-        if (hierarchyState === ts_types_1.HierarchyState.expand) this._refreshHierarchyState(col, row, recalculateColWidths), 
+        if (this.isHeader(col, row)) {
+            const headerTreeNode = this.internalProps.layoutMap.getHeader(col, row), {hierarchyState: rawHierarchyState, define: columnDefine} = headerTreeNode;
+            if (![ ts_types_1.HierarchyState.collapse, ts_types_1.HierarchyState.expand ].includes(rawHierarchyState) || !columnDefine) return;
+            const children = columnDefine.columns;
+            if (Array.isArray(children) && children.length > 0) {
+                const hierarchyState = rawHierarchyState === ts_types_1.HierarchyState.expand ? ts_types_1.HierarchyState.collapse : ts_types_1.HierarchyState.expand;
+                headerTreeNode.hierarchyState = hierarchyState, headerTreeNode.define.hierarchyState = hierarchyState, 
+                this.updateColumns(this.internalProps.columns);
+            }
+            this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.TREE_HIERARCHY_STATE_CHANGE, {
+                col: col,
+                row: row,
+                hierarchyState: hierarchyState,
+                originData: headerTreeNode,
+                cellLocation: this.getCellLocation(col, row)
+            });
+        } else if (hierarchyState === ts_types_1.HierarchyState.expand) this._refreshHierarchyState(col, row, recalculateColWidths), 
         this.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.TREE_HIERARCHY_STATE_CHANGE, {
             col: col,
             row: row,