vxe-table 3.15.29 → 3.15.31

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

@@ -126,10 +126,8 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
       fullDataRowIdData[rowid] = rest;
       fullAllDataRowIdData[rowid] = rest;
     } else {
-      if (process.env.NODE_ENV === 'development') {
-        if (parentRowId) {
-          (0, _log.warnLog)('vxe.error.unableInsert');
-        }
+      if (parentRowId) {
+        (0, _log.warnLog)('vxe.error.unableInsert');
       }
       afterFullData[funcName](item);
       tableFullTreeData[funcName](item);
@@ -277,11 +275,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           const parentLevel = parentRest ? parentRest.level : 0;
           newRecords.forEach((item, i) => {
             const rowid = (0, _util.getRowid)($xeTable, item);
-            if (process.env.NODE_ENV === 'development') {
-              if (item[treeOpts.parentField]) {
-                if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                  (0, _log.errLog)('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
-                }
+            if (item[treeOpts.parentField]) {
+              if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                (0, _log.errLog)('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`]);
               }
             }
             if (parentRow) {
@@ -326,9 +322,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             }
           }
         } else {
-          if (process.env.NODE_ENV === 'development') {
-            (0, _log.warnLog)('vxe.error.unableInsert');
-          }
+          (0, _log.warnLog)('vxe.error.unableInsert');
           insertTreeRow($xeTable, newRecords, true);
         }
       } else {
@@ -946,9 +940,7 @@ var _default = exports.default = {
       syncActivedCell($xeTable);
     },
     _clearActived(row) {
-      if (process.env.NODE_ENV === 'development') {
-        (0, _log.warnLog)('vxe.error.delFunc', ['clearActived', 'clearEdit']);
-      }
+      (0, _log.warnLog)('vxe.error.delFunc', ['clearActived', 'clearEdit']);
       // 即将废弃
       return this.clearEdit(row);
     },
@@ -968,9 +960,7 @@ var _default = exports.default = {
     },
     _getActiveRecord() {
       const $xeTable = this;
-      if (process.env.NODE_ENV === 'development') {
-        (0, _log.warnLog)('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
-      }
+      (0, _log.warnLog)('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord']);
       // 即将废弃
       return $xeTable.getEditRecord();
     },
@@ -996,9 +986,7 @@ var _default = exports.default = {
     },
     _isActiveByRow(row) {
       const $xeTable = this;
-      if (process.env.NODE_ENV === 'development') {
-        (0, _log.warnLog)('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
-      }
+      (0, _log.warnLog)('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
       // 即将废弃
       return $xeTable.isEditByRow(row);
     },
@@ -1080,9 +1068,7 @@ var _default = exports.default = {
     },
     _setActiveRow(row) {
       const $xeTable = this;
-      if (process.env.NODE_ENV === 'development') {
-        (0, _log.warnLog)('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
-      }
+      (0, _log.warnLog)('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
       // 即将废弃
       return $xeTable.setEditRow(row);
     },
@@ -1102,9 +1088,7 @@ var _default = exports.default = {
       return handleEditCell($xeTable, row, column, isPos);
     },
     _setActiveCell(row, fieldOrColumn) {
-      if (process.env.NODE_ENV === 'development') {
-        (0, _log.warnLog)('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
-      }
+      (0, _log.warnLog)('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
       // 即将废弃
       return this.setEditCell(row, fieldOrColumn);
     },

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:i}=t;(r||i)&&("row"===e.mode?l.forEach(e=>setEditColumnModel(r,e)):setEditColumnModel(r,i))}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),i=t?_xeUtils.default.findTree(d,e=>t===e[c],{children:g}):null;if(i){var i=i.item,o=u[(0,_util.getRowid)(n,i)],o=o?o.level:0;let e=i[w],t=i[g];_xeUtils.default.isArray(e)||(e=i[w]=[]),_xeUtils.default.isArray(t)||(t=i[w]=[]),e[f](l),t[f](l);i={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:e,parent:i,level:o+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=i,u[r]=i}else{"development"===process.env.NODE_ENV&&t&&(0,_log.warnLog)("vxe.error.unableInsert"),a[f](l),d[f](l);o={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:d,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=o,u[r]=o}})}function handleInsertRowAt(a,t,l,s){var e=a;let i=a.treeConfig,{tableFullTreeData:r,afterFullData:o,mergeBodyList:n,tableFullData:d,fullDataRowIdData:u,fullAllDataRowIdData:c,insertRowMaps:h}=a,g=a.computeTreeOpts,{transform:w,rowField:f,mapChildrenField:m}=g,p=g.children||g.childrenField,v=(_xeUtils.default.isArray(t)||(t=[t]),a.defineField(t.map(e=>Object.assign(i&&w?{[m]:[],[p]:[]}:{},e))));if(_xeUtils.default.eqNull(l))i&&w?insertTreeRow(a,v,!1):(v.forEach(e=>{var t=(0,_util.getRowid)(a,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:o,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};u[t]=l,c[t]=l,o.unshift(e),d.unshift(e)}),n.forEach(e=>{var t=e.row;0<t&&(e.row=t+v.length)}));else if(-1===l)i&&w?insertTreeRow(a,v,!0):(v.forEach(e=>{var t=(0,_util.getRowid)(a,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:o,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};u[t]=l,c[t]=l,o.push(e),d.push(e)}),n.forEach(e=>{var{row:t,rowspan:l}=e;t+l>o.length&&(e.rowspan=l+v.length)}));else if(i&&w){let d=_xeUtils.default.findTree(r,e=>l[f]===e[f],{children:m});if(d){let i=d.parent,o=i?i[m]:r;t=c[(0,_util.getRowid)(a,i)];let n=t?t.level:0;if(v.forEach((e,t)=>{var l=(0,_util.getRowid)(a,e);"development"===process.env.NODE_ENV&&e[g.parentField]&&i&&e[g.parentField]!==i[f]&&(0,_log.errLog)("vxe.error.errProp",[g.parentField+"="+e[g.parentField],g.parentField+"="+i[f]]),i&&(e[g.parentField]=i[f]);let r=d.index+t;s&&(r+=1),o.splice(r,0,e);t={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:o,parent:i,level:n+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};u[l]=t,c[l]=t}),i){t=_xeUtils.default.findTree(r,e=>l[f]===e[f],{children:p});if(t){var x=t.items;let e=t.index;s&&(e+=1),x.splice(e,0,...v)}}}else"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(a,v,!0)}else{if(i)throw new Error(getI18n("vxe.error.noTree",["insert"]));let r=-1;if(_xeUtils.default.isNumber(l)?l<o.length&&(r=l):r=a.findRowIndexOf(o,l),-1===(r=s?Math.min(o.length,r+1):r))throw new Error((0,_log.errLog)("vxe.error.unableInsert"));o.splice(r,0,...v);t=a.findRowIndexOf(d,l);-1<t?d.splice(t+(s?1:0),0,...v):d.push(...v),n.forEach(e=>{var{row:t,rowspan:l}=e;t>r?e.row=t+v.length:t+l>r&&(e.rowspan=l+v.length)})}return v.forEach(e=>{var t=(0,_util.getRowid)(a,e);h[t]=e}),e.insertRowFlag++,a.cacheRowMap(!1),a.updateScrollYStatus(),a.handleTableData(i&&w),i&&w||a.updateAfterDataIndex(),a.updateFooter(),a.handleUpdateBodyMerge(),a.checkSelectionStatus(),e.scrollYLoad&&a.updateScrollYSpace(),a.$nextTick().then(()=>(a.updateCellAreas(),a.recalculate())).then(()=>({row:v.length?v[v.length-1]:null,rows:v}))}function handleInsertChildRowAt(e,t,l,r,i){var o=e.treeConfig;let{transform:n,rowField:d,parentField:a}=e.computeTreeOpts;return o&&n?handleInsertRowAt(e,(t=_xeUtils.default.isArray(t)?t:[t]).map(e=>Object.assign({},e,{[a]:l[d]})),r,i):((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:i}=r,{row:o,column:n}=r,d=e.computeValidOpts;if(o||n){if(l&&(0,_util.getRowid)(e,l)!==(0,_util.getRowid)(e,o))return e.$nextTick();syncActivedCell(e),r.args=null,r.row=null,r.column=null,e.updateFooter(),e.dispatchEvent("edit-closed",{row:o,rowIndex:e.getRowIndex(o),$rowIndex:e.getVMRowIndex(o),column:n,columnIndex:e.getColumnIndex(n),$columnIndex:e.getVMColumnIndex(n)},t||null)}return i.row=null,i.column=null,d.autoClear&&("full"!==d.msgMode||"obsolete"===getConfig().cellVaildMode)&&e.clearValidate?e.clearValidate():e.$nextTick().then(()=>e.updateCellAreas())}function handleEditActive(l,r,i,o,e){let n=l.$xeGrid;var{editConfig:t,mouseConfig:d}=l,{editStore:a,tableColumn:s}=l,u=l.computeEditOpts,c=u.mode,{actived:a,focused:h}=a;let{row:g,column:w}=r;var f=w.editRender,m=r.cell||l.getCellElement(g,w),p=u.beforeEditMethod||u.activeMethod;if((r.cell=m)&&(0,_utils.isEnableConf)(t)&&(0,_utils.isEnableConf)(f)&&!l.isPendingByRow(g)){if(a.row!==g||"cell"===c&&a.column!==w){let t="edit-disabled";if(!p||p(Object.assign(Object.assign({},r),{$table:l,$grid:n}))){d&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),l.closeTooltip(),a.column&&handleClearEdit(l,i),t="edit-activated",w.renderHeight=m.offsetHeight,a.args=r,a.row=g,a.column=w,"row"===c?s.forEach(e=>getEditColumnModel(g,e)):getEditColumnModel(g,w);let e=u.afterEditMethod;l.$nextTick(()=>{o&&l.handleFocus(r,i),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)},i),"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)},i)}else{t=a.column;d&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),t!==w&&(f=t.model,f.update&&(0,_util.setCellValue)(g,t,f.value),l.clearValidate)&&l.clearValidate(g,w),w.renderHeight=m.offsetHeight,a.args=r,a.column=w,e&&setTimeout(()=>{l.handleFocus(r,i)})}h.column=null,h.row=null,l.focus()}return l.$nextTick()}function handleEditCell(t,l,e,r){let i=t;var o=t.editConfig;let n=_xeUtils.default.isString(e)?t.getColumnByField(e):e;return l&&n&&(0,_utils.isEnableConf)(o)&&(0,_utils.isEnableConf)(n.editRender)?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),i._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,i=r.editStore;let{tableFullTreeData:o,selectCheckboxMaps:n,afterFullData:d,mergeBodyList:a,tableFullData:s,pendingRowMaps:u,insertRowMaps:c,removeRowMaps:h}=l;var g=l.computeCheckboxOpts,w=l.computeTreeOpts;let{transform:f,mapChildrenField:m}=w,p=w.children||w.childrenField;w=i.actived,i=g.checkField;let v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=s,e.forEach(e=>{var t;l.isInsertByRow(e)||(t=(0,_util.getRowid)(l,e),h[t]=e)}),i||(e.forEach(e=>{e=(0,_util.getRowid)(this,e);n[e]&&delete n[e]}),r.updateCheckboxFlag++),s===e?(e=v=s.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&f?e.forEach(e=>{let t=(0,_util.getRowid)(this,e);var l=_xeUtils.default.findTree(o,e=>t===(0,_util.getRowid)(this,e),{children:m}),l=(l&&(l=l.items.splice(l.index,1),v.push(l[0])),_xeUtils.default.findTree(o,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)}):e.forEach(e=>{var t=this.findRowIndexOf(s,e);-1<t&&(t=s.splice(t,1),v.push(t[0]));let r=this.findRowIndexOf(d,e);-1<r&&(a.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))}),w.row&&-1<l.findRowIndexOf(e,w.row)&&l.clearEdit(),e.forEach(e=>{e=(0,_util.getRowid)(l,e);c[e]&&delete c[e],u[e]&&delete u[e]}),r.removeRowFlag++,r.insertRowFlag++,r.pendingRowFlag++,l.cacheRowMap(!1),l.handleTableData(t&&f),l.updateFooter(),l.handleUpdateBodyMerge(),t&&f||l.updateAfterDataIndex(),l.checkSelectionStatus(),r.scrollYLoad&&l.updateScrollYSpace(),this.$nextTick().then(()=>(this.updateCellAreas(),this.recalculate())).then(()=>({row:v.length?v[v.length-1]:null,rows:v}))},_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,i=t.computeTreeOpts;return e?(syncActivedCell(t),l?_xeUtils.default.filterTree(r,e=>t.isUpdateByRow(e),i):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"development"===process.env.NODE_ENV&&(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(){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["getActiveRecord","getEditRecord"]),this.getEditRecord()},_getEditRecord(){var e=this.editStore,t=this.afterFullData,l=this.$refs.refElem,{args:e,row:r}=e.actived;return e&&-1<this.findRowIndexOf(t,r)&&l.querySelectorAll(".vxe-body--column.col--active").length?Object.assign({},e):null},_isActiveByRow(e){return"development"===process.env.NODE_ENV&&(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:i,column:o,cell:n}=r,d=o.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&&!o.fixed&&this.scrollToRow(i,o)}},_setActiveRow(e){return"development"===process.env.NODE_ENV&&(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"development"===process.env.NODE_ENV&&(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,i=l.computeEditOpts,t=_xeUtils.default.isString(t)?l.getColumnByField(t):t;return e&&t&&"manual"!==i.trigger&&-1<(i=l.findRowIndexOf(r,e))&&(r=l.getCellElement(e,t),e={row:e,rowIndex:i,column:t,columnIndex:l.getColumnIndex(t),cell:r},l.handleSelected(e,{})),l.$nextTick()},handleSelected(e,t){let l=this;var r=l.mouseConfig,i=l.editStore,o=l.computeMouseOpts;let n=l.computeEditOpts,{actived:d,selected:a}=i,{row:s,column:u}=e,c=r&&o.selected;return!c||a.row===s&&a.column===u||(d.row!==s||"cell"===n.mode&&d.column!==u)&&(handleClearEdit(l,t),l.clearSelected(),l.clearCellAreas&&(l.clearCellAreas(),l.clearCopyCellArea()),a.args=e,a.row=s,a.column=u,c&&this.addCellSelectedClass(),l.focus(),t)&&l.dispatchEvent("cell-selected",e,t),l.$nextTick()},_getSelectedCell(){var e=this.editStore,{args:e,column:t}=e.selected;return e&&t?Object.assign({},e):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:i}=t;(r||i)&&("row"===e.mode?l.forEach(e=>setEditColumnModel(r,e)):setEditColumnModel(r,i))}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),i=t?_xeUtils.default.findTree(d,e=>t===e[c],{children:g}):null;if(i){var i=i.item,o=u[(0,_util.getRowid)(n,i)],o=o?o.level:0;let e=i[w],t=i[g];_xeUtils.default.isArray(e)||(e=i[w]=[]),_xeUtils.default.isArray(t)||(t=i[w]=[]),e[f](l),t[f](l);i={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:e,parent:i,level:o+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=i,u[r]=i}else{t&&(0,_log.warnLog)("vxe.error.unableInsert"),a[f](l),d[f](l);o={row:l,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:d,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};s[r]=o,u[r]=o}})}function handleInsertRowAt(a,t,l,s){var e=a;let i=a.treeConfig,{tableFullTreeData:r,afterFullData:o,mergeBodyList:n,tableFullData:d,fullDataRowIdData:u,fullAllDataRowIdData:c,insertRowMaps:h}=a,g=a.computeTreeOpts,{transform:w,rowField:f,mapChildrenField:m}=g,p=g.children||g.childrenField,x=(_xeUtils.default.isArray(t)||(t=[t]),a.defineField(t.map(e=>Object.assign(i&&w?{[m]:[],[p]:[]}:{},e))));if(_xeUtils.default.eqNull(l))i&&w?insertTreeRow(a,x,!1):(x.forEach(e=>{var t=(0,_util.getRowid)(a,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:o,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};u[t]=l,c[t]=l,o.unshift(e),d.unshift(e)}),n.forEach(e=>{var t=e.row;0<t&&(e.row=t+x.length)}));else if(-1===l)i&&w?insertTreeRow(a,x,!0):(x.forEach(e=>{var t=(0,_util.getRowid)(a,e),l={row:e,rowid:t,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:o,parent:null,level:0,height:0,resizeHeight:0,oTop:0,expandHeight:0};u[t]=l,c[t]=l,o.push(e),d.push(e)}),n.forEach(e=>{var{row:t,rowspan:l}=e;t+l>o.length&&(e.rowspan=l+x.length)}));else if(i&&w){let d=_xeUtils.default.findTree(r,e=>l[f]===e[f],{children:m});if(d){let i=d.parent,o=i?i[m]:r;t=c[(0,_util.getRowid)(a,i)];let n=t?t.level:0;if(x.forEach((e,t)=>{var l=(0,_util.getRowid)(a,e);e[g.parentField]&&i&&e[g.parentField]!==i[f]&&(0,_log.errLog)("vxe.error.errProp",[g.parentField+"="+e[g.parentField],g.parentField+"="+i[f]]),i&&(e[g.parentField]=i[f]);let r=d.index+t;s&&(r+=1),o.splice(r,0,e);t={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,treeIndex:-1,items:o,parent:i,level:n+1,height:0,resizeHeight:0,oTop:0,expandHeight:0};u[l]=t,c[l]=t}),i){t=_xeUtils.default.findTree(r,e=>l[f]===e[f],{children:p});if(t){var v=t.items;let e=t.index;s&&(e+=1),v.splice(e,0,...x)}}}else(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(a,x,!0)}else{if(i)throw new Error(getI18n("vxe.error.noTree",["insert"]));let r=-1;if(_xeUtils.default.isNumber(l)?l<o.length&&(r=l):r=a.findRowIndexOf(o,l),-1===(r=s?Math.min(o.length,r+1):r))throw new Error((0,_log.errLog)("vxe.error.unableInsert"));o.splice(r,0,...x);t=a.findRowIndexOf(d,l);-1<t?d.splice(t+(s?1:0),0,...x):d.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)(a,e);h[t]=e}),e.insertRowFlag++,a.cacheRowMap(!1),a.updateScrollYStatus(),a.handleTableData(i&&w),i&&w||a.updateAfterDataIndex(),a.updateFooter(),a.handleUpdateBodyMerge(),a.checkSelectionStatus(),e.scrollYLoad&&a.updateScrollYSpace(),a.$nextTick().then(()=>(a.updateCellAreas(),a.recalculate())).then(()=>({row:x.length?x[x.length-1]:null,rows:x}))}function handleInsertChildRowAt(e,t,l,r,i){var o=e.treeConfig;let{transform:n,rowField:d,parentField:a}=e.computeTreeOpts;return o&&n?handleInsertRowAt(e,(t=_xeUtils.default.isArray(t)?t:[t]).map(e=>Object.assign({},e,{[a]:l[d]})),r,i):((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:i}=r,{row:o,column:n}=r,d=e.computeValidOpts;if(o||n){if(l&&(0,_util.getRowid)(e,l)!==(0,_util.getRowid)(e,o))return e.$nextTick();syncActivedCell(e),r.args=null,r.row=null,r.column=null,e.updateFooter(),e.dispatchEvent("edit-closed",{row:o,rowIndex:e.getRowIndex(o),$rowIndex:e.getVMRowIndex(o),column:n,columnIndex:e.getColumnIndex(n),$columnIndex:e.getVMColumnIndex(n)},t||null)}return i.row=null,i.column=null,d.autoClear&&("full"!==d.msgMode||"obsolete"===getConfig().cellVaildMode)&&e.clearValidate?e.clearValidate():e.$nextTick().then(()=>e.updateCellAreas())}function handleEditActive(l,r,i,o,e){let n=l.$xeGrid;var{editConfig:t,mouseConfig:d}=l,{editStore:a,tableColumn:s}=l,u=l.computeEditOpts,c=u.mode,{actived:a,focused:h}=a;let{row:g,column:w}=r;var f=w.editRender,m=r.cell||l.getCellElement(g,w),p=u.beforeEditMethod||u.activeMethod;if((r.cell=m)&&(0,_utils.isEnableConf)(t)&&(0,_utils.isEnableConf)(f)&&!l.isPendingByRow(g)){if(a.row!==g||"cell"===c&&a.column!==w){let t="edit-disabled";if(!p||p(Object.assign(Object.assign({},r),{$table:l,$grid:n}))){d&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),l.closeTooltip(),a.column&&handleClearEdit(l,i),t="edit-activated",w.renderHeight=m.offsetHeight,a.args=r,a.row=g,a.column=w,"row"===c?s.forEach(e=>getEditColumnModel(g,e)):getEditColumnModel(g,w);let e=u.afterEditMethod;l.$nextTick(()=>{o&&l.handleFocus(r,i),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)},i),"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)},i)}else{t=a.column;d&&(l.clearSelected(),l.clearCellAreas)&&(l.clearCellAreas(),l.clearCopyCellArea()),t!==w&&(f=t.model,f.update&&(0,_util.setCellValue)(g,t,f.value),l.clearValidate)&&l.clearValidate(g,w),w.renderHeight=m.offsetHeight,a.args=r,a.column=w,e&&setTimeout(()=>{l.handleFocus(r,i)})}h.column=null,h.row=null,l.focus()}return l.$nextTick()}function handleEditCell(t,l,e,r){let i=t;var o=t.editConfig;let n=_xeUtils.default.isString(e)?t.getColumnByField(e):e;return l&&n&&(0,_utils.isEnableConf)(o)&&(0,_utils.isEnableConf)(n.editRender)?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),i._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,i=r.editStore;let{tableFullTreeData:o,selectCheckboxMaps:n,afterFullData:d,mergeBodyList:a,tableFullData:s,pendingRowMaps:u,insertRowMaps:c,removeRowMaps:h}=l;var g=l.computeCheckboxOpts,w=l.computeTreeOpts;let{transform:f,mapChildrenField:m}=w,p=w.children||w.childrenField;w=i.actived,i=g.checkField;let x=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=s,e.forEach(e=>{var t;l.isInsertByRow(e)||(t=(0,_util.getRowid)(l,e),h[t]=e)}),i||(e.forEach(e=>{e=(0,_util.getRowid)(this,e);n[e]&&delete n[e]}),r.updateCheckboxFlag++),s===e?(e=x=s.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&f?e.forEach(e=>{let t=(0,_util.getRowid)(this,e);var l=_xeUtils.default.findTree(o,e=>t===(0,_util.getRowid)(this,e),{children:m}),l=(l&&(l=l.items.splice(l.index,1),x.push(l[0])),_xeUtils.default.findTree(o,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)}):e.forEach(e=>{var t=this.findRowIndexOf(s,e);-1<t&&(t=s.splice(t,1),x.push(t[0]));let r=this.findRowIndexOf(d,e);-1<r&&(a.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))}),w.row&&-1<l.findRowIndexOf(e,w.row)&&l.clearEdit(),e.forEach(e=>{e=(0,_util.getRowid)(l,e);c[e]&&delete c[e],u[e]&&delete u[e]}),r.removeRowFlag++,r.insertRowFlag++,r.pendingRowFlag++,l.cacheRowMap(!1),l.handleTableData(t&&f),l.updateFooter(),l.handleUpdateBodyMerge(),t&&f||l.updateAfterDataIndex(),l.checkSelectionStatus(),r.scrollYLoad&&l.updateScrollYSpace(),this.$nextTick().then(()=>(this.updateCellAreas(),this.recalculate())).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,i=t.computeTreeOpts;return e?(syncActivedCell(t),l?_xeUtils.default.filterTree(r,e=>t.isUpdateByRow(e),i):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(){return(0,_log.warnLog)("vxe.error.delFunc",["getActiveRecord","getEditRecord"]),this.getEditRecord()},_getEditRecord(){var e=this.editStore,t=this.afterFullData,l=this.$refs.refElem,{args:e,row:r}=e.actived;return e&&-1<this.findRowIndexOf(t,r)&&l.querySelectorAll(".vxe-body--column.col--active").length?Object.assign({},e):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:i,column:o,cell:n}=r,d=o.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&&!o.fixed&&this.scrollToRow(i,o)}},_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,i=l.computeEditOpts,t=_xeUtils.default.isString(t)?l.getColumnByField(t):t;return e&&t&&"manual"!==i.trigger&&-1<(i=l.findRowIndexOf(r,e))&&(r=l.getCellElement(e,t),e={row:e,rowIndex:i,column:t,columnIndex:l.getColumnIndex(t),cell:r},l.handleSelected(e,{})),l.$nextTick()},handleSelected(e,t){let l=this;var r=l.mouseConfig,i=l.editStore,o=l.computeMouseOpts;let n=l.computeEditOpts,{actived:d,selected:a}=i,{row:s,column:u}=e,c=r&&o.selected;return!c||a.row===s&&a.column===u||(d.row!==s||"cell"===n.mode&&d.column!==u)&&(handleClearEdit(l,t),l.clearSelected(),l.clearCellAreas&&(l.clearCellAreas(),l.clearCopyCellArea()),a.args=e,a.row=s,a.column=u,c&&this.addCellSelectedClass(),l.focus(),t)&&l.dispatchEvent("cell-selected",e,t),l.$nextTick()},_getSelectedCell(){var e=this.editStore,{args:e,column:t}=e.selected;return e&&t?Object.assign({},e):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/module/export/mixin.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-exports.readLocalFile = readLocalFile;
-exports.saveLocalFile = saveLocalFile;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 var _ui = require("../../../ui");
 var _util = require("../../src/util");
@@ -19,9 +17,6 @@ const {
   renderer
 } = _ui.VxeUI;
 let htmlCellElem;
-// 导入
-let fileForm;
-let fileInput;
 const csvBOM = '\ufeff';
 const enterSymbol = '\r\n';
 function hasTreeChildren($xeTable, row) {
@@ -46,7 +41,7 @@ function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
   return cellValue;
 }
 function defaultFilterExportColumn(column) {
-  return column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type) > -1;
+  return !!column.field || ['seq', 'checkbox', 'radio'].indexOf(column.type || '') === -1;
 }
 function toTableBorder(border) {
   if (border === true) {
@@ -601,41 +596,6 @@ function getContent($xeTable, opts, columns, datas) {
   }
   return '';
 }
-/**
- * 保存文件到本地
- * @param {*} options 参数
- */
-function saveLocalFile(options) {
-  const {
-    filename,
-    type,
-    content
-  } = options;
-  const name = `${filename}.${type}`;
-  if (window.Blob) {
-    const blob = content instanceof Blob ? content : (0, _util2.getExportBlobByContent)(_xeUtils.default.toValueString(content), options);
-    if (navigator.msSaveBlob) {
-      navigator.msSaveBlob(blob, name);
-    } else {
-      const url = URL.createObjectURL(blob);
-      const linkElem = document.createElement('a');
-      linkElem.target = '_blank';
-      linkElem.download = name;
-      linkElem.href = url;
-      document.body.appendChild(linkElem);
-      linkElem.click();
-      document.body.removeChild(linkElem);
-      requestAnimationFrame(() => {
-        if (linkElem.parentNode) {
-          linkElem.parentNode.removeChild(linkElem);
-        }
-        URL.revokeObjectURL(url);
-      });
-    }
-    return Promise.resolve();
-  }
-  return Promise.reject(new Error(getI18n('vxe.error.notExp')));
-}
 function downloadFile($xeTable, opts, content) {
   const {
     filename,
@@ -650,22 +610,22 @@ function downloadFile($xeTable, opts, content) {
       blob
     });
   }
-  saveLocalFile({
-    filename,
-    type,
-    content
-  }).then(() => {
-    if (opts.message !== false) {
-      // 检测弹窗模块
-      if (!_ui.VxeUI.modal) {
-        (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
+  if (_ui.VxeUI.saveFile) {
+    _ui.VxeUI.saveFile({
+      filename,
+      type,
+      content
+    }).then(() => {
+      if (opts.message !== false) {
+        if (_ui.VxeUI.modal) {
+          _ui.VxeUI.modal.message({
+            content: getI18n('vxe.table.expSuccess'),
+            status: 'success'
+          });
+        }
       }
-      _ui.VxeUI.modal.message({
-        content: getI18n('vxe.table.expSuccess'),
-        status: 'success'
-      });
-    }
-  });
+    });
+  }
 }
 function clearColumnConvert(columns) {
   _xeUtils.default.eachTree(columns, column => {
@@ -1094,72 +1054,6 @@ function handleCloseExport() {
   }
   return Promise.resolve();
 }
-/**
- * 读取本地文件
- * @param {*} options 参数
- */
-function readLocalFile(options = {}) {
-  if (!fileForm) {
-    fileForm = document.createElement('form');
-    fileInput = document.createElement('input');
-    fileForm.className = 'vxe-table--file-form';
-    fileInput.name = 'file';
-    fileInput.type = 'file';
-    fileForm.appendChild(fileInput);
-    document.body.appendChild(fileForm);
-  }
-  return new Promise((resolve, reject) => {
-    const types = options.types || [];
-    const isAllType = !types.length || types.some(type => type === '*');
-    fileInput.multiple = !!options.multiple;
-    fileInput.accept = isAllType ? '' : `.${types.join(', .')}`;
-    fileInput.onchange = evnt => {
-      const {
-        files
-      } = evnt.target;
-      const file = files[0];
-      let errType;
-      // 校验类型
-      if (!isAllType) {
-        for (let fIndex = 0; fIndex < files.length; fIndex++) {
-          const {
-            type
-          } = (0, _utils.parseFile)(files[fIndex]);
-          if (!_xeUtils.default.includes(types, type)) {
-            errType = type;
-            break;
-          }
-        }
-      }
-      if (!errType) {
-        resolve({
-          status: true,
-          files,
-          file
-        });
-      } else {
-        if (options.message !== false) {
-          // 检测弹窗模块
-          if (!_ui.VxeUI.modal) {
-            (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
-          }
-          _ui.VxeUI.modal.message({
-            content: getI18n('vxe.error.notType', [errType]),
-            status: 'error'
-          });
-        }
-        const params = {
-          status: false,
-          files,
-          file
-        };
-        reject(params);
-      }
-    };
-    fileForm.reset();
-    fileInput.click();
-  });
-}
 function handleFilterColumns(exportOpts, column, columns) {
   return columns.some(item => {
     if ((0, _util.isColumnInfo)(item)) {
@@ -1195,7 +1089,7 @@ function handleFilterFields(exportOpts, column, includeFields, excludeFields) {
     }
     return false;
   }
-  return exportOpts.original ? column.field : defaultFilterExportColumn(column);
+  return exportOpts.original ? !!column.field : defaultFilterExportColumn(column);
 }
 function handleExportAndPrint($xeTable, options, isPrint) {
   const props = $xeTable;
@@ -1267,7 +1161,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   });
   // 默认选中
   _xeUtils.default.eachTree(exportColumns, (column, index, items, path, parent) => {
-    const isColGroup = column.children && column.children.length;
+    const isColGroup = column.children && column.children.length > 0;
     let isChecked = false;
     if (columns && columns.length) {
       isChecked = handleFilterColumns(defOpts, column, columns);
@@ -1407,14 +1301,14 @@ var _default = exports.default = {
         showFooter
       } = props;
       const {
-        mergeFooterList,
         isGroup
       } = reactData;
       const {
         tableFullColumn,
         afterFullData,
+        collectColumn,
         mergeBodyList,
-        collectColumn
+        mergeFooterList
       } = internalData;
       const exportOpts = $xeTable.computeExportOpts;
       const treeOpts = $xeTable.computeTreeOpts;
@@ -1462,29 +1356,36 @@ var _default = exports.default = {
       if (!mode) {
         mode = selectRecords.length ? 'selected' : 'current';
       }
-      const customCols = columns && columns.length ? columns : _xeUtils.default.searchTree(collectColumn, column => {
-        const isColGroup = column.children && column.children.length;
-        let isChecked = false;
-        if (columns && columns.length) {
-          isChecked = handleFilterColumns(opts, column, columns);
-        } else if (excludeFields || includeFields) {
-          isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
-        } else {
-          isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
-        }
-        return isChecked;
-      }, {
-        children: 'children',
-        mapChildren: 'childNodes',
-        original: true
-      });
+      let isCustomCol = false;
+      let customCols = [];
+      if (columns && columns.length) {
+        isCustomCol = true;
+        customCols = columns;
+      } else {
+        customCols = _xeUtils.default.searchTree(collectColumn, column => {
+          const isColGroup = column.children && column.children.length > 0;
+          let isChecked = false;
+          if (columns && columns.length) {
+            isChecked = handleFilterColumns(opts, column, columns);
+          } else if (excludeFields || includeFields) {
+            isChecked = handleFilterFields(opts, column, includeFields, excludeFields);
+          } else {
+            isChecked = column.visible && (isColGroup || defaultFilterExportColumn(column));
+          }
+          return isChecked;
+        }, {
+          children: 'children',
+          mapChildren: 'childNodes',
+          original: true
+        });
+      }
       const handleOptions = Object.assign({}, opts, {
         filename: '',
         sheetName: ''
       });
       // 如果设置源数据，则默认导出设置了字段的列
-      if (!customCols && !columnFilterMethod) {
-        handleOptions.columnFilterMethod = ({
+      if (!isCustomCol && !columnFilterMethod) {
+        columnFilterMethod = ({
           column
         }) => {
           if (excludeFields) {
@@ -1498,8 +1399,9 @@ var _default = exports.default = {
             }
             return false;
           }
-          return original ? column.field : defaultFilterExportColumn(column);
+          return original ? !!column.field : defaultFilterExportColumn(column);
         };
+        handleOptions.columnFilterMethod = columnFilterMethod;
       }
       if (customCols) {
         handleOptions._isCustomColumn = true;
@@ -1530,6 +1432,7 @@ var _default = exports.default = {
           children: 'childNodes',
           mapChildren: '_children'
         }), (column, index) => (0, _util.isColumnInfo)(column) && (!columnFilterMethod || columnFilterMethod({
+          $table: $xeTable,
           column: column,
           $columnIndex: index
         })), {
@@ -1539,6 +1442,7 @@ var _default = exports.default = {
         });
       } else {
         groups = _xeUtils.default.searchTree(isGroup ? collectColumn : tableFullColumn, (column, index) => column.visible && (!columnFilterMethod || columnFilterMethod({
+          $table: $xeTable,
           column,
           $columnIndex: index
         })), {
@@ -1591,10 +1495,8 @@ var _default = exports.default = {
       // 检查类型，如果为自定义导出，则不需要校验类型
       if (!handleOptions.exportMethod && !_xeUtils.default.includes(_xeUtils.default.keys(exportOpts._typeMaps), type)) {
         (0, _log.errLog)('vxe.error.notType', [type]);
-        if (process.env.NODE_ENV === 'development') {
-          if (['xlsx', 'pdf'].includes(type)) {
-            (0, _log.warnLog)('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
-          }
+        if (['xlsx', 'pdf'].includes(type)) {
+          (0, _log.warnLog)('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
         }
         const params = {
           status: false
@@ -1621,10 +1523,8 @@ var _default = exports.default = {
             handleOptions.data = selectRecords;
           }
         } else if (mode === 'all') {
-          if (process.env.NODE_ENV === 'development') {
-            if (!$xeGrid) {
-              (0, _log.warnLog)('vxe.error.errProp', ['all', 'mode=current,selected']);
-            }
+          if (!$xeGrid) {
+            (0, _log.errLog)('vxe.error.errProp', ['all', 'mode=current,selected']);
           }
           if ($xeGrid && !handleOptions.remote) {
             const gridReactData = $xeGrid;
@@ -1641,10 +1541,8 @@ var _default = exports.default = {
             const ajaxMethods = ajax.queryAll;
             const queryAllSuccessMethods = ajax.queryAllSuccess;
             const queryAllErrorMethods = ajax.queryAllError;
-            if (process.env.NODE_ENV === 'development') {
-              if (!ajaxMethods) {
-                (0, _log.warnLog)('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
-              }
+            if (!ajaxMethods) {
+              (0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
             }
             if (ajaxMethods) {
               const params = {
@@ -1687,6 +1585,7 @@ var _default = exports.default = {
       return handleExport($xeTable, handleOptions);
     },
     _importByFile(file, options) {
+      const $xeTable = this;
       const opts = Object.assign({}, options);
       const {
         beforeImportMethod
@@ -1694,12 +1593,13 @@ var _default = exports.default = {
       if (beforeImportMethod) {
         beforeImportMethod({
           options: opts,
-          $table: this
+          $table: $xeTable
         });
       }
-      return handleFileImport(this, file, opts);
+      return handleFileImport($xeTable, file, opts);
     },
     _importData(options) {
+      const $xeTable = this;
       const {
         importOpts
       } = this;
@@ -1718,12 +1618,12 @@ var _default = exports.default = {
           $table: this
         });
       }
-      return readLocalFile(opts).catch(e => {
+      return _ui.VxeUI.readFile(opts).catch(e => {
         if (afterImportMethod) {
           afterImportMethod({
             status: false,
             options: opts,
-            $table: this
+            $table: $xeTable
           });
         }
         return Promise.reject(e);
@@ -1731,14 +1631,14 @@ var _default = exports.default = {
         const {
           file
         } = params;
-        return handleFileImport(this, file, opts);
+        return handleFileImport($xeTable, file, opts);
       });
     },
     _saveFile(options) {
-      return saveLocalFile(options);
+      return _ui.VxeUI.saveFile(options);
     },
     _readFile(options) {
-      return readLocalFile(options);
+      return _ui.VxeUI.readFile(options);
     },
     _print(options) {
       const $xeTable = this;
@@ -1846,18 +1746,28 @@ var _default = exports.default = {
       return Promise.resolve();
     },
     _openImport(options) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const reactData = $xeTable;
       const {
-        importOpts
-      } = this;
+        treeConfig,
+        importConfig
+      } = props;
+      const {
+        initStore,
+        importStore,
+        importParams
+      } = reactData;
+      const importOpts = $xeTable.computeImportOpts;
       const defOpts = Object.assign({
         mode: 'insertTop',
         message: true,
         types: _xeUtils.default.keys(importOpts._typeMaps),
         modes: ['insertTop', 'covering']
-      }, options, importOpts);
+      }, importOpts, options);
       const types = defOpts.types || [];
       const modes = defOpts.modes || [];
-      const isTree = !!this.getTreeStatus();
+      const isTree = !!treeConfig;
       if (isTree) {
         if (defOpts.message) {
           _ui.VxeUI.modal.message({
@@ -1867,7 +1777,7 @@ var _default = exports.default = {
         }
         return;
       }
-      if (!this.importConfig) {
+      if (!importConfig) {
         (0, _log.errLog)('vxe.error.reqProp', ['import-config']);
       }
       // 处理类型
@@ -1889,7 +1799,7 @@ var _default = exports.default = {
           label: getI18n(`vxe.import.modes.${item}`)
         };
       });
-      Object.assign(this.importStore, {
+      Object.assign(importStore, {
         file: null,
         type: '',
         filename: '',
@@ -1897,31 +1807,38 @@ var _default = exports.default = {
         typeList,
         visible: true
       });
-      Object.assign(this.importParams, defOpts);
-      if (!modeList.some(item => item.value === this.importParams.mode)) {
-        this.importParams.mode = modeList[0].value;
+      Object.assign(importParams, defOpts);
+      if (!modeList.some(item => item.value === importParams.mode)) {
+        importParams.mode = modeList[0].value;
       }
-      this.initStore.import = true;
+      initStore.import = true;
     },
     _closeExport: handleCloseExport,
     _openExport(options) {
-      const {
-        exportOpts
-      } = this;
-      if (!this.exportConfig) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const exportOpts = $xeTable.computeExportOpts;
+      const defOpts = Object.assign({
+        message: true,
+        types: _xeUtils.default.keys(exportOpts._typeMaps)
+      }, exportOpts, options);
+      if (!props.exportConfig) {
         (0, _log.errLog)('vxe.error.reqProp', ['export-config']);
       }
-      return handleExportAndPrint(this, Object.assign({}, exportOpts, options));
+      return handleExportAndPrint($xeTable, defOpts);
     },
     _closePrint: handleCloseExport,
     _openPrint(options) {
-      const {
-        printOpts
-      } = this;
-      if (!this.printConfig) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const printOpts = $xeTable.computePrintOpts;
+      const defOpts = Object.assign({
+        message: true
+      }, printOpts, options);
+      if (!props.printConfig) {
         (0, _log.errLog)('vxe.error.reqProp', ['print-config']);
       }
-      return handleExportAndPrint(this, Object.assign({}, printOpts, options), true);
+      return handleExportAndPrint($xeTable, defOpts, true);
     }
   }
 };