vxe-table 3.20.13 → 3.21.0-beta.1

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

@@ -61,7 +61,7 @@ function syncActivedCell($xeTable) {
     row,
     column
   } = actived;
-  if (row || column) {
+  if (row && column) {
     if (editOpts.mode === 'row') {
       tableColumn.forEach(column => setEditColumnModel(row, column));
     } else {
@@ -153,6 +153,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
       fullAllDataRowIdData[rowid] = rest;
     }
   });
+  $xeTable.handleClearStack();
 }
 // function insertGroupRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, newRecords: any[], isAppend: boolean) {
 // }
@@ -251,6 +252,7 @@ function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow)
           mergeItem.row = mergeRowIndex + newRecords.length;
         }
       });
+      $xeTable.handleClearStack();
     }
   } else {
     if (targetRow === -1) {
@@ -289,6 +291,7 @@ function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow)
           afterFullData.push(item);
           tableFullData.push(item);
         });
+        $xeTable.handleClearStack();
       }
     } else {
       // 如果为虚拟树
@@ -364,6 +367,7 @@ function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow)
               parentChilds.splice(targetIndex, 0, ...treeRecords);
             }
           }
+          $xeTable.handleClearStack();
         } else {
           (0, _log.warnLog)('vxe.error.unableInsert');
           insertTreeRow($xeTable, newRecords, true);
@@ -413,6 +417,7 @@ function handleInsertRowAt($xeTable, records, targetRowOrRowid, isInsertNextRow)
             mergeItem.rowspan = mergeRowspan + newRecords.length;
           }
         });
+        $xeTable.handleClearStack();
       }
     }
   }
@@ -516,10 +521,10 @@ function handleClearEdit($xeTable, evnt, targetRow) {
       return $xeTable.$nextTick();
     }
     syncActivedCell($xeTable);
+    $xeTable.updateFooter();
     actived.args = null;
     actived.row = null;
     actived.column = null;
-    $xeTable.updateFooter();
     $xeTable.dispatchEvent('edit-closed', {
       row,
       rowIndex: $xeTable.getRowIndex(row),
@@ -540,7 +545,7 @@ function handleClearEdit($xeTable, evnt, targetRow) {
   }
   return $xeTable.$nextTick().then(() => $xeTable.updateCellAreas());
 }
-function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
+function handleEditActive($xeTable, params, evnt, options) {
   const props = $xeTable;
   const reactData = $xeTable;
   const $xeGrid = $xeTable.$xeGrid;
@@ -567,6 +572,11 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
   const {
     editRender
   } = column;
+  const {
+    isFocus,
+    isPos,
+    isClear
+  } = options;
   const cell = params.cell || $xeTable.getCellElement(row, column);
   const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
   params.cell = cell;
@@ -596,6 +606,10 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
           actived.args = params;
           actived.row = row;
           actived.column = column;
+          $xeTable.handlePushStack();
+          if (isClear) {
+            (0, _util.setCellValue)(row, column, null);
+          }
           if (mode === 'row') {
             tableColumn.forEach(column => getEditColumnModel(row, column));
           } else {
@@ -644,7 +658,7 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
             $xeTable.clearCopyCellArea();
           }
         }
-        if (oldColumn !== column) {
+        if (oldColumn && oldColumn !== column) {
           const {
             model: oldModel
           } = oldColumn;
@@ -671,12 +685,15 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
   }
   return $xeTable.$nextTick();
 }
-function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
+function handleEditCell($xeTable, row, fieldOrColumn, options) {
   const props = $xeTable;
   const internalData = $xeTable;
   const {
     editConfig
   } = props;
+  const {
+    isPos
+  } = options;
   const column = _xeUtils.default.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
   if (row && column && (0, _utils.isEnableConf)(editConfig) && (0, _utils.isEnableConf)(column.editRender) && !$xeTable.isAggregateRecord(row)) {
     return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
@@ -689,7 +706,7 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
           columnIndex: $xeTable.getColumnIndex(column),
           cell,
           $table: $xeTable
-        }, null, isPos, isPos);
+        }, null, options);
         internalData._lastCallTime = Date.now();
       }
       return $xeTable.$nextTick();
