vxe-table 4.11.5 → 4.11.7

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

@@ -971,7 +971,7 @@ hooks.add('tableExportModule', {
                 isMerge: hasMerge,
                 useStyle: true,
                 current: 'current',
-                modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
+                modes: ['current', 'selected', 'empty'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
             }, options);
             const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps);
             const modes = defOpts.modes || [];
@@ -1093,7 +1093,7 @@ hooks.add('tableExportModule', {
                     isMerge: hasMerge,
                     useStyle: true,
                     current: 'current',
-                    modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
+                    modes: ['current', 'selected', 'empty'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : []),
                     download: true,
                     type: 'csv'
                     // filename: '',
@@ -1309,7 +1309,7 @@ hooks.add('tableExportModule', {
                             }
                         }
                     }
-                    else if (mode === 'current') {
+                    if (mode === 'current') {
                         handleOptions.data = afterFullData;
                     }
                 }

package/es/table/src/table.js

@@ -2305,7 +2305,7 @@ export default defineComponent({
             reactData.isIndeterminate = false;
             reactData.treeIndeterminateMaps = {};
             internalData.treeIndeterminateRowMaps = {};
-            tablePrivateMethods.checkSelectionStatus();
+            $xeTable.checkSelectionStatus();
             return nextTick();
         };
         // 还原展开、选中等相关状态
@@ -2341,12 +2341,12 @@ export default defineComponent({
             reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {}; // 刷新行展开状态
             // 还原保留状态
             if (expandColumn && expandOpts.reserve) {
-                tableMethods.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true);
+                $xeTable.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true);
             }
             // 树展开
             reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {}; // 刷新树展开状态
             if (treeConfig && treeOpts.reserve) {
-                tableMethods.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true);
+                $xeTable.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true);
             }
         };
         /**
@@ -2653,15 +2653,11 @@ export default defineComponent({
             internalData.tableFullData = fullData;
             internalData.tableFullTreeData = treeData;
             // 缓存数据
-            $xeTable.cacheRowMap(true, isReset);
+            $xeTable.cacheRowMap(true);
             // 原始数据
             internalData.tableSynchData = datas;
             if (isReset) {
                 internalData.isResizeCellHeight = false;
-                reactData.rowExpandedMaps = {};
-                reactData.rowExpandLazyLoadedMaps = {};
-                reactData.treeExpandedMaps = {};
-                reactData.treeExpandLazyLoadedMaps = {};
             }
             // 克隆原数据，用于显示编辑状态，与编辑值做对比
             if (keepSource) {
@@ -3093,9 +3089,9 @@ export default defineComponent({
             handleCheckedAllCheckboxRow(value);
             if (evnt) {
                 dispatchEvent('checkbox-all', {
-                    records: tableMethods.getCheckboxRecords(),
-                    reserves: tableMethods.getCheckboxReserveRecords(),
-                    indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+                    records: $xeTable.getCheckboxRecords(),
+                    reserves: $xeTable.getCheckboxReserveRecords(),
+                    indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
                     checked: value
                 }, evnt);
             }
@@ -3979,7 +3975,7 @@ export default defineComponent({
              */
             getTreeRowChildren(rowOrRowid) {
                 const { treeConfig } = props;
-                const { fullDataRowIdData } = internalData;
+                const { fullAllDataRowIdData } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform, mapChildrenField } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -3992,7 +3988,7 @@ export default defineComponent({
                         rowid = getRowid($xeTable, rowOrRowid);
                     }
                     if (rowid) {
-                        const rest = fullDataRowIdData[rowid];
+                        const rest = fullAllDataRowIdData[rowid];
                         const row = rest ? rest.row : null;
                         if (row) {
                             return row[transform ? mapChildrenField : childrenField] || [];
@@ -4006,7 +4002,7 @@ export default defineComponent({
              */
             getTreeParentRow(rowOrRowid) {
                 const { treeConfig } = props;
-                const { fullDataRowIdData } = internalData;
+                const { fullAllDataRowIdData } = internalData;
                 if (rowOrRowid && treeConfig) {
                     let rowid;
                     if (XEUtils.isString(rowOrRowid)) {
@@ -4016,7 +4012,7 @@ export default defineComponent({
                         rowid = getRowid($xeTable, rowOrRowid);
                     }
                     if (rowid) {
-                        const rest = fullDataRowIdData[rowid];
+                        const rest = fullAllDataRowIdData[rowid];
                         return rest ? rest.parent : null;
                     }
                 }
@@ -4031,9 +4027,9 @@ export default defineComponent({
              * @param {String/Number} rowid 行主键
              */
             getRowById(cellValue) {
-                const { fullDataRowIdData } = internalData;
+                const { fullAllDataRowIdData } = internalData;
                 const rowid = XEUtils.eqNull(cellValue) ? '' : encodeURIComponent(cellValue || '');
-                return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
+                return fullAllDataRowIdData[rowid] ? fullAllDataRowIdData[rowid].row : null;
             },
             /**
              * 根据行获取行的唯一主键
@@ -5216,11 +5212,12 @@ export default defineComponent({
                 return rowRest && !!rowRest.treeLoaded;
             },
             clearTreeExpandLoaded(rows) {
-                const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
                 const { fullAllDataRowIdData } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
+                let tExpandedMaps = {};
                 if (rows) {
+                    tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
                     if (!XEUtils.isArray(rows)) {
                         rows = [rows];
                     }
@@ -5235,10 +5232,15 @@ export default defineComponent({
                         }
                     });
                 }
-                reactData.treeExpandedMaps = tExpandedMaps;
+                else {
+                    XEUtils.each(fullAllDataRowIdData, (rowRest) => {
+                        rowRest.treeLoaded = false;
+                    });
+                }
+                reactData.treeExpandedMaps = {};
                 if (transform) {
                     handleVirtualTreeToList();
-                    return tablePrivateMethods.handleTableData();
+                    return $xeTable.handleTableData();
                 }
                 return nextTick();
             },
@@ -6631,7 +6633,7 @@ export default defineComponent({
             /**
              * 更新数据行的 Map
              */
-            cacheRowMap(isReset, isSource) {
+            cacheRowMap() {
                 const { treeConfig } = props;
                 const treeOpts = computeTreeOpts.value;
                 const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
@@ -6652,23 +6654,19 @@ export default defineComponent({
                     if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
                         row[childrenField] = null;
                     }
-                    let cacheItem = fullAllDataRowIdData[rowid];
-                    if (isReset || !cacheItem) {
-                        cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
-                    }
-                    cacheItem.row = row;
-                    cacheItem.items = items;
-                    cacheItem.parent = parentRow;
-                    cacheItem.level = level;
-                    cacheItem.index = treeConfig && parentRow ? -1 : index;
-                    if (isSource) {
-                        fullDataRowIdMaps[rowid] = cacheItem;
-                    }
-                    fullAllDataRowIdMaps[rowid] = cacheItem;
+                    let rowRest = fullAllDataRowIdData[rowid];
+                    if (!rowRest) {
+                        rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    }
+                    rowRest.row = row;
+                    rowRest.items = items;
+                    rowRest.parent = parentRow;
+                    rowRest.level = level;
+                    rowRest.index = treeConfig && parentRow ? -1 : index;
+                    fullDataRowIdMaps[rowid] = rowRest;
+                    fullAllDataRowIdMaps[rowid] = rowRest;
                 };
-                if (isSource) {
-                    internalData.fullDataRowIdData = fullDataRowIdMaps;
-                }
+                internalData.fullDataRowIdData = fullDataRowIdMaps;
                 internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
                 if (treeConfig) {
                     XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
@@ -9796,7 +9794,7 @@ export default defineComponent({
             if (value && value.length >= 50000) {
                 warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
-            loadTableData(value, true).then(() => {
+            loadTableData(value, false).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 const expandOpts = computeExpandOpts.value;
                 internalData.inited = true;

package/es/table/style.css

@@ -2383,7 +2383,7 @@
   background-color: var(--vxe-ui-layout-background-color);
 }
 .vxe-table--render-default .vxe-table--footer-wrapper {
-  margin-top: -1px;
+  margin-top: calc(var(--vxe-ui-table-border-width) * -1);
   background-color: var(--vxe-ui-table-footer-background-color);
 }
 .vxe-table--render-default .vxe-table--header,