vxe-table 3.16.0 → 3.16.2

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

@@ -227,7 +227,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         const {
           row: mergeRowIndex
         } = mergeItem;
-        if (mergeRowIndex > 0) {
+        if (mergeRowIndex >= 0) {
           mergeItem.row = mergeRowIndex + newRecords.length;
         }
       });
@@ -268,16 +268,6 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           afterFullData.push(item);
           tableFullData.push(item);
         });
-        // 刷新单元格合并
-        mergeBodyList.forEach(mergeItem => {
-          const {
-            row: mergeRowIndex,
-            rowspan: mergeRowspan
-          } = mergeItem;
-          if (mergeRowIndex + mergeRowspan > afterFullData.length) {
-            mergeItem.rowspan = mergeRowspan + newRecords.length;
-          }
-        });
       }
     } else {
       // 如果为虚拟树
@@ -383,9 +373,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             row: mergeRowIndex,
             rowspan: mergeRowspan
           } = mergeItem;
-          if (mergeRowIndex > afIndex) {
+          if (mergeRowIndex >= afIndex) {
             mergeItem.row = mergeRowIndex + newRecords.length;
-          } else if (mergeRowIndex + mergeRowspan > afIndex) {
+          } else if (isInsertNextRow ? mergeRowIndex + mergeRowspan >= afIndex : mergeRowIndex + mergeRowspan > afIndex) {
             mergeItem.rowspan = mergeRowspan + newRecords.length;
           }
         });

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,p=w.children||w.childrenField,x=(_xeUtils.default.isArray(t)||(t=[t]),d.defineField(t.map(e=>Object.assign(o&&f?{[v]:[],[p]:[]}:{},e))));if(_xeUtils.default.eqNull(l))if(o&&f)insertTreeRow(d,x,!1);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"]))}else x.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+x.length)});else if(-1===l)if(o&&f)insertTreeRow(d,x,!0);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"]))}else x.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)}),n.forEach(e=>{var{row:t,rowspan:l}=e;t+l>i.length&&(e.rowspan=l+x.length)});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(x.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:p});if(t){var C=t.items;let e=t.index;s&&(e+=1),C.splice(e,0,...x)}}}else(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(d,x,!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,...x);t=d.findRowIndexOf(a,l);-1<t?a.splice(t+(s?1:0),0,...x):a.push(...x),n.forEach(e=>{var{row:t,rowspan:l}=e;t>r?e.row=t+x.length:t+l>r&&(e.rowspan=l+x.length)})}return x.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:x.length?x[x.length-1]:null,rows:x}))}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,p=f.children||f.childrenField;f=o.actived,o=w.checkField;let x=[];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=x=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),x.push(l[0])),_xeUtils.default.findTree(n,e=>t===(0,_util.getRowid)(this,e),{children:p})),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),x.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:x.length?x[x.length-1]:null,rows:x}))},_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: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")}}};

package/lib/table/src/body.js

@@ -293,7 +293,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         colspan
       } = spanRest;
       if (!rowspan || !colspan) {
-        return null;
+        return renderEmptyElement($xeTable);
       }
       if (rowspan > 1) {
         isMergeCell = true;
@@ -313,7 +313,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
       colspan = 1
     } = spanMethod(cellParams) || {};
     if (!rowspan || !colspan) {
-      return null;
+      return renderEmptyElement($xeTable);
     }
     if (rowspan > 1) {
       isMergeCell = true;
@@ -431,10 +431,8 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
   }
   let showAreaRowStatus = false;
