vxe-table 3.4.5 → 3.4.7-beta.2

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/button/src/button.js

@@ -324,48 +324,49 @@ var _default2 = {
           };
 
           var _DomTools$getAbsolute = _tools.DomTools.getAbsolutePos(targetElem),
+              top = _DomTools$getAbsolute.top,
+              left = _DomTools$getAbsolute.left,
               boundingTop = _DomTools$getAbsolute.boundingTop,
-              boundingLeft = _DomTools$getAbsolute.boundingLeft,
               visibleHeight = _DomTools$getAbsolute.visibleHeight,
               visibleWidth = _DomTools$getAbsolute.visibleWidth;
 
           var panelPlacement = 'bottom';
 
           if (transfer) {
-            var left = boundingLeft + targetWidth - panelWidth;
-            var top = boundingTop + targetHeight;
+            var btnLeft = left + targetWidth - panelWidth;
+            var btnTop = top + targetHeight;
 
             if (placement === 'top') {
               panelPlacement = 'top';
-              top = boundingTop - panelHeight;
+              btnTop = top - panelHeight;
             } else if (!placement) {
               // 如果下面不够放，则向上
-              if (top + panelHeight + marginSize > visibleHeight) {
+              if (boundingTop + targetHeight + panelHeight + marginSize > visibleHeight) {
                 panelPlacement = 'top';
-                top = boundingTop - panelHeight;
+                btnTop = top - panelHeight;
               } // 如果上面不够放，则向下（优先）
 
 
-              if (top < marginSize) {
+              if (btnTop < marginSize) {
                 panelPlacement = 'bottom';
-                top = boundingTop + targetHeight;
+                btnTop = top + 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: "".concat(left, "px"),
+              left: "".concat(btnLeft, "px"),
               right: 'auto',
-              top: "".concat(top, "px"),
+              top: "".concat(btnTop, "px"),
               minWidth: "".concat(targetWidth, "px")
             });
           } else {

package/lib/button/src/button.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_tools=require("../../tools");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var _default2={name:"VxeButton",mixins:[_size.default],props:{type:String,size:{type:String,default:function(){return _conf.default.button.size||_conf.default.size}},name:[String,Number],content:String,placement:String,status:String,icon:String,round:Boolean,circle:Boolean,disabled:Boolean,loading:Boolean,destroyOnClose:Boolean,className:String,transfer:{type:Boolean,default:function(){return _conf.default.button.transfer}}},data:function(){return{inited:!1,showPanel:!1,animatVisible:!1,panelIndex:0,panelStyle:null,panelPlacement:null}},computed:{isText:function(){return"text"===this.type},isFormBtn:function(){return-1<["submit","reset","button"].indexOf(this.type)},btnType:function(){return this.isText?this.type:"button"}},created:function(){_tools.GlobalEvent.on(this,"mousewheel",this.handleGlobalMousewheelEvent)},beforeDestroy:function(){var e=this.$refs.panel;e&&e.parentNode&&e.parentNode.removeChild(e)},destroyed:function(){_tools.GlobalEvent.off(this,"mousewheel")},render:function(e){var n=this,t=this.$scopedSlots,o=this.$listeners,i=this.className,s=this.inited,a=this.type,r=this.destroyOnClose,l=this.isFormBtn,u=this.status,c=this.btnType,d=this.vSize,f=this.name,p=this.disabled,h=this.loading,m=this.showPanel,v=this.animatVisible,b=this.panelPlacement,_=t.dropdowns;return _?e("div",{class:["vxe-button--dropdown",i,(_defineProperty(t={},"size--".concat(d),d),_defineProperty(t,"is--active",m),t)]},[e("button",{ref:"xBtn",class:["vxe-button","type--".concat(c),(_defineProperty(t={},"size--".concat(d),d),_defineProperty(t,"theme--".concat(u),u),_defineProperty(t,"is--round",this.round),_defineProperty(t,"is--circle",this.circle),_defineProperty(t,"is--disabled",p||h),_defineProperty(t,"is--loading",h),t)],attrs:{name:f,type:l?a:"button",disabled:p||h},on:Object.assign({mouseenter:this.mouseenterTargetEvent,mouseleave:this.mouseleaveEvent},_xeUtils.default.objectMap(o,function(e,t){return function(e){return n.$emit(t,{$event:e})}}))},this.renderContent(e).concat([e("i",{class:"vxe-button--dropdown-arrow ".concat(_conf.default.icon.BUTTON_DROPDOWN)})])),e("div",{ref:"panel",class:["vxe-button--dropdown-panel",(_defineProperty(t={},"size--".concat(d),d),_defineProperty(t,"animat--leave",v),_defineProperty(t,"animat--enter",m),t)],attrs:{placement:b},style:this.panelStyle},s?[e("div",{class:"vxe-button--dropdown-wrapper",on:{mousedown:this.mousedownDropdownEvent,click:this.clickDropdownEvent,mouseenter:this.mouseenterEvent,mouseleave:this.mouseleaveEvent}},r&&!m?[]:_.call(this,{},e))]:null)]):e("button",{ref:"xBtn",class:["vxe-button","type--".concat(c),i,(_defineProperty(i={},"size--".concat(d),d),_defineProperty(i,"theme--".concat(u),u),_defineProperty(i,"is--round",this.round),_defineProperty(i,"is--circle",this.circle),_defineProperty(i,"is--disabled",p||h),_defineProperty(i,"is--loading",h),i)],attrs:{name:f,type:l?a:"button",disabled:p||h},on:_xeUtils.default.objectMap(o,function(e,t){return function(e){return n.$emit(t,{$event:e})}})},this.renderContent(e))},methods:{renderContent:function(e){var t=this.$scopedSlots,n=this.content,o=this.icon,i=[];return this.loading?i.push(e("i",{class:["vxe-button--loading-icon",_conf.default.icon.BUTTON_LOADING]})):o&&i.push(e("i",{class:["vxe-button--icon",o]})),t.default?i.push(e("span",{class:"vxe-button--content"},t.default.call(this))):n&&i.push(e("span",{class:"vxe-button--content"},[_tools.UtilTools.getFuncText(n)])),i},handleGlobalMousewheelEvent:function(e){this.showPanel&&!_tools.DomTools.getEventTargetNode(e,this.$refs.panel).flag&&this.closePanel()},updateZindex:function(){this.panelIndex<_tools.UtilTools.getLastZIndex()&&(this.panelIndex=_tools.UtilTools.nextZIndex())},mousedownDropdownEvent:function(e){0===e.button&&e.stopPropagation()},clickDropdownEvent:function(e){var t=this,n=e.currentTarget,o=this.$refs.panel,i=_tools.DomTools.getEventTargetNode(e,n,"vxe-button"),n=i.flag,i=i.targetElem;n&&(o&&(o.dataset.active="N"),this.showPanel=!1,setTimeout(function(){o&&"Y"===o.dataset.active||(t.animatVisible=!1)},350),this.$emit("dropdown-click",{name:i.getAttribute("name"),$event:e}))},mouseenterTargetEvent:function(){var e=this,t=this.$refs.panel;t.dataset.active="Y",this.inited||(this.inited=!0,this.transfer&&document.body.appendChild(t)),this.showTime=setTimeout(function(){"Y"===t.dataset.active?e.mouseenterEvent():e.animatVisible=!1},250)},mouseenterEvent:function(){var e=this,t=this.$refs.panel;t.dataset.active="Y",this.animatVisible=!0,setTimeout(function(){"Y"===t.dataset.active&&(e.showPanel=!0,e.updateZindex(),e.updatePlacement(),setTimeout(function(){e.showPanel&&e.updatePlacement()},50))},20)},mouseleaveEvent:function(){this.closePanel()},closePanel:function(){var e=this,t=this.$refs.panel;clearTimeout(this.showTime),t?(t.dataset.active="N",setTimeout(function(){"Y"!==t.dataset.active&&(e.showPanel=!1,setTimeout(function(){"Y"!==t.dataset.active&&(e.animatVisible=!1)},350))},100)):(this.animatVisible=!1,this.showPanel=!1)},updatePlacement:function(){var f=this;return this.$nextTick().then(function(){var e=f.$refs,t=f.transfer,n=f.placement,o=f.panelIndex,i=e.xBtn,s=e.panel;if(s&&i){var a=i.offsetHeight,r=i.offsetWidth,l=s.offsetHeight,u=s.offsetWidth,c={zIndex:o},d=_tools.DomTools.getAbsolutePos(i),e=d.boundingTop,s=d.boundingLeft,o=d.visibleHeight,i=d.visibleWidth,d="bottom";return t?(t=e+a,"top"===n?(d="top",t=e-l):n||(o<t+l+5&&(d="top",t=e-l),t<5&&(d="bottom",t=e+a)),i<(s=s+r-u)+u+5&&(s-=s+u+5-i),s<5&&(s=5),Object.assign(c,{left:"".concat(s,"px"),right:"auto",top:"".concat(t,"px"),minWidth:"".concat(r,"px")})):"top"===n?(d="top",c.bottom="".concat(a,"px")):n||o<e+a+l&&5<e-a-l&&(d="top",c.bottom="".concat(a,"px")),f.panelStyle=c,f.panelPlacement=d,f.$nextTick()}})},focus:function(){return this.$el.focus(),this.$nextTick()},blur:function(){return this.$el.blur(),this.$nextTick()}}};exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_tools=require("../../tools");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var _default2={name:"VxeButton",mixins:[_size.default],props:{type:String,size:{type:String,default:function(){return _conf.default.button.size||_conf.default.size}},name:[String,Number],content:String,placement:String,status:String,icon:String,round:Boolean,circle:Boolean,disabled:Boolean,loading:Boolean,destroyOnClose:Boolean,className:String,transfer:{type:Boolean,default:function(){return _conf.default.button.transfer}}},data:function(){return{inited:!1,showPanel:!1,animatVisible:!1,panelIndex:0,panelStyle:null,panelPlacement:null}},computed:{isText:function(){return"text"===this.type},isFormBtn:function(){return-1<["submit","reset","button"].indexOf(this.type)},btnType:function(){return this.isText?this.type:"button"}},created:function(){_tools.GlobalEvent.on(this,"mousewheel",this.handleGlobalMousewheelEvent)},beforeDestroy:function(){var e=this.$refs.panel;e&&e.parentNode&&e.parentNode.removeChild(e)},destroyed:function(){_tools.GlobalEvent.off(this,"mousewheel")},render:function(e){var n=this,t=this.$scopedSlots,o=this.$listeners,i=this.className,s=this.inited,a=this.type,r=this.destroyOnClose,l=this.isFormBtn,u=this.status,c=this.btnType,d=this.vSize,f=this.name,p=this.disabled,h=this.loading,m=this.showPanel,v=this.animatVisible,b=this.panelPlacement,_=t.dropdowns;return _?e("div",{class:["vxe-button--dropdown",i,(_defineProperty(t={},"size--".concat(d),d),_defineProperty(t,"is--active",m),t)]},[e("button",{ref:"xBtn",class:["vxe-button","type--".concat(c),(_defineProperty(t={},"size--".concat(d),d),_defineProperty(t,"theme--".concat(u),u),_defineProperty(t,"is--round",this.round),_defineProperty(t,"is--circle",this.circle),_defineProperty(t,"is--disabled",p||h),_defineProperty(t,"is--loading",h),t)],attrs:{name:f,type:l?a:"button",disabled:p||h},on:Object.assign({mouseenter:this.mouseenterTargetEvent,mouseleave:this.mouseleaveEvent},_xeUtils.default.objectMap(o,function(e,t){return function(e){return n.$emit(t,{$event:e})}}))},this.renderContent(e).concat([e("i",{class:"vxe-button--dropdown-arrow ".concat(_conf.default.icon.BUTTON_DROPDOWN)})])),e("div",{ref:"panel",class:["vxe-button--dropdown-panel",(_defineProperty(t={},"size--".concat(d),d),_defineProperty(t,"animat--leave",v),_defineProperty(t,"animat--enter",m),t)],attrs:{placement:b},style:this.panelStyle},s?[e("div",{class:"vxe-button--dropdown-wrapper",on:{mousedown:this.mousedownDropdownEvent,click:this.clickDropdownEvent,mouseenter:this.mouseenterEvent,mouseleave:this.mouseleaveEvent}},r&&!m?[]:_.call(this,{},e))]:null)]):e("button",{ref:"xBtn",class:["vxe-button","type--".concat(c),i,(_defineProperty(i={},"size--".concat(d),d),_defineProperty(i,"theme--".concat(u),u),_defineProperty(i,"is--round",this.round),_defineProperty(i,"is--circle",this.circle),_defineProperty(i,"is--disabled",p||h),_defineProperty(i,"is--loading",h),i)],attrs:{name:f,type:l?a:"button",disabled:p||h},on:_xeUtils.default.objectMap(o,function(e,t){return function(e){return n.$emit(t,{$event:e})}})},this.renderContent(e))},methods:{renderContent:function(e){var t=this.$scopedSlots,n=this.content,o=this.icon,i=[];return this.loading?i.push(e("i",{class:["vxe-button--loading-icon",_conf.default.icon.BUTTON_LOADING]})):o&&i.push(e("i",{class:["vxe-button--icon",o]})),t.default?i.push(e("span",{class:"vxe-button--content"},t.default.call(this))):n&&i.push(e("span",{class:"vxe-button--content"},[_tools.UtilTools.getFuncText(n)])),i},handleGlobalMousewheelEvent:function(e){this.showPanel&&!_tools.DomTools.getEventTargetNode(e,this.$refs.panel).flag&&this.closePanel()},updateZindex:function(){this.panelIndex<_tools.UtilTools.getLastZIndex()&&(this.panelIndex=_tools.UtilTools.nextZIndex())},mousedownDropdownEvent:function(e){0===e.button&&e.stopPropagation()},clickDropdownEvent:function(e){var t=this,n=e.currentTarget,o=this.$refs.panel,i=_tools.DomTools.getEventTargetNode(e,n,"vxe-button"),n=i.flag,i=i.targetElem;n&&(o&&(o.dataset.active="N"),this.showPanel=!1,setTimeout(function(){o&&"Y"===o.dataset.active||(t.animatVisible=!1)},350),this.$emit("dropdown-click",{name:i.getAttribute("name"),$event:e}))},mouseenterTargetEvent:function(){var e=this,t=this.$refs.panel;t.dataset.active="Y",this.inited||(this.inited=!0,this.transfer&&document.body.appendChild(t)),this.showTime=setTimeout(function(){"Y"===t.dataset.active?e.mouseenterEvent():e.animatVisible=!1},250)},mouseenterEvent:function(){var e=this,t=this.$refs.panel;t.dataset.active="Y",this.animatVisible=!0,setTimeout(function(){"Y"===t.dataset.active&&(e.showPanel=!0,e.updateZindex(),e.updatePlacement(),setTimeout(function(){e.showPanel&&e.updatePlacement()},50))},20)},mouseleaveEvent:function(){this.closePanel()},closePanel:function(){var e=this,t=this.$refs.panel;clearTimeout(this.showTime),t?(t.dataset.active="N",setTimeout(function(){"Y"!==t.dataset.active&&(e.showPanel=!1,setTimeout(function(){"Y"!==t.dataset.active&&(e.animatVisible=!1)},350))},100)):(this.animatVisible=!1,this.showPanel=!1)},updatePlacement:function(){var p=this;return this.$nextTick().then(function(){var e=p.$refs,t=p.transfer,n=p.placement,o=p.panelIndex,i=e.xBtn,s=e.panel;if(s&&i){var a=i.offsetHeight,r=i.offsetWidth,l=s.offsetHeight,u=s.offsetWidth,c={zIndex:o},d=_tools.DomTools.getAbsolutePos(i),f=d.top,e=d.left,s=d.boundingTop,o=d.visibleHeight,i=d.visibleWidth,d="bottom";return t?(t=f+a,"top"===n?(d="top",t=f-l):n||(o<s+a+l+5&&(d="top",t=f-l),t<5&&(d="bottom",t=f+a)),i<(e=e+r-u)+u+5&&(e-=e+u+5-i),e<5&&(e=5),Object.assign(c,{left:"".concat(e,"px"),right:"auto",top:"".concat(t,"px"),minWidth:"".concat(r,"px")})):"top"===n?(d="top",c.bottom="".concat(a,"px")):n||o<s+a+l&&5<s-a-l&&(d="top",c.bottom="".concat(a,"px")),p.panelStyle=c,p.panelPlacement=d,p.$nextTick()}})},focus:function(){return this.$el.focus(),this.$nextTick()},blur:function(){return this.$el.blur(),this.$nextTick()}}};exports.default=_default2;

package/lib/edit/src/mixin.js

@@ -30,7 +30,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 var getRowid = _tools.UtilTools.getRowid;
 
 function insertTreeRow(_vm, newRecords, isAppend) {
-  var treeFullData = _vm.treeFullData,
+  var tableFullTreeData = _vm.tableFullTreeData,
       afterFullData = _vm.afterFullData,
       fullDataRowIdData = _vm.fullDataRowIdData,
       fullAllDataRowIdData = _vm.fullAllDataRowIdData,
@@ -39,7 +39,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
   newRecords.forEach(function (item) {
     var parentRowId = item[treeOpts.parentField];
     var rowid = getRowid(_vm, item);
-    var matchObj = parentRowId ? _xeUtils.default.findTree(treeFullData, function (item) {
+    var matchObj = parentRowId ? _xeUtils.default.findTree(tableFullTreeData, function (item) {
       return parentRowId === item[treeOpts.rowField];
     }, treeOpts) : null;
 
@@ -57,6 +57,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       var rest = {
         row: item,
         rowid: rowid,
+        seq: -1,
         index: -1,
         _index: -1,
         $index: -1,
@@ -74,14 +75,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       }
 
       afterFullData[funcName](item);
-      treeFullData[funcName](item);
+      tableFullTreeData[funcName](item);
       var _rest = {
         row: item,
         rowid: rowid,
+        seq: -1,
         index: -1,
         _index: -1,
         $index: -1,
-        items: treeFullData,
+        items: tableFullTreeData,
         parent: null,
         level: 0
       };
@@ -89,8 +91,6 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       fullAllDataRowIdData[rowid] = _rest;
     }
   });
-
-  _vm.updateVirtualTreeData();
 }
 
 var _default = {
@@ -116,12 +116,10 @@ var _default = {
       var _this = this,
           _editStore$insertList;
 
-      var treeFullData = this.treeFullData,
+      var tableFullTreeData = this.tableFullTreeData,
           mergeList = this.mergeList,
           afterFullData = this.afterFullData,
           editStore = this.editStore,
-          sYOpts = this.sYOpts,
-          scrollYLoad = this.scrollYLoad,
           tableFullData = this.tableFullData,
           treeConfig = this.treeConfig,
           fullDataRowIdData = this.fullDataRowIdData,
@@ -174,7 +172,7 @@ var _default = {
         } else {
           // 如果为虚拟树
           if (treeConfig && transform) {
-            var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+            var matchObj = _xeUtils.default.findTree(tableFullTreeData, function (item) {
               return row[treeOpts.rowField] === item[treeOpts.rowField];
             }, treeOpts);
 
@@ -202,6 +200,7 @@ var _default = {
                 var rest = {
                   row: item,
                   rowid: rowid,
+                  seq: -1,
                   index: -1,
                   _index: -1,
                   $index: -1,
@@ -212,7 +211,6 @@ var _default = {
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
               });
-              this.updateVirtualTreeData();
             } else {
               if (process.env.NODE_ENV === 'development') {
                 _tools.UtilTools.warn('vxe.error.unableInsert');
@@ -250,13 +248,13 @@ var _default = {
 
       (_editStore$insertList = editStore.insertList).unshift.apply(_editStore$insertList, _toConsumableArray(newRecords));
 
-      this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
-      this.handleTableData(transform);
+      this.handleTableData(treeConfig && treeOpts.transform);
       this.updateFooter();
       this.cacheRowMap();
+      this.updateAfterDataIndex();
       this.checkSelectionStatus();
 
-      if (scrollYLoad) {
+      if (this.scrollYLoad) {
         this.updateScrollYSpace();
       }
 
@@ -283,15 +281,13 @@ var _default = {
 
       var afterFullData = this.afterFullData,
           tableFullData = this.tableFullData,
-          treeFullData = this.treeFullData,
+          tableFullTreeData = this.tableFullTreeData,
           treeConfig = this.treeConfig,
           mergeList = this.mergeList,
           editStore = this.editStore,
           checkboxOpts = this.checkboxOpts,
           selection = this.selection,
           isInsertByRow = this.isInsertByRow,
-          sYOpts = this.sYOpts,
-          scrollYLoad = this.scrollYLoad,
           treeOpts = this.treeOpts;
       var transform = treeOpts.transform;
       var actived = editStore.actived,
@@ -335,7 +331,7 @@ var _default = {
           rows.forEach(function (row) {
             var rowid = getRowid(_this2, row);
 
-            var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+            var matchObj = _xeUtils.default.findTree(tableFullTreeData, function (item) {
               return rowid === getRowid(_this2, item);
             }, treeOpts);
 
@@ -349,8 +345,6 @@ var _default = {
             if (afIndex > -1) {
               afterFullData.splice(afIndex, 1);
             }
-
-            _this2.updateVirtualTreeData();
           });
         } else {
           rows.forEach(function (row) {
@@ -394,13 +388,13 @@ var _default = {
           insertList.splice(iIndex, 1);
         }
       });
-      this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
-      this.handleTableData(transform);
+      this.handleTableData(treeConfig && treeOpts.transform);
       this.updateFooter();
       this.cacheRowMap();
+      this.updateAfterDataIndex();
       this.checkSelectionStatus();
 
-      if (scrollYLoad) {
+      if (this.scrollYLoad) {
         this.updateScrollYSpace();
       }
 
@@ -475,7 +469,7 @@ var _default = {
       var _this6 = this;
 
       var treeConfig = this.treeConfig,
-          treeFullData = this.treeFullData,
+          tableFullTreeData = this.tableFullTreeData,
           tableFullData = this.tableFullData,
           treeOpts = this.treeOpts;
       var insertList = this.editStore.insertList;
@@ -487,7 +481,7 @@ var _default = {
           insertList.forEach(function (row) {
             var rowid = getRowid(_this6, row);
 
-            var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+            var matchObj = _xeUtils.default.findTree(tableFullTreeData, function (item) {
               return rowid === getRowid(_this6, item);
             }, treeOpts);
 

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;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;
+"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.tableFullTreeData,a=n.afterFullData,c=n.fullDataRowIdData,u=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=u[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,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:i+1},c[l]=i,u[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,seq:-1,index:-1,_index:-1,$index:-1,items:s,parent:null,level:0},c[l]=e,u[l]=e)})}var _default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var o=this,r=this.tableFullTreeData,l=this.mergeList,i=this.afterFullData,n=this.editStore,s=this.tableFullData,a=this.treeConfig,c=this.fullDataRowIdData,u=this.fullAllDataRowIdData,d=this.treeOpts,h=d.transform,f=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return o.defineField(Object.assign({},e))});if(t)if(-1===t)a&&h?insertTreeRow(this,f,!0):(i.push.apply(i,_toConsumableArray(f)),s.push.apply(s,_toConsumableArray(f)),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>i.length&&(e.rowspan=r+f.length)}));else if(a&&h){var m,p,v,w=_xeUtils.default.findTree(r,function(e){return t[d.rowField]===e[d.rowField]},d);w?(m=w.parent,p=w.items,r=u[getRowid(this,m)],v=r?r.level:0,f.forEach(function(e,t){var r=getRowid(o,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&m&&e[d.parentField]!==m[d.rowField]&&_tools.UtilTools.error("vxe.error.errProp",["".concat(d.parentField,"=").concat(e[d.parentField]),"".concat(d.parentField,"=").concat(m[d.rowField])]),m&&(e[d.parentField]=m[d.rowField]),p.splice(w.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:p,parent:m,level:v+1};c[r]=e,u[r]=e})):("development"===process.env.NODE_ENV&&_tools.UtilTools.warn("vxe.error.unableInsert"),insertTreeRow(this,f,!0))}else{if(a)throw new Error(_tools.UtilTools.getLog("vxe.error.noTree",["insert"]));var _=i.indexOf(t);if(-1===_)throw new Error(_tools.UtilTools.error("vxe.error.unableInsert"));i.splice.apply(i,[_,0].concat(_toConsumableArray(f))),s.splice.apply(s,[s.indexOf(t),0].concat(_toConsumableArray(f))),l.forEach(function(e){var t=e.row,r=e.rowspan;_<t?e.row=t+f.length:_<t+r&&(e.rowspan=r+f.length)})}else a&&h?insertTreeRow(this,f,!1):(i.unshift.apply(i,_toConsumableArray(f)),s.unshift.apply(s,_toConsumableArray(f)),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+f.length)}));return(n=n.insertList).unshift.apply(n,_toConsumableArray(f)),this.handleTableData(a&&d.transform),this.updateFooter(),this.cacheRowMap(),this.updateAfterDataIndex(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.recalculate()}).then(function(){return{row:f.length?f[f.length-1]:null,rows:f}})},_remove:function(e){var o=this,l=this.afterFullData,r=this.tableFullData,i=this.tableFullTreeData,t=this.treeConfig,n=this.mergeList,s=this.editStore,a=this.checkboxOpts,c=this.selection,u=this.isInsertByRow,d=this.treeOpts,h=d.transform,f=s.actived,m=s.removeList,p=s.insertList,a=a.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){u(e)||m.push(e)}),a||e.forEach(function(e){e=c.indexOf(e);-1<e&&c.splice(e,1)}),r===e?(e=v=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&h?e.forEach(function(e){var t=getRowid(o,e),r=_xeUtils.default.findTree(i,function(e){return t===getRowid(o,e)},d);r&&(r=r.items.splice(r.index,1),v.push(r[0]));e=l.indexOf(e);-1<e&&l.splice(e,1)}):e.forEach(function(e){var t=r.indexOf(e);-1<t&&(t=r.splice(t,1),v.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))}),f.row&&-1<e.indexOf(f.row)&&this.clearActived(),e.forEach(function(e){e=p.indexOf(e);-1<e&&p.splice(e,1)}),this.handleTableData(t&&d.transform),this.updateFooter(),this.cacheRowMap(),this.updateAfterDataIndex(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.recalculate()}).then(function(){return{row:v.length?v[v.length-1]:null,rows:v}})},_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.tableFullTreeData,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,c=i.mode,u=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"===c&&d.column!==f?(r="edit-disabled",u&&!u(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"===c?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,c=e.row,u=e.column,d=o&&l.selected;return!d||a.row===c&&a.column===u||(s.row!==c||"cell"===i.mode&&s.column!==u)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),a.args=e,a.row=c,a.column=u,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,24 @@ 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, path) {
   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 (path) {
+    return (0, _util.toTreePathSeq)(path);
+  }
+
+  return seqOpts.startIndex + rowIndex + 1;
 }
 
 function defaultFilterExportColumn(column) {
@@ -112,12 +121,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 +158,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 +200,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 +235,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 +343,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)) {