vxe-table 3.13.17 → 3.13.19

package/es/table/src/methods.js

@@ -2201,10 +2201,26 @@ const Methods = {
      * 获取父容器的高度
      */
     getParentHeight() {
-        const { $el, $xegrid, height } = this;
-        const parentElem = $el.parentNode;
-        const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-        return Math.floor($xegrid ? $xegrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        const props = $xeTable;
+        const { height } = props;
+        const el = $xeTable.$refs.refElem;
+        if (el) {
+            const parentElem = el.parentNode;
+            const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+            let parentWrapperHeight = 0;
+            if (parentElem) {
+                if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+                    parentWrapperHeight = $xeGrid.getParentHeight();
+                }
+                else {
+                    parentWrapperHeight = parentElem.clientHeight;
+                }
+            }
+            return Math.floor(parentWrapperHeight - parentPaddingSize);
+        }
+        return 0;
     },
     /**
      * 获取需要排除的高度
@@ -2295,28 +2311,26 @@ const Methods = {
         if (treeConfig) {
             // 树结构自动转换
             if (treeOpts.transform) {
-                if (process.env.NODE_ENV === 'development') {
-                    if (!treeOpts.rowField) {
-                        errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
-                    }
-                    if (!treeOpts.parentField) {
-                        errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
-                    }
-                    if (!childrenField) {
-                        errLog('vxe.error.reqProp', ['tree-config.childrenField']);
-                    }
-                    if (!treeOpts.mapChildrenField) {
-                        errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
-                    }
-                    if (childrenField === treeOpts.mapChildrenField) {
-                        errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
-                    }
-                    // fullData.forEach(row => {
-                    //   if (row[childrenField] && row[childrenField].length) {
-                    //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
-                    //   }
-                    // })
+                if (!treeOpts.rowField) {
+                    errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
+                }
+                if (!treeOpts.parentField) {
+                    errLog('vxe.error.reqProp', ['table.tree-config.parentField']);
                 }
+                if (!childrenField) {
+                    errLog('vxe.error.reqProp', ['tree-config.childrenField']);
+                }
+                if (!treeOpts.mapChildrenField) {
+                    errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
+                }
+                if (childrenField === treeOpts.mapChildrenField) {
+                    errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+                }
+                // fullData.forEach(row => {
+                //   if (row[childrenField] && row[childrenField].length) {
+                //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
+                //   }
+                // })
                 treeData = XEUtils.toArrayTree(fullData, {
                     key: treeOpts.rowField,
                     parentKey: treeOpts.parentField,
@@ -2381,16 +2395,14 @@ const Methods = {
                 //     }
                 //   }
                 // }
-                if (process.env.NODE_ENV === 'development') {
-                    if (!(this.height || this.maxHeight)) {
-                        errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-                    }
-                    // if (!this.showOverflow) {
-                    //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-                    // }
-                    if (this.spanMethod) {
-                        warnLog('vxe.error.scrollErrProp', ['table.span-method']);
-                    }
+                if (!(this.height || this.maxHeight)) {
+                    errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+                }
+                // if (!this.showOverflow) {
+                //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+                // }
+                if (this.spanMethod) {
+                    errLog('vxe.error.scrollErrProp', ['table.span-method']);
                 }
             }
             handleReserveStatus($xeTable);
@@ -2535,16 +2547,18 @@ const Methods = {
     cacheRowMap() {
         const $xeTable = this;
         const props = $xeTable;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const treeOpts = $xeTable.computeTreeOpts;
+        const { treeExpandedMaps } = reactData;
         const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const rowkey = getRowkey($xeTable);
-        const isLazy = treeConfig && treeOpts.lazy;
-        const fullAllDataRowIdMaps = {};
+        const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
+        const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
         const handleRow = (row, index, items, path, parentRow, nodes) => {
             let rowid = getRowid($xeTable, row);
             const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
@@ -2553,13 +2567,23 @@ const Methods = {
                 rowid = getRowUniqueId();
                 XEUtils.set(row, rowkey, rowid);
             }
-            if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-                row[childrenField] = null;
+            if (treeConfig && treeOpts.lazy) {
+                const treeExpRest = treeExpandedMaps[rowid];
+                if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
+                    row[childrenField] = null;
+                }
+                if (treeExpRest) {
+                    if (!row[childrenField] || !row[childrenField].length) {
+                        delete treeTempExpandedMaps[rowid];
+                    }
+                }
             }
             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.treeLoaded = false;
+            rowRest.expandLoaded = false;
             rowRest.row = row;
             rowRest.items = items;
             rowRest.parent = parentRow;
@@ -2568,14 +2592,15 @@ const Methods = {
             fullDataRowIdMaps[rowid] = rowRest;
             fullAllDataRowIdMaps[rowid] = rowRest;
         };
-        internalData.fullDataRowIdData = fullDataRowIdMaps;
-        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
         if (treeConfig) {
             XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
         }
         else {
             tableFullData.forEach(handleRow);
         }
+        internalData.fullDataRowIdData = fullDataRowIdMaps;
+        internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
+        reactData.treeExpandedMaps = treeTempExpandedMaps;
     },
     cacheSourceMap(fullData) {
         let { treeConfig, treeOpts, sourceDataRowIdData } = this;
@@ -2912,12 +2937,19 @@ const Methods = {
      * 如果还额外传了 field 则还原指定的单元格数据
      */
     revertData(rows, field) {
-        const { keepSource, tableSourceData, treeConfig } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { keepSource, treeConfig } = props;
+        const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const { transform } = treeOpts;
         if (!keepSource) {
             if (process.env.NODE_ENV === 'development') {
-                warnLog('vxe.error.reqProp', ['keep-source']);
+                errLog('vxe.error.reqProp', ['keep-source']);
             }
-            return this.$nextTick();
+            return $xeTable.$nextTick();
         }
         let targetRows = rows;
         if (rows) {
@@ -2926,31 +2958,53 @@ const Methods = {
             }
         }
         else {
-            targetRows = XEUtils.toArray(this.getUpdateRecords());
+            targetRows = XEUtils.toArray($xeTable.getUpdateRecords());
         }
+        let reDelFlag = false;
         if (targetRows.length) {
-            targetRows.forEach((row) => {
-                if (!this.isInsertByRow(row)) {
-                    const rowIndex = this.getRowIndex(row);
-                    if (treeConfig && rowIndex === -1) {
-                        errLog('vxe.error.noTree', ['revertData']);
-                    }
-                    const oRow = tableSourceData[rowIndex];
-                    if (oRow && row) {
-                        if (field) {
-                            XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
-                        }
-                        else {
-                            XEUtils.destructuring(row, XEUtils.clone(oRow, true));
+            targetRows.forEach((item) => {
+                const rowid = getRowid($xeTable, item);
+                const rowRest = fullAllDataRowIdData[rowid];
+                if (rowRest) {
+                    const row = rowRest.row;
+                    if (!$xeTable.isInsertByRow(row)) {
+                        const oRow = sourceDataRowIdData[rowid];
+                        if (oRow && row) {
+                            if (field) {
+                                XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
+                            }
+                            else {
+                                XEUtils.destructuring(row, XEUtils.clone(oRow, true));
+                            }
+                            if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                                tableFullData.unshift(row);
+                                afterFullData.unshift(row);
+                                reDelFlag = true;
+                            }
                         }
                     }
                 }
             });
         }
         if (rows) {
-            return this.$nextTick();
+            if (reDelFlag) {
+                $xeTable.updateFooter();
+                $xeTable.cacheRowMap(false);
+                $xeTable.handleTableData(treeConfig && transform);
+                if (!(treeConfig && transform)) {
+                    $xeTable.updateAfterDataIndex();
+                }
+                $xeTable.checkSelectionStatus();
+                if (reactData.scrollYLoad) {
+                    $xeTable.updateScrollYSpace();
+                }
+            }
+            return $xeTable.$nextTick().then(() => {
+                $xeTable.updateCellAreas();
+                return $xeTable.recalculate();
+            });
         }
-        return this.reloadData(tableSourceData);
+        return $xeTable.reloadData(tableSourceData);
     },
     /**
      * 清空单元格内容
@@ -3069,10 +3123,19 @@ const Methods = {
      * @param {Row} row 行对象
      */
     isInsertByRow(row) {
-        const { editStore } = this;
-        const rowid = getRowid(this, row);
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { editStore } = reactData;
+        const rowid = getRowid($xeTable, row);
         return !!editStore.insertMaps[rowid];
     },
+    isRemoveByRow(row) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { editStore } = reactData;
+        const rowid = getRowid($xeTable, row);
+        return !!editStore.removeMaps[rowid];
+    },
     /**
      * 删除所有新增的临时数据
      * @returns
@@ -8829,23 +8892,21 @@ const Methods = {
 const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
     Methods[name] = function (...args) {
-        if (process.env.NODE_ENV === 'development') {
-            if (!this[`_${name}`]) {
-                if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableExportModule']);
-                }
-                else if ('fullValidate,validate'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
-                }
-                else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
-                }
-                else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableEditModule']);
-                }
-                else if ('openCustom'.split(',').includes(name)) {
-                    errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
-                }
+        if (!this[`_${name}`]) {
+            if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableExportModule']);
+            }
+            else if ('fullValidate,validate'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
+            }
+            else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
+            }
+            else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableEditModule']);
+            }
+            else if ('openCustom'.split(',').includes(name)) {
+                errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
             }
         }
         return this[`_${name}`] ? this[`_${name}`](...args) : null;

package/es/table/src/table.js

@@ -1492,26 +1492,24 @@ export default {
                 warnLog('vxe.error.reqProp', ['tooltip-config']);
             }
         }
-        if (process.env.NODE_ENV === 'development') {
-            // 使用已安装的组件，如果未安装则不渲染
-            const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');
-            const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
-            $xeTable.$nextTick(() => {
-                if (props.loading) {
-                    if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
-                        errLog('vxe.error.reqComp', ['vxe-loading']);
-                    }
+        // 使用已安装的组件，如果未安装则不渲染
+        const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');
+        const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
+        $xeTable.$nextTick(() => {
+            if (props.loading) {
+                if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
+                    errLog('vxe.error.reqComp', ['vxe-loading']);
                 }
-                if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
-                    (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
-                    (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
-                    props.tooltipConfig || props.editRules) {
-                    if (!VxeUITooltipComponent) {
-                        errLog('vxe.error.reqComp', ['vxe-tooltip']);
-                    }
+            }
+            if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
+                (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
+                (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
+                props.tooltipConfig || props.editRules) {
+                if (!VxeUITooltipComponent) {
+                    errLog('vxe.error.reqComp', ['vxe-tooltip']);
                 }
-            });
-        }
+            }
+        });
         if (this.autoResize) {
             const resizeObserver = globalResize.create(() => {
                 if (this.autoResize) {

package/es/table/src/util.js

@@ -133,13 +133,11 @@ export function assembleColumn(_vm) {
     const { $el, $xetable, $xecolumn, columnConfig } = _vm;
     const groupConfig = $xecolumn ? $xecolumn.columnConfig : null;
     if (groupConfig) {
-        if (process.env.NODE_ENV === 'development') {
-            if ($xecolumn.$options._componentTag === 'vxe-table-column') {
-                errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`]);
-            }
-            else if ($xecolumn.$options._componentTag === 'vxe-column') {
-                warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
-            }
+        if ($xecolumn.$options._componentTag === 'vxe-table-column') {
+            errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`]);
+        }
+        else if ($xecolumn.$options._componentTag === 'vxe-column') {
+            warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
         }
         if (!groupConfig.children) {
             groupConfig.children = [];

package/es/toolbar/src/toolbar.js

@@ -230,9 +230,7 @@ export default {
                             tCommandMethod(params);
                         }
                         else {
-                            if (process.env.NODE_ENV === 'development') {
-                                errLog('vxe.error.notCommands', [code]);
-                            }
+                            errLog('vxe.error.notCommands', [code]);
                         }
                     }
                     $xeToolbar.dispatchEvent('button-click', params, evnt);
@@ -259,9 +257,7 @@ export default {
                             tCommandMethod(params);
                         }
                         else {
-                            if (process.env.NODE_ENV === 'development') {
-                                errLog('vxe.error.notCommands', [code]);
-                            }
+                            errLog('vxe.error.notCommands', [code]);
                         }
                     }
                     $xeToolbar.dispatchEvent('tool-click', params, evnt);
@@ -676,28 +672,24 @@ export default {
                 $xetable.connect(this);
             }
             const customOpts = $xeToolbar.computeCustomOpts;
-            if (process.env.NODE_ENV === 'development') {
-                if (customOpts.isFooter) {
-                    warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
-                }
-                if (customOpts.showFooter) {
-                    warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
-                }
-                if (customOpts.immediate) {
-                    warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
-                }
-                if (customOpts.trigger) {
-                    warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
-                }
+            if (customOpts.isFooter) {
+                warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
+            }
+            if (customOpts.showFooter) {
+                warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
+            }
+            if (customOpts.immediate) {
+                warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
+            }
+            if (customOpts.trigger) {
+                warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
             }
         });
-        if (process.env.NODE_ENV === 'development') {
-            // 使用已安装的组件，如果未安装则不渲染
-            const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
-            if (props.refresh || props.import || props.export || props.print || props.zoom) {
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
+        // 使用已安装的组件，如果未安装则不渲染
+        const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
+        if (props.refresh || props.import || props.export || props.print || props.zoom) {
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
             }
         }
     },

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.13.17";
+export const version = "3.13.19";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.13.17"}`;
+const version = `table v${"3.13.19"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);