@@ -868,6 +885,7 @@ var _default = exports.default = {
       reactData.removeRowFlag++;
       reactData.insertRowFlag++;
       reactData.pendingRowFlag++;
+      $xeTable.handleClearStack();
       $xeTable.cacheRowMap(false);
       $xeTable.handleTableData(treeConfig && transform);
       $xeTable.updateFooter();
@@ -1002,9 +1020,12 @@ var _default = exports.default = {
     /**
      * 处理激活编辑
      */
-    handleEdit(params, evnt) {
+    handleEdit(params, evnt, options) {
       const $xeTable = this;
-      return handleEditActive($xeTable, params, evnt, true, true);
+      return handleEditActive($xeTable, params, evnt, Object.assign({
+        isFocus: true,
+        isPos: true
+      }, options));
     },
     /**
      * @deprecated
@@ -1198,7 +1219,7 @@ var _default = exports.default = {
     /**
      * 激活行编辑
      */
-    _setEditRow(row, fieldOrColumn) {
+    _setEditRow(row, fieldOrColumn, options) {
       const $xeTable = this;
       const internalData = $xeTable;
       const {
@@ -1212,7 +1233,10 @@ var _default = exports.default = {
           column = _xeUtils.default.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
         }
       }
-      return handleEditCell($xeTable, row, column, isPos);
+      return handleEditCell($xeTable, row, column, Object.assign({
+        isPos,
+        isFocus: isPos
+      }, options));
     },
     _setActiveCell(row, fieldOrColumn) {
       const $xeTable = this;
@@ -1223,9 +1247,12 @@ var _default = exports.default = {
     /**
      * 激活单元格编辑
      */
-    _setEditCell(row, fieldOrColumn) {
+    _setEditCell(row, fieldOrColumn, options) {
       const $xeTable = this;
-      return handleEditCell($xeTable, row, fieldOrColumn, true);
+      return handleEditCell($xeTable, row, fieldOrColumn, Object.assign({
+        isFocus: true,
+        isPos: true
+      }, options));
     },
     /**
      * 只对 trigger=dblclick 有效，选中单元格

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: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[g]=[]),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(d,t,e,a){var l=d;let o=d.treeConfig;var r=l.isRowGroupStatus;let{tableFullTreeData:s,afterFullData:i,mergeBodyList:n,tableFullData:u,fullDataRowIdData:c,fullAllDataRowIdData:h,insertRowMaps:g,removeRowMaps:w}=d;var f=d.computeTreeOpts;let{transform:x,parentField:m,rowField:v,mapChildrenField:p}=f,_=f.children||f.childrenField,R=(_xeUtils.default.isArray(t)||(t=[t]),e),C=((_xeUtils.default.isString(e)||_xeUtils.default.isNumber(e))&&(f=h[e])&&(R=f.row),d.defineField(t.map(e=>Object.assign(o&&x?{[p]:[],[_]:[]}:{},e)))),I=[];if(o&&x&&(I=_xeUtils.default.toArrayTree(C,{key:v,parentKey:m,children:_})),_xeUtils.default.eqNull(R))if(o&&x)insertTreeRow(d,C,!1);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.errLog)(getI18n("vxe.error.noGroup",["insert"]))}else C.forEach(e=>{var t=(0,_util.getRowid)(d,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),u.unshift(e)}),n.forEach(e=>{var t=e.row;0<=t&&(e.row=t+C.length)});else if(-1===R)if(o&&x)insertTreeRow(d,C,!0);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.errLog)(getI18n("vxe.error.noGroup",["insert"]))}else C.forEach(e=>{var t=(0,_util.getRowid)(d,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),u.push(e)});else if(o&&x){let n=_xeUtils.default.findTree(s,e=>R[v]===e[v],{children:p});if(n){let r=n.parent,o=r?r[p]:s;e=h[(0,_util.getRowid)(d,r)];let i=e?e.level:0;if(I.forEach((e,t)=>{r?e[m]!==r[v]&&((0,_log.errLog)("vxe.error.errProp",[m+"="+e[m],m+"="+r[v]]),e[m]=r[v]):null!==e[m]&&(_xeUtils.default.eqNull(e[m])||(0,_log.errLog)("vxe.error.errProp",[m+"="+e[m],"null"]),e[m]=null);let l=n.index+t;a&&(l+=1),o.splice(l,0,e)}),_xeUtils.default.eachTree(I,e=>{var t=(0,_util.getRowid)(d,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,_tIndex:-1,items:o,parent:r,level:i+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};e[_]&&(e[p]=e[_]),c[t]=l,h[t]=l},{children:_}),r){f=_xeUtils.default.findTree(s,e=>R[v]===e[v],{children:_});if(f){t=f.items;let e=f.index;a&&(e+=1),t.splice(e,0,...I)}}}else(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(d,C,!0)}else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.errLog)(getI18n("vxe.error.noGroup",["insert"]))}else{if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));let r=-1;if(_xeUtils.default.isNumber(R)?R<i.length&&(r=R):r=d.findRowIndexOf(i,R),-1===(r=a?Math.min(i.length,r+1):r))throw new Error(getI18n("vxe.error.unableInsert"));i.splice(r,0,...C);e=d.findRowIndexOf(u,R);-1<e?u.splice(e+(a?1:0),0,...C):u.push(...C),n.forEach(e=>{var{row:t,rowspan:l}=e;t>=r?e.row=t+C.length:(a?t+l>=r:t+l>r)&&(e.rowspan=l+C.length)})}f=e=>{var t=(0,_util.getRowid)(d,e);w[t]?(delete w[t],g[t]&&delete g[t]):g[t]=e};return o&&x?_xeUtils.default.eachTree(I,f,{children:p}):C.forEach(f),l.removeRowFlag++,l.insertRowFlag++,d.cacheRowMap(!1),d.updateScrollYStatus(),d.handleTableData(o&&x),o&&x||d.updateAfterDataIndex(),d.updateFooter(),d.handleUpdateBodyMerge(),d.checkSelectionStatus(),l.scrollYLoad&&d.updateScrollYSpace(),d.$nextTick().then(()=>(d.updateCellAreas(),d.recalculate(!0))).then(()=>({row:C.length?C[C.length-1]:null,rows:C}))}function handleInsertChildRowAt(e,l,r,o,i){var n=e.treeConfig,d=e.fullAllDataRowIdData;let{transform:t,rowField:a,parentField:s}=e.computeTreeOpts;if(n&&t){_xeUtils.default.isArray(l)||(l=[l]);let t=r;return(_xeUtils.default.isString(r)||_xeUtils.default.isNumber(r))&&(n=d[r])&&(t=n.row),handleInsertRowAt(e,l.map(e=>Object.assign({},e,{[s]:t[a]})),o,i)}return(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,x=r.cell||l.getCellElement(g,w),m=u.beforeEditMethod||u.activeMethod;if((r.cell=x)&&(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(!m||m(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=x.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=x.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 o=this;var t=o,l=o,r=o,t=t.treeConfig,{editStore:i,isRowGroupStatus:n}=l;let{tableFullTreeData:d,selectCheckboxMaps:a,afterFullData:s,mergeBodyList:u,tableFullData:c,pendingRowMaps:h,insertRowMaps:g,removeRowMaps:w}=r;var f=o.computeCheckboxOpts,x=o.computeTreeOpts;let{transform:m,mapChildrenField:v}=x,p=x.children||x.childrenField;x=i.actived,i=f.checkField;let _=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=c,e.forEach(e=>{var t;o.isInsertByRow(e)||(t=(0,_util.getRowid)(o,e),w[t]=e)}),i||(e.forEach(e=>{e=(0,_util.getRowid)(this,e);a[e]&&delete a[e]}),l.updateCheckboxFlag++),c===e?(e=_=c.slice(0),r.tableFullData=[],r.afterFullData=[],o.clearMergeCells()):t&&m?e.forEach(e=>{let t=(0,_util.getRowid)(o,e);var l=_xeUtils.default.findTree(d,e=>t===(0,_util.getRowid)(o,e),{children:v}),l=(l&&(l=l.items.splice(l.index,1),_.push(l[0])),_xeUtils.default.findTree(d,e=>t===(0,_util.getRowid)(o,e),{children:p})),l=(l&&l.items.splice(l.index,1),o.findRowIndexOf(s,e));-1<l&&s.splice(l,1)}):n?(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"])):e.forEach(e=>{var t=o.findRowIndexOf(c,e);-1<t&&(t=c.splice(t,1),_.push(t[0]));let r=o.findRowIndexOf(s,e);-1<r&&(u.forEach(e=>{var{row:t,rowspan:l}=e;t>r?e.row=t-1:t+l>r&&(e.rowspan=l-1)}),s.splice(r,1))}),x.row&&-1<o.findRowIndexOf(e,x.row)&&o.clearEdit(),e.forEach(e=>{e=(0,_util.getRowid)(o,e);g[e]&&delete g[e],h[e]&&delete h[e]}),l.removeRowFlag++,l.insertRowFlag++,l.pendingRowFlag++,o.cacheRowMap(!1),o.handleTableData(t&&m),o.updateFooter(),o.handleUpdateBodyMerge(),t&&m||o.updateAfterDataIndex(),o.checkSelectionStatus(),l.scrollYLoad&&o.updateScrollYSpace(),o.$nextTick().then(()=>(o.updateCellAreas(),o.recalculate(!0))).then(()=>({row:_.length?_[_.length-1]:null,rows:_}))},_removeCheckboxRow(){let t=this;return t.remove(t.getCheckboxRecords()).then(e=>(t.clearCheckboxRow(),e))},_removeRadioRow(){let t=this;var e=t.getRadioRecord();return t.remove(e||[]).then(e=>(t.clearRadioRow(),e))},_removeCurrentRow(){let t=this;var e=t.getCurrentRecord();return t.remove(e||[]).then(e=>(t.clearCurrentRow(),e))},_getRecordset(){let l=this;var e=l.getRemoveRecords(),t=l.getPendingRecords();let r=e.concat(t);var o=l.getUpdateRecords().filter(t=>!r.some(e=>l.eqRow(e,t)));return{insertRecords:l.getInsertRecords(),removeRecords:e,updateRecords:o,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,rowIndex:this.getRowIndex(e),column:t,columnIndex:this.getColumnIndex(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){var l=this.visibleColumn;let r=_xeUtils.default.find(l,e=>(0,_utils.isEnableConf)(e.editRender)),o=!1;return t&&(o=!0)!==t&&(r=_xeUtils.default.isString(t)?this.getColumnByField(t):t),handleEditCell(this,e,r,o)},_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&&l.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,e=e["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[g]=[]),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"),d[f](l),a[f](l);i={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,_tIndex:-1,items:a,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=i,u[r]=i}}),n.handleClearStack()}function handleInsertRowAt(a,t,e,d){var l=a;let o=a.treeConfig;var r=l.isRowGroupStatus;let{tableFullTreeData:s,afterFullData:i,mergeBodyList:n,tableFullData:u,fullDataRowIdData:c,fullAllDataRowIdData:h,insertRowMaps:g,removeRowMaps:w}=a;var f=a.computeTreeOpts;let{transform:x,parentField:m,rowField:v,mapChildrenField:p}=f,C=f.children||f.childrenField,_=(_xeUtils.default.isArray(t)||(t=[t]),e),R=((_xeUtils.default.isString(e)||_xeUtils.default.isNumber(e))&&(f=h[e])&&(_=f.row),a.defineField(t.map(e=>Object.assign(o&&x?{[p]:[],[C]:[]}:{},e)))),I=[];if(o&&x&&(I=_xeUtils.default.toArrayTree(R,{key:v,parentKey:m,children:C})),_xeUtils.default.eqNull(_))if(o&&x)insertTreeRow(a,R,!1);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.errLog)(getI18n("vxe.error.noGroup",["insert"]))}else R.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),u.unshift(e)}),n.forEach(e=>{var t=e.row;0<=t&&(e.row=t+R.length)}),a.handleClearStack();else if(-1===_)if(o&&x)insertTreeRow(a,R,!0);else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.errLog)(getI18n("vxe.error.noGroup",["insert"]))}else R.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),u.push(e)}),a.handleClearStack();else if(o&&x){let n=_xeUtils.default.findTree(s,e=>_[v]===e[v],{children:p});if(n){let r=n.parent,o=r?r[p]:s;e=h[(0,_util.getRowid)(a,r)];let i=e?e.level:0;if(I.forEach((e,t)=>{r?e[m]!==r[v]&&((0,_log.errLog)("vxe.error.errProp",[m+"="+e[m],m+"="+r[v]]),e[m]=r[v]):null!==e[m]&&(_xeUtils.default.eqNull(e[m])||(0,_log.errLog)("vxe.error.errProp",[m+"="+e[m],"null"]),e[m]=null);let l=n.index+t;d&&(l+=1),o.splice(l,0,e)}),_xeUtils.default.eachTree(I,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:o,parent:r,level:i+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};e[C]&&(e[p]=e[C]),c[t]=l,h[t]=l},{children:C}),r){f=_xeUtils.default.findTree(s,e=>_[v]===e[v],{children:C});if(f){t=f.items;let e=f.index;d&&(e+=1),t.splice(e,0,...I)}}a.handleClearStack()}else(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(a,R,!0)}else if(r){if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));(0,_log.errLog)(getI18n("vxe.error.noGroup",["insert"]))}else{if(o)throw new Error(getI18n("vxe.error.noTree",["insert"]));let r=-1;if(_xeUtils.default.isNumber(_)?_<i.length&&(r=_):r=a.findRowIndexOf(i,_),-1===(r=d?Math.min(i.length,r+1):r))throw new Error(getI18n("vxe.error.unableInsert"));i.splice(r,0,...R);e=a.findRowIndexOf(u,_);-1<e?u.splice(e+(d?1:0),0,...R):u.push(...R),n.forEach(e=>{var{row:t,rowspan:l}=e;t>=r?e.row=t+R.length:(d?t+l>=r:t+l>r)&&(e.rowspan=l+R.length)}),a.handleClearStack()}f=e=>{var t=(0,_util.getRowid)(a,e);w[t]?(delete w[t],g[t]&&delete g[t]):g[t]=e};return o&&x?_xeUtils.default.eachTree(I,f,{children:p}):R.forEach(f),l.removeRowFlag++,l.insertRowFlag++,a.cacheRowMap(!1),a.updateScrollYStatus(),a.handleTableData(o&&x),o&&x||a.updateAfterDataIndex(),a.updateFooter(),a.handleUpdateBodyMerge(),a.checkSelectionStatus(),l.scrollYLoad&&a.updateScrollYSpace(),a.$nextTick().then(()=>(a.updateCellAreas(),a.recalculate(!0))).then(()=>({row:R.length?R[R.length-1]:null,rows:R}))}function handleInsertChildRowAt(e,l,r,o,i){var n=e.treeConfig,a=e.fullAllDataRowIdData;let{transform:t,rowField:d,parentField:s}=e.computeTreeOpts;if(n&&t){_xeUtils.default.isArray(l)||(l=[l]);let t=r;return(_xeUtils.default.isString(r)||_xeUtils.default.isNumber(r))&&(n=a[r])&&(t=n.row),handleInsertRowAt(e,l.map(e=>Object.assign({},e,{[s]:t[d]})),o,i)}return(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),e.updateFooter(),r.args=null,r.row=null,r.column=null,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){let n=l.$xeGrid;var{editConfig:e,mouseConfig:a}=l,{editStore:d,tableColumn:s}=l,u=l.computeEditOpts,c=u.mode,{actived:d,focused:t}=d;let{row:h,column:g}=r;var w=g.editRender;let{isFocus:f,isPos:x,isClear:m}=i;var i=r.cell||l.getCellElement(h,g),v=u.beforeEditMethod||u.activeMethod;if((r.cell=i)&&(0,_utils.isEnableConf)(e)&&(0,_utils.isEnableConf)(w)&&!l.isPendingByRow(h)&&!l.isAggregateRecord(h)){if(d.row!==h||"cell"===c&&d.column!==g){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",g.renderHeight=i.offsetHeight,d.args=r,d.row=h,d.column=g,l.handlePushStack(),m&&(0,_util.setCellValue)(h,g,null),"row"===c?s.forEach(e=>getEditColumnModel(h,e)):getEditColumnModel(h,g);let e=u.afterEditMethod;l.$nextTick(()=>{f&&l.handleFocus(r,o),e&&e(Object.assign(Object.assign({},r),{$table:l,$grid:n}))})}l.dispatchEvent(t,{row:h,rowIndex:l.getRowIndex(h),$rowIndex:l.getVMRowIndex(h),column:g,columnIndex:l.getColumnIndex(g),$columnIndex:l.getVMColumnIndex(g)},o),"edit-activated"===t&&l.dispatchEvent("edit-actived",{row:h,rowIndex:l.getRowIndex(h),$rowIndex:l.getVMRowIndex(h),column:g,columnIndex:l.getColumnIndex(g),$columnIndex:l.getVMColumnIndex(g)},o)}else{e=d.column;a&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),e&&e!==g&&(w=e.model,w.update&&(0,_util.setCellValue)(h,e,w.value),l.clearValidate)&&l.clearValidate(h,g),g.renderHeight=i.offsetHeight,d.args=r,d.column=g,x&&setTimeout(()=>{l.handleFocus(r,o)})}t.column=null,t.row=null,l.focus()}return l.$nextTick()}function handleEditCell(t,l,e,r){let o=t;var i=t.editConfig,n=r.isPos;let a=_xeUtils.default.isString(e)?t.getColumnByField(e):e;return l&&a&&(0,_utils.isEnableConf)(i)&&(0,_utils.isEnableConf)(a.editRender)&&!t.isAggregateRecord(l)?Promise.resolve(n?t.scrollToRow(l,a):null).then(()=>{var e=t.getCellElement(l,a);return e&&(handleEditActive(t,{row:l,rowIndex:t.getRowIndex(l),column:a,columnIndex:t.getColumnIndex(a),cell:e,$table:t},null,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 o=this;var t=o,l=o,r=o,t=t.treeConfig,{editStore:i,isRowGroupStatus:n}=l;let{tableFullTreeData:a,selectCheckboxMaps:d,afterFullData:s,mergeBodyList:u,tableFullData:c,pendingRowMaps:h,insertRowMaps:g,removeRowMaps:w}=r;var f=o.computeCheckboxOpts,x=o.computeTreeOpts;let{transform:m,mapChildrenField:v}=x,p=x.children||x.childrenField;x=i.actived,i=f.checkField;let C=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=c,e.forEach(e=>{var t;o.isInsertByRow(e)||(t=(0,_util.getRowid)(o,e),w[t]=e)}),i||(e.forEach(e=>{e=(0,_util.getRowid)(this,e);d[e]&&delete d[e]}),l.updateCheckboxFlag++),c===e?(e=C=c.slice(0),r.tableFullData=[],r.afterFullData=[],o.clearMergeCells()):t&&m?e.forEach(e=>{let t=(0,_util.getRowid)(o,e);var l=_xeUtils.default.findTree(a,e=>t===(0,_util.getRowid)(o,e),{children:v}),l=(l&&(l=l.items.splice(l.index,1),C.push(l[0])),_xeUtils.default.findTree(a,e=>t===(0,_util.getRowid)(o,e),{children:p})),l=(l&&l.items.splice(l.index,1),o.findRowIndexOf(s,e));-1<l&&s.splice(l,1)}):n?(0,_log.warnLog)(getI18n("vxe.error.noGroup",["remove"])):e.forEach(e=>{var t=o.findRowIndexOf(c,e);-1<t&&(t=c.splice(t,1),C.push(t[0]));let r=o.findRowIndexOf(s,e);-1<r&&(u.forEach(e=>{var{row:t,rowspan:l}=e;t>r?e.row=t-1:t+l>r&&(e.rowspan=l-1)}),s.splice(r,1))}),x.row&&-1<o.findRowIndexOf(e,x.row)&&o.clearEdit(),e.forEach(e=>{e=(0,_util.getRowid)(o,e);g[e]&&delete g[e],h[e]&&delete h[e]}),l.removeRowFlag++,l.insertRowFlag++,l.pendingRowFlag++,o.handleClearStack(),o.cacheRowMap(!1),o.handleTableData(t&&m),o.updateFooter(),o.handleUpdateBodyMerge(),t&&m||o.updateAfterDataIndex(),o.checkSelectionStatus(),l.scrollYLoad&&o.updateScrollYSpace(),o.$nextTick().then(()=>(o.updateCellAreas(),o.recalculate(!0))).then(()=>({row:C.length?C[C.length-1]:null,rows:C}))},_removeCheckboxRow(){let t=this;return t.remove(t.getCheckboxRecords()).then(e=>(t.clearCheckboxRow(),e))},_removeRadioRow(){let t=this;var e=t.getRadioRecord();return t.remove(e||[]).then(e=>(t.clearRadioRow(),e))},_removeCurrentRow(){let t=this;var e=t.getCurrentRecord();return t.remove(e||[]).then(e=>(t.clearCurrentRow(),e))},_getRecordset(){let l=this;var e=l.getRemoveRecords(),t=l.getPendingRecords();let r=e.concat(t);var o=l.getUpdateRecords().filter(t=>!r.some(e=>l.eqRow(e,t)));return{insertRecords:l.getInsertRecords(),removeRecords:e,updateRecords:o,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,l){return handleEditActive(this,e,t,Object.assign({isFocus:!0,isPos:!0},l))},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,rowIndex:this.getRowIndex(e),column:t,columnIndex:this.getColumnIndex(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,l){var r=this.visibleColumn;let o=_xeUtils.default.find(r,e=>(0,_utils.isEnableConf)(e.editRender)),i=!1;return t&&(i=!0)!==t&&(o=_xeUtils.default.isString(t)?this.getColumnByField(t):t),handleEditCell(this,e,o,Object.assign({isPos:i,isFocus:i},l))},_setActiveCell(e,t){return(0,_log.warnLog)("vxe.error.delFunc",["setActiveCell","setEditCell"]),this.setEditCell(e,t)},_setEditCell(e,t,l){return handleEditCell(this,e,t,Object.assign({isFocus:!0,isPos:!0},l))},_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&&l.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,e=e["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/module/keyboard/mixin.js

@@ -546,8 +546,8 @@ var _default = exports.default = {
       const checkboxOpts = $xeTable.computeCheckboxOpts;
       const mouseOpts = $xeTable.computeMouseOpts;
       const editOpts = $xeTable.computeEditOpts;
-      if (mouseConfig && mouseOpts.area && $xeTable.triggerClAreaModnEvent) {
-        return $xeTable.triggerClAreaModnEvent(evnt, params);
+      if (mouseConfig && mouseOpts.area && $xeTable.triggerCelllAreaMnEvent) {
+        return $xeTable.triggerCelllAreaMnEvent(evnt, params);
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           handleCheckboxRangeEvent($xeTable, evnt, params);

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../src/util"),_dom=require("../../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getCheckboxRangeRows(t,e,l,o,n,r,i){var u=t.showOverflow,{fullAllDataRowIdData:c,isResizeCellHeight:s}=t,d=t.computeRowOpts,h=t.computeCellOpts,g=t.computeDefaultRowHeight,l=l.row;let a=0,m=[],C=0;var p=0<i,w=t.scrollYLoad,v=t.afterFullData;if(C=p?r+i:n.height-r+Math.abs(i),w){n=t.getVTRowIndex(l);if(!(s||h.height||d.height)&&u)m=p?v.slice(n,n+Math.ceil(C/g)):v.slice(n-Math.floor(C/g),n+1);else if(p)for(let e=n;e<v.length;e++){var f=v[e],x=c[t.getRowid(f)]||{};if(a+=x.resizeHeight||h.height||d.height||x.height||g,m.push(f),a>C)return m}else for(let e=n;0<=e;e--){var R=v[e],b=c[t.getRowid(R)]||{};if(a+=b.resizeHeight||h.height||d.height||b.height||g,m.push(R),a>C)return m}}else for(var I=p?"next":"previous";o&&a<C;){var E=t.getRowNode(o);E&&(m.push(E.item),a+=o.offsetHeight,o=o[I+"ElementSibling"])}return m}function handleMoveSelected(e,t,l,o,n,r,i){var{afterFullData:u,visibleColumn:c}=e;let s=Object.assign({},l);var{row:l,column:d}=s,l=e.getVTRowIndex(l),h=e.getVTColumnIndex(d),g=e.$refs.refTableBody,g=g?g.$el:null,g=g?g.clientWidth:0;let a=o||r||d.renderWidth<g;return o&&0<=h||r&&h<=c.length-1?a=!1:t.preventDefault(),n&&0<l?(s.rowIndex=l-1,s.row=u[s.rowIndex]):i&&l<u.length-1?(s.rowIndex=l+1,s.row=u[s.rowIndex]):o&&h?(s.columnIndex=h-1,s.column=c[s.columnIndex]):r&&h<c.length-1&&(s.columnIndex=h+1,s.column=c[s.columnIndex]),e.scrollToRow(s.row,s.column,{colAlign:a}).then(()=>{s.cell=e.getCellElement(s.row,s.column),e.handleSelected(s,t)}),s}function handleCheckboxRangeEvent(S,e,M){var t=S.elemStore,l=(0,_util.getRefElem)(t["main-body-scroll"]),o=(0,_util.getRefElem)(t["left-body-scroll"]),t=(0,_util.getRefElem)(t["right-body-scroll"]),{column:n,cell:r}=M;if("checkbox"===n.type){let O=l;if(o&&"left"===n.fixed?O=o:t&&"right"===n.fixed&&(O=t),O){l=O.getBoundingClientRect();let t=S.$refs.refElem,u=e.clientX,c=e.clientY,s=O.querySelector(".vxe-table--checkbox-range"),d=r.parentNode,h=S.getCheckboxRecords(),g=[],a=1,m=e.clientY-l.y+O.scrollTop,C=e.clientX-l.x+O.scrollLeft,p=O.scrollTop,i=d.offsetHeight,w=d.getBoundingClientRect(),v=c-w.y,f=null,x=!1,R=1,b=(e,t)=>{S.dispatchEvent("checkbox-range-"+e,{records:()=>S.getCheckboxRecords(),reserves:()=>S.getCheckboxReserveRecords()},t)},I=e=>{var{clientX:t,clientY:l}=e,t=t-u,l=l-c+(O.scrollTop-p);let o=Math.abs(l),n=Math.abs(t),r=m,i=C;l<a?(r+=l)<a&&(r=a,o=m):o=Math.min(o,O.scrollHeight-m-a),t<a?(i+=t,n>C&&(i=a,n=C)):n=Math.min(n,O.clientWidth-C-a),s.style.height=o+"px",s.style.width=n+"px",s.style.left=i+"px",s.style.top=r+"px",s.style.display="block";t=getCheckboxRangeRows(S,e,M,d,w,v,l<a?-o:o);10<o&&t.length!==g.length&&(l=(0,_dom.hasControlKey)(e),g=t,l?t.forEach(e=>{S.handleBatchSelectRows([e],-1===h.indexOf(e))}):(S.setAllCheckboxRow(!1),S.handleCheckedCheckboxRow(t,!0,!1)),b("change",e))},E=()=>{clearTimeout(f),f=null},T=r=>{E(),f=setTimeout(()=>{var e,t,l,o,n;f&&({scrollLeft:e,scrollTop:t,clientHeight:l,scrollHeight:o}=O,n=Math.ceil(50*R/i),x?t+l<o?(S.scrollTo(e,t+n),T(r),I(r)):E():t?(S.scrollTo(e,t-n),T(r),I(r)):E())},50)};(0,_dom.addClass)(t,"drag--range"),document.onmousemove=e=>{e.preventDefault(),e.stopPropagation();var t=e.clientY,l=(0,_dom.getAbsolutePos)(O).boundingTop;t<l?(x=!1,R=l-t,f||T(e)):t>l+O.clientHeight?(x=!0,R=t-l-O.clientHeight,f||T(e)):f&&E(),I(e)},document.onmouseup=e=>{E(),(0,_dom.removeClass)(t,"drag--range"),s.removeAttribute("style"),document.onmousemove=null,document.onmouseup=null,b("end",e)},b("start",e)}}}var _default=exports.default={methods:{moveTabSelected(e,t,l){let o=this;var n=o.editConfig,{afterFullData:r,visibleColumn:i}=o,u=o.computeEditOpts,c=o.computeRowOpts,s=o.computeCurrentRowOpts,d=o.computeColumnOpts,h=o.computeCurrentColumnOpts;let g,a,m,C=Object.assign({},e);var e=o.getVTRowIndex(C.row),p=o.getVTColumnIndex(C.column),t=(l.preventDefault(),t?p<=0?0<e&&(a=e-1,g=r[a],m=i.length-1):m=p-1:p>=i.length-1?e<r.length-1&&(a=e+1,g=r[a],m=0):m=p+1,i[m]);t&&(g?(C.rowIndex=a,C.row=g):C.rowIndex=e,C.columnIndex=m,C.column=t,C.cell=o.getCellElement(C.row,C.column),c.isCurrent&&s.isFollowSelected&&o.triggerCurrentRowEvent(l,C),d.isCurrent&&h.isFollowSelected&&o.triggerCurrentColumnEvent(l,C),n?"click"!==u.trigger&&"dblclick"!==u.trigger||("row"===u.mode?o.handleEdit(C,l):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)})):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)}))},moveCurrentRow(e,t,l){let o=this;var n=o.treeConfig;let{afterFullData:r,currentRow:i}=o;var u=o.computeTreeOpts,u=u.children||u.childrenField;let c;if(i?n?({index:n,items:u}=_xeUtils.default.findTree(r,e=>e===i,{children:u}),e&&0<n?c=u[n-1]:t&&n<u.length-1&&(c=u[n+1])):(u=o.getVTRowIndex(i),e&&0<u?c=r[u-1]:t&&u<r.length-1&&(c=r[u+1])):c=r[0],c){l.preventDefault();let e={$table:o,row:c,rowIndex:o.getRowIndex(c),$rowIndex:o.getVMRowIndex(c)};o.scrollToRow(c).then(()=>o.triggerCurrentRowEvent(l,e))}},moveCurrentColumn(e,t,l){let o=this;var n=o.currentColumn,r=o.visibleColumn;let i=null;if(n?(n=o.getVTColumnIndex(n),e&&0<n?i=r[n-1]:t&&n<r.length-1&&(i=r[n+1])):i=r[0],i){l.preventDefault();let e={$table:o,column:i,columnIndex:o.getColumnIndex(i),$columnIndex:o.getVMColumnIndex(i)};o.scrollToColumn(i).then(()=>o.triggerCurrentColumnEvent(l,e))}},moveArrowSelected(e,t,l,o,n,r){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,r,e,t,l,o,n);(s.isCurrent||u)&&(d.isFollowSelected?i.triggerCurrentRowEvent(r,e):(l||n)&&(s.isCurrent||u)&&i.moveCurrentRow(l,n,r)),(h.isCurrent||c)&&(g.isFollowSelected?i.triggerCurrentColumnEvent(r,e):(t||o)&&(h.isCurrent||c)&&i.moveCurrentColumn(t,o,r))},moveEnterSelected(e,t,l,o,n,r){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,r,e,t,l,o,n);(s.isCurrent||u)&&d.isFollowSelected&&i.triggerCurrentRowEvent(r,e),(h.isCurrent||c)&&g.isFollowSelected&&i.triggerCurrentColumnEvent(r,e)},moveSelected(e,t,l,o,n,r){handleMoveSelected(this,r,e,t,l,o,n)},handleCellMousedownEvent(e,t){var l=this,{editConfig:o,checkboxConfig:n,mouseConfig:r}=l,i=l.computeCheckboxOpts,u=l.computeMouseOpts,c=l.computeEditOpts;if(r&&u.area&&l.triggerClAreaModnEvent)return l.triggerClAreaModnEvent(e,t);n&&i.range&&handleCheckboxRangeEvent(l,e,t),r&&u.selected&&(o&&"cell"!==c.mode||l.handleSelected(t,e))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../src/util"),_dom=require("../../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getCheckboxRangeRows(t,e,l,o,n,r,i){var u=t.showOverflow,{fullAllDataRowIdData:c,isResizeCellHeight:s}=t,d=t.computeRowOpts,h=t.computeCellOpts,g=t.computeDefaultRowHeight,l=l.row;let a=0,m=[],C=0;var p=0<i,w=t.scrollYLoad,v=t.afterFullData;if(C=p?r+i:n.height-r+Math.abs(i),w){n=t.getVTRowIndex(l);if(!(s||h.height||d.height)&&u)m=p?v.slice(n,n+Math.ceil(C/g)):v.slice(n-Math.floor(C/g),n+1);else if(p)for(let e=n;e<v.length;e++){var f=v[e],x=c[t.getRowid(f)]||{};if(a+=x.resizeHeight||h.height||d.height||x.height||g,m.push(f),a>C)return m}else for(let e=n;0<=e;e--){var R=v[e],b=c[t.getRowid(R)]||{};if(a+=b.resizeHeight||h.height||d.height||b.height||g,m.push(R),a>C)return m}}else for(var I=p?"next":"previous";o&&a<C;){var E=t.getRowNode(o);E&&(m.push(E.item),a+=o.offsetHeight,o=o[I+"ElementSibling"])}return m}function handleMoveSelected(e,t,l,o,n,r,i){var{afterFullData:u,visibleColumn:c}=e;let s=Object.assign({},l);var{row:l,column:d}=s,l=e.getVTRowIndex(l),h=e.getVTColumnIndex(d),g=e.$refs.refTableBody,g=g?g.$el:null,g=g?g.clientWidth:0;let a=o||r||d.renderWidth<g;return o&&0<=h||r&&h<=c.length-1?a=!1:t.preventDefault(),n&&0<l?(s.rowIndex=l-1,s.row=u[s.rowIndex]):i&&l<u.length-1?(s.rowIndex=l+1,s.row=u[s.rowIndex]):o&&h?(s.columnIndex=h-1,s.column=c[s.columnIndex]):r&&h<c.length-1&&(s.columnIndex=h+1,s.column=c[s.columnIndex]),e.scrollToRow(s.row,s.column,{colAlign:a}).then(()=>{s.cell=e.getCellElement(s.row,s.column),e.handleSelected(s,t)}),s}function handleCheckboxRangeEvent(S,e,M){var t=S.elemStore,l=(0,_util.getRefElem)(t["main-body-scroll"]),o=(0,_util.getRefElem)(t["left-body-scroll"]),t=(0,_util.getRefElem)(t["right-body-scroll"]),{column:n,cell:r}=M;if("checkbox"===n.type){let O=l;if(o&&"left"===n.fixed?O=o:t&&"right"===n.fixed&&(O=t),O){l=O.getBoundingClientRect();let t=S.$refs.refElem,u=e.clientX,c=e.clientY,s=O.querySelector(".vxe-table--checkbox-range"),d=r.parentNode,h=S.getCheckboxRecords(),g=[],a=1,m=e.clientY-l.y+O.scrollTop,C=e.clientX-l.x+O.scrollLeft,p=O.scrollTop,i=d.offsetHeight,w=d.getBoundingClientRect(),v=c-w.y,f=null,x=!1,R=1,b=(e,t)=>{S.dispatchEvent("checkbox-range-"+e,{records:()=>S.getCheckboxRecords(),reserves:()=>S.getCheckboxReserveRecords()},t)},I=e=>{var{clientX:t,clientY:l}=e,t=t-u,l=l-c+(O.scrollTop-p);let o=Math.abs(l),n=Math.abs(t),r=m,i=C;l<a?(r+=l)<a&&(r=a,o=m):o=Math.min(o,O.scrollHeight-m-a),t<a?(i+=t,n>C&&(i=a,n=C)):n=Math.min(n,O.clientWidth-C-a),s.style.height=o+"px",s.style.width=n+"px",s.style.left=i+"px",s.style.top=r+"px",s.style.display="block";t=getCheckboxRangeRows(S,e,M,d,w,v,l<a?-o:o);10<o&&t.length!==g.length&&(l=(0,_dom.hasControlKey)(e),g=t,l?t.forEach(e=>{S.handleBatchSelectRows([e],-1===h.indexOf(e))}):(S.setAllCheckboxRow(!1),S.handleCheckedCheckboxRow(t,!0,!1)),b("change",e))},E=()=>{clearTimeout(f),f=null},T=r=>{E(),f=setTimeout(()=>{var e,t,l,o,n;f&&({scrollLeft:e,scrollTop:t,clientHeight:l,scrollHeight:o}=O,n=Math.ceil(50*R/i),x?t+l<o?(S.scrollTo(e,t+n),T(r),I(r)):E():t?(S.scrollTo(e,t-n),T(r),I(r)):E())},50)};(0,_dom.addClass)(t,"drag--range"),document.onmousemove=e=>{e.preventDefault(),e.stopPropagation();var t=e.clientY,l=(0,_dom.getAbsolutePos)(O).boundingTop;t<l?(x=!1,R=l-t,f||T(e)):t>l+O.clientHeight?(x=!0,R=t-l-O.clientHeight,f||T(e)):f&&E(),I(e)},document.onmouseup=e=>{E(),(0,_dom.removeClass)(t,"drag--range"),s.removeAttribute("style"),document.onmousemove=null,document.onmouseup=null,b("end",e)},b("start",e)}}}var _default=exports.default={methods:{moveTabSelected(e,t,l){let o=this;var n=o.editConfig,{afterFullData:r,visibleColumn:i}=o,u=o.computeEditOpts,c=o.computeRowOpts,s=o.computeCurrentRowOpts,d=o.computeColumnOpts,h=o.computeCurrentColumnOpts;let g,a,m,C=Object.assign({},e);var e=o.getVTRowIndex(C.row),p=o.getVTColumnIndex(C.column),t=(l.preventDefault(),t?p<=0?0<e&&(a=e-1,g=r[a],m=i.length-1):m=p-1:p>=i.length-1?e<r.length-1&&(a=e+1,g=r[a],m=0):m=p+1,i[m]);t&&(g?(C.rowIndex=a,C.row=g):C.rowIndex=e,C.columnIndex=m,C.column=t,C.cell=o.getCellElement(C.row,C.column),c.isCurrent&&s.isFollowSelected&&o.triggerCurrentRowEvent(l,C),d.isCurrent&&h.isFollowSelected&&o.triggerCurrentColumnEvent(l,C),n?"click"!==u.trigger&&"dblclick"!==u.trigger||("row"===u.mode?o.handleEdit(C,l):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)})):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)}))},moveCurrentRow(e,t,l){let o=this;var n=o.treeConfig;let{afterFullData:r,currentRow:i}=o;var u=o.computeTreeOpts,u=u.children||u.childrenField;let c;if(i?n?({index:n,items:u}=_xeUtils.default.findTree(r,e=>e===i,{children:u}),e&&0<n?c=u[n-1]:t&&n<u.length-1&&(c=u[n+1])):(u=o.getVTRowIndex(i),e&&0<u?c=r[u-1]:t&&u<r.length-1&&(c=r[u+1])):c=r[0],c){l.preventDefault();let e={$table:o,row:c,rowIndex:o.getRowIndex(c),$rowIndex:o.getVMRowIndex(c)};o.scrollToRow(c).then(()=>o.triggerCurrentRowEvent(l,e))}},moveCurrentColumn(e,t,l){let o=this;var n=o.currentColumn,r=o.visibleColumn;let i=null;if(n?(n=o.getVTColumnIndex(n),e&&0<n?i=r[n-1]:t&&n<r.length-1&&(i=r[n+1])):i=r[0],i){l.preventDefault();let e={$table:o,column:i,columnIndex:o.getColumnIndex(i),$columnIndex:o.getVMColumnIndex(i)};o.scrollToColumn(i).then(()=>o.triggerCurrentColumnEvent(l,e))}},moveArrowSelected(e,t,l,o,n,r){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,r,e,t,l,o,n);(s.isCurrent||u)&&(d.isFollowSelected?i.triggerCurrentRowEvent(r,e):(l||n)&&(s.isCurrent||u)&&i.moveCurrentRow(l,n,r)),(h.isCurrent||c)&&(g.isFollowSelected?i.triggerCurrentColumnEvent(r,e):(t||o)&&(h.isCurrent||c)&&i.moveCurrentColumn(t,o,r))},moveEnterSelected(e,t,l,o,n,r){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,r,e,t,l,o,n);(s.isCurrent||u)&&d.isFollowSelected&&i.triggerCurrentRowEvent(r,e),(h.isCurrent||c)&&g.isFollowSelected&&i.triggerCurrentColumnEvent(r,e)},moveSelected(e,t,l,o,n,r){handleMoveSelected(this,r,e,t,l,o,n)},handleCellMousedownEvent(e,t){var l=this,{editConfig:o,checkboxConfig:n,mouseConfig:r}=l,i=l.computeCheckboxOpts,u=l.computeMouseOpts,c=l.computeEditOpts;if(r&&u.area&&l.triggerCelllAreaMnEvent)return l.triggerCelllAreaMnEvent(e,t);n&&i.range&&handleCheckboxRangeEvent(l,e,t),r&&u.selected&&(o&&"cell"!==c.mode||l.handleSelected(t,e))}}};

package/lib/table/src/cell.js

@@ -391,10 +391,10 @@ function renderFooterHandle(h, params) {
   return Cell.renderDefaultFooter(h, params);
 }
 const Cell = exports.Cell = {
-  createColumn($xeTable, _vm) {
+  createColumn($xeTable, columnOpts) {
     const {
       type
-    } = _vm;
+    } = columnOpts;
     const renConfs = {
       renderHeader: renderHeaderHandle,
       renderCell: renderCellHandle,
@@ -403,7 +403,7 @@ const Cell = exports.Cell = {
     if (type === 'expand') {
       renConfs.renderData = Cell.renderExpandData;
     }
-    return (0, _util.createColumn)($xeTable, _vm, renConfs);
+    return (0, _util.createColumn)($xeTable, columnOpts, renConfs);
   },
   /**
    * 列头标题

package/lib/table/src/column.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.columnWatch = exports.columnProps = void 0;
-var _cell = _interopRequireDefault(require("./cell"));
 var _comp = require("../../ui/src/comp");
 var _util = require("./util");
+var _cell = _interopRequireDefault(require("./cell"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const columnProps = exports.columnProps = {
   // 列唯一主键
@@ -169,8 +169,9 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
   name: 'VxeColumn',
   props: columnProps,
   provide() {
+    const $xeColumn = this;
     return {
-      $xeColumn: this,
+      $xeColumn,
       $xeGrid: null,
       $xeGantt: null
     };
@@ -185,15 +186,19 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
   },
   watch: columnWatch,
   created() {
+    const $xeColumn = this;
+    const props = $xeColumn;
     const $xeTable = this.$xeTable;
-    this.columnConfig = this.createColumn($xeTable, this);
+    this.columnConfig = _cell.default.createColumn($xeTable, props);
   },
   mounted() {
+    const $xeColumn = this;
     this.columnConfig.slots = this.$scopedSlots;
-    (0, _util.assembleColumn)(this);
+    (0, _util.assembleColumn)($xeColumn);
   },
   destroyed() {
-    (0, _util.destroyColumn)(this);
+    const $xeColumn = this;
+    (0, _util.destroyColumn)($xeColumn);
   },
   render(h) {
     return h('div', this.$slots.default);

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.columnWatch=exports.columnProps=void 0;var _cell=_interopRequireDefault(require("./cell")),_comp=require("../../ui/src/comp"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let columnProps=exports.columnProps={colId:[String,Number],type:String,field:String,title:String,width:[Number,String],minWidth:[Number,String],maxWidth:[Number,String],resizable:{type:Boolean,default:null},fixed:String,align:String,headerAlign:String,footerAlign:String,showOverflow:{type:[Boolean,String],default:null},showHeaderOverflow:{type:[Boolean,String],default:null},showFooterOverflow:{type:[Boolean,String],default:null},className:[String,Function],headerClassName:[String,Function],footerClassName:[String,Function],formatter:[Function,Array,String],headerFormatter:[Function,Array,String],footerFormatter:[Function,Array,String],padding:{type:Boolean,default:null},verticalAlign:{type:String,default:null},sortable:Boolean,remoteSort:{type:Boolean,default:null},sortBy:[String,Function],sortType:String,sortMethod:Function,filters:{type:Array,default:null},filterMultiple:{type:Boolean,default:!0},filterMethod:Function,filterResetMethod:Function,filterRecoverMethod:Function,filterRender:Object,floatingFilters:Object,rowGroupNode:Boolean,treeNode:Boolean,dragSort:Boolean,rowResize:Boolean,visible:{type:Boolean,default:null},headerExportMethod:Function,exportMethod:Function,footerExportMethod:Function,titleHelp:Object,titlePrefix:Object,titleSuffix:Object,cellType:String,cellRender:Object,editRender:Object,contentRender:Object,aggFunc:[Boolean,String],copyMethod:Function,cutMethod:Function,pasteMethod:Function,params:Object},columnWatch=exports.columnWatch={};Object.keys(columnProps).forEach(o=>{columnWatch[o]=function(e){var t=this.$xeTable;this.columnConfig.update(o,e),t&&("filters"===o?(t.setFilter(this.columnConfig,e),t.handleUpdateDataQueue()):["visible","fixed","width","minWidth","maxWidth"].includes(o)&&t.handleRefreshColumnQueue())}});var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeColumn",props:columnProps,provide(){return{$xeColumn:this,$xeGrid:null,$xeGantt:null}},inject:{$xeTable:{default:null},$xeColumn:{default:null}},watch:columnWatch,created(){var e=this.$xeTable;this.columnConfig=this.createColumn(e,this)},mounted(){this.columnConfig.slots=this.$scopedSlots,(0,_util.assembleColumn)(this)},destroyed(){(0,_util.destroyColumn)(this)},render(e){return e("div",this.$slots.default)},methods:_cell.default});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.columnWatch=exports.columnProps=void 0;var _comp=require("../../ui/src/comp"),_util=require("./util"),_cell=_interopRequireDefault(require("./cell"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let columnProps=exports.columnProps={colId:[String,Number],type:String,field:String,title:String,width:[Number,String],minWidth:[Number,String],maxWidth:[Number,String],resizable:{type:Boolean,default:null},fixed:String,align:String,headerAlign:String,footerAlign:String,showOverflow:{type:[Boolean,String],default:null},showHeaderOverflow:{type:[Boolean,String],default:null},showFooterOverflow:{type:[Boolean,String],default:null},className:[String,Function],headerClassName:[String,Function],footerClassName:[String,Function],formatter:[Function,Array,String],headerFormatter:[Function,Array,String],footerFormatter:[Function,Array,String],padding:{type:Boolean,default:null},verticalAlign:{type:String,default:null},sortable:Boolean,remoteSort:{type:Boolean,default:null},sortBy:[String,Function],sortType:String,sortMethod:Function,filters:{type:Array,default:null},filterMultiple:{type:Boolean,default:!0},filterMethod:Function,filterResetMethod:Function,filterRecoverMethod:Function,filterRender:Object,floatingFilters:Object,rowGroupNode:Boolean,treeNode:Boolean,dragSort:Boolean,rowResize:Boolean,visible:{type:Boolean,default:null},headerExportMethod:Function,exportMethod:Function,footerExportMethod:Function,titleHelp:Object,titlePrefix:Object,titleSuffix:Object,cellType:String,cellRender:Object,editRender:Object,contentRender:Object,aggFunc:[Boolean,String],copyMethod:Function,cutMethod:Function,pasteMethod:Function,params:Object},columnWatch=exports.columnWatch={};Object.keys(columnProps).forEach(o=>{columnWatch[o]=function(e){var t=this.$xeTable;this.columnConfig.update(o,e),t&&("filters"===o?(t.setFilter(this.columnConfig,e),t.handleUpdateDataQueue()):["visible","fixed","width","minWidth","maxWidth"].includes(o)&&t.handleRefreshColumnQueue())}});var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeColumn",props:columnProps,provide(){return{$xeColumn:this,$xeGrid:null,$xeGantt:null}},inject:{$xeTable:{default:null},$xeColumn:{default:null}},watch:columnWatch,created(){var e=this.$xeTable;this.columnConfig=_cell.default.createColumn(e,this)},mounted(){this.columnConfig.slots=this.$scopedSlots,(0,_util.assembleColumn)(this)},destroyed(){(0,_util.destroyColumn)(this)},render(e){return e("div",this.$slots.default)},methods:_cell.default});

package/lib/table/src/group.js

@@ -4,17 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _cell = _interopRequireDefault(require("./cell"));
 var _comp = require("../../ui/src/comp");
 var _util = require("./util");
 var _column = require("./column");
+var _cell = _interopRequireDefault(require("./cell"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var _default = exports.default = /* define-vxe-component start */(0, _comp.defineVxeComponent)({
   name: 'VxeColgroup',
   props: _column.columnProps,
   provide() {
+    const $xeColgroup = this;
     return {
-      $xeColumn: this,
+      $xeColumn: $xeColgroup,
       $xeGrid: null,
       $xeGantt: null
     };
@@ -29,10 +30,13 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
   },
   watch: _column.columnWatch,
   created() {
+    const $xeColgroup = this;
+    const props = $xeColgroup;
     const $xeTable = this.$xeTable;
-    this.columnConfig = this.createColumn($xeTable, this);
+    this.columnConfig = _cell.default.createColumn($xeTable, props);
   },
   mounted() {
+    const $xeColgroup = this;
     const {
       $scopedSlots
     } = this;
@@ -41,10 +45,11 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
       columnSlots.header = $scopedSlots.header;
     }
     this.columnConfig.slots = columnSlots;
-    (0, _util.assembleColumn)(this);
+    (0, _util.assembleColumn)($xeColgroup);
   },
   destroyed() {
-    (0, _util.destroyColumn)(this);
+    const $xeColgroup = this;
+    (0, _util.destroyColumn)($xeColgroup);
   },
   render(h) {
     return h('div', this.$slots.default);

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _cell=_interopRequireDefault(require("./cell")),_comp=require("../../ui/src/comp"),_util=require("./util"),_column=require("./column");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeColgroup",props:_column.columnProps,provide(){return{$xeColumn:this,$xeGrid:null,$xeGantt:null}},inject:{$xeTable:{default:null},$xeColumn:{default:null}},watch:_column.columnWatch,created(){var e=this.$xeTable;this.columnConfig=this.createColumn(e,this)},mounted(){var e=this.$scopedSlots,l={};e.header&&(l.header=e.header),this.columnConfig.slots=l,(0,_util.assembleColumn)(this)},destroyed(){(0,_util.destroyColumn)(this)},render(e){return e("div",this.$slots.default)},methods:_cell.default});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_util=require("./util"),_column=require("./column"),_cell=_interopRequireDefault(require("./cell"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeColgroup",props:_column.columnProps,provide(){return{$xeColumn:this,$xeGrid:null,$xeGantt:null}},inject:{$xeTable:{default:null},$xeColumn:{default:null}},watch:_column.columnWatch,created(){var e=this.$xeTable;this.columnConfig=_cell.default.createColumn(e,this)},mounted(){var e=this.$scopedSlots,l={};e.header&&(l.header=e.header),this.columnConfig.slots=l,(0,_util.assembleColumn)(this)},destroyed(){(0,_util.destroyColumn)(this)},render(e){return e("div",this.$slots.default)},methods:_cell.default});