vxe-table 3.17.0-beta.9 → 3.17.0

package/lib/table/module/custom/mixin.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
+var _util = require("../../src/util");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function calcMaxHeight($xeTable) {
   const reactData = $xeTable;
@@ -114,21 +115,20 @@ var _default = exports.default = {
         }
       });
       reactData.isCustomStatus = true;
-      return $xeTable.saveCustomStore('confirm').then(() => {
-        if (allowGroup && allowValues && $xeTable.handlePivotTableAggregateData) {
-          if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
-            // 更新数据分组
-            if (aggHandleFields.length) {
-              $xeTable.setRowGroups(aggHandleFields);
-            } else {
-              $xeTable.clearRowGroups();
-            }
+      if (allowGroup && allowValues && !!$xeTable.handlePivotTableAggregateData) {
+        if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
+          // 更新数据分组
+          if (aggHandleFields.length) {
+            $xeTable.setRowGroups(aggHandleFields);
           } else {
-            // 更新聚合函数
-            $xeTable.handleUpdateAggData();
+            $xeTable.clearRowGroups();
           }
+        } else if (allowValues) {
+          // 更新聚合函数
+          $xeTable.handleUpdateAggData();
         }
-      });
+      }
+      return $xeTable.saveCustomStore('confirm');
     },
     _cancelCustom() {
       const $xeTable = this;
@@ -193,6 +193,7 @@ var _default = exports.default = {
         sort: options === true,
         aggFunc: options === true
       }, options);