-  if (mouseConfig && mouseOpts.area && selectCellToRow) {
-    if (!_columnIndex && selectCellToRow === true || selectCellToRow === column.field) {
-      showAreaRowStatus = true;
-    }
+  if (mouseConfig && mouseOpts.area && !_columnIndex && selectCellToRow) {
+    showAreaRowStatus = true;
   }
   if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
     tdVNs.push(h('div', {

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,A,t,r,H,q,a,F,L,o,i,N,U,s){var d=l.$xeGrid,{columnKey:V,resizable:n,showOverflow:c,border:W,height:p,treeConfig:X,cellClassName:j,cellStyle:G,align:P,spanMethod:Y,mouseConfig:K,editConfig:J,editRules:u,tooltipConfig:g,padding:x}=l,{tableData:Q,dragRow:Z,overflowX:ee,currentColumn:le,scrollXLoad:te,scrollYLoad:re,mergeBodyFlag:ae,calcCellHeightFlag:v,resizeHeightFlag:m,resizeWidthFlag:oe,editStore:ie,isAllOverflow:se,validErrorMaps:w}=l,{fullAllDataRowIdData:de,fullColumnIdData:f,mergeBodyCellMaps:ne,visibleColumn:ce,afterFullData:pe,mergeBodyList:ue,scrollXStore:ge,scrollYStore:xe}=l,h=l.computeCellOpts,y=l.computeValidOpts,ve=l.computeCheckboxOpts,me=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,v=v?h.height||C.height:0,{disabledMethod:R,isCrossDrag:Ce,isPeerDrag:_e}=_,Re=l.computeColumnOpts,Ee=l.computeMouseOpts,Se=l.computeCellOffsetWidth,De=l.computeAreaOpts.selectCellToRow,{type:Oe,cellRender:Ie,editRender:$e,align:Te,showOverflow:ke,className:Be,treeNode:Me,rowResize:ze,padding:E,verticalAlign:S,slots:Ae}=i,D=h.verticalAlign,ie=ie.actived,He=de[t]||{},O=i.id,f=f[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=f.index,b=f._index,f=(0,_utils.isEnableConf)($e),m=m?He.resizeHeight:0;let $=r?i.fixed!==r:i.fixed&&ee;ee=_xeUtils.default.eqNull(E)?null===x?h.padding:x:E,x=_xeUtils.default.eqNull(ke)?c:ke,E="ellipsis"===x;let T="title"===x,k=!0===x||"tooltip"===x;c=se||T||k||E,ke=_xeUtils.default.isBoolean(i.resizable)?i.resizable:Re.resizable||n,x=!!v,n=0<m;let Ue;v={},m=Te||(I?I.tableCellAlign:"")||P,Te=_xeUtils.default.eqNull(S)?D:S,I=w[t+":"+O],P=u&&y.showMessage&&("default"===y.message?p||1<Q.length:"inline"===y.message),D={colid:O};let B={$table:l,$grid:d,isEdit:!1,seq:A,rowid:t,row:a,rowIndex:F,$rowIndex:L,_rowIndex:o,column:i,columnIndex:Ne,$columnIndex:N,_columnIndex:b,fixed:r,type:renderType,isHidden:!!$,level:q,visibleData:pe,data:Q,items:s},M=!1,Ve=!1,z=((M=C.drag?"row"===_.trigger||i.dragSort&&"cell"===_.trigger:M)&&(Ve=!(!R||!R(B))),(T||k||Le||g)&&(v.mouseenter=e=>{isVMScrollProcess(l)||(T?(0,_dom.updateCellTitle)(e.currentTarget,i):(k||Le)&&l.triggerBodyTooltipEvent(e,B),l.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},B),e))}),(k||Le||g)&&(v.mouseleave=e=>{isVMScrollProcess(l)||((k||Le)&&l.handleTargetLeaveEvent(e),l.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},B),e))}),(M||ve.range||K)&&(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&&ue.length){S=ne[o+":"+b];if(S){var{rowspan:w,colspan:u}=S;if(!w||!u)return null;1<w&&(z=!0,Xe=w,D.rowspan=w),1<u&&(z=!0,We=u,D.colspan=u)}}else if(Y){var{rowspan:p=1,colspan:d=1}=Y(B)||{};if(!p||!d)return null;1<p&&(z=!0,Xe=p,D.rowspan=p),1<d&&(z=!0,We=d,D.colspan=d)}!($=$&&z&&(1<D.colspan||1<D.rowspan)?!1:$)&&J&&($e||Ie)&&(me.showStatus||me.showUpdateStatus)&&(Ue=l.isUpdateByRow(a,i.field));A=re&&!c;let je=(0,_util.getCellRestHeight)(He,h,C,be);F=N===U.length-1,L=!i.resizeWidth&&("auto"===i.minWidth||"auto"===i.width);let Ge=!1;z||Z&&(0,_util.getRowid)(l,Z)===t||(re&&!X&&!fe.immediate&&(o<xe.visibleStartIndex-xe.preloadSize||o>xe.visibleEndIndex+xe.preloadSize)||te&&!we.immediate&&!i.fixed&&(b<ge.visibleStartIndex-ge.preloadSize||b>ge.visibleEndIndex+ge.preloadSize))&&(Ge=!0),1<Xe&&(Q=pe[o+Xe-1])&&(s=de[(0,_util.getRowid)(l,Q)])&&(je+=s.oTop+(0,_util.getCellRestHeight)(s,h,C,be)-He.oTop-(0,_util.getCellRestHeight)(He,h,C,be));_={};if(c&&oe){let l=0;if(1<We)for(let e=1;e<We;e++){var Pe=ce[Ne+e];Pe&&(l+=Pe.renderWidth)}_.width=i.renderWidth+l-Se+"px"}re||c||x||n?_.height=je+"px":_.minHeight=je+"px";R=[];$&&se?R.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":E}],style:_})):(X&&R.push(...renderLine(e,l,t,B,je)),R.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":E}],style:_,attrs:{title:T?l.getCellLabel(a,i):null}},Ge?[]:[e("div",{attrs:{colid:O,rowid:t},class:"vxe-cell--wrapper vxe-body-cell--wrapper"},i.renderCell(e,B))])),P&&I&&(g=I.rule,ve=Ae?Ae.valid:null,ae=Object.assign(Object.assign(Object.assign({},B),I),{rule:I}),R.push(e("div",{key:"tcv",class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(y.className,I)],style:g&&g.maxWidth?{width:g.maxWidth+"px"}:void 0},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(y.theme||"normal")},[ve?l.callSlot(ve,ae,e):[e("span",{class:"vxe-cell--valid-error-msg"},I.content)]])]))));let Ye=!1;return K&&Ee.area&&De&&((b||!0!==De)&&De!==i.field||(Ye=!0)),!$&&ke&&he&&R.push(e("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>l.handleColResizeMousedownEvent(e,r,B),dblclick:e=>l.handleColResizeDblclickEvent(e,B)}})),(ze||ye)&&C.resizable&&R.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,Te?"col--vertical-"+Te:"",m?"col--"+m:"",Oe?"col--"+Oe:"",{"col--last":F,"col--tree-node":Me,"col--edit":f,"col--ellipsis":c,"col--cs-height":x,"col--rs-height":n,"col--to-row":Ye,"col--auto-height":A,"fixed--width":!L,"fixed--hidden":$,"is--padding":ee,"is--progress":$&&se||Ge,"is--drag-cell":M&&(Ce||_e||!q),"is--drag-disabled":Ve,"col--dirty":Ue,"col--active":J&&f&&ie.row===a&&(ie.column===i||"row"===me.mode),"col--valid-error":!!I,"col--current":le===i},(0,_utils.getClass)(qe,B),(0,_utils.getClass)(Be,B),(0,_utils.getClass)(j,B)],key:V||te||re||Re.useKey||C.useKey||Re.drag?i.id:N,attrs:D,style:Object.assign({},_xeUtils.default.isFunction(Fe)?Fe(B):Fe,_xeUtils.default.isFunction(G)?G(B):G),on:v},H&&$?[]:R)}function renderRows(m,w,f,h,y,b){let C=w.$parent;var e=C,l=C,t=C;let _=C.$xeGrid,{stripe:R,rowKey:E,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":R&&(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:""],v=b.map((e,l)=>renderTdColumn(m,C,c,i,f,h,n,r,d,a,p,e,l,b,y));if(P.push(m("tr",{class:u,attrs:{rowid:i},style:O?_xeUtils.default.isFunction(O)?O(g):O:void 0,key:E||B||M||j.useKey||j.drag||ee.drag||N||$?i:a,on:o},v)),x){var{height:u,padding:g,mode:o}=C.computeExpandOpts;if("fixed"===o)P.push(m("tr",{class:"vxe-body--row-expanded-place",key:"expand_"+i,attrs:{rowid:i}},[m("td",{class:"vxe-body--row-expanded-place-column",attrs:{colspan:b.length},style:{height:`${L?s.expandHeight||u:0}px`}})]));else{v={},x=(u&&(v.height=u+"px"),$&&(v.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(m("tr",{class:["vxe-body--expanded-row",{"is--padding":g}],key:"expand_"+i},[m("td",{class:["vxe-body--expanded-column",{"fixed--hidden":f&&!T,"col--ellipsis":o}],attrs:{colspan:b.length}},[m("div",{class:["vxe-body--expanded-cell",{"is--ellipsis":u}],style:v},[H.renderData(m,x)])])]))}}e&&P.push(...renderRows(m,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:v,overflowX:m,scrollXLoad:w,scrollYLoad:f,isAllOverflow:h,expandColumn:y,dragRow:b,dragCol:C}=r,{visibleColumn:a,fullAllDataRowIdData:_,fullColumnIdData:R}=a,E=l.computeEmptyOpts,S=l.computeMouseOpts,D=l.computeExpandOpts;let O=x,I=c,$=!1;!(w||f||h)||y&&"fixed"!==D.mode||p||u||($=!0),v||!n&&m||(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&&(v=p._index,m=u._index,h<v?O=[b].concat(O):m<h&&(O=O.concat([b]))),n||r||w&&C&&2<I.length&&(a=R[C.id])&&(f=a._index,x=I[0],y=I[I.length-1],_=R[x.id],D=R[y.id],_)&&D&&(p=_._index,u=D._index,f<p?I=[C].concat(I):u<f&&(I=I.concat([C])));let T;v=i?i.empty:null,m={$table:l,$grid:o},T=v?v.call(l,m):(b=(h=E.name?renderer.get(E.name):null)?h.renderTableEmpty||h.renderTableEmptyView||h.renderEmpty:null)?(0,_vn.getSlotVNs)(b.call(l,t,E,m)):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-copy-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,A,t,r,H,q,a,F,L,o,i,N,U,s){var d=l.$xeGrid,{columnKey:V,resizable:n,showOverflow:c,border:W,height:p,treeConfig:X,cellClassName:j,cellStyle:G,align:P,spanMethod:Y,mouseConfig:K,editConfig:J,editRules:u,tooltipConfig:g,padding:x}=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:w}=l,{fullAllDataRowIdData:de,fullColumnIdData:f,mergeBodyCellMaps:ne,visibleColumn:ce,afterFullData:pe,mergeBodyList:ue,scrollXStore:ge,scrollYStore:xe}=l,h=l.computeCellOpts,y=l.computeValidOpts,me=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?h.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:ke,className:Be,treeNode:Me,rowResize:ze,padding:R,verticalAlign:S,slots:Ae}=i,D=h.verticalAlign,ie=ie.actived,He=de[t]||{},O=i.id,f=f[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=f.index,b=f._index,f=(0,_utils.isEnableConf)($e),v=v?He.resizeHeight:0;let $=r?i.fixed!==r:i.fixed&&ee;ee=_xeUtils.default.eqNull(R)?null===x?h.padding:x:R,x=_xeUtils.default.eqNull(ke)?c:ke,R="ellipsis"===x;let T="title"===x,k=!0===x||"tooltip"===x;c=se||T||k||R,ke=_xeUtils.default.isBoolean(i.resizable)?i.resizable:Ee.resizable||n,x=!!m,n=0<v;let Ue;m={},v=Te||(I?I.tableCellAlign:"")||P,Te=_xeUtils.default.eqNull(S)?D:S,I=w[t+":"+O],P=u&&y.showMessage&&("default"===y.message?p||1<Q.length:"inline"===y.message),D={colid:O};let B={$table:l,$grid:d,isEdit:!1,seq:A,rowid:t,row:a,rowIndex:F,$rowIndex:L,_rowIndex:o,column:i,columnIndex:Ne,$columnIndex:N,_columnIndex:b,fixed:r,type:renderType,isHidden:!!$,level:q,visibleData:pe,data:Q,items:s},M=!1,Ve=!1,z=((M=C.drag?"row"===_.trigger||i.dragSort&&"cell"===_.trigger:M)&&(Ve=!(!E||!E(B))),(T||k||Le||g)&&(m.mouseenter=e=>{isVMScrollProcess(l)||(T?(0,_dom.updateCellTitle)(e.currentTarget,i):(k||Le)&&l.triggerBodyTooltipEvent(e,B),l.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},B),e))}),(k||Le||g)&&(m.mouseleave=e=>{isVMScrollProcess(l)||((k||Le)&&l.handleTargetLeaveEvent(e),l.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},B),e))}),(M||me.range||K)&&(m.mousedown=e=>{l.triggerCellMousedownEvent(e,B)}),M&&(m.mouseup=l.triggerCellMouseupEvent),m.click=e=>{l.triggerCellClickEvent(e,B)},!(m.dblclick=e=>{l.triggerCellDblclickEvent(e,B)})),We=1,Xe=1;if(ae&&ue.length){S=ne[o+":"+b];if(S){var{rowspan:w,colspan:u}=S;if(!w||!u)return renderEmptyElement(l);1<w&&(z=!0,Xe=w,D.rowspan=w),1<u&&(z=!0,We=u,D.colspan=u)}}else if(Y){var{rowspan:p=1,colspan:d=1}=Y(B)||{};if(!p||!d)return renderEmptyElement(l);1<p&&(z=!0,Xe=p,D.rowspan=p),1<d&&(z=!0,We=d,D.colspan=d)}!($=$&&z&&(1<D.colspan||1<D.rowspan)?!1:$)&&J&&($e||Ie)&&(ve.showStatus||ve.showUpdateStatus)&&(Ue=l.isUpdateByRow(a,i.field));A=re&&!c;let je=(0,_util.getCellRestHeight)(He,h,C,be);F=N===U.length-1,L=!i.resizeWidth&&("auto"===i.minWidth||"auto"===i.width);let Ge=!1;z||Z&&(0,_util.getRowid)(l,Z)===t||(re&&!X&&!fe.immediate&&(o<xe.visibleStartIndex-xe.preloadSize||o>xe.visibleEndIndex+xe.preloadSize)||te&&!we.immediate&&!i.fixed&&(b<ge.visibleStartIndex-ge.preloadSize||b>ge.visibleEndIndex+ge.preloadSize))&&(Ge=!0),1<Xe&&(Q=pe[o+Xe-1])&&(s=de[(0,_util.getRowid)(l,Q)])&&(je+=s.oTop+(0,_util.getCellRestHeight)(s,h,C,be)-He.oTop-(0,_util.getCellRestHeight)(He,h,C,be));_={};if(c&&oe){let l=0;if(1<We)for(let e=1;e<We;e++){var Pe=ce[Ne+e];Pe&&(l+=Pe.renderWidth)}_.width=i.renderWidth+l-Se+"px"}re||c||x||n?_.height=je+"px":_.minHeight=je+"px";E=[];$&&se?E.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":R}],style:_})):(X&&E.push(...renderLine(e,l,t,B,je)),E.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":R}],style:_,attrs:{title:T?l.getCellLabel(a,i):null}},Ge?[]:[e("div",{attrs:{colid:O,rowid:t},class:"vxe-cell--wrapper vxe-body-cell--wrapper"},i.renderCell(e,B))])),P&&I&&(g=I.rule,me=Ae?Ae.valid:null,ae=Object.assign(Object.assign(Object.assign({},B),I),{rule:I}),E.push(e("div",{key:"tcv",class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(y.className,I)],style:g&&g.maxWidth?{width:g.maxWidth+"px"}:void 0},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(y.theme||"normal")},[me?l.callSlot(me,ae,e):[e("span",{class:"vxe-cell--valid-error-msg"},I.content)]])]))));let Ye=!1;return K&&Re.area&&!b&&De&&(Ye=!0),!$&&ke&&he&&E.push(e("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>l.handleColResizeMousedownEvent(e,r,B),dblclick:e=>l.handleColResizeDblclickEvent(e,B)}})),(ze||ye)&&C.resizable&&E.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,Te?"col--vertical-"+Te:"",v?"col--"+v:"",Oe?"col--"+Oe:"",{"col--last":F,"col--tree-node":Me,"col--edit":f,"col--ellipsis":c,"col--cs-height":x,"col--rs-height":n,"col--to-row":Ye,"col--auto-height":A,"fixed--width":!L,"fixed--hidden":$,"is--padding":ee,"is--progress":$&&se||Ge,"is--drag-cell":M&&(Ce||_e||!q),"is--drag-disabled":Ve,"col--dirty":Ue,"col--active":J&&f&&ie.row===a&&(ie.column===i||"row"===ve.mode),"col--valid-error":!!I,"col--current":le===i},(0,_utils.getClass)(qe,B),(0,_utils.getClass)(Be,B),(0,_utils.getClass)(j,B)],key:V||te||re||Ee.useKey||C.useKey||Ee.drag?i.id:N,attrs:D,style:Object.assign({},_xeUtils.default.isFunction(Fe)?Fe(B):Fe,_xeUtils.default.isFunction(G)?G(B):G),on:m},H&&$?[]:E)}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-copy-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/style/style.css

@@ -2105,7 +2105,13 @@
 }
 .vxe-table--cell-area .vxe-table--cell-col-status-area,
 .vxe-table--cell-area .vxe-table--cell-row-status-area {
-  background-color: var(--vxe-ui-table-checkbox-range-background-color);
+  background-color: var(--vxe-ui-table-cell-area-status-background-color);
+}
+.vxe-table--cell-area .vxe-table--cell-col-status-area {
+  border-bottom: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
+}
+.vxe-table--cell-area .vxe-table--cell-row-status-area {
+  border-right: var(--vxe-ui-table-cell-area-border-width) solid var(--vxe-ui-table-cell-area-border-color);
 }
 
 @keyframes moveCopyCellBorder {