vxe-table 3.4.3-beta.0 → 3.4.6

package/README.en.md

@@ -79,7 +79,7 @@ A [vue](https://www.npmjs.com/package/vue) based PC form component, support add,
 Version：[vue](https://www.npmjs.com/package/vue) 2.6.x, Dependent: [xe-utils](https://www.npmjs.com/package/xe-utils)
 
 ```shell
-npm install xe-utils vxe-table
+npm install xe-utils vxe-table@3
 ```
 
 Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.net/npm/vxe-table/)

package/README.md

@@ -83,7 +83,7 @@
 版本：[vue](https://www.npmjs.com/package/vue) 2.6.x, 依赖库：[xe-utils](https://www.npmjs.com/package/xe-utils)
 
 ```shell
-npm install xe-utils vxe-table
+npm install xe-utils vxe-table@3
 ```
 
 Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.net/npm/vxe-table/)

package/README.zh-TW.md

@@ -83,7 +83,7 @@
 版本：[vue](https://www.npmjs.com/package/vue) 2.6.x, 依賴庫：[xe-utils](https://www.npmjs.com/package/xe-utils)
 
 ```shell
-npm install xe-utils vxe-table
+npm install xe-utils vxe-table@3
 ```
 
 Get on [unpkg](https://unpkg.com/vxe-table/) and [cdnjs](https://cdn.jsdelivr.net/npm/vxe-table/)

package/lib/edit/src/mixin.js

@@ -28,6 +28,71 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 var getRowid = _tools.UtilTools.getRowid;
+
+function insertTreeRow(_vm, newRecords, isAppend) {
+  var treeFullData = _vm.treeFullData,
+      afterFullData = _vm.afterFullData,
+      fullDataRowIdData = _vm.fullDataRowIdData,
+      fullAllDataRowIdData = _vm.fullAllDataRowIdData,
+      treeOpts = _vm.treeOpts;
+  var funcName = isAppend ? 'push' : 'unshift';
+  newRecords.forEach(function (item) {
+    var parentRowId = item[treeOpts.parentField];
+    var rowid = getRowid(_vm, item);
+    var matchObj = parentRowId ? _xeUtils.default.findTree(treeFullData, function (item) {
+      return parentRowId === item[treeOpts.rowField];
+    }, treeOpts) : null;
+
+    if (matchObj) {
+      var parentRow = matchObj.item;
+      var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
+      var parentLevel = parentRest ? parentRest.level : 0;
+      var parentChilds = parentRow[treeOpts.children];
+
+      if (!_xeUtils.default.isArray(parentChilds)) {
+        parentChilds = parentRow[treeOpts.children] = [];
+      }
+
+      parentChilds[funcName](item);
+      var rest = {
+        row: item,
+        rowid: rowid,
+        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) {
+          _tools.UtilTools.warn('vxe.error.unableInsert');
+        }
+      }
+
+      afterFullData[funcName](item);
+      treeFullData[funcName](item);
+      var _rest = {
+        row: item,
+        rowid: rowid,
+        index: -1,
+        _index: -1,
+        $index: -1,
+        items: treeFullData,
+        parent: null,
+        level: 0
+      };
+      fullDataRowIdData[rowid] = _rest;
+      fullAllDataRowIdData[rowid] = _rest;
+    }
+  });
+
+  _vm.updateVirtualTreeData();
+}
+
 var _default = {
   methods: {
     /**
@@ -62,6 +127,7 @@ var _default = {
           fullDataRowIdData = this.fullDataRowIdData,
           fullAllDataRowIdData = this.fullAllDataRowIdData,
           treeOpts = this.treeOpts;
+      var transform = treeOpts.transform;
 
       if (!_xeUtils.default.isArray(records)) {
         records = [records];
@@ -73,47 +139,8 @@ var _default = {
 
       if (!row) {
         // 如果为虚拟树
-        if (treeConfig && treeOpts.transform) {
-          newRecords.forEach(function (item) {
-            var parentRowId = item[treeOpts.parentField];
-            var rowid = getRowid(_this, item);
-
-            if (parentRowId) {
-              var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
-                return parentRowId === item[treeOpts.rowField];
-              }, treeOpts);
-
-              if (matchObj) {
-                var parentRow = matchObj.item;
-                var parentRest = fullAllDataRowIdData[getRowid(_this, parentRow)];
-                var parentLevel = parentRest ? parentRest.level : 0;
-                var parentChilds = parentRow[treeOpts.children];
-
-                if (!_xeUtils.default.isArray(parentChilds)) {
-                  parentChilds = parentRow[treeOpts.children] = [];
-                }
-
-                parentChilds.push(item);
-                var rest = {
-                  row: item,
-                  rowid: rowid,
-                  index: -1,
-                  _index: -1,
-                  $index: -1,
-                  items: parentChilds,
-                  parent: parent,
-                  level: parentLevel + 1
-                };
-                fullDataRowIdData[rowid] = rest;
-                fullAllDataRowIdData[rowid] = rest;
-              } else {// 父节点不存在
-              }
-            } else {
-              afterFullData.unshift(item);
-              treeFullData.unshift(item);
-            }
-          });
-          this.updateVirtualTreeData();
+        if (treeConfig && transform) {
+          insertTreeRow(this, newRecords, false);
         } else {
           afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
           tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords)); // 刷新单元格合并
@@ -128,48 +155,103 @@ var _default = {
         }
       } else {
         if (row === -1) {
-          afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
-          tableFullData.push.apply(tableFullData, _toConsumableArray(newRecords)); // 刷新单元格合并
+          // 如果为虚拟树
+          if (treeConfig && transform) {
+            insertTreeRow(this, newRecords, true);
+          } else {
+            afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
+            tableFullData.push.apply(tableFullData, _toConsumableArray(newRecords)); // 刷新单元格合并
 
-          mergeList.forEach(function (mergeItem) {
-            var mergeRowIndex = mergeItem.row,
-                mergeRowspan = mergeItem.rowspan;
+            mergeList.forEach(function (mergeItem) {
+              var mergeRowIndex = mergeItem.row,
+                  mergeRowspan = mergeItem.rowspan;
 
-            if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-              mergeItem.rowspan = mergeRowspan + newRecords.length;
-            }
-          });
-        } else {
-          if (treeConfig) {
-            throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['insert']));
+              if (mergeRowIndex + mergeRowspan > afterFullData.length) {
+                mergeItem.rowspan = mergeRowspan + newRecords.length;
+              }
+            });
           }
+        } else {
+          // 如果为虚拟树
+          if (treeConfig && transform) {
+            var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+              return row[treeOpts.rowField] === item[treeOpts.rowField];
+            }, treeOpts);
 
-          var afIndex = afterFullData.indexOf(row);
+            if (matchObj) {
+              var parentRow = matchObj.parent;
+              var parentChilds = matchObj.items;
+              var parentRest = fullAllDataRowIdData[getRowid(this, parentRow)];
+              var parentLevel = parentRest ? parentRest.level : 0;
+              newRecords.forEach(function (item, i) {
+                var rowid = getRowid(_this, item);
+
+                if (process.env.NODE_ENV === 'development') {
+                  if (item[treeOpts.parentField]) {
+                    if (parentRow && item[treeOpts.parentField] !== parentRow[treeOpts.rowField]) {
+                      _tools.UtilTools.error('vxe.error.errProp', ["".concat(treeOpts.parentField, "=").concat(item[treeOpts.parentField]), "".concat(treeOpts.parentField, "=").concat(parentRow[treeOpts.rowField])]);
+                    }
+                  }
+                }
 
-          if (afIndex === -1) {
-            throw new Error(_tools.UtilTools.error('vxe.error.unableInsert'));
-          }
+                if (parentRow) {
+                  item[treeOpts.parentField] = parentRow[treeOpts.rowField];
+                }
+
+                parentChilds.splice(matchObj.index + i, 0, item);
+                var rest = {
+                  row: item,
+                  rowid: rowid,
+                  index: -1,
+                  _index: -1,
+                  $index: -1,
+                  items: parentChilds,
+                  parent: parentRow,
+                  level: parentLevel + 1
+                };
+                fullDataRowIdData[rowid] = rest;
+                fullAllDataRowIdData[rowid] = rest;
+              });
+              this.updateVirtualTreeData();
+            } else {
+              if (process.env.NODE_ENV === 'development') {
+                _tools.UtilTools.warn('vxe.error.unableInsert');
+              }
 
-          afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
-          tableFullData.splice.apply(tableFullData, [tableFullData.indexOf(row), 0].concat(_toConsumableArray(newRecords))); // 刷新单元格合并
+              insertTreeRow(this, newRecords, true);
+            }
+          } else {
+            if (treeConfig) {
+              throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['insert']));
+            }
 
-          mergeList.forEach(function (mergeItem) {
-            var mergeRowIndex = mergeItem.row,
-                mergeRowspan = mergeItem.rowspan;
+            var afIndex = afterFullData.indexOf(row);
 
-            if (mergeRowIndex > afIndex) {
-              mergeItem.row = mergeRowIndex + newRecords.length;
-            } else if (mergeRowIndex + mergeRowspan > afIndex) {
-              mergeItem.rowspan = mergeRowspan + newRecords.length;
+            if (afIndex === -1) {
+              throw new Error(_tools.UtilTools.error('vxe.error.unableInsert'));
             }
-          });
+
+            afterFullData.splice.apply(afterFullData, [afIndex, 0].concat(_toConsumableArray(newRecords)));
+            tableFullData.splice.apply(tableFullData, [tableFullData.indexOf(row), 0].concat(_toConsumableArray(newRecords))); // 刷新单元格合并
+
+            mergeList.forEach(function (mergeItem) {
+              var mergeRowIndex = mergeItem.row,
+                  mergeRowspan = mergeItem.rowspan;
+
+              if (mergeRowIndex > afIndex) {
+                mergeItem.row = mergeRowIndex + newRecords.length;
+              } else if (mergeRowIndex + mergeRowspan > afIndex) {
+                mergeItem.rowspan = mergeRowspan + newRecords.length;
+              }
+            });
+          }
         }
       }
 
       (_editStore$insertList = editStore.insertList).unshift.apply(_editStore$insertList, _toConsumableArray(newRecords));
 
       this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
-      this.handleTableData();
+      this.handleTableData(transform);
       this.updateFooter();
       this.cacheRowMap();
       this.checkSelectionStatus();
@@ -211,6 +293,7 @@ var _default = {
           sYOpts = this.sYOpts,
           scrollYLoad = this.scrollYLoad,
           treeOpts = this.treeOpts;
+      var transform = treeOpts.transform;
       var actived = editStore.actived,
           removeList = editStore.removeList,
           insertList = editStore.insertList;
@@ -248,7 +331,7 @@ var _default = {
         this.clearMergeCells();
       } else {
         // 如果为虚拟树
-        if (treeConfig && treeOpts.transform) {
+        if (treeConfig && transform) {
           rows.forEach(function (row) {
             var rowid = getRowid(_this2, row);
 
@@ -312,7 +395,7 @@ var _default = {
         }
       });
       this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
-      this.handleTableData();
+      this.handleTableData(transform);
       this.updateFooter();
       this.cacheRowMap();
       this.checkSelectionStatus();

package/lib/edit/src/mixin.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_tools=require("../../tools"),_dom=require("../../tools/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(r="Object"===r&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,o=new Array(t);r<t;r++)o[r]=e[r];return o}var getRowid=_tools.UtilTools.getRowid,_default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var n=this,s=this.treeFullData,r=this.mergeList,a=this.afterFullData,o=this.editStore,l=this.sYOpts,i=this.scrollYLoad,u=this.tableFullData,c=this.treeConfig,d=this.fullDataRowIdData,h=this.fullAllDataRowIdData,f=this.treeOpts,m=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return n.defineField(Object.assign({},e))});if(t)if(-1===t)a.push.apply(a,_toConsumableArray(m)),u.push.apply(u,_toConsumableArray(m)),r.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+m.length)});else{if(c)throw new Error(_tools.UtilTools.getLog("vxe.error.noTree",["insert"]));var p=a.indexOf(t);if(-1===p)throw new Error(_tools.UtilTools.error("vxe.error.unableInsert"));a.splice.apply(a,[p,0].concat(_toConsumableArray(m))),u.splice.apply(u,[u.indexOf(t),0].concat(_toConsumableArray(m))),r.forEach(function(e){var t=e.row,r=e.rowspan;p<t?e.row=t+m.length:p<t+r&&(e.rowspan=r+m.length)})}else c&&f.transform?(m.forEach(function(e){var t,r,o,l=e[f.parentField],i=getRowid(n,e);l?(o=_xeUtils.default.findTree(s,function(e){return l===e[f.rowField]},f))&&(t=o.item,o=(r=h[getRowid(n,t)])?r.level:0,r=t[f.children],(r=!_xeUtils.default.isArray(r)?t[f.children]=[]:r).push(e),o={row:e,rowid:i,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1},d[i]=o,h[i]=o):(a.unshift(e),s.unshift(e))}),this.updateVirtualTreeData()):(a.unshift.apply(a,_toConsumableArray(m)),u.unshift.apply(u,_toConsumableArray(m)),r.forEach(function(e){var t=e.row;0<t&&(e.row=t+m.length)}));return(o=o.insertList).unshift.apply(o,_toConsumableArray(m)),this.scrollYLoad=!c&&-1<l.gt&&l.gt<u.length,this.handleTableData(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),i&&this.updateScrollYSpace(),this.$nextTick().then(function(){return n.updateCellAreas(),n.recalculate()}).then(function(){return{row:m.length?m[m.length-1]:null,rows:m}})},_remove:function(e){var o=this,l=this.afterFullData,r=this.tableFullData,i=this.treeFullData,t=this.treeConfig,n=this.mergeList,s=this.editStore,a=this.checkboxOpts,u=this.selection,c=this.isInsertByRow,d=this.sYOpts,h=this.scrollYLoad,f=this.treeOpts,m=s.actived,p=s.removeList,v=s.insertList,a=a.checkField,g=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){c(e)||p.push(e)}),a||e.forEach(function(e){e=u.indexOf(e);-1<e&&u.splice(e,1)}),r===e?(e=g=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&f.transform?e.forEach(function(e){var t=getRowid(o,e),r=_xeUtils.default.findTree(i,function(e){return t===getRowid(o,e)},f);r&&(r=r.items.splice(r.index,1),g.push(r[0]));e=l.indexOf(e);-1<e&&l.splice(e,1),o.updateVirtualTreeData()}):e.forEach(function(e){var t=r.indexOf(e);-1<t&&(t=r.splice(t,1),g.push(t[0]));var o=l.indexOf(e);-1<o&&(n.forEach(function(e){var t=e.row,r=e.rowspan;o<t?e.row=t-1:o<t+r&&(e.rowspan=r-1)}),l.splice(o,1))}),m.row&&-1<e.indexOf(m.row)&&this.clearActived(),e.forEach(function(e){e=v.indexOf(e);-1<e&&v.splice(e,1)}),this.scrollYLoad=!t&&-1<d.gt&&d.gt<r.length,this.handleTableData(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),h&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.recalculate()}).then(function(){return{row:g.length?g[g.length-1]:null,rows:g}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords()}},_getInsertRecords:function(){var r=this,e=this.treeConfig,o=this.treeFullData,t=this.tableFullData,l=this.treeOpts,i=this.editStore.insertList,n=[];return i.length&&(e&&l.transform?i.forEach(function(e){var t=getRowid(r,e);_xeUtils.default.findTree(o,function(e){return t===getRowid(r,e)},l)&&n.push(e)}):i.forEach(function(e){-1<t.indexOf(e)&&n.push(e)})),n},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,o=this.treeConfig,l=this.treeOpts,i=this.editStore;if(e){e=i.actived,i=e.row,e=e.column;return(i||e)&&this._syncActivedCell(),o?_xeUtils.default.filterTree(t,function(e){return r(e)},l):t.filter(function(e){return r(e)})}return[]},handleActived:function(e,t){var r,o=this,l=this.editStore,i=this.editOpts,n=this.tableColumn,s=this.editConfig,a=this.mouseConfig,u=i.mode,c=i.activeMethod,d=l.actived,h=e.row,f=e.column,i=f.editRender,l=e.cell=e.cell||this.getCell(h,f);return(0,_tools.isEnableConf)(s)&&(0,_tools.isEnableConf)(i)&&l&&(d.row!==h||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(e)||(a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),this.clearActived(t),r="edit-actived",f.renderHeight=l.offsetHeight,d.args=e,d.row=h,d.column=f,"row"===u?n.forEach(function(e){return o._getColumnModel(h,e)}):this._getColumnModel(h,f),this.$nextTick(function(){o.handleFocus(e,t)})),this.emitEvent(r,{row:h,rowIndex:this.getRowIndex(h),$rowIndex:this.getVMRowIndex(h),column:f,columnIndex:this.getColumnIndex(f),$columnIndex:this.getVMColumnIndex(f)},t)):(r=d.column,a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==f&&((a=r.model).update&&_tools.UtilTools.setCellValue(h,r,a.value),this.clearValidate()),f.renderHeight=l.offsetHeight,d.args=e,d.column=f,setTimeout(function(){o.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_tools.UtilTools.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_tools.UtilTools.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,o=this.editOpts,r=r.actived,l=r.row,r=r.column;(l||r)&&("row"===o.mode?e.forEach(function(e){return t._setColumnModel(l,e)}):this._setColumnModel(l,r))},_clearActived:function(e){var t=this.editStore.actived,r=t.row,o=t.column;return(r||o)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:o,columnIndex:this.getColumnIndex(o),$columnIndex:this.getVMColumnIndex(o)},e)),(_vXETable.default._valid?this.clearValidate():this.$nextTick()).then(this.recalculate)},_getActiveRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,o=t.actived,t=o.args,o=o.row;return t&&-1<r.indexOf(o)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},t):null},_isActiveByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,o=e.row,l=e.column,i=e.cell,n=l.editRender;(0,_tools.isEnableConf)(n)&&(t=_vXETable.default.renderer.get(n.name),e=n.autofocus,n=n.autoselect,(r=!(r=e?i.querySelector(e):r)&&t&&t.autofocus?i.querySelector(t.autofocus):r)?(r.focus(),n?r.select():_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select())):this.scrollToRow(o,l))},_setActiveRow:function(e){return this.setActiveCell(e,_xeUtils.default.find(this.visibleColumn,function(e){return(0,_tools.isEnableConf)(e.editRender)}))},_setActiveCell:function(t,e){var r=this,o=this.editConfig,l=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&l&&(0,_tools.isEnableConf)(o)&&(0,_tools.isEnableConf)(l.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,l);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:l,columnIndex:r.getColumnIndex(l),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,o=this.editOpts,l=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==o.trigger&&(-1<(o=r.indexOf(e))&&(r=this.getCell(e,t),r={row:e,rowIndex:o,column:t,columnIndex:l.indexOf(t),cell:r},this.handleSelected(r,{}))),this.$nextTick()},handleSelected:function(e,t){var r=this,o=this.mouseConfig,l=this.mouseOpts,i=this.editOpts,n=this.editStore,s=n.actived,a=n.selected,u=e.row,c=e.column,d=o&&l.selected;return!d||a.row===u&&a.column===c||(s.row!==u||"cell"===i.mode&&s.column!==c)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),a.args=e,a.row=u,a.column=c,d&&r.addColSdCls(),r.focus(),t&&r.emitEvent("cell-selected",e,t)),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _tools.DomTools.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_tools.DomTools.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&((e=this.getCell(t,e))&&_tools.DomTools.addClass(e,"col--selected"))}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_tools=require("../../tools"),_dom=require("../../tools/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(r="Object"===r&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,o=new Array(t);r<t;r++)o[r]=e[r];return o}var getRowid=_tools.UtilTools.getRowid;function insertTreeRow(n,e,t){var s=n.treeFullData,a=n.afterFullData,u=n.fullDataRowIdData,c=n.fullAllDataRowIdData,d=n.treeOpts,h=t?"push":"unshift";e.forEach(function(e){var t,r,o=e[d.parentField],l=getRowid(n,e),i=o?_xeUtils.default.findTree(s,function(e){return o===e[d.rowField]},d):null;i?(t=i.item,i=(r=c[getRowid(n,t)])?r.level:0,r=t[d.children],(r=!_xeUtils.default.isArray(r)?t[d.children]=[]:r)[h](e),i={row:e,rowid:l,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:i+1},u[l]=i,c[l]=i):("development"===process.env.NODE_ENV&&o&&_tools.UtilTools.warn("vxe.error.unableInsert"),a[h](e),s[h](e),e={row:e,rowid:l,index:-1,_index:-1,$index:-1,items:s,parent:null,level:0},u[l]=e,c[l]=e)}),n.updateVirtualTreeData()}var _default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var o=this,r=this.treeFullData,l=this.mergeList,i=this.afterFullData,n=this.editStore,s=this.sYOpts,a=this.scrollYLoad,u=this.tableFullData,c=this.treeConfig,d=this.fullDataRowIdData,h=this.fullAllDataRowIdData,f=this.treeOpts,p=f.transform,m=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return o.defineField(Object.assign({},e))});if(t)if(-1===t)c&&p?insertTreeRow(this,m,!0):(i.push.apply(i,_toConsumableArray(m)),u.push.apply(u,_toConsumableArray(m)),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>i.length&&(e.rowspan=r+m.length)}));else if(c&&p){var v,w,_,g=_xeUtils.default.findTree(r,function(e){return t[f.rowField]===e[f.rowField]},f);g?(v=g.parent,w=g.items,r=h[getRowid(this,v)],_=r?r.level:0,m.forEach(function(e,t){var r=getRowid(o,e);"development"===process.env.NODE_ENV&&e[f.parentField]&&v&&e[f.parentField]!==v[f.rowField]&&_tools.UtilTools.error("vxe.error.errProp",["".concat(f.parentField,"=").concat(e[f.parentField]),"".concat(f.parentField,"=").concat(v[f.rowField])]),v&&(e[f.parentField]=v[f.rowField]),w.splice(g.index+t,0,e);e={row:e,rowid:r,index:-1,_index:-1,$index:-1,items:w,parent:v,level:_+1};d[r]=e,h[r]=e}),this.updateVirtualTreeData()):("development"===process.env.NODE_ENV&&_tools.UtilTools.warn("vxe.error.unableInsert"),insertTreeRow(this,m,!0))}else{if(c)throw new Error(_tools.UtilTools.getLog("vxe.error.noTree",["insert"]));var C=i.indexOf(t);if(-1===C)throw new Error(_tools.UtilTools.error("vxe.error.unableInsert"));i.splice.apply(i,[C,0].concat(_toConsumableArray(m))),u.splice.apply(u,[u.indexOf(t),0].concat(_toConsumableArray(m))),l.forEach(function(e){var t=e.row,r=e.rowspan;C<t?e.row=t+m.length:C<t+r&&(e.rowspan=r+m.length)})}else c&&p?insertTreeRow(this,m,!1):(i.unshift.apply(i,_toConsumableArray(m)),u.unshift.apply(u,_toConsumableArray(m)),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+m.length)}));return(n=n.insertList).unshift.apply(n,_toConsumableArray(m)),this.scrollYLoad=!c&&-1<s.gt&&s.gt<u.length,this.handleTableData(p),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),a&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.recalculate()}).then(function(){return{row:m.length?m[m.length-1]:null,rows:m}})},_remove:function(e){var o=this,l=this.afterFullData,r=this.tableFullData,i=this.treeFullData,t=this.treeConfig,n=this.mergeList,s=this.editStore,a=this.checkboxOpts,u=this.selection,c=this.isInsertByRow,d=this.sYOpts,h=this.scrollYLoad,f=this.treeOpts,p=f.transform,m=s.actived,v=s.removeList,w=s.insertList,a=a.checkField,_=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){c(e)||v.push(e)}),a||e.forEach(function(e){e=u.indexOf(e);-1<e&&u.splice(e,1)}),r===e?(e=_=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&p?e.forEach(function(e){var t=getRowid(o,e),r=_xeUtils.default.findTree(i,function(e){return t===getRowid(o,e)},f);r&&(r=r.items.splice(r.index,1),_.push(r[0]));e=l.indexOf(e);-1<e&&l.splice(e,1),o.updateVirtualTreeData()}):e.forEach(function(e){var t=r.indexOf(e);-1<t&&(t=r.splice(t,1),_.push(t[0]));var o=l.indexOf(e);-1<o&&(n.forEach(function(e){var t=e.row,r=e.rowspan;o<t?e.row=t-1:o<t+r&&(e.rowspan=r-1)}),l.splice(o,1))}),m.row&&-1<e.indexOf(m.row)&&this.clearActived(),e.forEach(function(e){e=w.indexOf(e);-1<e&&w.splice(e,1)}),this.scrollYLoad=!t&&-1<d.gt&&d.gt<r.length,this.handleTableData(p),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),h&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.recalculate()}).then(function(){return{row:_.length?_[_.length-1]:null,rows:_}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords()}},_getInsertRecords:function(){var r=this,e=this.treeConfig,o=this.treeFullData,t=this.tableFullData,l=this.treeOpts,i=this.editStore.insertList,n=[];return i.length&&(e&&l.transform?i.forEach(function(e){var t=getRowid(r,e);_xeUtils.default.findTree(o,function(e){return t===getRowid(r,e)},l)&&n.push(e)}):i.forEach(function(e){-1<t.indexOf(e)&&n.push(e)})),n},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,o=this.treeConfig,l=this.treeOpts,i=this.editStore;if(e){e=i.actived,i=e.row,e=e.column;return(i||e)&&this._syncActivedCell(),o?_xeUtils.default.filterTree(t,function(e){return r(e)},l):t.filter(function(e){return r(e)})}return[]},handleActived:function(e,t){var r,o=this,l=this.editStore,i=this.editOpts,n=this.tableColumn,s=this.editConfig,a=this.mouseConfig,u=i.mode,c=i.activeMethod,d=l.actived,h=e.row,f=e.column,i=f.editRender,l=e.cell=e.cell||this.getCell(h,f);return(0,_tools.isEnableConf)(s)&&(0,_tools.isEnableConf)(i)&&l&&(d.row!==h||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(e)||(a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),this.clearActived(t),r="edit-actived",f.renderHeight=l.offsetHeight,d.args=e,d.row=h,d.column=f,"row"===u?n.forEach(function(e){return o._getColumnModel(h,e)}):this._getColumnModel(h,f),this.$nextTick(function(){o.handleFocus(e,t)})),this.emitEvent(r,{row:h,rowIndex:this.getRowIndex(h),$rowIndex:this.getVMRowIndex(h),column:f,columnIndex:this.getColumnIndex(f),$columnIndex:this.getVMColumnIndex(f)},t)):(r=d.column,a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==f&&((a=r.model).update&&_tools.UtilTools.setCellValue(h,r,a.value),this.clearValidate()),f.renderHeight=l.offsetHeight,d.args=e,d.column=f,setTimeout(function(){o.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_tools.UtilTools.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_tools.UtilTools.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,o=this.editOpts,r=r.actived,l=r.row,r=r.column;(l||r)&&("row"===o.mode?e.forEach(function(e){return t._setColumnModel(l,e)}):this._setColumnModel(l,r))},_clearActived:function(e){var t=this.editStore.actived,r=t.row,o=t.column;return(r||o)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:o,columnIndex:this.getColumnIndex(o),$columnIndex:this.getVMColumnIndex(o)},e)),(_vXETable.default._valid?this.clearValidate():this.$nextTick()).then(this.recalculate)},_getActiveRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,o=t.actived,t=o.args,o=o.row;return t&&-1<r.indexOf(o)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},t):null},_isActiveByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,o=e.row,l=e.column,i=e.cell,n=l.editRender;(0,_tools.isEnableConf)(n)&&(t=_vXETable.default.renderer.get(n.name),e=n.autofocus,n=n.autoselect,(r=!(r=e?i.querySelector(e):r)&&t&&t.autofocus?i.querySelector(t.autofocus):r)?(r.focus(),n?r.select():_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select())):this.scrollToRow(o,l))},_setActiveRow:function(e){return this.setActiveCell(e,_xeUtils.default.find(this.visibleColumn,function(e){return(0,_tools.isEnableConf)(e.editRender)}))},_setActiveCell:function(t,e){var r=this,o=this.editConfig,l=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&l&&(0,_tools.isEnableConf)(o)&&(0,_tools.isEnableConf)(l.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,l);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:l,columnIndex:r.getColumnIndex(l),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,o=this.editOpts,l=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==o.trigger&&(-1<(o=r.indexOf(e))&&(r=this.getCell(e,t),r={row:e,rowIndex:o,column:t,columnIndex:l.indexOf(t),cell:r},this.handleSelected(r,{}))),this.$nextTick()},handleSelected:function(e,t){var r=this,o=this.mouseConfig,l=this.mouseOpts,i=this.editOpts,n=this.editStore,s=n.actived,a=n.selected,u=e.row,c=e.column,d=o&&l.selected;return!d||a.row===u&&a.column===c||(s.row!==u||"cell"===i.mode&&s.column!==c)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),a.args=e,a.row=u,a.column=c,d&&r.addColSdCls(),r.focus(),t&&r.emitEvent("cell-selected",e,t)),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _tools.DomTools.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_tools.DomTools.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&((e=this.getCell(t,e))&&_tools.DomTools.addClass(e,"col--selected"))}}};exports.default=_default;

package/lib/export/src/mixin.js

@@ -67,15 +67,26 @@ function hasTreeChildren($xetable, row) {
   return row[treeOpts.children] && row[treeOpts.children].length > 0;
 }
 
-function getSeq($xetable, row, rowIndex, column, columnIndex) {
+function getSeq($xetable, row, rowIndex, column, columnIndex, paths) {
   var seqOpts = $xetable.seqOpts;
   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 (paths) {
+    return paths.map(function (num, i) {
+      return i % 2 === 0 ? Number(num) + 1 : '.';
+    }).join('');
+  }
+
+  return seqOpts.startIndex + rowIndex + 1;
 }
 
 function defaultFilterExportColumn(column) {
@@ -112,12 +123,13 @@ function getLabelData($xetable, opts, columns, datas) {
   if (treeConfig) {
     // 如果是树表格只允许导出数据源
     var rest = [];
+    var expandMaps = new Map();
 
     _xeUtils.default.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.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)) {
         var hasRowChild = hasTreeChildren($xetable, row);
         var _item = {
           _row: row,
@@ -148,7 +160,7 @@ function getLabelData($xetable, opts, columns, datas) {
           } else {
             switch (column.type) {
               case 'seq':
-                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex);
+                cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, path);
                 break;
 
               case 'checkbox':
@@ -190,6 +202,7 @@ function getLabelData($xetable, opts, columns, datas) {
 
           _item[column.id] = _xeUtils.default.toValueString(cellValue);
         });
+        expandMaps.set(row, 1);
         rest.push(Object.assign(_item, row));
       }
     }, treeOpts);
@@ -224,7 +237,7 @@ function getLabelData($xetable, opts, columns, datas) {
       } else {
         switch (column.type) {
           case 'seq':
-            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex);
+            cellValue = getSeq($xetable, row, rowIndex, column, columnIndex, null);
             break;
 
           case 'checkbox':
@@ -332,6 +345,10 @@ function getFooterData(opts, footerTableData) {
 
 function getCsvCellTypeLabel(column, cellValue) {
   if (cellValue) {
+    if (column.type === 'seq') {
+      return "\t".concat(cellValue);
+    }
+
     switch (column.cellType) {
       case 'string':
         if (!isNaN(cellValue)) {