+      const allCols = [];
       _xeUtils.default.eachTree(collectColumn, column => {
         if (opts.resizable) {
           column.resizeWidth = 0;
@@ -202,6 +203,7 @@ var _default = exports.default = {
         }
         if (opts.sort) {
           column.renderSortNumber = column.sortNumber;
+          column.parentId = column.defaultParentId;
         }
         if (!checkMethod || checkMethod({
           $table: $xeTable,
@@ -214,9 +216,18 @@ var _default = exports.default = {
           column.renderAggFn = column.defaultAggFunc;
         }
         column.renderResizeWidth = column.renderWidth;
+        allCols.push(column);
       });
+      if (opts.sort) {
+        const newCollectCols = _xeUtils.default.toArrayTree(_xeUtils.default.orderBy(allCols, 'renderSortNumber'), {
+          key: 'id',
+          parentKey: 'parentId',
+          children: 'children'
+        });
+        internalData.collectColumn = newCollectCols;
+        internalData.tableFullColumn = (0, _util.getColumnList)(newCollectCols);
+      }
       reactData.isCustomStatus = false;
-      $xeTable.saveCustomStore('reset');
       return $xeTable.handleCustom().then(() => {
         if (opts.aggFunc && $xeTable.handlePivotTableAggregateData) {
           const rowGroupFields = $xeTable.computeRowGroupFields;
@@ -230,6 +241,7 @@ var _default = exports.default = {
             $xeTable.handleUpdateAggData();
           }
         }
+        $xeTable.saveCustomStore('reset');
       });
     },
     _toggleCustomAllCheckbox() {

package/lib/table/module/custom/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function calcMaxHeight(e){var t=e.customStore,e=e.$refs.refElem;let s=0;e&&(s=e.clientHeight-28),t.maxHeight=Math.max(88,s)}function emitCustomEvent(e,t,s){(e.$xeGrid||e).dispatchEvent("custom",{type:t},s)}var _default=exports.default={methods:{_openCustom(){let e=this;var{initStore:t,customStore:s}=e;return s.visible=!0,t.custom=!0,e.handleUpdateCustomColumn(),e.checkCustomStatus(),calcMaxHeight(e),e.$nextTick().then(()=>calcMaxHeight(e))},_closeCustom(){var e=this,t=e.customStore,s=e.computeCustomOpts;return t.visible&&(t.visible=!1,s.immediate||e.handleCustom()),e.$nextTick()},_toggleCustom(){var e=this,t=e.customStore;return t.visible?e.closeCustom():e.openCustom()},_saveCustom(){let e=this;var t=e;let{customColumnList:s,aggHandleFields:i,rowGroupList:l}=t,{allowVisible:o,allowSort:r,allowFixed:u,allowResizable:a,allowGroup:n,allowValues:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(s,(e,t,s,i,l)=>{l?e.fixed=l.fixed:(r&&(e.renderSortNumber=t+1),u&&(e.fixed=e.renderFixed)),a&&e.renderVisible&&(!e.children||e.children.length)&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth),o&&(e.visible=e.renderVisible),n&&d&&(e.aggFunc=e.renderAggFn)}),t.isCustomStatus=!0,e.saveCustomStore("confirm").then(()=>{n&&d&&e.handlePivotTableAggregateData&&(l.length!==i.length||l.some((e,t)=>e.field!==i[t])?i.length?e.setRowGroups(i):e.clearRowGroups():e.handleUpdateAggData())})},_cancelCustom(){var e=this,{customColumnList:t,customStore:s}=e;let{oldSortMaps:l,oldFixedMaps:o,oldVisibleMaps:r}=s,{allowVisible:u,allowSort:a,allowFixed:n,allowResizable:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(t,e=>{var t=e.getKey(),s=!!r[t],i=o[t]||"";u&&(e.renderVisible=s,e.visible=s),n&&(e.renderFixed=i,e.fixed=i),a&&(e.renderSortNumber=l[t]||0),d&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),e.$nextTick()},_resetCustom(e){let t=this;var s=t,i=t;let l=s.rowGroupList;i=i.collectColumn;let o=t.computeCustomOpts.checkMethod,r=Object.assign({visible:!0,resizable:!0===e,fixed:!0===e,sort:!0===e,aggFunc:!0===e},e);return _xeUtils.default.eachTree(i,e=>{r.resizable&&(e.resizeWidth=0),r.fixed&&(e.fixed=e.defaultFixed),r.sort&&(e.renderSortNumber=e.sortNumber),o&&!o({$table:t,column:e})||(e.visible=e.defaultVisible),r.aggFunc&&(e.aggFunc=e.defaultAggFunc,e.renderAggFn=e.defaultAggFunc),e.renderResizeWidth=e.renderWidth}),s.isCustomStatus=!1,t.saveCustomStore("reset"),t.handleCustom().then(()=>{var e;r.aggFunc&&t.handlePivotTableAggregateData&&(((e=t.computeRowGroupFields)||l).length?e&&e.length?t.setRowGroups(e):t.clearRowGroups():t.handleUpdateAggData())})},_toggleCustomAllCheckbox(){var e=this.customStore,e=!e.isAll;return this.setCustomAllCheckbox(e)},_setCustomAllCheckbox(e){let t=this;var s=t,i=s.customStore,l=s.customColumnList,o=t.computeCustomOpts;let{checkMethod:r,visibleMethod:u}=o,a=!!e;o.immediate?(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.visible=a,e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a,s.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:visible")):(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a),t.checkCustomStatus()},checkCustomStatus(){let t=this;var e=t.customStore,s=t.collectColumn;let i=t.computeCustomOpts.checkMethod;e.isAll=s.every(e=>!!i&&!i({$table:t,column:e})||e.renderVisible),e.isIndeterminate=!e.isAll&&s.some(e=>(!i||i({$table:t,column:e}))&&(e.renderVisible||e.halfVisible))},emitCustomEvent(e,t){(this.$xeGrid||this).dispatchEvent("custom",{type:e},t)},triggerCustomEvent(e){var t=this.customStore;t.visible?(this.closeCustom(),emitCustomEvent(this,"close",e)):(t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customOpenEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!0,t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customCloseEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!1,this.closeCustom(),emitCustomEvent(this,"close",e))},handleUpdateCustomColumn(){var e=this,t=e.customStore,o=this.collectColumn;if(t.visible){let s={},i={},l={};_xeUtils.default.eachTree(o,e=>{var t=e.getKey();e.renderFixed=e.fixed,e.renderVisible=e.visible,e.renderResizeWidth=e.renderWidth,s[t]=e.renderSortNumber,i[t]=e.fixed,l[t]=e.visible}),t.oldSortMaps=s,t.oldFixedMaps=i,t.oldVisibleMaps=l,e.customColumnList=o.slice(0)}}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function calcMaxHeight(e){var t=e.customStore,e=e.$refs.refElem;let s=0;e&&(s=e.clientHeight-28),t.maxHeight=Math.max(88,s)}function emitCustomEvent(e,t,s){(e.$xeGrid||e).dispatchEvent("custom",{type:t},s)}var _default=exports.default={methods:{_openCustom(){let e=this;var{initStore:t,customStore:s}=e;return s.visible=!0,t.custom=!0,e.handleUpdateCustomColumn(),e.checkCustomStatus(),calcMaxHeight(e),e.$nextTick().then(()=>calcMaxHeight(e))},_closeCustom(){var e=this,t=e.customStore,s=e.computeCustomOpts;return t.visible&&(t.visible=!1,s.immediate||e.handleCustom()),e.$nextTick()},_toggleCustom(){var e=this,t=e.customStore;return t.visible?e.closeCustom():e.openCustom()},_saveCustom(){var e=this,t=e;let{customColumnList:s,aggHandleFields:i,rowGroupList:l}=t,{allowVisible:o,allowSort:r,allowFixed:u,allowResizable:a,allowGroup:n,allowValues:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(s,(e,t,s,i,l)=>{l?e.fixed=l.fixed:(r&&(e.renderSortNumber=t+1),u&&(e.fixed=e.renderFixed)),a&&e.renderVisible&&(!e.children||e.children.length)&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth),o&&(e.visible=e.renderVisible),n&&d&&(e.aggFunc=e.renderAggFn)}),t.isCustomStatus=!0,n&&d&&e.handlePivotTableAggregateData&&(l.length!==i.length||l.some((e,t)=>e.field!==i[t])?i.length?e.setRowGroups(i):e.clearRowGroups():d&&e.handleUpdateAggData()),e.saveCustomStore("confirm")},_cancelCustom(){var e=this,{customColumnList:t,customStore:s}=e;let{oldSortMaps:l,oldFixedMaps:o,oldVisibleMaps:r}=s,{allowVisible:u,allowSort:a,allowFixed:n,allowResizable:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(t,e=>{var t=e.getKey(),s=!!r[t],i=o[t]||"";u&&(e.renderVisible=s,e.visible=s),n&&(e.renderFixed=i,e.fixed=i),a&&(e.renderSortNumber=l[t]||0),d&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),e.$nextTick()},_resetCustom(e){let t=this;var s=t,i=t;let l=s.rowGroupList;var o=i.collectColumn;let r=t.computeCustomOpts.checkMethod,u=Object.assign({visible:!0,resizable:!0===e,fixed:!0===e,sort:!0===e,aggFunc:!0===e},e),a=[];return _xeUtils.default.eachTree(o,e=>{u.resizable&&(e.resizeWidth=0),u.fixed&&(e.fixed=e.defaultFixed),u.sort&&(e.renderSortNumber=e.sortNumber,e.parentId=e.defaultParentId),r&&!r({$table:t,column:e})||(e.visible=e.defaultVisible),u.aggFunc&&(e.aggFunc=e.defaultAggFunc,e.renderAggFn=e.defaultAggFunc),e.renderResizeWidth=e.renderWidth,a.push(e)}),u.sort&&(e=_xeUtils.default.toArrayTree(_xeUtils.default.orderBy(a,"renderSortNumber"),{key:"id",parentKey:"parentId",children:"children"}),i.collectColumn=e,i.tableFullColumn=(0,_util.getColumnList)(e)),s.isCustomStatus=!1,t.handleCustom().then(()=>{var e;u.aggFunc&&t.handlePivotTableAggregateData&&(((e=t.computeRowGroupFields)||l).length?e&&e.length?t.setRowGroups(e):t.clearRowGroups():t.handleUpdateAggData()),t.saveCustomStore("reset")})},_toggleCustomAllCheckbox(){var e=this.customStore,e=!e.isAll;return this.setCustomAllCheckbox(e)},_setCustomAllCheckbox(e){let t=this;var s=t,i=s.customStore,l=s.customColumnList,o=t.computeCustomOpts;let{checkMethod:r,visibleMethod:u}=o,a=!!e;o.immediate?(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.visible=a,e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a,s.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:visible")):(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a),t.checkCustomStatus()},checkCustomStatus(){let t=this;var e=t.customStore,s=t.collectColumn;let i=t.computeCustomOpts.checkMethod;e.isAll=s.every(e=>!!i&&!i({$table:t,column:e})||e.renderVisible),e.isIndeterminate=!e.isAll&&s.some(e=>(!i||i({$table:t,column:e}))&&(e.renderVisible||e.halfVisible))},emitCustomEvent(e,t){(this.$xeGrid||this).dispatchEvent("custom",{type:e},t)},triggerCustomEvent(e){var t=this.customStore;t.visible?(this.closeCustom(),emitCustomEvent(this,"close",e)):(t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customOpenEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!0,t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customCloseEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!1,this.closeCustom(),emitCustomEvent(this,"close",e))},handleUpdateCustomColumn(){var e=this,t=e.customStore,o=this.collectColumn;if(t.visible){let s={},i={},l={};_xeUtils.default.eachTree(o,e=>{var t=e.getKey();e.renderFixed=e.fixed,e.renderVisible=e.visible,e.renderResizeWidth=e.renderWidth,s[t]=e.renderSortNumber,i[t]=e.fixed,l[t]=e.visible}),t.oldSortMaps=s,t.oldFixedMaps=i,t.oldVisibleMaps=l,e.customColumnList=o.slice(0)}}}};

package/lib/table/module/edit/mixin.js

@@ -115,6 +115,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         treeIndex: -1,
+        _tIndex: -1,
         items: parentChilds,
         parent: parentRow,
         level: parentLevel + 1,
@@ -139,6 +140,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         treeIndex: -1,
+        _tIndex: -1,
         items: tableFullTreeData,
         parent: null,
         level: 0,
@@ -209,6 +211,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           _index: -1,
           $index: -1,
           treeIndex: -1,
+          _tIndex: -1,
           items: afterFullData,
           parent: null,
           level: 0,
@@ -255,6 +258,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             _index: -1,
             $index: -1,
             treeIndex: -1,
+            _tIndex: -1,
             items: afterFullData,
             parent: null,
             level: 0,
@@ -305,6 +309,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               _index: -1,
               $index: -1,
               treeIndex: -1,
+              _tIndex: -1,
               items: parentMapChilds,
               parent: parentRow,
               level: parentLevel + 1,

package/lib/table/module/edit/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_util=require("../../src/util"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,renderer,getI18n}=_ui.VxeUI,browseObj=_xeUtils.default.browse();function getEditColumnModel(e,t){var{model:l,editRender:r}=t;r&&(l.value=(0,_util.getCellValue)(e,t),l.update=!1)}function setEditColumnModel(e,t){var{model:l,editRender:r}=t;r&&l.update&&((0,_util.setCellValue)(e,t,l.value),l.update=!1,l.value=null)}function removeCellSelectedClass(e){var e=e.$refs.refElem;e&&(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}function syncActivedCell(e){var{editStore:t,tableColumn:l}=e,e=e.computeEditOpts,t=t.actived;let{row:r,column:o}=t;(r||o)&&("row"===e.mode?l.forEach(e=>setEditColumnModel(r,e)):setEditColumnModel(r,o))}function insertTreeRow(n,e,t){let{tableFullTreeData:a,afterFullData:d,fullDataRowIdData:s,fullAllDataRowIdData:u}=n;var l=n.computeTreeOpts;let{rowField:c,parentField:h,mapChildrenField:g}=l,w=l.children||l.childrenField,f=t?"push":"unshift";e.forEach(l=>{let t=l[h];var r=(0,_util.getRowid)(n,l),o=t?_xeUtils.default.findTree(a,e=>t===e[c],{children:g}):null;if(o){var o=o.item,i=u[(0,_util.getRowid)(n,o)],i=i?i.level:0;let e=o[w],t=o[g];_xeUtils.default.isArray(e)||(e=o[w]=[]),_xeUtils.default.isArray(t)||(t=o[w]=[]),e[f](l),t[f](l);o={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:e,parent:o,level:i+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=o,u[r]=o}else{t&&(0,_log.warnLog)("vxe.error.unableInsert"),d[f](l),a[f](l);i={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:a,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=i,u[r]=i}})}function handleInsertRowAt(d,t,l,s){var e=d;let o=d.treeConfig;var r=e.isRowGroupStatus;let{tableFullTreeData:u,afterFullData:i,mergeBodyList:n,tableFullData:a,fullDataRowIdData:c,fullAllDataRowIdData:h,insertRowMaps:g}=d,w=d.computeTreeOpts,{transform:f,rowField:m,mapChildrenField:v}=w,x=w.children||w.childrenField,p=(_xeUtils.default.isArray(t)||(t=[t]),d.defineField(t.map(e=>Object.assign(o&&f?{[v]:[],[x]:[]}:{},e))));if(_xeUtils.default.eqNull(l))if(o&&f)insertTreeRow(d,p,!1);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"]))}else p.forEach(e=>{var t=(0,_util.getRowid)(d,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:i,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};c[t]=l,h[t]=l,i.unshift(e),a.unshift(e)}),n.forEach(e=>{var t=e.row;0<=t&&(e.row=t+p.length)});else if(-1===l)if(o&&f)insertTreeRow(d,p,!0);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"]))}else p.forEach(e=>{var t=(0,_util.getRowid)(d,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:i,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};c[t]=l,h[t]=l,i.push(e),a.push(e)});else if(o&&f){let a=_xeUtils.default.findTree(u,e=>l[m]===e[m],{children:v});if(a){let o=a.parent,i=o?o[v]:u;t=h[(0,_util.getRowid)(d,o)];let n=t?t.level:0;if(p.forEach((e,t)=>{var l=(0,_util.getRowid)(d,e);e[w.parentField]&&o&&e[w.parentField]!==o[m]&&(0,_log.errLog)("vxe.error.errProp",[w.parentField+"="+e[w.parentField],w.parentField+"="+o[m]]),o&&(e[w.parentField]=o[m]);let r=a.index+t;s&&(r+=1),i.splice(r,0,e);t={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:i,parent:o,level:n+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};c[l]=t,h[l]=t}),o){t=_xeUtils.default.findTree(u,e=>l[m]===e[m],{children:x});if(t){var C=t.items;let e=t.index;s&&(e+=1),C.splice(e,0,...p)}}}else(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(d,p,!0)}else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"]))}else{if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));let r=-1;if(_xeUtils.default.isNumber(l)?l<i.length&&(r=l):r=d.findRowIndexOf(i,l),-1===(r=s?Math.min(i.length,r+1):r))throw new Error((0,_log.errLog)("vxe.error.unableInsert"));i.splice(r,0,...p);t=d.findRowIndexOf(a,l);-1<t?a.splice(t+(s?1:0),0,...p):a.push(...p),n.forEach(e=>{var{row:t,rowspan:l}=e;t>=r?e.row=t+p.length:(s?t+l>=r:t+l>r)&&(e.rowspan=l+p.length)})}return p.forEach(e=>{var t=(0,_util.getRowid)(d,e);g[t]=e}),e.insertRowFlag++,d.cacheRowMap(!1),d.updateScrollYStatus(),d.handleTableData(o&&f),o&&f||d.updateAfterDataIndex(),d.updateFooter(),d.handleUpdateBodyMerge(),d.checkSelectionStatus(),e.scrollYLoad&&d.updateScrollYSpace(),d.$nextTick().then(()=>(d.updateCellAreas(),d.recalculate(!0))).then(()=>({row:p.length?p[p.length-1]:null,rows:p}))}function handleInsertChildRowAt(e,t,l,r,o){var i=e.treeConfig;let{transform:n,rowField:a,parentField:d}=e.computeTreeOpts;return i&&n?handleInsertRowAt(e,(t=_xeUtils.default.isArray(t)?t:[t]).map(e=>Object.assign({},e,{[d]:l[a]})),r,o):((0,_log.errLog)("vxe.error.errProp",["tree-config.transform=false","tree-config.transform=true"]),Promise.resolve({row:null,rows:[]}))}function handleClearEdit(e,t,l){var r=e.editStore,{actived:r,focused:o}=r,{row:i,column:n}=r,a=e.computeValidOpts;if(i||n){if(l&&(0,_util.getRowid)(e,l)!==(0,_util.getRowid)(e,i))return e.$nextTick();syncActivedCell(e),r.args=null,r.row=null,r.column=null,e.updateFooter(),e.dispatchEvent("edit-closed",{row:i,rowIndex:e.getRowIndex(i),$rowIndex:e.getVMRowIndex(i),column:n,columnIndex:e.getColumnIndex(n),$columnIndex:e.getVMColumnIndex(n)},t||null)}return o.row=null,o.column=null,a.autoClear&&("full"!==a.msgMode||"obsolete"===getConfig().cellVaildMode)&&e.clearValidate?e.clearValidate():e.$nextTick().then(()=>e.updateCellAreas())}function handleEditActive(l,r,o,i,e){let n=l.$xeGrid;var{editConfig:t,mouseConfig:a}=l,{editStore:d,tableColumn:s}=l,u=l.computeEditOpts,c=u.mode,{actived:d,focused:h}=d;let{row:g,column:w}=r;var f=w.editRender,m=r.cell||l.getCellElement(g,w),v=u.beforeEditMethod||u.activeMethod;if((r.cell=m)&&(0,_utils.isEnableConf)(t)&&(0,_utils.isEnableConf)(f)&&!l.isPendingByRow(g)&&!l.isAggregateRecord(g)){if(d.row!==g||"cell"===c&&d.column!==w){let t="edit-disabled";if(!v||v(Object.assign(Object.assign({},r),{$table:l,$grid:n}))){a&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),l.closeTooltip(),d.column&&handleClearEdit(l,o),t="edit-activated",w.renderHeight=m.offsetHeight,d.args=r,d.row=g,d.column=w,"row"===c?s.forEach(e=>getEditColumnModel(g,e)):getEditColumnModel(g,w);let e=u.afterEditMethod;l.$nextTick(()=>{i&&l.handleFocus(r,o),e&&e(Object.assign(Object.assign({},r),{$table:l,$grid:n}))})}l.dispatchEvent(t,{row:g,rowIndex:l.getRowIndex(g),$rowIndex:l.getVMRowIndex(g),column:w,columnIndex:l.getColumnIndex(w),$columnIndex:l.getVMColumnIndex(w)},o),"edit-activated"===t&&l.dispatchEvent("edit-actived",{row:g,rowIndex:l.getRowIndex(g),$rowIndex:l.getVMRowIndex(g),column:w,columnIndex:l.getColumnIndex(w),$columnIndex:l.getVMColumnIndex(w)},o)}else{t=d.column;a&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),t!==w&&(f=t.model,f.update&&(0,_util.setCellValue)(g,t,f.value),l.clearValidate)&&l.clearValidate(g,w),w.renderHeight=m.offsetHeight,d.args=r,d.column=w,e&&setTimeout(()=>{l.handleFocus(r,o)})}h.column=null,h.row=null,l.focus()}return l.$nextTick()}function handleEditCell(t,l,e,r){let o=t;var i=t.editConfig;let n=_xeUtils.default.isString(e)?t.getColumnByField(e):e;return l&&n&&(0,_utils.isEnableConf)(i)&&(0,_utils.isEnableConf)(n.editRender)&&!t.isAggregateRecord(l)?Promise.resolve(r?t.scrollToRow(l,n):null).then(()=>{var e=t.getCellElement(l,n);return e&&(handleEditActive(t,{row:l,rowIndex:t.getRowIndex(l),column:n,columnIndex:t.getColumnIndex(n),cell:e,$table:t},null,r,r),o._lastCallTime=Date.now()),t.$nextTick()}):t.$nextTick()}var _default=exports.default={methods:{_insert(e){return handleInsertRowAt(this,e,null)},_insertAt(e,t){return handleInsertRowAt(this,e,t)},_insertNextAt(e,t){return handleInsertRowAt(this,e,t,!0)},_insertChild(e,t){return handleInsertChildRowAt(this,e,t,null)},_insertChildAt(e,t,l){return handleInsertChildRowAt(this,e,t,l)},_insertChildNextAt(e,t,l){return handleInsertChildRowAt(this,e,t,l,!0)},_remove(e){let l=this;var t=l,r=l,t=t.treeConfig,{editStore:o,isRowGroupStatus:i}=r;let{tableFullTreeData:n,selectCheckboxMaps:a,afterFullData:d,mergeBodyList:s,tableFullData:u,pendingRowMaps:c,insertRowMaps:h,removeRowMaps:g}=l;var w=l.computeCheckboxOpts,f=l.computeTreeOpts;let{transform:m,mapChildrenField:v}=f,x=f.children||f.childrenField;f=o.actived,o=w.checkField;let p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=u,e.forEach(e=>{var t;l.isInsertByRow(e)||(t=(0,_util.getRowid)(l,e),g[t]=e)}),o||(e.forEach(e=>{e=(0,_util.getRowid)(this,e);a[e]&&delete a[e]}),r.updateCheckboxFlag++),u===e?(e=p=u.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&m?e.forEach(e=>{let t=(0,_util.getRowid)(this,e);var l=_xeUtils.default.findTree(n,e=>t===(0,_util.getRowid)(this,e),{children:v}),l=(l&&(l=l.items.splice(l.index,1),p.push(l[0])),_xeUtils.default.findTree(n,e=>t===(0,_util.getRowid)(this,e),{children:x})),l=(l&&l.items.splice(l.index,1),this.findRowIndexOf(d,e));-1<l&&d.splice(l,1)}):i?(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"])):e.forEach(e=>{var t=this.findRowIndexOf(u,e);-1<t&&(t=u.splice(t,1),p.push(t[0]));let r=this.findRowIndexOf(d,e);-1<r&&(s.forEach(e=>{var{row:t,rowspan:l}=e;t>r?e.row=t-1:t+l>r&&(e.rowspan=l-1)}),d.splice(r,1))}),f.row&&-1<l.findRowIndexOf(e,f.row)&&l.clearEdit(),e.forEach(e=>{e=(0,_util.getRowid)(l,e);h[e]&&delete h[e],c[e]&&delete c[e]}),r.removeRowFlag++,r.insertRowFlag++,r.pendingRowFlag++,l.cacheRowMap(!1),l.handleTableData(t&&m),l.updateFooter(),l.handleUpdateBodyMerge(),t&&m||l.updateAfterDataIndex(),l.checkSelectionStatus(),r.scrollYLoad&&l.updateScrollYSpace(),this.$nextTick().then(()=>(this.updateCellAreas(),this.recalculate(!0))).then(()=>({row:p.length?p[p.length-1]:null,rows:p}))},_removeCheckboxRow(){return this.remove(this.getCheckboxRecords()).then(e=>(this.clearCheckboxRow(),e))},_removeRadioRow(){var e=this.getRadioRecord();return this.remove(e||[]).then(e=>(this.clearRadioRow(),e))},_removeCurrentRow(){var e=this.getCurrentRecord();return this.remove(e||[]).then(e=>(this.clearCurrentRow(),e))},_getRecordset(){var e=this.getRemoveRecords(),t=this.getPendingRecords();let l=e.concat(t);var r=this.getUpdateRecords().filter(t=>!l.some(e=>this.eqRow(e,t)));return{insertRecords:this.getInsertRecords(),removeRecords:e,updateRecords:r,pendingRecords:t}},_getInsertRecords(){let{fullAllDataRowIdData:l,insertRowMaps:e}=this,r=[];return _xeUtils.default.each(e,(e,t)=>{l[t]&&r.push(e)}),r},_getRemoveRecords(){var e=this.removeRowMaps;let t=[];return _xeUtils.default.each(e,e=>{t.push(e)}),t},_getUpdateRecords(){let t=this;var{keepSource:e,treeConfig:l}=t,r=t.tableFullData,o=t.computeTreeOpts;return e?(syncActivedCell(t),l?_xeUtils.default.filterTree(r,e=>t.isUpdateByRow(e),o):r.filter(e=>t.isUpdateByRow(e))):[]},handleEdit(e,t){return handleEditActive(this,e,t,!0,!0)},handleActived(e,t){return this.handleEdit(e,t)},_getColumnModel(e,t){getEditColumnModel(e,t)},_setColumnModel(e,t){setEditColumnModel(e,t)},_syncActivedCell(){syncActivedCell(this)},_clearActived(e){return(0,_log.warnLog)("vxe.error.delFunc",["clearActived","clearEdit"]),this.clearEdit(e)},_clearEdit(e){return handleClearEdit(this,null,e)},handleClearEdit(e,t){return handleClearEdit(this,e,t)},_getActiveRecord(){var e=((0,_log.warnLog)("vxe.error.delFunc",["getActiveRecord","getEditCell"]),this).editStore,t=this.fullAllDataRowIdData,{args:e,row:l}=e.actived;return e&&l&&t[(0,_util.getRowid)(this,l)]?Object.assign({},e,{row:l}):null},_getEditRecord(){var e=((0,_log.warnLog)("vxe.error.delFunc",["getEditRecord","getEditCell"]),this).editStore,t=this.fullAllDataRowIdData,{args:e,row:l}=e.actived;return e&&l&&t[(0,_util.getRowid)(this,l)]?Object.assign({},e,{row:l}):null},_getEditCell(){var e=this.editStore,{row:e,column:t}=e.actived;return t&&e?{row:e,column:t}:null},_isActiveByRow(e){return(0,_log.warnLog)("vxe.error.delFunc",["isActiveByRow","isEditByRow"]),this.isEditByRow(e)},_isEditByRow(e){var t=this.editStore;return t.actived.row===e},handleFocus(r){var{row:o,column:i,cell:n}=r,a=i.editRender,d=this.computeEditOpts;if((0,_utils.isEnableConf)(a)){var s=renderer.get(a.name);let e=a.autofocus||a.autoFocus,t=a.autoSelect||a.autoselect,l;d.autoFocus&&(!e&&s&&(e=s.tableAutoFocus||s.tableAutofocus||s.autoFocus||s.autofocus),!t&&s&&(t=s.tableAutoSelect||s.autoSelect||s.autoselect),_xeUtils.default.isFunction(e)?l=e.call(this,r):e&&(l=!0===e?n.querySelector("input,textarea"):n.querySelector(e))&&l.focus()),l?t?l.select():browseObj.msie&&((a=l.createTextRange()).collapse(!1),a.select()):d.autoPos&&!i.fixed&&this.scrollToRow(o,i)}},_setActiveRow(e){return(0,_log.warnLog)("vxe.error.delFunc",["setActiveRow","setEditRow"]),this.setEditRow(e)},_setEditRow(e,t){let l=_xeUtils.default.find(this.visibleColumn,e=>(0,_utils.isEnableConf)(e.editRender)),r=!1;return t&&(r=!0)!==t&&(l=_xeUtils.default.isString(t)?this.getColumnByField(t):t),handleEditCell(this,e,l,r)},_setActiveCell(e,t){return(0,_log.warnLog)("vxe.error.delFunc",["setActiveCell","setEditCell"]),this.setEditCell(e,t)},_setEditCell(e,t){return handleEditCell(this,e,t,!0)},_setSelectCell(e,t){var l=this,r=l.tableData,o=l.computeEditOpts,t=_xeUtils.default.isString(t)?l.getColumnByField(t):t;return e&&t&&"manual"!==o.trigger&&-1<(o=l.findRowIndexOf(r,e))&&(r=l.getCellElement(e,t),e={row:e,rowIndex:o,column:t,columnIndex:l.getColumnIndex(t),cell:r},l.handleSelected(e,{})),l.$nextTick()},handleSelected(e,t){let l=this;var r=l.mouseConfig,o=l.editStore,i=l.computeMouseOpts;let n=l.computeEditOpts,{actived:a,selected:d}=o,{row:s,column:u}=e,c=r&&i.selected;return!c||d.row===s&&d.column===u||(a.row!==s||"cell"===n.mode&&a.column!==u)&&(handleClearEdit(l,t),l.clearSelected(),l.clearCellAreas&&(l.clearCellAreas(),l.clearCopyCellArea()),d.args=e,d.row=s,d.column=u,c&&this.addCellSelectedClass(),l.focus(),t)&&l.dispatchEvent("cell-selected",e,t),l.$nextTick()},_getSelectedCell(){var e=this.editStore,{row:e,column:t}=e.selected;return e&&t?{row:e,column:t}:null},_clearSelected(){var e=this.editStore,e=e.selected;return e.row=null,e.column=null,removeCellSelectedClass(this),this.$nextTick()},reColTitleSdCls(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),e=>(0,_dom.removeClass)(e,"col--title-selected"))},addCellSelectedClass(){var e=this.editStore,e=e.selected,{row:e,column:t}=e;removeCellSelectedClass(this),e&&t&&(e=this.getCellElement(e,t))&&(0,_dom.addClass)(e,"col--selected")}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_util=require("../../src/util"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,renderer,getI18n}=_ui.VxeUI,browseObj=_xeUtils.default.browse();function getEditColumnModel(e,t){var{model:l,editRender:r}=t;r&&(l.value=(0,_util.getCellValue)(e,t),l.update=!1)}function setEditColumnModel(e,t){var{model:l,editRender:r}=t;r&&l.update&&((0,_util.setCellValue)(e,t,l.value),l.update=!1,l.value=null)}function removeCellSelectedClass(e){var e=e.$refs.refElem;e&&(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}function syncActivedCell(e){var{editStore:t,tableColumn:l}=e,e=e.computeEditOpts,t=t.actived;let{row:r,column:o}=t;(r||o)&&("row"===e.mode?l.forEach(e=>setEditColumnModel(r,e)):setEditColumnModel(r,o))}function insertTreeRow(n,e,t){let{tableFullTreeData:d,afterFullData:a,fullDataRowIdData:s,fullAllDataRowIdData:u}=n;var l=n.computeTreeOpts;let{rowField:c,parentField:h,mapChildrenField:g}=l,w=l.children||l.childrenField,f=t?"push":"unshift";e.forEach(l=>{let t=l[h];var r=(0,_util.getRowid)(n,l),o=t?_xeUtils.default.findTree(d,e=>t===e[c],{children:g}):null;if(o){var o=o.item,i=u[(0,_util.getRowid)(n,o)],i=i?i.level:0;let e=o[w],t=o[g];_xeUtils.default.isArray(e)||(e=o[w]=[]),_xeUtils.default.isArray(t)||(t=o[w]=[]),e[f](l),t[f](l);o={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,_tIndex:-1,items:e,parent:o,level:i+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=o,u[r]=o}else{t&&(0,_log.warnLog)("vxe.error.unableInsert"),a[f](l),d[f](l);i={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,_tIndex:-1,items:d,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=i,u[r]=i}})}function handleInsertRowAt(a,t,l,s){var e=a;let o=a.treeConfig;var r=e.isRowGroupStatus;let{tableFullTreeData:u,afterFullData:i,mergeBodyList:n,tableFullData:d,fullDataRowIdData:c,fullAllDataRowIdData:h,insertRowMaps:g}=a,w=a.computeTreeOpts,{transform:f,rowField:m,mapChildrenField:x}=w,v=w.children||w.childrenField,p=(_xeUtils.default.isArray(t)||(t=[t]),a.defineField(t.map(e=>Object.assign(o&&f?{[x]:[],[v]:[]}:{},e))));if(_xeUtils.default.eqNull(l))if(o&&f)insertTreeRow(a,p,!1);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"]))}else p.forEach(e=>{var t=(0,_util.getRowid)(a,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,_tIndex:-1,items:i,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};c[t]=l,h[t]=l,i.unshift(e),d.unshift(e)}),n.forEach(e=>{var t=e.row;0<=t&&(e.row=t+p.length)});else if(-1===l)if(o&&f)insertTreeRow(a,p,!0);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"]))}else p.forEach(e=>{var t=(0,_util.getRowid)(a,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,_tIndex:-1,items:i,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};c[t]=l,h[t]=l,i.push(e),d.push(e)});else if(o&&f){let d=_xeUtils.default.findTree(u,e=>l[m]===e[m],{children:x});if(d){let o=d.parent,i=o?o[x]:u;t=h[(0,_util.getRowid)(a,o)];let n=t?t.level:0;if(p.forEach((e,t)=>{var l=(0,_util.getRowid)(a,e);e[w.parentField]&&o&&e[w.parentField]!==o[m]&&(0,_log.errLog)("vxe.error.errProp",[w.parentField+"="+e[w.parentField],w.parentField+"="+o[m]]),o&&(e[w.parentField]=o[m]);let r=d.index+t;s&&(r+=1),i.splice(r,0,e);t={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,_tIndex:-1,items:i,parent:o,level:n+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};c[l]=t,h[l]=t}),o){t=_xeUtils.default.findTree(u,e=>l[m]===e[m],{children:v});if(t){var C=t.items;let e=t.index;s&&(e+=1),C.splice(e,0,...p)}}}else(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(a,p,!0)}else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"]))}else{if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));let r=-1;if(_xeUtils.default.isNumber(l)?l<i.length&&(r=l):r=a.findRowIndexOf(i,l),-1===(r=s?Math.min(i.length,r+1):r))throw new Error((0,_log.errLog)("vxe.error.unableInsert"));i.splice(r,0,...p);t=a.findRowIndexOf(d,l);-1<t?d.splice(t+(s?1:0),0,...p):d.push(...p),n.forEach(e=>{var{row:t,rowspan:l}=e;t>=r?e.row=t+p.length:(s?t+l>=r:t+l>r)&&(e.rowspan=l+p.length)})}return p.forEach(e=>{var t=(0,_util.getRowid)(a,e);g[t]=e}),e.insertRowFlag++,a.cacheRowMap(!1),a.updateScrollYStatus(),a.handleTableData(o&&f),o&&f||a.updateAfterDataIndex(),a.updateFooter(),a.handleUpdateBodyMerge(),a.checkSelectionStatus(),e.scrollYLoad&&a.updateScrollYSpace(),a.$nextTick().then(()=>(a.updateCellAreas(),a.recalculate(!0))).then(()=>({row:p.length?p[p.length-1]:null,rows:p}))}function handleInsertChildRowAt(e,t,l,r,o){var i=e.treeConfig;let{transform:n,rowField:d,parentField:a}=e.computeTreeOpts;return i&&n?handleInsertRowAt(e,(t=_xeUtils.default.isArray(t)?t:[t]).map(e=>Object.assign({},e,{[a]:l[d]})),r,o):((0,_log.errLog)("vxe.error.errProp",["tree-config.transform=false","tree-config.transform=true"]),Promise.resolve({row:null,rows:[]}))}function handleClearEdit(e,t,l){var r=e.editStore,{actived:r,focused:o}=r,{row:i,column:n}=r,d=e.computeValidOpts;if(i||n){if(l&&(0,_util.getRowid)(e,l)!==(0,_util.getRowid)(e,i))return e.$nextTick();syncActivedCell(e),r.args=null,r.row=null,r.column=null,e.updateFooter(),e.dispatchEvent("edit-closed",{row:i,rowIndex:e.getRowIndex(i),$rowIndex:e.getVMRowIndex(i),column:n,columnIndex:e.getColumnIndex(n),$columnIndex:e.getVMColumnIndex(n)},t||null)}return o.row=null,o.column=null,d.autoClear&&("full"!==d.msgMode||"obsolete"===getConfig().cellVaildMode)&&e.clearValidate?e.clearValidate():e.$nextTick().then(()=>e.updateCellAreas())}function handleEditActive(l,r,o,i,e){let n=l.$xeGrid;var{editConfig:t,mouseConfig:d}=l,{editStore:a,tableColumn:s}=l,u=l.computeEditOpts,c=u.mode,{actived:a,focused:h}=a;let{row:g,column:w}=r;var f=w.editRender,m=r.cell||l.getCellElement(g,w),x=u.beforeEditMethod||u.activeMethod;if((r.cell=m)&&(0,_utils.isEnableConf)(t)&&(0,_utils.isEnableConf)(f)&&!l.isPendingByRow(g)&&!l.isAggregateRecord(g)){if(a.row!==g||"cell"===c&&a.column!==w){let t="edit-disabled";if(!x||x(Object.assign(Object.assign({},r),{$table:l,$grid:n}))){d&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),l.closeTooltip(),a.column&&handleClearEdit(l,o),t="edit-activated",w.renderHeight=m.offsetHeight,a.args=r,a.row=g,a.column=w,"row"===c?s.forEach(e=>getEditColumnModel(g,e)):getEditColumnModel(g,w);let e=u.afterEditMethod;l.$nextTick(()=>{i&&l.handleFocus(r,o),e&&e(Object.assign(Object.assign({},r),{$table:l,$grid:n}))})}l.dispatchEvent(t,{row:g,rowIndex:l.getRowIndex(g),$rowIndex:l.getVMRowIndex(g),column:w,columnIndex:l.getColumnIndex(w),$columnIndex:l.getVMColumnIndex(w)},o),"edit-activated"===t&&l.dispatchEvent("edit-actived",{row:g,rowIndex:l.getRowIndex(g),$rowIndex:l.getVMRowIndex(g),column:w,columnIndex:l.getColumnIndex(w),$columnIndex:l.getVMColumnIndex(w)},o)}else{t=a.column;d&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),t!==w&&(f=t.model,f.update&&(0,_util.setCellValue)(g,t,f.value),l.clearValidate)&&l.clearValidate(g,w),w.renderHeight=m.offsetHeight,a.args=r,a.column=w,e&&setTimeout(()=>{l.handleFocus(r,o)})}h.column=null,h.row=null,l.focus()}return l.$nextTick()}function handleEditCell(t,l,e,r){let o=t;var i=t.editConfig;let n=_xeUtils.default.isString(e)?t.getColumnByField(e):e;return l&&n&&(0,_utils.isEnableConf)(i)&&(0,_utils.isEnableConf)(n.editRender)&&!t.isAggregateRecord(l)?Promise.resolve(r?t.scrollToRow(l,n):null).then(()=>{var e=t.getCellElement(l,n);return e&&(handleEditActive(t,{row:l,rowIndex:t.getRowIndex(l),column:n,columnIndex:t.getColumnIndex(n),cell:e,$table:t},null,r,r),o._lastCallTime=Date.now()),t.$nextTick()}):t.$nextTick()}var _default=exports.default={methods:{_insert(e){return handleInsertRowAt(this,e,null)},_insertAt(e,t){return handleInsertRowAt(this,e,t)},_insertNextAt(e,t){return handleInsertRowAt(this,e,t,!0)},_insertChild(e,t){return handleInsertChildRowAt(this,e,t,null)},_insertChildAt(e,t,l){return handleInsertChildRowAt(this,e,t,l)},_insertChildNextAt(e,t,l){return handleInsertChildRowAt(this,e,t,l,!0)},_remove(e){let l=this;var t=l,r=l,t=t.treeConfig,{editStore:o,isRowGroupStatus:i}=r;let{tableFullTreeData:n,selectCheckboxMaps:d,afterFullData:a,mergeBodyList:s,tableFullData:u,pendingRowMaps:c,insertRowMaps:h,removeRowMaps:g}=l;var w=l.computeCheckboxOpts,f=l.computeTreeOpts;let{transform:m,mapChildrenField:x}=f,v=f.children||f.childrenField;f=o.actived,o=w.checkField;let p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=u,e.forEach(e=>{var t;l.isInsertByRow(e)||(t=(0,_util.getRowid)(l,e),g[t]=e)}),o||(e.forEach(e=>{e=(0,_util.getRowid)(this,e);d[e]&&delete d[e]}),r.updateCheckboxFlag++),u===e?(e=p=u.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&m?e.forEach(e=>{let t=(0,_util.getRowid)(this,e);var l=_xeUtils.default.findTree(n,e=>t===(0,_util.getRowid)(this,e),{children:x}),l=(l&&(l=l.items.splice(l.index,1),p.push(l[0])),_xeUtils.default.findTree(n,e=>t===(0,_util.getRowid)(this,e),{children:v})),l=(l&&l.items.splice(l.index,1),this.findRowIndexOf(a,e));-1<l&&a.splice(l,1)}):i?(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"])):e.forEach(e=>{var t=this.findRowIndexOf(u,e);-1<t&&(t=u.splice(t,1),p.push(t[0]));let r=this.findRowIndexOf(a,e);-1<r&&(s.forEach(e=>{var{row:t,rowspan:l}=e;t>r?e.row=t-1:t+l>r&&(e.rowspan=l-1)}),a.splice(r,1))}),f.row&&-1<l.findRowIndexOf(e,f.row)&&l.clearEdit(),e.forEach(e=>{e=(0,_util.getRowid)(l,e);h[e]&&delete h[e],c[e]&&delete c[e]}),r.removeRowFlag++,r.insertRowFlag++,r.pendingRowFlag++,l.cacheRowMap(!1),l.handleTableData(t&&m),l.updateFooter(),l.handleUpdateBodyMerge(),t&&m||l.updateAfterDataIndex(),l.checkSelectionStatus(),r.scrollYLoad&&l.updateScrollYSpace(),this.$nextTick().then(()=>(this.updateCellAreas(),this.recalculate(!0))).then(()=>({row:p.length?p[p.length-1]:null,rows:p}))},_removeCheckboxRow(){return this.remove(this.getCheckboxRecords()).then(e=>(this.clearCheckboxRow(),e))},_removeRadioRow(){var e=this.getRadioRecord();return this.remove(e||[]).then(e=>(this.clearRadioRow(),e))},_removeCurrentRow(){var e=this.getCurrentRecord();return this.remove(e||[]).then(e=>(this.clearCurrentRow(),e))},_getRecordset(){var e=this.getRemoveRecords(),t=this.getPendingRecords();let l=e.concat(t);var r=this.getUpdateRecords().filter(t=>!l.some(e=>this.eqRow(e,t)));return{insertRecords:this.getInsertRecords(),removeRecords:e,updateRecords:r,pendingRecords:t}},_getInsertRecords(){let{fullAllDataRowIdData:l,insertRowMaps:e}=this,r=[];return _xeUtils.default.each(e,(e,t)=>{l[t]&&r.push(e)}),r},_getRemoveRecords(){var e=this.removeRowMaps;let t=[];return _xeUtils.default.each(e,e=>{t.push(e)}),t},_getUpdateRecords(){let t=this;var{keepSource:e,treeConfig:l}=t,r=t.tableFullData,o=t.computeTreeOpts;return e?(syncActivedCell(t),l?_xeUtils.default.filterTree(r,e=>t.isUpdateByRow(e),o):r.filter(e=>t.isUpdateByRow(e))):[]},handleEdit(e,t){return handleEditActive(this,e,t,!0,!0)},handleActived(e,t){return this.handleEdit(e,t)},_getColumnModel(e,t){getEditColumnModel(e,t)},_setColumnModel(e,t){setEditColumnModel(e,t)},_syncActivedCell(){syncActivedCell(this)},_clearActived(e){return(0,_log.warnLog)("vxe.error.delFunc",["clearActived","clearEdit"]),this.clearEdit(e)},_clearEdit(e){return handleClearEdit(this,null,e)},handleClearEdit(e,t){return handleClearEdit(this,e,t)},_getActiveRecord(){var e=((0,_log.warnLog)("vxe.error.delFunc",["getActiveRecord","getEditCell"]),this).editStore,t=this.fullAllDataRowIdData,{args:e,row:l}=e.actived;return e&&l&&t[(0,_util.getRowid)(this,l)]?Object.assign({},e,{row:l}):null},_getEditRecord(){var e=((0,_log.warnLog)("vxe.error.delFunc",["getEditRecord","getEditCell"]),this).editStore,t=this.fullAllDataRowIdData,{args:e,row:l}=e.actived;return e&&l&&t[(0,_util.getRowid)(this,l)]?Object.assign({},e,{row:l}):null},_getEditCell(){var e=this.editStore,{row:e,column:t}=e.actived;return t&&e?{row:e,column:t}:null},_isActiveByRow(e){return(0,_log.warnLog)("vxe.error.delFunc",["isActiveByRow","isEditByRow"]),this.isEditByRow(e)},_isEditByRow(e){var t=this.editStore;return t.actived.row===e},handleFocus(r){var{row:o,column:i,cell:n}=r,d=i.editRender,a=this.computeEditOpts;if((0,_utils.isEnableConf)(d)){var s=renderer.get(d.name);let e=d.autofocus||d.autoFocus,t=d.autoSelect||d.autoselect,l;a.autoFocus&&(!e&&s&&(e=s.tableAutoFocus||s.tableAutofocus||s.autoFocus||s.autofocus),!t&&s&&(t=s.tableAutoSelect||s.autoSelect||s.autoselect),_xeUtils.default.isFunction(e)?l=e.call(this,r):e&&(l=!0===e?n.querySelector("input,textarea"):n.querySelector(e))&&l.focus()),l?t?l.select():browseObj.msie&&((d=l.createTextRange()).collapse(!1),d.select()):a.autoPos&&!i.fixed&&this.scrollToRow(o,i)}},_setActiveRow(e){return(0,_log.warnLog)("vxe.error.delFunc",["setActiveRow","setEditRow"]),this.setEditRow(e)},_setEditRow(e,t){let l=_xeUtils.default.find(this.visibleColumn,e=>(0,_utils.isEnableConf)(e.editRender)),r=!1;return t&&(r=!0)!==t&&(l=_xeUtils.default.isString(t)?this.getColumnByField(t):t),handleEditCell(this,e,l,r)},_setActiveCell(e,t){return(0,_log.warnLog)("vxe.error.delFunc",["setActiveCell","setEditCell"]),this.setEditCell(e,t)},_setEditCell(e,t){return handleEditCell(this,e,t,!0)},_setSelectCell(e,t){var l=this,r=l.tableData,o=l.computeEditOpts,t=_xeUtils.default.isString(t)?l.getColumnByField(t):t;return e&&t&&"manual"!==o.trigger&&-1<(o=l.findRowIndexOf(r,e))&&(r=l.getCellElement(e,t),e={row:e,rowIndex:o,column:t,columnIndex:l.getColumnIndex(t),cell:r},l.handleSelected(e,{})),l.$nextTick()},handleSelected(e,t){let l=this;var r=l.mouseConfig,o=l.editStore,i=l.computeMouseOpts;let n=l.computeEditOpts,{actived:d,selected:a}=o,{row:s,column:u}=e,c=r&&i.selected;return!c||a.row===s&&a.column===u||(d.row!==s||"cell"===n.mode&&d.column!==u)&&(handleClearEdit(l,t),l.clearSelected(),l.clearCellAreas&&(l.clearCellAreas(),l.clearCopyCellArea()),a.args=e,a.row=s,a.column=u,c&&this.addCellSelectedClass(),l.focus(),t)&&l.dispatchEvent("cell-selected",e,t),l.$nextTick()},_getSelectedCell(){var e=this.editStore,{row:e,column:t}=e.selected;return e&&t?{row:e,column:t}:null},_clearSelected(){var e=this.editStore,e=e.selected;return e.row=null,e.column=null,removeCellSelectedClass(this),this.$nextTick()},reColTitleSdCls(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),e=>(0,_dom.removeClass)(e,"col--title-selected"))},addCellSelectedClass(){var e=this.editStore,e=e.selected,{row:e,column:t}=e;removeCellSelectedClass(this),e&&t&&(e=this.getCellElement(e,t))&&(0,_dom.addClass)(e,"col--selected")}}};

