vxe-table 4.1.0 → 4.1.1-1.beta.0

package/README.en.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-A [vue](https://www.npmjs.com/package/vue) based PC form component, support add, delete, change, virtual scroll, lazy load, shortcut menu, data validation, tree structure, print export, form rendering, data paging, virtual list, modal window, custom template, renderer, flexible configuration items, extension interface, etc...
+A [vue](https://www.npmjs.com/package/vue) based PC form component, support add, delete, change, virtual list, virtual tree, lazy load, shortcut menu, data validation, print export, form rendering, data paging, modal window, custom template, renderer, flexible configuration items, extension interface, etc...
 
 * Design concept
   * Efficient and concise API design for modern browsers.
@@ -66,9 +66,9 @@ Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 8+ ✔ |
 * [x] Form
 * [x] Toolbar
 * [x] Pulldown
-* [x] List
+* [x] Virtual list
+* [x] Virtual tree
 * [x] Editable CRUD
-* [x] Tree table
 * [x] Validate
 * [x] Data Proxy
 * [x] Keyboard navigation

package/README.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-一个基于 [vue](https://www.npmjs.com/package/vue) 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...  
+一个基于 [vue](https://www.npmjs.com/package/vue) 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...  
 
 * 设计理念
   * 面向现代浏览器，高效的简洁 API 设计
@@ -24,6 +24,7 @@
   * [x] v2.0 基于 vue2.6+，支持所有主流的浏览器，同时兼具功能与性能
   * [x] v3.0 基于 vue2.6+，支持现代浏览器并保留兼容 IE11，提升渲染性能
   * [x] v4.0 基于 vue3.0+，只支持现代浏览器，不支持 IE
+  * [ ] 下一阶段：sticky 表格、css 变量、虚拟滚动与动态行高、数据可视化
 
 ## QQ 交流群
 
@@ -71,8 +72,8 @@ Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 8+ ✔ |
 * [x] 工具栏
 * [x] 下拉容器
 * [x] 虚拟列表
+* [x] 虚拟树
 * [x] 增删改查
-* [x] 树表格
 * [x] 数据校验
 * [x] 数据代理
 * [x] 键盘导航

package/README.zh-TW.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-一個基於 [vue](https://www.npmjs.com/package/vue) 的PC端表格組件，支持增删改查、虛擬滾動、懶加載、快捷選單、數據校驗、樹形結構、列印匯出、表單渲染、數據分頁、虛擬清單、彈窗、自定義範本、渲染器、賊靈活的配寘項、擴展接口等…
+一個基於 [vue](https://www.npmjs.com/package/vue) 的PC端表格組件，支持增删改查、虛擬清單、虛擬樹、懶加載、快捷選單、數據校驗、列印匯出、表單渲染、數據分頁、彈窗、自定義範本、渲染器、賊靈活的配寘項、擴展接口等…
 
 * 設計理念
   * 面向現代瀏覽器，高效的簡潔 API 設計
@@ -24,6 +24,7 @@
   * [x] v2.0 基於 vue2.6+，支持所有主流的瀏覽器，同時兼具功能與效能
   * [x] v3.0 基於 vue2.6+，支持現代瀏覽器並保留相容IE11，提升渲染效能
   * [x] v4.0 基于 vue3.0+，只支持現代瀏覽器，不支持IE
+  * [ ] 下一阶段：sticky 表格、css 变量、虚拟滚动与动态行高、数据可视化
 
 ## QQ 交流群
 
@@ -72,7 +73,6 @@ Latest ✔ | Latest ✔ | Latest ✔ | Latest ✔ | 8+ ✔ |
 * [x] 下拉容器
 * [x] 虛擬清單
 * [x] 增删改查
-* [x] 樹表格
 * [x] 數據校驗
 * [x] 數據代理
 * [x] 鍵盤導航

package/es/button/src/button.js

@@ -127,39 +127,39 @@ export default defineComponent({
                     var panelStyle = {
                         zIndex: panelIndex
                     };
-                    var _a = getAbsolutePos(targetElem), boundingTop = _a.boundingTop, boundingLeft = _a.boundingLeft, visibleHeight = _a.visibleHeight, visibleWidth = _a.visibleWidth;
+                    var _a = getAbsolutePos(targetElem), top_1 = _a.top, left = _a.left, boundingTop = _a.boundingTop, visibleHeight = _a.visibleHeight, visibleWidth = _a.visibleWidth;
                     var panelPlacement = 'bottom';
                     if (transfer) {
-                        var left = boundingLeft + targetWidth - panelWidth;
-                        var top_1 = boundingTop + targetHeight;
+                        var btnLeft = left + targetWidth - panelWidth;
+                        var btnTop = top_1 + targetHeight;
                         if (placement === 'top') {
                             panelPlacement = 'top';
-                            top_1 = boundingTop - panelHeight;
+                            btnTop = top_1 - panelHeight;
                         }
                         else if (!placement) {
                             // 如果下面不够放，则向上
-                            if (top_1 + panelHeight + marginSize > visibleHeight) {
+                            if (boundingTop + targetHeight + panelHeight + marginSize > visibleHeight) {
                                 panelPlacement = 'top';
-                                top_1 = boundingTop - panelHeight;
+                                btnTop = top_1 - panelHeight;
                             }
                             // 如果上面不够放，则向下（优先）
-                            if (top_1 < marginSize) {
+                            if (btnTop < marginSize) {
                                 panelPlacement = 'bottom';
-                                top_1 = boundingTop + targetHeight;
+                                btnTop = top_1 + targetHeight;
                             }
                         }
                         // 如果溢出右边
-                        if (left + panelWidth + marginSize > visibleWidth) {
-                            left -= left + panelWidth + marginSize - visibleWidth;
+                        if (btnLeft + panelWidth + marginSize > visibleWidth) {
+                            btnLeft -= btnLeft + panelWidth + marginSize - visibleWidth;
                         }
                         // 如果溢出左边
-                        if (left < marginSize) {
-                            left = marginSize;
+                        if (btnLeft < marginSize) {
+                            btnLeft = marginSize;
                         }
                         Object.assign(panelStyle, {
-                            left: left + "px",
+                            left: btnLeft + "px",
                             right: 'auto',
-                            top: top_1 + "px",
+                            top: btnTop + "px",
                             minWidth: targetWidth + "px"
                         });
                     }

package/es/edit/src/hook.js

@@ -17,15 +17,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from) {
 import { nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import { renderer } from '../../v-x-e-table';
-import { errLog, getLog, isEnableConf } from '../../tools/utils';
-import { getCellValue, setCellValue } from '../../table/src/util';
+import { errLog, getLog, isEnableConf, warnLog } from '../../tools/utils';
+import { getCellValue, setCellValue, getRowid } from '../../table/src/util';
 import { browse, removeClass, addClass } from '../../tools/dom';
 var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getActiveRecord', 'getSelectedCell', 'clearActived', 'clearSelected', 'isActiveByRow', 'setActiveRow', 'setActiveCell', 'setSelectCell'];
 var editHook = {
     setupTable: function ($xetable) {
         var props = $xetable.props, reactData = $xetable.reactData, internalData = $xetable.internalData;
         var refElem = $xetable.getRefMaps().refElem;
-        var _a = $xetable.getComputeMaps(), computeMouseOpts = _a.computeMouseOpts, computeEditOpts = _a.computeEditOpts, computeCheckboxOpts = _a.computeCheckboxOpts, computeSYOpts = _a.computeSYOpts, computeTreeOpts = _a.computeTreeOpts;
+        var _a = $xetable.getComputeMaps(), computeMouseOpts = _a.computeMouseOpts, computeEditOpts = _a.computeEditOpts, computeCheckboxOpts = _a.computeCheckboxOpts, computeTreeOpts = _a.computeTreeOpts;
         var editMethods = {};
         var editPrivateMethods = {};
         var getEditColumnModel = function (row, column) {
@@ -66,6 +66,41 @@ var editHook = {
                 }
             }
         }
+        function insertTreeRow(newRecords, isAppend) {
+            var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+            var treeOpts = computeTreeOpts.value;
+            var funcName = isAppend ? 'push' : 'unshift';
+            newRecords.forEach(function (item) {
+                var parentRowId = item[treeOpts.parentField];
+                var rowid = getRowid($xetable, item);
+                var matchObj = parentRowId ? XEUtils.findTree(tableFullTreeData, function (item) { return parentRowId === item[treeOpts.rowField]; }, treeOpts) : null;
+                if (matchObj) {
+                    var parentRow = matchObj.item;
+                    var parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow)];
+                    var parentLevel = parentRest ? parentRest.level : 0;
+                    var parentChilds = parentRow[treeOpts.children];
+                    if (!XEUtils.isArray(parentChilds)) {
+                        parentChilds = parentRow[treeOpts.children] = [];
+                    }
+                    parentChilds[funcName](item);
+                    var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds, parent: parent, level: parentLevel + 1 };
+                    fullDataRowIdData[rowid] = rest;
+                    fullAllDataRowIdData[rowid] = rest;
+                }
+                else {
+                    if (process.env.NODE_ENV === 'development') {
+                        if (parentRowId) {
+                            warnLog('vxe.error.unableInsert');
+                        }
+                    }
+                    afterFullData[funcName](item);
+                    tableFullTreeData[funcName](item);
+                    var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: tableFullTreeData, parent: null, level: 0 };
+                    fullDataRowIdData[rowid] = rest;
+                    fullAllDataRowIdData[rowid] = rest;
+                }
+            });
+        }
         editMethods = {
             /**
              * 往表格中插入临时数据
@@ -77,75 +112,121 @@ var editHook = {
             },
             /**
              * 往表格指定行中插入临时数据
-             * 如果 row 为空则从插入到顶部
-             * 如果 row 为 -1 则从插入到底部
-             * 如果 row 为有效行则插入到该行的位置
+             * 如果 row 为空则从插入到顶部，如果为树结构，则插入到目标节点顶部
+             * 如果 row 为 -1 则从插入到底部，如果为树结构，则插入到目标节点底部
+             * 如果 row 为有效行则插入到该行的位置，如果为树结构，则有插入到效的目标节点该行的位置
              * @param {Object/Array} records 新的数据
              * @param {Row} row 指定行
              */
             insertAt: function (records, row) {
                 var _a;
                 var treeConfig = props.treeConfig;
-                var mergeList = reactData.mergeList, editStore = reactData.editStore, scrollYLoad = reactData.scrollYLoad;
-                var afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
-                var sYOpts = computeSYOpts.value;
+                var mergeList = reactData.mergeList, editStore = reactData.editStore;
+                var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData, fullDataRowIdData = internalData.fullDataRowIdData, fullAllDataRowIdData = internalData.fullAllDataRowIdData;
+                var treeOpts = computeTreeOpts.value;
+                var transform = treeOpts.transform;
                 if (!XEUtils.isArray(records)) {
                     records = [records];
                 }
                 var newRecords = records.map(function (record) { return $xetable.defineField(Object.assign({}, record)); });
                 if (!row) {
-                    afterFullData.unshift.apply(afterFullData, newRecords);
-                    tableFullData.unshift.apply(tableFullData, newRecords);
-                    // 刷新单元格合并
-                    mergeList.forEach(function (mergeItem) {
-                        var mergeRowIndex = mergeItem.row;
-                        if (mergeRowIndex > 0) {
-                            mergeItem.row = mergeRowIndex + newRecords.length;
-                        }
-                    });
-                }
-                else {
-                    if (row === -1) {
-                        afterFullData.push.apply(afterFullData, newRecords);
-                        tableFullData.push.apply(tableFullData, newRecords);
+                    // 如果为虚拟树
+                    if (treeConfig && transform) {
+                        insertTreeRow(newRecords, false);
+                    }
+                    else {
+                        afterFullData.unshift.apply(afterFullData, newRecords);
+                        tableFullData.unshift.apply(tableFullData, newRecords);
                         // 刷新单元格合并
                         mergeList.forEach(function (mergeItem) {
-                            var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
-                            if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-                                mergeItem.rowspan = mergeRowspan + newRecords.length;
+                            var mergeRowIndex = mergeItem.row;
+                            if (mergeRowIndex > 0) {
+                                mergeItem.row = mergeRowIndex + newRecords.length;
                             }
                         });
                     }
-                    else {
-                        if (treeConfig) {
-                            throw new Error(getLog('vxe.error.noTree', ['insert']));
+                }
+                else {
+                    if (row === -1) {
+                        // 如果为虚拟树
+                        if (treeConfig && transform) {
+                            insertTreeRow(newRecords, true);
                         }
-                        var afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
-                        if (afIndex_1 === -1) {
-                            throw new Error(errLog('vxe.error.unableInsert'));
+                        else {
+                            afterFullData.push.apply(afterFullData, newRecords);
+                            tableFullData.push.apply(tableFullData, newRecords);
+                            // 刷新单元格合并
+                            mergeList.forEach(function (mergeItem) {
+                                var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
+                                if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+                                    mergeItem.rowspan = mergeRowspan + newRecords.length;
+                                }
+                            });
                         }
-                        afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords));
-                        tableFullData.splice.apply(tableFullData, __spreadArray([$xetable.findRowIndexOf(tableFullData, row), 0], newRecords));
-                        // 刷新单元格合并
-                        mergeList.forEach(function (mergeItem) {
-                            var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
-                            if (mergeRowIndex > afIndex_1) {
-                                mergeItem.row = mergeRowIndex + newRecords.length;
+                    }
+                    else {
+                        // 如果为虚拟树
+                        if (treeConfig && transform) {
+                            var matchObj_1 = XEUtils.findTree(tableFullTreeData, function (item) { return row[treeOpts.rowField] === item[treeOpts.rowField]; }, treeOpts);
+                            if (matchObj_1) {
+                                var parentRow_1 = matchObj_1.parent;
+                                var parentChilds_1 = matchObj_1.items;
+                                var parentRest = fullAllDataRowIdData[getRowid($xetable, parentRow_1)];
+                                var parentLevel_1 = parentRest ? parentRest.level : 0;
+                                newRecords.forEach(function (item, i) {
+                                    var rowid = getRowid($xetable, item);
+                                    if (process.env.NODE_ENV === 'development') {
+                                        if (item[treeOpts.parentField]) {
+                                            if (parentRow_1 && item[treeOpts.parentField] !== parentRow_1[treeOpts.rowField]) {
+                                                errLog('vxe.error.errProp', [treeOpts.parentField + "=" + item[treeOpts.parentField], treeOpts.parentField + "=" + parentRow_1[treeOpts.rowField]]);
+                                            }
+                                        }
+                                    }
+                                    if (parentRow_1) {
+                                        item[treeOpts.parentField] = parentRow_1[treeOpts.rowField];
+                                    }
+                                    parentChilds_1.splice(matchObj_1.index + i, 0, item);
+                                    var rest = { row: item, rowid: rowid, seq: -1, index: -1, _index: -1, $index: -1, items: parentChilds_1, parent: parentRow_1, level: parentLevel_1 + 1 };
+                                    fullDataRowIdData[rowid] = rest;
+                                    fullAllDataRowIdData[rowid] = rest;
+                                });
                             }
-                            else if (mergeRowIndex + mergeRowspan > afIndex_1) {
-                                mergeItem.rowspan = mergeRowspan + newRecords.length;
+                            else {
+                                if (process.env.NODE_ENV === 'development') {
+                                    warnLog('vxe.error.unableInsert');
+                                }
+                                insertTreeRow(newRecords, true);
                             }
-                        });
+                        }
+                        else {
+                            if (treeConfig) {
+                                throw new Error(getLog('vxe.error.noTree', ['insert']));
+                            }
+                            var afIndex_1 = $xetable.findRowIndexOf(afterFullData, row);
+                            if (afIndex_1 === -1) {
+                                throw new Error(errLog('vxe.error.unableInsert'));
+                            }
+                            afterFullData.splice.apply(afterFullData, __spreadArray([afIndex_1, 0], newRecords));
+                            tableFullData.splice.apply(tableFullData, __spreadArray([$xetable.findRowIndexOf(tableFullData, row), 0], newRecords));
+                            // 刷新单元格合并
+                            mergeList.forEach(function (mergeItem) {
+                                var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
+                                if (mergeRowIndex > afIndex_1) {
+                                    mergeItem.row = mergeRowIndex + newRecords.length;
+                                }
+                                else if (mergeRowIndex + mergeRowspan > afIndex_1) {
+                                    mergeItem.rowspan = mergeRowspan + newRecords.length;
+                                }
+                            });
+                        }
                     }
                 }
                 (_a = editStore.insertList).unshift.apply(_a, newRecords);
-                reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
-                $xetable.updateCache();
-                $xetable.handleTableData();
-                $xetable.updateAfterDataIndex();
+                $xetable.cacheRowMap();
+                $xetable.handleTableData(treeConfig && treeOpts.transform);
                 $xetable.checkSelectionStatus();
-                if (scrollYLoad) {
+                if (reactData.scrollYLoad) {
                     $xetable.updateScrollYSpace();
                 }
                 return nextTick().then(function () {
@@ -166,10 +247,11 @@ var editHook = {
              */
             remove: function (rows) {
                 var treeConfig = props.treeConfig;
-                var mergeList = reactData.mergeList, editStore = reactData.editStore, selection = reactData.selection, scrollYLoad = reactData.scrollYLoad;
-                var afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
+                var mergeList = reactData.mergeList, editStore = reactData.editStore, selection = reactData.selection;
+                var tableFullTreeData = internalData.tableFullTreeData, afterFullData = internalData.afterFullData, tableFullData = internalData.tableFullData;
                 var checkboxOpts = computeCheckboxOpts.value;
-                var sYOpts = computeSYOpts.value;
+                var treeOpts = computeTreeOpts.value;
+                var transform = treeOpts.transform;
                 var actived = editStore.actived, removeList = editStore.removeList, insertList = editStore.insertList;
                 var property = checkboxOpts.checkField;
                 var rest = [];
@@ -202,27 +284,44 @@ var editHook = {
                     $xetable.clearMergeCells();
                 }
                 else {
-                    rows.forEach(function (row) {
-                        var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
-                        if (tfIndex > -1) {
-                            var rItems = tableFullData.splice(tfIndex, 1);
-                            rest.push(rItems[0]);
-                        }
-                        var afIndex = $xetable.findRowIndexOf(afterFullData, row);
-                        if (afIndex > -1) {
-                            // 刷新单元格合并
-                            mergeList.forEach(function (mergeItem) {
-                                var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
-                                if (mergeRowIndex > afIndex) {
-                                    mergeItem.row = mergeRowIndex - 1;
-                                }
-                                else if (mergeRowIndex + mergeRowspan > afIndex) {
-                                    mergeItem.rowspan = mergeRowspan - 1;
-                                }
-                            });
-                            afterFullData.splice(afIndex, 1);
-                        }
-                    });
+                    // 如果为虚拟树
+                    if (treeConfig && transform) {
+                        rows.forEach(function (row) {
+                            var rowid = getRowid($xetable, row);
+                            var matchObj = XEUtils.findTree(tableFullTreeData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            if (matchObj) {
+                                var rItems = matchObj.items.splice(matchObj.index, 1);
+                                rest.push(rItems[0]);
+                            }
+                            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+                            if (afIndex > -1) {
+                                afterFullData.splice(afIndex, 1);
+                            }
+                        });
+                    }
+                    else {
+                        rows.forEach(function (row) {
+                            var tfIndex = $xetable.findRowIndexOf(tableFullData, row);
+                            if (tfIndex > -1) {
+                                var rItems = tableFullData.splice(tfIndex, 1);
+                                rest.push(rItems[0]);
+                            }
+                            var afIndex = $xetable.findRowIndexOf(afterFullData, row);
+                            if (afIndex > -1) {
+                                // 刷新单元格合并
+                                mergeList.forEach(function (mergeItem) {
+                                    var mergeRowIndex = mergeItem.row, mergeRowspan = mergeItem.rowspan;
+                                    if (mergeRowIndex > afIndex) {
+                                        mergeItem.row = mergeRowIndex - 1;
+                                    }
+                                    else if (mergeRowIndex + mergeRowspan > afIndex) {
+                                        mergeItem.rowspan = mergeRowspan - 1;
+                                    }
+                                });
+                                afterFullData.splice(afIndex, 1);
+                            }
+                        });
+                    }
                 }
                 // 如果当前行被激活编辑，则清除激活状态
                 if (actived.row && $xetable.findRowIndexOf(rows, actived.row) > -1) {
@@ -235,13 +334,11 @@ var editHook = {
                         insertList.splice(iIndex, 1);
                     }
                 });
-                reactData.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
                 $xetable.updateFooter();
-                $xetable.updateCache();
-                $xetable.handleTableData();
-                $xetable.updateAfterDataIndex();
+                $xetable.cacheRowMap();
+                $xetable.handleTableData(treeConfig && treeOpts.transform);
                 $xetable.checkSelectionStatus();
-                if (scrollYLoad) {
+                if (reactData.scrollYLoad) {
                     $xetable.updateScrollYSpace();
                 }
                 return nextTick().then(function () {
@@ -294,16 +391,30 @@ var editHook = {
              * 获取新增的临时数据
              */
             getInsertRecords: function () {
+                var treeConfig = props.treeConfig;
                 var editStore = reactData.editStore;
-                var tableFullData = internalData.tableFullData;
+                var tableFullTreeData = internalData.tableFullTreeData, tableFullData = internalData.tableFullData;
+                var treeOpts = computeTreeOpts.value;
                 var insertList = editStore.insertList;
                 var insertRecords = [];
                 if (insertList.length) {
-                    tableFullData.forEach(function (row) {
-                        if ($xetable.findRowIndexOf(insertList, row) > -1) {
-                            insertRecords.push(row);
-                        }
-                    });
+                    // 如果为虚拟树
+                    if (treeConfig && treeOpts.transform) {
+                        insertList.forEach(function (row) {
+                            var rowid = getRowid($xetable, row);
+                            var matchObj = XEUtils.findTree(tableFullTreeData, function (item) { return rowid === getRowid($xetable, item); }, treeOpts);
+                            if (matchObj) {
+                                insertRecords.push(row);
+                            }
+                        });
+                    }
+                    else {
+                        insertList.forEach(function (row) {
+                            if ($xetable.findRowIndexOf(tableFullData, row) > -1) {
+                                insertRecords.push(row);
+                            }
+                        });
+                    }
                 }
                 return insertRecords;
             },

package/es/export/src/hook.js

@@ -2,7 +2,7 @@ import { inject, nextTick } from 'vue';
 import XEUtils from 'xe-utils';
 import GlobalConfig from '../../v-x-e-table/src/conf';
 import { VXETable } from '../../v-x-e-table';
-import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../table/src/util';
+import { isColumnInfo, mergeBodyMethod, getCellValue, toTreePathSeq } from '../../table/src/util';
 import { errLog, warnLog, parseFile, formatText } from '../../tools/utils';
 import { readLocalFile, handlePrint, saveLocalFile, createHtmlPage, getExportBlobByContent } from './util';
 var htmlCellElem;
@@ -86,6 +86,9 @@ function getFooterData(opts, footerTableData) {
 }
 function getCsvCellTypeLabel(column, cellValue) {
     if (cellValue) {
+        if (column.type === 'seq') {
+            return "\t" + cellValue;
+        }
         switch (column.cellType) {
             case 'string':
                 if (!isNaN(cellValue)) {
@@ -262,10 +265,16 @@ var tableExportHook = {
             var treeOpts = computeTreeOpts.value;
             return row[treeOpts.children] && row[treeOpts.children].length;
         };
-        var getSeq = function (row, rowIndex, column, columnIndex) {
+        var getSeq = function (row, rowIndex, column, columnIndex, path) {
             var seqOpts = computeSeqOpts.value;
             var seqMethod = seqOpts.seqMethod || column.seqMethod;
-            return seqMethod ? seqMethod({ row: row, rowIndex: rowIndex, column: column, columnIndex: columnIndex }) : (seqOpts.startIndex + rowIndex + 1);
+            if (seqMethod) {
+                return seqMethod({ row: row, rowIndex: rowIndex, column: column, columnIndex: columnIndex });
+            }
+            if (path) {
+                return toTreePathSeq(path);
+            }
+            return seqOpts.startIndex + rowIndex + 1;
         };
         var toBooleanValue = function (cellValue) {
             return XEUtils.isBoolean(cellValue) ? (cellValue ? 'TRUE' : 'FALSE') : cellValue;
@@ -282,10 +291,11 @@ var tableExportHook = {
             if (treeConfig) {
                 // 如果是树表格只允许导出数据源
                 var rest_1 = [];
+                var expandMaps_1 = new Map();
                 XEUtils.eachTree(datas, function (item, rowIndex, items, path, parent, nodes) {
                     var row = item._row || item;
                     var parentRow = parent && parent._row ? parent._row : parent;
-                    if ((isAllExpand || !parentRow || $xetable.isTreeExpandByRow(parentRow))) {
+                    if ((isAllExpand || !parentRow || (expandMaps_1.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)))) {
                         var hasRowChild = hasTreeChildren(row);
                         var item_3 = {
                             _row: row,
@@ -309,7 +319,7 @@ var tableExportHook = {
                             else {
                                 switch (column.type) {
                                     case 'seq':
-                                        cellValue = getSeq(row, rowIndex, column, columnIndex);
+                                        cellValue = getSeq(row, rowIndex, column, columnIndex, path);
                                         break;
                                     case 'checkbox':
                                         cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
@@ -342,6 +352,7 @@ var tableExportHook = {
                             }
                             item_3[column.id] = XEUtils.toValueString(cellValue);
                         });
+                        expandMaps_1.set(row, 1);
                         rest_1.push(Object.assign(item_3, row));
                     }
                 }, treeOpts);
@@ -367,7 +378,7 @@ var tableExportHook = {
                     else {
                         switch (column.type) {
                             case 'seq':
-                                cellValue = getSeq(row, rowIndex, column, columnIndex);
+                                cellValue = getSeq(row, rowIndex, column, columnIndex, []);
                                 break;
                             case 'checkbox':
                                 cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
@@ -688,6 +699,12 @@ var tableExportHook = {
             }
             saveLocalFile({ filename: filename, type: type, content: content }).then(function () {
                 if (opts.message !== false) {
+                    // 检测弹窗模块
+                    if (process.env.NODE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                        }
+                    }
                     VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.expSuccess'), status: 'success' });
                 }
             });
@@ -754,6 +771,12 @@ var tableExportHook = {
                         loadRest = $xetable.reloadData(data);
                     }
                     if (opts.message !== false) {
+                        // 检测弹窗模块
+                        if (process.env.NODE_ENV === 'development') {
+                            if (!VXETable.modal) {
+                                errLog('vxe.error.reqModule', ['Modal']);
+                            }
+                        }
                         VXETable.modal.message({ content: GlobalConfig.i18n('vxe.table.impSuccess', [rows.length]), status: 'success' });
                     }
                     return loadRest.then(function () {
@@ -764,6 +787,12 @@ var tableExportHook = {
                 });
             }
             else if (opts.message !== false) {
+                // 检测弹窗模块
+                if (process.env.NODE_ENV === 'development') {
+                    if (!VXETable.modal) {
+                        errLog('vxe.error.reqModule', ['Modal']);
+                    }
+                }
                 VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.impFields'), status: 'error' });
                 if (_importReject) {
                     _importReject({ status: false });
@@ -776,6 +805,12 @@ var tableExportHook = {
             // 检查类型，如果为自定义导出，则不需要校验类型
             if (!importMethod && !XEUtils.includes(VXETable.config.importTypes, type)) {
                 if (opts.message !== false) {
+                    // 检测弹窗模块
+                    if (process.env.NODE_ENV === 'development') {
+                        if (!VXETable.modal) {
+                            errLog('vxe.error.reqModule', ['Modal']);
+                        }
+                    }
                     VXETable.modal.message({ content: GlobalConfig.i18n('vxe.error.notType', [type]), status: 'error' });
                 }
                 var params = { status: false };