vxe-table 4.15.0-beta.8 → 4.15.0

package/es/table/module/custom/hook.js

@@ -1,6 +1,7 @@
 import { nextTick } from 'vue';
 import { VxeUI } from '../../../ui';
 import XEUtils from 'xe-utils';
+import { getColumnList } from '../../src/util';
 const tableCustomMethodKeys = ['openCustom', 'closeCustom', 'toggleCustom', 'saveCustom', 'cancelCustom', 'resetCustom', 'toggleCustomAllCheckbox', 'setCustomAllCheckbox'];
 VxeUI.hooks.add('tableCustomModule', {
     setupTable($xeTable) {
@@ -101,23 +102,22 @@ VxeUI.hooks.add('tableCustomModule', {
                 }
             });
             reactData.isCustomStatus = true;
-            return $xeTable.saveCustomStore('confirm').then(() => {
-                if (allowGroup && allowValues && $xeTable.handlePivotTableAggregateData) {
-                    if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
-                        // 更新数据分组
-                        if (aggHandleFields.length) {
-                            $xeTable.setRowGroups(aggHandleFields);
-                        }
-                        else {
-                            $xeTable.clearRowGroups();
-                        }
+            if (allowGroup && !!$xeTable.handlePivotTableAggregateData) {
+                if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
+                    // 更新数据分组
+                    if (aggHandleFields.length) {
+                        $xeTable.setRowGroups(aggHandleFields);
                     }
                     else {
-                        // 更新聚合函数
-                        $xeTable.handleUpdateAggData();
+                        $xeTable.clearRowGroups();
                     }
                 }
-            });
+                else if (allowValues) {
+                    // 更新聚合函数
+                    $xeTable.handleUpdateAggData();
+                }
+            }
+            return $xeTable.saveCustomStore('confirm');
         };
         const cancelCustom = () => {
             const { customColumnList, customStore } = reactData;
@@ -202,6 +202,7 @@ VxeUI.hooks.add('tableCustomModule', {
                     sort: options === true,
                     aggFunc: options === true
                 }, options);
+                const allCols = [];
                 XEUtils.eachTree(collectColumn, (column) => {
                     if (opts.resizable) {
                         column.resizeWidth = 0;
@@ -211,6 +212,7 @@ VxeUI.hooks.add('tableCustomModule', {
                     }
                     if (opts.sort) {
                         column.renderSortNumber = column.sortNumber;
+                        column.parentId = column.defaultParentId;
                     }
                     if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
                         column.visible = column.defaultVisible;
@@ -220,9 +222,14 @@ VxeUI.hooks.add('tableCustomModule', {
                         column.renderAggFn = column.defaultAggFunc;
                     }
                     column.renderResizeWidth = column.renderWidth;
+                    allCols.push(column);
                 });
+                if (opts.sort) {
+                    const newCollectCols = XEUtils.toArrayTree(XEUtils.orderBy(allCols, 'renderSortNumber'), { key: 'id', parentKey: 'parentId', children: 'children' });
+                    internalData.collectColumn = newCollectCols;
+                    internalData.tableFullColumn = getColumnList(newCollectCols);
+                }
                 reactData.isCustomStatus = false;
-                $xeTable.saveCustomStore('reset');
                 return $xeTable.handleCustom().then(() => {
                     if (opts.aggFunc && $xeTable.handlePivotTableAggregateData) {
                         const rowGroupFields = computeRowGroupFields.value;
@@ -238,6 +245,7 @@ VxeUI.hooks.add('tableCustomModule', {
                             $xeTable.handleUpdateAggData();
                         }
                     }
+                    $xeTable.saveCustomStore('reset');
                 });
             },
             toggleCustomAllCheckbox() {

package/es/table/module/edit/hook.js

@@ -77,7 +77,7 @@ hooks.add('tableEditModule', {
                     }
                     parentChilds[funcName](item);
                     mapChilds[funcName](item);
-                    const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     fullDataRowIdData[rowid] = rest;
                     fullAllDataRowIdData[rowid] = rest;
                 }
@@ -87,7 +87,7 @@ hooks.add('tableEditModule', {
                     }
                     afterFullData[funcName](item);
                     tableFullTreeData[funcName](item);
-                    const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     fullDataRowIdData[rowid] = rest;
                     fullAllDataRowIdData[rowid] = rest;
                 }
@@ -122,7 +122,7 @@ hooks.add('tableEditModule', {
                 else {
                     newRecords.forEach(item => {
                         const rowid = getRowid($xeTable, item);
-                        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                        const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                         fullDataRowIdData[rowid] = rest;
                         fullAllDataRowIdData[rowid] = rest;
                         afterFullData.unshift(item);
@@ -154,7 +154,7 @@ hooks.add('tableEditModule', {
                     else {
                         newRecords.forEach(item => {
                             const rowid = getRowid($xeTable, item);
-                            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, treeIndex: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                            const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, treeIndex: -1, _tIndex: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                             fullDataRowIdData[rowid] = rest;
                             fullAllDataRowIdData[rowid] = rest;
                             afterFullData.push(item);
@@ -186,7 +186,7 @@ hooks.add('tableEditModule', {
                                     targetIndex = targetIndex + 1;
                                 }
                                 parentMapChilds.splice(targetIndex, 0, item);
-                                const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                                const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                                 fullDataRowIdData[rowid] = rest;
                                 fullAllDataRowIdData[rowid] = rest;
                             });

package/es/table/src/body.js

@@ -258,7 +258,7 @@ export default defineVxeComponent({
             if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
                 isDirty = $xeTable.isUpdateByRow(row, column.field);
             }
-            const isVNAutoHeight = scrollYLoad && !hasEllipsis;
+            const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
             let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
             const isLastColumn = $columnIndex === columns.length - 1;
             const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
@@ -295,7 +295,7 @@ export default defineVxeComponent({
                 }
                 tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
             }
-            if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
+            if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
                 tcStyle.height = `${cellHeight}px`;
             }
             else {
@@ -458,15 +458,16 @@ export default defineVxeComponent({
                     };
                 }
                 if (rowRest) {
+                    rowIndex = rowRest.index;
+                    _rowIndex = rowRest._index;
                     rowLevel = rowRest.level;
+                    seq = rowRest.seq;
                     if (hasRowGroupAggregate || (treeConfig && transform && seqMode === 'increasing')) {
                         seq = rowRest._index + 1;
                     }
-                    else {
-                        seq = rowRest.seq;
+                    else if ((treeConfig && seqMode === 'fixed')) {
+                        seq = rowRest._tIndex + 1;
                     }
-                    rowIndex = rowRest.index;
-                    _rowIndex = rowRest._index;
                 }
                 const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex };
                 // 行是否被展开

package/es/table/src/cell.js

@@ -389,7 +389,7 @@ export const Cell = {
             const { computeAggregateOpts } = $table.getComputeMaps();
             const aggregateOpts = computeAggregateOpts.value;
             const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts;
-            const aggMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
+            const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
             const groupField = aggRow.groupField;
             const groupContent = aggRow.groupContent;
             const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : [];
@@ -423,9 +423,9 @@ export const Cell = {
                 cellValue = $table.getPivotTableAggregateCellAggValue(params);
             }
             else if (aggFunc === true || (countFields && countFields.includes(field))) {
-                if (aggMethod) {
+                if (aggCalcMethod) {
                     ctParams.aggValue = childCount;
-                    cellValue = `${aggMethod(ctParams)}`;
+                    cellValue = `${aggCalcMethod(ctParams)}`;
                 }
             }
         }
@@ -478,14 +478,14 @@ export const Cell = {
         const { rowGroupExpandedFlag } = tableReactData;
         const { rowGroupExpandedMaps } = tableInternalData;
         const aggregateOpts = computeAggregateOpts.value;
-        const { padding, indent } = aggregateOpts;
+        const { mode, padding, indent } = aggregateOpts;
         const rowid = getRowid($table, row);
         const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
         return h('div', {
             class: ['vxe-row-group--tree-node', {
                     'is--expanded': isExpand
                 }],
-            style: padding && indent
+            style: mode !== 'column' && padding && indent
                 ? {
                     paddingLeft: `${level * indent}px`
                 }

package/es/table/src/columnInfo.js

@@ -112,9 +112,11 @@ export class ColumnInfo {
             parentId: null,
             visible,
             // 内部属性（一旦被使用，将导致不可升级版本）
+            defaultParentId: null,
             halfVisible: false,
             defaultVisible: visible,
             defaultFixed: _vm.fixed,
+            defaultAggGroup: _vm.aggGroup,
             defaultAggFunc: _vm.aggFunc,
             checked: false,
             halfChecked: false,