package/lib/table/src/body.js

@@ -336,7 +336,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
-  const isVNAutoHeight = scrollYLoad && !hasEllipsis;
+  const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
   let cellHeight = (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight);
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
@@ -372,7 +372,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
     tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
   }
-  if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
+  if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
     tcStyle.height = `${cellHeight}px`;
   } else {
     tcStyle.minHeight = `${cellHeight}px`;
@@ -562,14 +562,15 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       };
     }
     if (rowRest) {
+      rowIndex = rowRest.index;
+      _rowIndex = rowRest._index;
       rowLevel = rowRest.level;
+      seq = rowRest.seq;
       if (hasRowGroupAggregate || treeConfig && transform && seqMode === 'increasing') {
         seq = rowRest._index + 1;
-      } else {
-        seq = rowRest.seq;
+      } else if (treeConfig && seqMode === 'fixed') {
+        seq = rowRest._tIndex + 1;
       }
-      rowIndex = rowRest.index;
-      _rowIndex = rowRest._index;
     }
     const params = {
       $table: $xeTable,

package/lib/table/src/body.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,renderType="body",isVMScrollProcess=e=>{var l=e.delayHover,{lastScrollTime:e,isDragResize:t}=e;return!!(t||e&&Date.now()<e+l)};function renderLine(e,l,t,r,a){var o=r.column,i=l.afterFullData,s=l.treeConfig,d=l.computeTreeOpts,{slots:o,treeNode:n}=o,c=l.fullAllDataRowIdData;if(o&&o.line)return l.callSlot(o.line,r,e);o=c[t];let p=0,u=null;return o&&(p=o.level,u=o.items[o.treeIndex-1]),s&&n&&(d.showLine||d.line)?[e("div",{key:"tl",class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${(0,_util.getRowid)(l,i[0])===t?1:(0,_util.calcTreeLine)(r,u)}px`,bottom:`-${Math.floor(a/2)}px`,left:p*d.indent+(p?2-(0,_util.getOffsetSize)(l):0)+16+"px"}})])]:[]}function renderTdColumn(e,l,t,r,a,A,H,o,q,F,i,s,L,N,U){var d=l.$xeGrid,{columnKey:V,resizable:n,showOverflow:c,border:W,height:p,treeConfig:X,cellClassName:j,cellStyle:G,align:u,spanMethod:P,mouseConfig:Y,editConfig:K,editRules:g,tooltipConfig:x,padding:J}=l,{tableData:Q,dragRow:Z,overflowX:ee,currentColumn:le,scrollXLoad:te,scrollYLoad:re,mergeBodyFlag:ae,calcCellHeightFlag:m,resizeHeightFlag:v,resizeWidthFlag:oe,editStore:ie,isAllOverflow:se,validErrorMaps:de}=l,{fullAllDataRowIdData:ne,fullColumnIdData:w,mergeBodyCellMaps:ce,visibleColumn:pe,afterFullData:ue,mergeBodyList:ge,scrollXStore:xe,scrollYStore:me}=l,f=l.computeCellOpts,h=l.computeValidOpts,y=l.computeCheckboxOpts,ve=l.computeEditOpts,b=l.computeTooltipOpts,we=l.computeVirtualXOpts,fe=l.computeVirtualYOpts,{isAllColumnDrag:he,isAllRowDrag:ye}=l.resizableOpts,C=l.computeRowOpts,_=l.computeRowDragOpts,be=l.computeDefaultRowHeight,m=m?f.height||C.height:0,{disabledMethod:E,isCrossDrag:Ce,isPeerDrag:_e}=_,Ee=l.computeColumnOpts,Re=l.computeMouseOpts,Se=l.computeCellOffsetWidth,De=l.computeAreaOpts.selectCellToRow,{type:Oe,cellRender:Ie,editRender:$e,align:Te,showOverflow:R,className:ke,treeNode:Be,rowResize:Me,padding:S,verticalAlign:D,slots:ze}=s,Ae=f.verticalAlign,ie=ie.actived,He=ne[r]||{},O=s.id,w=w[O]||{},I=$e||Ie,I=I?renderer.get(I.name):null,qe=I?I.tableCellClassName||I.cellClassName:null,Fe=I?I.tableCellStyle||I.cellStyle:"";let Le=b.showAll;var Ne=w.index,b=w._index,w=(0,_utils.isEnableConf)($e),v=v?He.resizeHeight:0;let $=ee&&(a?s.fixed!==a:!!s.fixed);J=_xeUtils.default.eqNull(S)?null===J?f.padding:J:S,S=_xeUtils.default.eqNull(R)?c:R,c="ellipsis"===S;let T="title"===S,k=!0===S||"tooltip"===S;R=se||T||k||c,S=_xeUtils.default.isBoolean(s.resizable)?s.resizable:Ee.resizable||n,n=!!m,m=0<v;let Ue;v={},Te=Te||(I?I.tableCellAlign:"")||u,I=_xeUtils.default.eqNull(D)?Ae:D,u=de[r+":"+O],Ae=g&&h.showMessage&&("default"===h.message?p||1<Q.length:"inline"===h.message),D={colid:O};let B={$table:l,$grid:d,isEdit:!1,seq:t,rowid:r,row:o,rowIndex:q,$rowIndex:F,_rowIndex:i,column:s,columnIndex:Ne,$columnIndex:L,_columnIndex:b,fixed:a,type:renderType,isHidden:!!$,level:H,visibleData:ue,data:Q,items:U},M=!1,Ve=!1,z=((M=C.drag?"row"===_.trigger||s.dragSort&&"cell"===_.trigger:M)&&(Ve=!(!E||!E(B))),(T||k||Le||x)&&(v.mouseenter=e=>{isVMScrollProcess(l)||(T?(0,_dom.updateCellTitle)(e.currentTarget,s):(k||Le)&&l.triggerBodyTooltipEvent(e,B),l.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},B),e))}),(k||Le||x)&&(v.mouseleave=e=>{isVMScrollProcess(l)||((k||Le)&&l.handleTargetLeaveEvent(e),l.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},B),e))}),(M||y.range||Y)&&(v.mousedown=e=>{l.triggerCellMousedownEvent(e,B)}),M&&(v.mouseup=l.triggerCellMouseupEvent),v.click=e=>{l.triggerCellClickEvent(e,B)},!(v.dblclick=e=>{l.triggerCellDblclickEvent(e,B)})),We=1,Xe=1;if(ae&&ge.length){de=ce[i+":"+b];if(de){var{rowspan:g,colspan:p}=de;if(!g||!p)return renderEmptyElement(l);1<g&&(z=!0,Xe=g,D.rowspan=g),1<p&&(z=!0,We=p,D.colspan=p)}}else if(P){var{rowspan:d=1,colspan:t=1}=P(B)||{};if(!d||!t)return renderEmptyElement(l);1<d&&(z=!0,Xe=d,D.rowspan=d),1<t&&(z=!0,We=t,D.colspan=t)}!($=$&&z&&(1<D.colspan||1<D.rowspan)?!1:$)&&K&&($e||Ie)&&(ve.showStatus||ve.showUpdateStatus)&&(Ue=l.isUpdateByRow(o,s.field));q=re&&!R;let je=(0,_util.getCellRestHeight)(He,f,C,be);F=L===N.length-1,Q=!s.resizeWidth&&("auto"===s.minWidth||"auto"===s.width);let Ge=!1;!ee||z||Z&&(0,_util.getRowid)(l,Z)===r||(re&&!X&&!fe.immediate&&(i<me.visibleStartIndex-me.preloadSize||i>me.visibleEndIndex+me.preloadSize)||te&&!we.immediate&&!s.fixed&&(b<xe.visibleStartIndex-xe.preloadSize||b>xe.visibleEndIndex+xe.preloadSize))&&(Ge=!0),1<Xe&&(U=ue[i+Xe-1])&&(_=ne[(0,_util.getRowid)(l,U)])&&(je+=_.oTop+(0,_util.getCellRestHeight)(_,f,C,be)-He.oTop-(0,_util.getCellRestHeight)(He,f,C,be));E={};if(R&&oe){let l=0;if(1<We)for(let e=1;e<We;e++){var Pe=pe[Ne+e];Pe&&(l+=Pe.renderWidth)}E.width=s.renderWidth+l-Se+"px"}re||R||n||m?E.height=je+"px":E.minHeight=je+"px";x=[];$&&se?x.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":c}],style:E})):(X&&x.push(...renderLine(e,l,r,B,je)),x.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":c}],style:E,attrs:{title:T?l.getCellLabel(o,s):null}},Ge?[]:[e("div",{attrs:{colid:O,rowid:r},class:"vxe-cell--wrapper vxe-body-cell--wrapper"},s.renderCell(e,B))])),Ae&&u&&(y=u.rule,ae=ze?ze.valid:null,ge=Object.assign(Object.assign(Object.assign({},B),u),{rule:u}),x.push(e("div",{key:"tcv",class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(h.className,u)],style:y&&y.maxWidth?{width:y.maxWidth+"px"}:void 0},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(h.theme||"normal")},[ae?l.callSlot(ae,ge,e):[e("span",{class:"vxe-cell--valid-error-msg"},u.content)]])]))));let Ye=!1;return Y&&Re.area&&!b&&De&&(Ye=!0),!$&&S&&he&&x.push(e("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>l.handleColResizeMousedownEvent(e,a,B),dblclick:e=>l.handleColResizeDblclickEvent(e,B)}})),(Me||ye)&&C.resizable&&x.push(e("div",{key:"tcr",class:"vxe-cell--row-resizable",on:{mousedown:e=>l.handleRowResizeMousedownEvent(e,B),dblclick:e=>l.handleRowResizeDblclickEvent(e,B)}})),e("td",{class:["vxe-table--column vxe-body--column",O,I?"col--vertical-"+I:"",Te?"col--"+Te:"",Oe?"col--"+Oe:"",{"col--last":F,"col--tree-node":Be,"col--edit":w,"col--ellipsis":R,"col--cs-height":n,"col--rs-height":m,"col--to-row":Ye,"col--auto-height":q,"fixed--width":!Q,"fixed--hidden":$,"is--padding":J,"is--progress":$&&se||Ge,"is--drag-cell":M&&(Ce||_e||!H),"is--drag-disabled":Ve,"col--dirty":Ue,"col--active":K&&w&&ie.row===o&&(ie.column===s||"row"===ve.mode),"col--valid-error":!!u,"col--current":le===s},(0,_utils.getClass)(qe,B),(0,_utils.getClass)(ke,B),(0,_utils.getClass)(j,B)],key:V||te||re||Ee.useKey||C.useKey||Ee.drag?s.id:L,attrs:D,style:Object.assign({},_xeUtils.default.isFunction(Fe)?Fe(B):Fe,_xeUtils.default.isFunction(G)?G(B):G),on:v},A&&$?[]:x)}function renderRows(v,w,f,h,y,b){let C=w.$parent;var e=C,l=C,t=C;let _=C.$xeGrid,{stripe:E,rowKey:R,highlightHoverRow:S,rowClassName:D,rowStyle:O,editConfig:I,treeConfig:$}=e,{hasFixedColumn:T,treeExpandedFlag:k,scrollXLoad:B,scrollYLoad:M,isAllOverflow:z,rowExpandedFlag:A,expandColumn:H,selectRadioRow:q,pendingRowFlag:F,rowExpandHeightFlag:L,isRowGroupStatus:N}=l,{fullAllDataRowIdData:U,fullColumnIdData:V,treeExpandedMaps:Y,pendingRowMaps:K,rowExpandedMaps:J}=t,Q=C.computeCheckboxOpts,Z=C.computeRadioOpts,W=C.computeTreeOpts,X=C.computeEditOpts,j=C.computeRowOpts,ee=C.computeColumnOpts,{transform:G,seqMode:le}=W,te=W.children||W.childrenField,P=[],re=(0,_util.createHandleGetRowId)(C).handleGetRowId,ae=$||N;return y.forEach((r,a)=>{var o={};let i=re(r);var s=U[i]||{};let d=a,n=0,c=-1,p=-1;var u=N&&r.isAggregate,g=((j.isHover||S)&&(o.mouseenter=e=>{isVMScrollProcess(C)||C.triggerHoverEvent(e,{row:r,rowIndex:d})},o.mouseleave=()=>{isVMScrollProcess(C)||C.clearHoverRow()}),s&&(n=s.level,c=u||$&&G&&"increasing"===le?s._index+1:s.seq,d=s.index,p=s._index),{$table:C,seq:c,rowid:i,fixed:f,type:renderType,level:n,row:r,rowIndex:d,$rowIndex:a,_rowIndex:p}),x=H&&!!A&&!!J[i];let e=!1,l=[],t=!1;I&&(t=C.isInsertByRow(r)),!$||M||G||(l=r[te],e=!!k&&l&&0<l.length&&!!Y[i]),!j.drag||N||$&&!G||(o.dragstart=C.handleRowDragDragstartEvent,o.dragend=C.handleRowDragDragendEvent,o.dragover=C.handleRowDragDragoverEvent);var u=["vxe-body--row",ae?"row--level-"+n:"",{"row--stripe":E&&(p+1)%2==0,"is--new":t,"is--expand-row":x,"is--expand-tree":e,"row--new":t&&(X.showStatus||X.showInsertStatus),"row--radio":Z.highlight&&q===r,"row--checked":Q.highlight&&C.isCheckedByCheckboxRow(r),"row--pending":!!F&&!!K[i],"row--group":u},D?_xeUtils.default.isFunction(D)?D(g):D:""],m=b.map((e,l)=>renderTdColumn(v,C,c,i,f,h,n,r,d,a,p,e,l,b,y));if(P.push(v("tr",{class:u,attrs:{rowid:i},style:O?_xeUtils.default.isFunction(O)?O(g):O:void 0,key:R||B||M||j.useKey||j.drag||ee.drag||N||$?i:a,on:o},m)),x){var{height:u,padding:g,mode:o}=C.computeExpandOpts;if("fixed"===o)P.push(v("tr",{class:"vxe-body--row-expanded-place",key:"expand_"+i,attrs:{rowid:i}},[v("td",{class:"vxe-body--row-expanded-place-column",attrs:{colspan:b.length},style:{height:`${L?s.expandHeight||u:0}px`}})]));else{m={},x=(u&&(m.height=u+"px"),$&&(m.paddingLeft=n*W.indent+30+"px"),H||{}).showOverflow,o=H.id,s=V[o]||{},o=_xeUtils.default.eqNull(x)?z:x;let e=-1,l=-1,t=-1;s&&(e=s.index,l=s.$index,t=s._index);x={$grid:_,$table:C,seq:c,column:H,columnIndex:e,$columnIndex:l,_columnIndex:t,fixed:f,type:renderType,level:n,row:r,rowid:i,rowIndex:d,$rowIndex:a,_rowIndex:p,isHidden:!1,isEdit:!1,visibleData:[],data:[],items:[]};P.push(v("tr",{class:["vxe-body--expanded-row",{"is--padding":g}],key:"expand_"+i},[v("td",{class:["vxe-body--expanded-column",{"fixed--hidden":f&&!T,"col--ellipsis":o}],attrs:{colspan:b.length}},[v("div",{class:["vxe-body--expanded-cell",{"is--ellipsis":u}],style:m},[H.renderData(v,x)])])]))}}e&&P.push(...renderRows(v,w,f,h,l,b))}),P}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:""}},mounted(){var e=this,l=e.fixedType,t=e.$parent.elemStore,l=`${l||"main"}-body-`;t[l+"wrapper"]=e.$refs.refElem,t[l+"scroll"]=e.$refs.refBodyScroll,t[l+"table"]=e.$refs.refBodyTable,t[l+"colgroup"]=e.$refs.refBodyColgroup,t[l+"list"]=e.$refs.refBodyTBody,t[l+"xSpace"]=e.$refs.refBodyXSpace,t[l+"ySpace"]=e.$refs.refBodyYSpace,t[l+"emptyBlock"]=e.$refs.refBodyEmptyBlock},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null},render(t){let l=this.$parent;var e=l,r=l,a=l,o=l.$xeGrid,i=l.$scopedSlots,s=l.xID;let{fixedColumn:d,fixedType:n,tableColumn:c}=this;var{spanMethod:p,footerSpanMethod:u,mouseConfig:g}=e,{isGroup:r,tableData:x,isColLoading:m,overflowX:v,scrollXLoad:w,scrollYLoad:f,isAllOverflow:h,expandColumn:y,dragRow:b,dragCol:C}=r,{visibleColumn:a,fullAllDataRowIdData:_,fullColumnIdData:E}=a,R=l.computeEmptyOpts,S=l.computeMouseOpts,D=l.computeExpandOpts;let O=x,I=c,$=!1;!(w||f||h)||y&&"fixed"!==D.mode||p||u||($=!0),m||!n&&v||(I=a),n&&$&&(I=d||[]),f&&b&&2<O.length&&(x=_[(0,_util.getRowid)(l,b)])&&(h=x._index,y=O[0],D=O[O.length-1],p=_[(0,_util.getRowid)(l,y)],u=_[(0,_util.getRowid)(l,D)],p)&&u&&(m=p._index,v=u._index,h<m?O=[b].concat(O):v<h&&(O=O.concat([b]))),n||r||w&&C&&2<I.length&&(a=E[C.id])&&(f=a._index,x=I[0],y=I[I.length-1],_=E[x.id],D=E[y.id],_)&&D&&(p=_._index,u=D._index,f<p?I=[C].concat(I):u<f&&(I=I.concat([C])));let T;m=i?i.empty:null,v={$table:l,$grid:o},T=m?m.call(l,v):(b=(h=R.name?renderer.get(R.name):null)?h.renderTableEmpty||h.renderTableEmptyView||h.renderEmpty:null)?(0,_vn.getSlotVNs)(b.call(l,t,R,v)):e.emptyText||getI18n("vxe.table.emptyText"),r={scroll(e){l.triggerBodyScrollEvent(e,n)}};return t("div",{ref:"refElem",class:["vxe-table--body-wrapper",n?`fixed-${n}--wrapper`:"body--wrapper"],attrs:{xid:s}},[t("div",{ref:"refBodyScroll",class:"vxe-table--body-inner-wrapper",on:r},[n?renderEmptyElement(l):t("div",{ref:"refBodyXSpace",class:"vxe-body--x-space"}),t("div",{ref:"refBodyYSpace",class:"vxe-body--y-space"}),t("table",{ref:"refBodyTable",class:"vxe-table--body",attrs:{xid:s,cellspacing:0,cellpadding:0,border:0,xvm:$?"1":null}},[t("colgroup",{ref:"refBodyColgroup"},I.map((e,l)=>t("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),t("tbody",{ref:"refBodyTBody"},renderRows(t,this,n,$,O,I))]),t("div",{class:"vxe-table--checkbox-range"}),g&&S.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},S.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellAreaExtendMousedownEvent&&l.triggerCellAreaExtendMousedownEvent(e,{$table:l,fixed:n,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-clip-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"}),t("span",{class:"vxe-table--cell-row-status-area"})]):renderEmptyElement(l),n?renderEmptyElement(l):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},T)])])])}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,renderType="body",isVMScrollProcess=e=>{var l=e.delayHover,{lastScrollTime:e,isDragResize:t}=e;return!!(t||e&&Date.now()<e+l)};function renderLine(e,l,t,r,a){var o=r.column,i=l.afterFullData,s=l.treeConfig,d=l.computeTreeOpts,{slots:o,treeNode:n}=o,c=l.fullAllDataRowIdData;if(o&&o.line)return l.callSlot(o.line,r,e);o=c[t];let p=0,u=null;return o&&(p=o.level,u=o.items[o.treeIndex-1]),s&&n&&(d.showLine||d.line)?[e("div",{key:"tl",class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${(0,_util.getRowid)(l,i[0])===t?1:(0,_util.calcTreeLine)(r,u)}px`,bottom:`-${Math.floor(a/2)}px`,left:p*d.indent+(p?2-(0,_util.getOffsetSize)(l):0)+16+"px"}})])]:[]}function renderTdColumn(e,l,t,r,a,A,H,o,q,F,i,s,L,N,U){var d=l.$xeGrid,{columnKey:V,resizable:n,showOverflow:c,border:W,height:p,treeConfig:X,cellClassName:j,cellStyle:G,align:u,spanMethod:P,mouseConfig:Y,editConfig:K,editRules:g,tooltipConfig:x,padding:J}=l,{tableData:Q,dragRow:Z,overflowX:ee,currentColumn:le,scrollXLoad:te,scrollYLoad:re,mergeBodyFlag:ae,calcCellHeightFlag:m,resizeHeightFlag:v,resizeWidthFlag:oe,editStore:ie,isAllOverflow:se,validErrorMaps:de}=l,{fullAllDataRowIdData:ne,fullColumnIdData:w,mergeBodyCellMaps:ce,visibleColumn:pe,afterFullData:ue,mergeBodyList:ge,scrollXStore:xe,scrollYStore:me}=l,f=l.computeCellOpts,h=l.computeValidOpts,y=l.computeCheckboxOpts,ve=l.computeEditOpts,b=l.computeTooltipOpts,we=l.computeVirtualXOpts,fe=l.computeVirtualYOpts,{isAllColumnDrag:he,isAllRowDrag:ye}=l.resizableOpts,C=l.computeRowOpts,_=l.computeRowDragOpts,be=l.computeDefaultRowHeight,m=m?f.height||C.height:0,{disabledMethod:E,isCrossDrag:Ce,isPeerDrag:_e}=_,Ee=l.computeColumnOpts,Re=l.computeMouseOpts,Se=l.computeCellOffsetWidth,De=l.computeAreaOpts.selectCellToRow,{type:Oe,cellRender:Ie,editRender:$e,align:Te,showOverflow:R,className:ke,treeNode:Be,rowResize:Me,padding:S,verticalAlign:D,slots:ze}=s,Ae=f.verticalAlign,ie=ie.actived,He=ne[r]||{},O=s.id,w=w[O]||{},I=$e||Ie,I=I?renderer.get(I.name):null,qe=I?I.tableCellClassName||I.cellClassName:null,Fe=I?I.tableCellStyle||I.cellStyle:"";let Le=b.showAll;var Ne=w.index,b=w._index,w=(0,_utils.isEnableConf)($e),v=v?He.resizeHeight:0;let $=ee&&(a?s.fixed!==a:!!s.fixed);J=_xeUtils.default.eqNull(S)?null===J?f.padding:J:S,S=_xeUtils.default.eqNull(R)?c:R,c="ellipsis"===S;let T="title"===S,k=!0===S||"tooltip"===S;R=se||T||k||c,S=_xeUtils.default.isBoolean(s.resizable)?s.resizable:Ee.resizable||n,n=!!m,m=0<v;let Ue;v={},Te=Te||(I?I.tableCellAlign:"")||u,I=_xeUtils.default.eqNull(D)?Ae:D,u=de[r+":"+O],Ae=g&&h.showMessage&&("default"===h.message?p||1<Q.length:"inline"===h.message),D={colid:O};let B={$table:l,$grid:d,isEdit:!1,seq:t,rowid:r,row:o,rowIndex:q,$rowIndex:F,_rowIndex:i,column:s,columnIndex:Ne,$columnIndex:L,_columnIndex:b,fixed:a,type:renderType,isHidden:!!$,level:H,visibleData:ue,data:Q,items:U},M=!1,Ve=!1,z=((M=C.drag?"row"===_.trigger||s.dragSort&&"cell"===_.trigger:M)&&(Ve=!(!E||!E(B))),(T||k||Le||x)&&(v.mouseenter=e=>{isVMScrollProcess(l)||(T?(0,_dom.updateCellTitle)(e.currentTarget,s):(k||Le)&&l.triggerBodyTooltipEvent(e,B),l.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},B),e))}),(k||Le||x)&&(v.mouseleave=e=>{isVMScrollProcess(l)||((k||Le)&&l.handleTargetLeaveEvent(e),l.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},B),e))}),(M||y.range||Y)&&(v.mousedown=e=>{l.triggerCellMousedownEvent(e,B)}),M&&(v.mouseup=l.triggerCellMouseupEvent),v.click=e=>{l.triggerCellClickEvent(e,B)},!(v.dblclick=e=>{l.triggerCellDblclickEvent(e,B)})),We=1,Xe=1;if(ae&&ge.length){de=ce[i+":"+b];if(de){var{rowspan:g,colspan:p}=de;if(!g||!p)return renderEmptyElement(l);1<g&&(z=!0,Xe=g,D.rowspan=g),1<p&&(z=!0,We=p,D.colspan=p)}}else if(P){var{rowspan:d=1,colspan:t=1}=P(B)||{};if(!d||!t)return renderEmptyElement(l);1<d&&(z=!0,Xe=d,D.rowspan=d),1<t&&(z=!0,We=t,D.colspan=t)}!($=$&&z&&(1<D.colspan||1<D.rowspan)?!1:$)&&K&&($e||Ie)&&(ve.showStatus||ve.showUpdateStatus)&&(Ue=l.isUpdateByRow(o,s.field));q=!R&&(re||te);let je=(0,_util.getCellRestHeight)(He,f,C,be);F=L===N.length-1,Q=!s.resizeWidth&&("auto"===s.minWidth||"auto"===s.width);let Ge=!1;!ee||z||Z&&(0,_util.getRowid)(l,Z)===r||(re&&!X&&!fe.immediate&&(i<me.visibleStartIndex-me.preloadSize||i>me.visibleEndIndex+me.preloadSize)||te&&!we.immediate&&!s.fixed&&(b<xe.visibleStartIndex-xe.preloadSize||b>xe.visibleEndIndex+xe.preloadSize))&&(Ge=!0),1<Xe&&(U=ue[i+Xe-1])&&(_=ne[(0,_util.getRowid)(l,U)])&&(je+=_.oTop+(0,_util.getCellRestHeight)(_,f,C,be)-He.oTop-(0,_util.getCellRestHeight)(He,f,C,be));E={};if(R&&oe){let l=0;if(1<We)for(let e=1;e<We;e++){var Pe=pe[Ne+e];Pe&&(l+=Pe.renderWidth)}E.width=s.renderWidth+l-Se+"px"}re||te||R||n||m?E.height=je+"px":E.minHeight=je+"px";x=[];$&&se?x.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":c}],style:E})):(X&&x.push(...renderLine(e,l,r,B,je)),x.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":c}],style:E,attrs:{title:T?l.getCellLabel(o,s):null}},Ge?[]:[e("div",{attrs:{colid:O,rowid:r},class:"vxe-cell--wrapper vxe-body-cell--wrapper"},s.renderCell(e,B))])),Ae&&u&&(y=u.rule,ae=ze?ze.valid:null,ge=Object.assign(Object.assign(Object.assign({},B),u),{rule:u}),x.push(e("div",{key:"tcv",class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(h.className,u)],style:y&&y.maxWidth?{width:y.maxWidth+"px"}:void 0},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(h.theme||"normal")},[ae?l.callSlot(ae,ge,e):[e("span",{class:"vxe-cell--valid-error-msg"},u.content)]])]))));let Ye=!1;return Y&&Re.area&&!b&&De&&(Ye=!0),!$&&S&&he&&x.push(e("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>l.handleColResizeMousedownEvent(e,a,B),dblclick:e=>l.handleColResizeDblclickEvent(e,B)}})),(Me||ye)&&C.resizable&&x.push(e("div",{key:"tcr",class:"vxe-cell--row-resizable",on:{mousedown:e=>l.handleRowResizeMousedownEvent(e,B),dblclick:e=>l.handleRowResizeDblclickEvent(e,B)}})),e("td",{class:["vxe-table--column vxe-body--column",O,I?"col--vertical-"+I:"",Te?"col--"+Te:"",Oe?"col--"+Oe:"",{"col--last":F,"col--tree-node":Be,"col--edit":w,"col--ellipsis":R,"col--cs-height":n,"col--rs-height":m,"col--to-row":Ye,"col--auto-height":q,"fixed--width":!Q,"fixed--hidden":$,"is--padding":J,"is--progress":$&&se||Ge,"is--drag-cell":M&&(Ce||_e||!H),"is--drag-disabled":Ve,"col--dirty":Ue,"col--active":K&&w&&ie.row===o&&(ie.column===s||"row"===ve.mode),"col--valid-error":!!u,"col--current":le===s},(0,_utils.getClass)(qe,B),(0,_utils.getClass)(ke,B),(0,_utils.getClass)(j,B)],key:V||te||re||Ee.useKey||C.useKey||Ee.drag?s.id:L,attrs:D,style:Object.assign({},_xeUtils.default.isFunction(Fe)?Fe(B):Fe,_xeUtils.default.isFunction(G)?G(B):G),on:v},A&&$?[]:x)}function renderRows(v,w,f,h,y,b){let C=w.$parent;var e=C,l=C,t=C;let _=C.$xeGrid,{stripe:E,rowKey:R,highlightHoverRow:S,rowClassName:D,rowStyle:O,editConfig:I,treeConfig:$}=e,{hasFixedColumn:T,treeExpandedFlag:k,scrollXLoad:B,scrollYLoad:M,isAllOverflow:z,rowExpandedFlag:A,expandColumn:H,selectRadioRow:q,pendingRowFlag:F,rowExpandHeightFlag:L,isRowGroupStatus:N}=l,{fullAllDataRowIdData:U,fullColumnIdData:Y,treeExpandedMaps:K,pendingRowMaps:J,rowExpandedMaps:Q}=t,Z=C.computeCheckboxOpts,ee=C.computeRadioOpts,V=C.computeTreeOpts,W=C.computeEditOpts,X=C.computeRowOpts,le=C.computeColumnOpts,{transform:j,seqMode:G}=V,te=V.children||V.childrenField,P=[],re=(0,_util.createHandleGetRowId)(C).handleGetRowId,ae=$||N;return y.forEach((r,a)=>{var o={};let i=re(r);var s=U[i]||{};let d=a,n=0,c=-1,p=-1;var u=N&&r.isAggregate,g=((X.isHover||S)&&(o.mouseenter=e=>{isVMScrollProcess(C)||C.triggerHoverEvent(e,{row:r,rowIndex:d})},o.mouseleave=()=>{isVMScrollProcess(C)||C.clearHoverRow()}),s&&(d=s.index,p=s._index,n=s.level,c=s.seq,u||$&&j&&"increasing"===G?c=s._index+1:$&&"fixed"===G&&(c=s._tIndex+1)),{$table:C,seq:c,rowid:i,fixed:f,type:renderType,level:n,row:r,rowIndex:d,$rowIndex:a,_rowIndex:p}),x=H&&!!A&&!!Q[i];let e=!1,l=[],t=!1;I&&(t=C.isInsertByRow(r)),!$||M||j||(l=r[te],e=!!k&&l&&0<l.length&&!!K[i]),!X.drag||N||$&&!j||(o.dragstart=C.handleRowDragDragstartEvent,o.dragend=C.handleRowDragDragendEvent,o.dragover=C.handleRowDragDragoverEvent);var u=["vxe-body--row",ae?"row--level-"+n:"",{"row--stripe":E&&(p+1)%2==0,"is--new":t,"is--expand-row":x,"is--expand-tree":e,"row--new":t&&(W.showStatus||W.showInsertStatus),"row--radio":ee.highlight&&q===r,"row--checked":Z.highlight&&C.isCheckedByCheckboxRow(r),"row--pending":!!F&&!!J[i],"row--group":u},D?_xeUtils.default.isFunction(D)?D(g):D:""],m=b.map((e,l)=>renderTdColumn(v,C,c,i,f,h,n,r,d,a,p,e,l,b,y));if(P.push(v("tr",{class:u,attrs:{rowid:i},style:O?_xeUtils.default.isFunction(O)?O(g):O:void 0,key:R||B||M||X.useKey||X.drag||le.drag||N||$?i:a,on:o},m)),x){var{height:u,padding:g,mode:o}=C.computeExpandOpts;if("fixed"===o)P.push(v("tr",{class:"vxe-body--row-expanded-place",key:"expand_"+i,attrs:{rowid:i}},[v("td",{class:"vxe-body--row-expanded-place-column",attrs:{colspan:b.length},style:{height:`${L?s.expandHeight||u:0}px`}})]));else{m={},x=(u&&(m.height=u+"px"),$&&(m.paddingLeft=n*V.indent+30+"px"),H||{}).showOverflow,o=H.id,s=Y[o]||{},o=_xeUtils.default.eqNull(x)?z:x;let e=-1,l=-1,t=-1;s&&(e=s.index,l=s.$index,t=s._index);x={$grid:_,$table:C,seq:c,column:H,columnIndex:e,$columnIndex:l,_columnIndex:t,fixed:f,type:renderType,level:n,row:r,rowid:i,rowIndex:d,$rowIndex:a,_rowIndex:p,isHidden:!1,isEdit:!1,visibleData:[],data:[],items:[]};P.push(v("tr",{class:["vxe-body--expanded-row",{"is--padding":g}],key:"expand_"+i},[v("td",{class:["vxe-body--expanded-column",{"fixed--hidden":f&&!T,"col--ellipsis":o}],attrs:{colspan:b.length}},[v("div",{class:["vxe-body--expanded-cell",{"is--ellipsis":u}],style:m},[H.renderData(v,x)])])]))}}e&&P.push(...renderRows(v,w,f,h,l,b))}),P}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:""}},mounted(){var e=this,l=e.fixedType,t=e.$parent.elemStore,l=`${l||"main"}-body-`;t[l+"wrapper"]=e.$refs.refElem,t[l+"scroll"]=e.$refs.refBodyScroll,t[l+"table"]=e.$refs.refBodyTable,t[l+"colgroup"]=e.$refs.refBodyColgroup,t[l+"list"]=e.$refs.refBodyTBody,t[l+"xSpace"]=e.$refs.refBodyXSpace,t[l+"ySpace"]=e.$refs.refBodyYSpace,t[l+"emptyBlock"]=e.$refs.refBodyEmptyBlock},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null},render(t){let l=this.$parent;var e=l,r=l,a=l,o=l.$xeGrid,i=l.$scopedSlots,s=l.xID;let{fixedColumn:d,fixedType:n,tableColumn:c}=this;var{spanMethod:p,footerSpanMethod:u,mouseConfig:g}=e,{isGroup:r,tableData:x,isColLoading:m,overflowX:v,scrollXLoad:w,scrollYLoad:f,isAllOverflow:h,expandColumn:y,dragRow:b,dragCol:C}=r,{visibleColumn:a,fullAllDataRowIdData:_,fullColumnIdData:E}=a,R=l.computeEmptyOpts,S=l.computeMouseOpts,D=l.computeExpandOpts;let O=x,I=c,$=!1;!(w||f||h)||y&&"fixed"!==D.mode||p||u||($=!0),m||!n&&v||(I=a),n&&$&&(I=d||[]),f&&b&&2<O.length&&(x=_[(0,_util.getRowid)(l,b)])&&(h=x._index,y=O[0],D=O[O.length-1],p=_[(0,_util.getRowid)(l,y)],u=_[(0,_util.getRowid)(l,D)],p)&&u&&(m=p._index,v=u._index,h<m?O=[b].concat(O):v<h&&(O=O.concat([b]))),n||r||w&&C&&2<I.length&&(a=E[C.id])&&(f=a._index,x=I[0],y=I[I.length-1],_=E[x.id],D=E[y.id],_)&&D&&(p=_._index,u=D._index,f<p?I=[C].concat(I):u<f&&(I=I.concat([C])));let T;m=i?i.empty:null,v={$table:l,$grid:o},T=m?m.call(l,v):(b=(h=R.name?renderer.get(R.name):null)?h.renderTableEmpty||h.renderTableEmptyView||h.renderEmpty:null)?(0,_vn.getSlotVNs)(b.call(l,t,R,v)):e.emptyText||getI18n("vxe.table.emptyText"),r={scroll(e){l.triggerBodyScrollEvent(e,n)}};return t("div",{ref:"refElem",class:["vxe-table--body-wrapper",n?`fixed-${n}--wrapper`:"body--wrapper"],attrs:{xid:s}},[t("div",{ref:"refBodyScroll",class:"vxe-table--body-inner-wrapper",on:r},[n?renderEmptyElement(l):t("div",{ref:"refBodyXSpace",class:"vxe-body--x-space"}),t("div",{ref:"refBodyYSpace",class:"vxe-body--y-space"}),t("table",{ref:"refBodyTable",class:"vxe-table--body",attrs:{xid:s,cellspacing:0,cellpadding:0,border:0,xvm:$?"1":null}},[t("colgroup",{ref:"refBodyColgroup"},I.map((e,l)=>t("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),t("tbody",{ref:"refBodyTBody"},renderRows(t,this,n,$,O,I))]),t("div",{class:"vxe-table--checkbox-range"}),g&&S.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},S.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellAreaExtendMousedownEvent&&l.triggerCellAreaExtendMousedownEvent(e,{$table:l,fixed:n,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-clip-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"}),t("span",{class:"vxe-table--cell-row-status-area"})]):renderEmptyElement(l),n?renderEmptyElement(l):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},T)])])])}};

package/lib/table/src/columnInfo.js

@@ -138,15 +138,20 @@ class ColumnInfo {
       parentId: null,
       visible,
       // 内部属性（一旦被使用，将导致不可升级版本）
+      defaultParentId: null,
       halfVisible: false,
       defaultVisible: visible,
       defaultFixed: _vm.fixed,
+      defaultAggGroup: _vm.aggGroup,
       defaultAggFunc: _vm.aggFunc,
       checked: false,
       halfChecked: false,
       disabled: false,
+      // 分组层级
       level: 1,
+      // 跨行
       rowSpan: 1,
+      // 跨列
       colSpan: 1,
       // 数据排序
       order: null,

package/lib/table/src/columnInfo.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,{field:s,editRender:a}=r,u=n?n.computeProxyOpts:null,f=r.formatter,g=!_xeUtils.default.isBoolean(r.visible)||r.visible,c=["seq","checkbox","radio","expand","html"];r.type&&-1===c.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,c.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(c=d.treeConfig,c)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),f&&(_xeUtils.default.isString(f)?(d=formats.get(f)||_xeUtils.default[f])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f]):!_xeUtils.default.isArray(f)||(c=formats.get(f[0])||_xeUtils.default[f[0]])&&_xeUtils.default.isFunction(c.tableCellFormatMethod||c.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f[0]])),r.aggFunc&&!e.handlePivotTableAggregateData&&!0!==r.aggFunc&&(0,_log.errLog)("vxe.error.errProp",["column.agg-func="+r.aggFunc,"column.agg-func=true"]),s&&a&&(a.startField&&0<=(""+a.startField).indexOf(s)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+s,"edit-render.startField="+a.startField]),a.endField)&&0<=(""+a.endField).indexOf(s)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+s,"edit-render.endField="+a.endField]),Object.assign(this,{type:r.type,property:r.field,field:s,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:f,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:a,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:r.aggFunc,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:g,halfVisible:!1,defaultVisible:g,defaultFixed:r.fixed,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),u&&u.beforeColumn&&u.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,{field:a,editRender:s}=r,u=n?n.computeProxyOpts:null,f=r.formatter,g=!_xeUtils.default.isBoolean(r.visible)||r.visible,c=["seq","checkbox","radio","expand","html"];r.type&&-1===c.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,c.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(c=d.treeConfig,c)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),f&&(_xeUtils.default.isString(f)?(d=formats.get(f)||_xeUtils.default[f])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f]):!_xeUtils.default.isArray(f)||(c=formats.get(f[0])||_xeUtils.default[f[0]])&&_xeUtils.default.isFunction(c.tableCellFormatMethod||c.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[f[0]])),r.aggFunc&&!e.handlePivotTableAggregateData&&!0!==r.aggFunc&&(0,_log.errLog)("vxe.error.errProp",["column.agg-func="+r.aggFunc,"column.agg-func=true"]),a&&s&&(s.startField&&0<=(""+s.startField).indexOf(a)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+a,"edit-render.startField="+s.startField]),s.endField)&&0<=(""+s.endField).indexOf(a)&&(0,_log.errLog)("vxe.error.modelConflicts",["field="+a,"edit-render.endField="+s.endField]),Object.assign(this,{type:r.type,property:r.field,field:a,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:f,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:s,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:r.aggFunc,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:g,defaultParentId:null,halfVisible:!1,defaultVisible:g,defaultFixed:r.fixed,defaultAggGroup:r.aggGroup,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderFixed:"",renderVisible:!1,renderWidth:0,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),u&&u.beforeColumn&&u.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;