k-vtable 1.0.11 → 1.0.13

package/es/ListTable.js

@@ -45,9 +45,9 @@ export class ListTable extends BaseTable {
         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, 
-        internalProps.multipleSort = !!options.multipleSort, internalProps.dataConfig = options.groupBy ? getGroupByDataConfig(options.groupBy) : {}, 
+        internalProps.multipleSort = !!options.multipleSort, internalProps.dataConfig = this.internalProps.groupBy ? getGroupByDataConfig(this.internalProps.groupBy, this.internalProps.customDealGroupData) : {}, 
         internalProps.columns = options.columns ? cloneDeepSpec(options.columns, [ "children" ]) : options.header ? cloneDeepSpec(options.header, [ "children" ]) : [], 
-        generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_d = null !== (_c = options.enableTreeNodeMerge) && void 0 !== _c ? _c : isValid(options.groupBy)) && void 0 !== _d && _d, 
+        generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_d = null !== (_c = options.enableTreeNodeMerge) && void 0 !== _c ? _c : isValid(this.internalProps.groupBy)) && void 0 !== _d && _d, 
         this.internalProps.headerHelper.setTableColumnsEditor(), this.showHeader = null === (_e = options.showHeader) || void 0 === _e || _e, 
         this.internalProps.columnWidthConfig = options.columnWidthConfig, this.transpose = null !== (_f = options.transpose) && void 0 !== _f && _f, 
         "node" !== Env.mode && (this.editorManager = new EditManager(this)), this.refreshHeader(), 
@@ -61,7 +61,7 @@ export class ListTable extends BaseTable {
             const EmptyTip = Factory.getComponent("emptyTip");
             this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this), null === (_h = this.internalProps.emptyTip) || void 0 === _h || _h.resetVisible();
         }
-        if (options.enableTreeStickCell) {
+        if (this.internalProps.enableTreeStickCell) {
             const ListTreeStickCellPlugin = Factory.getComponent("listTreeStickCellPlugin");
             this.listTreeStickCellPlugin = new ListTreeStickCellPlugin(this);
         }
@@ -142,6 +142,7 @@ export class ListTable extends BaseTable {
         this.refreshRowColCount(), this._resetFrozenColCount(), this.renderAsync()));
     }
     getCellValue(col, row, skipCustomMerge) {
+        var _a;
         if (-1 === col || -1 === row) return null;
         if (!skipCustomMerge) {
             const customMergeText = this.getCustomMergeValue(col, row);
@@ -154,11 +155,14 @@ export class ListTable extends BaseTable {
                 return title;
             }
             let value;
-            if (this.options.groupBy) {
+            if (this.internalProps.groupBy) {
                 const record = table.getCellRawRecord(col, row);
                 if (null == record ? void 0 : record.vtableMerge) return "";
                 table.internalProps.layoutMap.isAggregation(col, row) || (value = this.dataSource.getGroupSeriesNumber(row - this.columnHeaderLevelCount));
-            } else value = row - this.columnHeaderLevelCount + 1;
+            } else {
+                const define = table.getBodyColumnDefine(col, row), checkboxSeriesNumberStyle = table.getFieldData(define.field, col, row);
+                value = "string" == typeof checkboxSeriesNumberStyle ? checkboxSeriesNumberStyle : (null == checkboxSeriesNumberStyle ? void 0 : checkboxSeriesNumberStyle.text) ? null !== (_a = checkboxSeriesNumberStyle.text) && void 0 !== _a ? _a : "" : row - this.columnHeaderLevelCount + 1;
+            }
             const {format: format} = table.internalProps.layoutMap.getSeriesNumberBody(col, row);
             return "function" == typeof format ? format(col, row, this, value) : value;
         }
@@ -265,9 +269,9 @@ export class ListTable extends BaseTable {
         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, 
-        internalProps.dataConfig = options.groupBy ? getGroupByDataConfig(options.groupBy) : {}, 
+        internalProps.dataConfig = this.internalProps.groupBy ? getGroupByDataConfig(this.internalProps.groupBy, this.internalProps.customDealGroupData) : {}, 
         this.showHeader = null === (_c = options.showHeader) || void 0 === _c || _c, internalProps.columns = options.columns ? cloneDeepSpec(options.columns, [ "children" ]) : options.header ? cloneDeepSpec(options.header, [ "children" ]) : [], 
-        generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_e = null !== (_d = options.enableTreeNodeMerge) && void 0 !== _d ? _d : isValid(options.groupBy)) && void 0 !== _e && _e, 
+        generateAggregationForColumn(this), internalProps.enableTreeNodeMerge = null !== (_e = null !== (_d = options.enableTreeNodeMerge) && void 0 !== _d ? _d : isValid(this.internalProps.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) for (let i = internalProps.releaseList.length - 1; i >= 0; i--) {
@@ -395,7 +399,7 @@ export class ListTable extends BaseTable {
     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 || isArray(this.options.groupBy) && 0 === this.options.groupBy.length) {
+        if (!this.internalProps.groupBy || isArray(this.internalProps.groupBy) && 0 === this.internalProps.groupBy.length) {
             if (!this.getBodyColumnDefine(col, row).tree) return HierarchyState.none;
         }
         const index = this.getRecordShowIndexByCell(col, row);
@@ -693,7 +697,7 @@ export class ListTable extends BaseTable {
     }
     getGroupTitleLevel(col, row) {
         var _a;
-        if (!this.options.groupBy) return;
+        if (!this.internalProps.groupBy) return;
         const indexArr = this.dataSource.getIndexKey(this.getRecordShowIndexByCell(col, row)), groupLength = null !== (_a = this.dataSource.getGroupLength()) && void 0 !== _a ? _a : 0;
         let indexArrLngth = isArray(indexArr) ? indexArr.length - 1 : 0;
         return groupLength > 0 && indexArrLngth === groupLength && (indexArrLngth = void 0),