vxe-table 3.17.0-beta.8 → 3.17.0

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

@@ -1,4 +1,5 @@
 import XEUtils from 'xe-utils';
+import { getColumnList } from '../../src/util';
 function calcMaxHeight($xeTable) {
     const reactData = $xeTable;
     const { customStore } = reactData;
@@ -86,23 +87,22 @@ export default {
                 }
             });
             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 && allowValues && !!$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');
         },
         _cancelCustom() {
             const $xeTable = this;
@@ -147,6 +147,7 @@ export default {
                 sort: options === true,
                 aggFunc: options === true
             }, options);
+            const allCols = [];
             XEUtils.eachTree(collectColumn, (column) => {
                 if (opts.resizable) {
                     column.resizeWidth = 0;
@@ -156,6 +157,7 @@ export default {
                 }
                 if (opts.sort) {
                     column.renderSortNumber = column.sortNumber;
+                    column.parentId = column.defaultParentId;
                 }
                 if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
                     column.visible = column.defaultVisible;
@@ -165,9 +167,14 @@ export default {
                     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 = $xeTable.computeRowGroupFields;
@@ -183,6 +190,7 @@ export default {
                         $xeTable.handleUpdateAggData();
                     }
                 }
+                $xeTable.saveCustomStore('reset');
             });
         },
         _toggleCustomAllCheckbox() {

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

@@ -70,7 +70,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
             }
             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;
         }
@@ -80,7 +80,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
             }
             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;
         }
@@ -118,7 +118,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         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);
@@ -150,7 +150,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             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.push(item);
@@ -182,7 +182,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                             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

@@ -239,7 +239,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     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');
@@ -276,7 +276,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         }
         tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
     }
-    if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
+    if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
         tcStyle.height = `${cellHeight}px`;
     }
     else {
@@ -456,15 +456,16 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
             };
         }
         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

@@ -375,7 +375,7 @@ export const Cell = {
             const { fullColumnFieldData } = tableInternalData;
             const aggregateOpts = $table.computeAggregateOpts;
             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] || []) : [];
@@ -409,9 +409,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)}`;
                 }
             }
         }
@@ -461,14 +461,14 @@ export const Cell = {
         const { rowGroupExpandedFlag } = tableReactData;
         const { rowGroupExpandedMaps } = tableInternalData;
         const aggregateOpts = $table.computeAggregateOpts;
-        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

@@ -119,15 +119,20 @@ 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,
             disabled: false,
+            // 分组层级
             level: 1,
+            // 跨行
             rowSpan: 1,
+            // 跨列
             colSpan: 1,
             // 数据排序
             order: null,