vxe-table 3.5.6 → 3.5.7-beta.1

package/lib/table/src/table.js

@@ -13,6 +13,8 @@ var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
 
 var _body = _interopRequireDefault(require("./body"));
 
+var _header = _interopRequireDefault(require("../../header"));
+
 var _size = _interopRequireDefault(require("../../mixins/size"));
 
 var _utils = require("../../tools/utils");
@@ -55,7 +57,7 @@ function renderFixed(h, $xetable, fixedType) {
   return h('div', {
     class: "vxe-table--fixed-".concat(fixedType, "-wrapper"),
     ref: "".concat(fixedType, "Container")
-  }, [showHeader ? h('vxe-table-header', {
+  }, [showHeader ? h(_header.default, {
     props: {
       fixedType: fixedType,
       tableData: tableData,
@@ -1295,7 +1297,7 @@ var _default2 = {
     /**
      * 表头
      */
-    showHeader ? h('vxe-table-header', {
+    showHeader ? h(_header.default, {
       ref: 'tableHeader',
       props: {
         tableData: tableData,

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_body=_interopRequireDefault(require("./body")),_size=_interopRequireDefault(require("../../mixins/size")),_utils=require("../../tools/utils"),_resize=require("../../tools/resize"),_event=require("../../tools/event"),_methods=_interopRequireDefault(require("./methods")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var o,n=Object.keys(t);return Object.getOwnPropertySymbols&&(o=Object.getOwnPropertySymbols(t),e&&(o=o.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,o)),n}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(o),!0).forEach(function(e){_defineProperty(t,e,o[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):ownKeys(Object(o)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))})}return t}function _defineProperty(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}function renderFixed(e,t,o){var n=t._e,i=t.tableData,r=t.tableColumn,l=t.tableGroupColumn,s=t.vSize,a=t.showHeader,u=t.showFooter,c=t.columnStore,t=t.footerTableData,c=c["".concat(o,"List")];return e("div",{class:"vxe-table--fixed-".concat(o,"-wrapper"),ref:"".concat(o,"Container")},[a?e("vxe-table-header",{props:{fixedType:o,tableData:i,tableColumn:r,tableGroupColumn:l,size:s,fixedColumn:c},ref:"".concat(o,"Header")}):n(),e("vxe-table-body",{props:{fixedType:o,tableData:i,tableColumn:r,fixedColumn:c,size:s},ref:"".concat(o,"Body")}),u?e("vxe-table-footer",{props:{footerTableData:t,tableColumn:r,fixedColumn:c,fixedType:o,size:s},ref:"".concat(o,"Footer")}):n()])}function renderEmptyContenet(e,t){var o=t.$scopedSlots,n=t.emptyOpts,i={$table:t};return o.empty?o.empty.call(t,i,e):(o=(o=n.name?_vXETable.default.renderer.get(n.name):null)?o.renderEmpty:null)?o.call(t,e,n,i):(0,_utils.getFuncText)(t.emptyText)||_conf.default.i18n("vxe.table.emptyText")}function handleUupdateResize(e){var t=e.$el;t&&t.clientWidth&&t.clientHeight&&e.recalculate()}var _default2={name:"VxeTable",mixins:[_size.default],props:{id:String,data:Array,height:[Number,String],maxHeight:[Number,String],resizable:{type:Boolean,default:function(){return _conf.default.table.resizable}},stripe:{type:Boolean,default:function(){return _conf.default.table.stripe}},border:{type:[Boolean,String],default:function(){return _conf.default.table.border}},round:{type:Boolean,default:function(){return _conf.default.table.round}},size:{type:String,default:function(){return _conf.default.table.size||_conf.default.size}},fit:{type:Boolean,default:function(){return _conf.default.table.fit}},loading:Boolean,align:{type:String,default:function(){return _conf.default.table.align}},headerAlign:{type:String,default:function(){return _conf.default.table.headerAlign}},footerAlign:{type:String,default:function(){return _conf.default.table.footerAlign}},showHeader:{type:Boolean,default:function(){return _conf.default.table.showHeader}},highlightCurrentRow:{type:Boolean,default:function(){return _conf.default.table.highlightCurrentRow}},highlightHoverRow:{type:Boolean,default:function(){return _conf.default.table.highlightHoverRow}},highlightCurrentColumn:{type:Boolean,default:function(){return _conf.default.table.highlightCurrentColumn}},highlightHoverColumn:{type:Boolean,default:function(){return _conf.default.table.highlightHoverColumn}},highlightCell:Boolean,showFooter:Boolean,footerMethod:Function,rowClassName:[String,Function],cellClassName:[String,Function],headerRowClassName:[String,Function],headerCellClassName:[String,Function],footerRowClassName:[String,Function],footerCellClassName:[String,Function],cellStyle:[Object,Function],headerCellStyle:[Object,Function],footerCellStyle:[Object,Function],rowStyle:[Object,Function],headerRowStyle:[Object,Function],footerRowStyle:[Object,Function],mergeCells:Array,mergeFooterItems:Array,spanMethod:Function,footerSpanMethod:Function,showOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showOverflow}},showHeaderOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showHeaderOverflow}},showFooterOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showFooterOverflow}},columnKey:Boolean,rowKey:Boolean,rowId:{type:String,default:function(){return _conf.default.table.rowId}},zIndex:Number,emptyText:{type:String,default:function(){return _conf.default.table.emptyText}},keepSource:{type:Boolean,default:function(){return _conf.default.table.keepSource}},autoResize:{type:Boolean,default:function(){return _conf.default.table.autoResize}},syncResize:[Boolean,String,Number],columnConfig:Object,rowConfig:Object,resizableConfig:Object,seqConfig:Object,sortConfig:Object,filterConfig:Object,radioConfig:Object,checkboxConfig:Object,tooltipConfig:Object,exportConfig:[Boolean,Object],importConfig:[Boolean,Object],printConfig:Object,expandConfig:Object,treeConfig:[Boolean,Object],menuConfig:[Boolean,Object],contextMenu:[Boolean,Object],mouseConfig:Object,areaConfig:Object,keyboardConfig:Object,clipConfig:Object,fnrConfig:Object,editConfig:[Boolean,Object],validConfig:Object,editRules:Object,emptyRender:[Boolean,Object],customConfig:[Boolean,Object],scrollX:Object,scrollY:Object,animat:{type:Boolean,default:function(){return _conf.default.table.animat}},delayHover:{type:Number,default:function(){return _conf.default.table.delayHover}},params:Object},components:{VxeTableBody:_body.default},provide:function(){return{$xetable:this,xecolgroup:null}},inject:{$xegrid:{default:null}},data:function(){return{tId:"".concat(_xeUtils.default.uniqueId()),staticColumns:[],tableGroupColumn:[],tableColumn:[],tableData:[],scrollXLoad:!1,scrollYLoad:!1,overflowY:!0,overflowX:!1,scrollbarWidth:0,scrollbarHeight:0,rowHeight:0,parentHeight:0,isGroup:!1,isAllOverflow:!1,isAllSelected:!1,isIndeterminate:!1,selection:[],currentRow:null,currentColumn:null,selectRow:null,footerTableData:[],expandColumn:null,hasFixedColumn:!1,treeNodeColumn:null,rowExpandeds:[],expandLazyLoadeds:[],treeExpandeds:[],treeLazyLoadeds:[],treeIndeterminates:[],mergeList:[],mergeFooterList:[],initStore:{filter:!1,import:!1,export:!1},filterStore:{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1,maxHeight:null},columnStore:{leftList:[],centerList:[],rightList:[],resizeList:[],pxList:[],pxMinList:[],scaleList:[],scaleMinList:[],autoList:[]},ctxMenuStore:{selected:null,visible:!1,showChild:!1,selectChild:null,list:[],style:null},editStore:{indexs:{columns:[]},titles:{columns:[]},selected:{row:null,column:null},copyed:{cut:!1,rows:[],columns:[]},actived:{row:null,column:null},insertList:[],removeList:[]},tooltipStore:{row:null,column:null,visible:!1,currOpts:null},validStore:{visible:!1,row:null,column:null,content:"",rule:null,isArrow:!1},importStore:{inited:!1,file:null,type:"",modeList:[],typeList:[],filename:"",visible:!1},importParams:{mode:"",types:null,message:!0},exportStore:{inited:!1,name:"",modeList:[],typeList:[],columns:[],isPrint:!1,hasFooter:!1,hasTree:!1,hasMerge:!1,hasColgroup:!1,visible:!1},exportParams:{filename:"",sheetName:"",mode:"",type:"",isColgroup:!1,isMerge:!1,isAllExpand:!1,useStyle:!1,original:!1,message:!0,isHeader:!1,isFooter:!1}}},computed:{validOpts:function(){return Object.assign({message:"default"},_conf.default.table.validConfig,this.validConfig)},sXOpts:function(){return Object.assign({},_conf.default.table.scrollX,this.scrollX)},sYOpts:function(){return Object.assign({},_conf.default.table.scrollY,this.scrollY)},rowHeightMaps:function(){return{default:48,medium:44,small:40,mini:36}},columnOpts:function(){return Object.assign({},_conf.default.table.columnConfig,this.columnConfig)},rowOpts:function(){return Object.assign({},_conf.default.table.rowConfig,this.rowConfig)},resizableOpts:function(){return Object.assign({},_conf.default.table.resizableConfig,this.resizableConfig)},seqOpts:function(){return Object.assign({startIndex:0},_conf.default.table.seqConfig,this.seqConfig)},radioOpts:function(){return Object.assign({},_conf.default.table.radioConfig,this.radioConfig)},checkboxOpts:function(){return Object.assign({},_conf.default.table.checkboxConfig,this.checkboxConfig)},tooltipOpts:function(){return Object.assign({},_conf.default.tooltip,_conf.default.table.tooltipConfig,this.tooltipConfig)},tipConfig:function(){return _objectSpread(_objectSpread({},this.tooltipOpts),this.tooltipStore.currOpts)},validTipOpts:function(){return Object.assign({isArrow:!1},this.tooltipOpts)},editOpts:function(){return Object.assign({},_conf.default.table.editConfig,this.editConfig)},sortOpts:function(){return Object.assign({orders:["asc","desc",null]},_conf.default.table.sortConfig,this.sortConfig)},filterOpts:function(){return Object.assign({},_conf.default.table.filterConfig,this.filterConfig)},mouseOpts:function(){return Object.assign({},_conf.default.table.mouseConfig,this.mouseConfig)},areaOpts:function(){return Object.assign({},_conf.default.table.areaConfig,this.areaConfig)},keyboardOpts:function(){return Object.assign({},_conf.default.table.keyboardConfig,this.keyboardConfig)},clipOpts:function(){return Object.assign({},_conf.default.table.clipConfig,this.clipConfig)},fnrOpts:function(){return Object.assign({},_conf.default.table.fnrConfig,this.fnrConfig)},hasTip:function(){return _vXETable.default._tooltip},headerCtxMenu:function(){var e=this.ctxMenuOpts.header;return e&&e.options?e.options:[]},bodyCtxMenu:function(){var e=this.ctxMenuOpts.body;return e&&e.options?e.options:[]},footerCtxMenu:function(){var e=this.ctxMenuOpts.footer;return e&&e.options?e.options:[]},isCtxMenu:function(){return!(!this.contextMenu&&!this.menuConfig||!(0,_utils.isEnableConf)(this.ctxMenuOpts)||!(this.headerCtxMenu.length||this.bodyCtxMenu.length||this.footerCtxMenu.length))},ctxMenuOpts:function(){return Object.assign({},_conf.default.table.menuConfig,this.contextMenu,this.menuConfig)},ctxMenuList:function(){var t=[];return this.ctxMenuStore.list.forEach(function(e){e.forEach(function(e){t.push(e)})}),t},exportOpts:function(){return Object.assign({},_conf.default.table.exportConfig,this.exportConfig)},importOpts:function(){return Object.assign({},_conf.default.table.importConfig,this.importConfig)},printOpts:function(){return Object.assign({},_conf.default.table.printConfig,this.printConfig)},expandOpts:function(){return Object.assign({},_conf.default.table.expandConfig,this.expandConfig)},treeOpts:function(){return Object.assign({},_conf.default.table.treeConfig,this.treeConfig)},emptyOpts:function(){return Object.assign({},_conf.default.table.emptyRender,this.emptyRender)},cellOffsetWidth:function(){return this.border?Math.max(2,Math.ceil(this.scrollbarWidth/this.tableColumn.length)):1},customOpts:function(){return Object.assign({},_conf.default.table.customConfig,this.customConfig)},tableBorder:function(){var e=this.border;return!0===e?"full":e||"default"},isAllCheckboxDisabled:function(){var e=this.tableFullData,t=this.tableData,o=(this.treeConfig,this.checkboxOpts),n=o.strict,i=o.checkMethod;return!!n&&(!t.length&&!e.length||!!i&&e.every(function(e){return!i({row:e})}))}},watch:{data:function(e){var t=this,o=this.inited,n=this.initStatus;this.loadTableData(e).then(function(){t.inited=!0,t.initStatus=!0,n||t.handleLoadDefaults(),o||t.handleInitDefaults(),(t.scrollXLoad||t.scrollYLoad)&&t.expandColumn&&(0,_log.warnLog)("vxe.error.scrollErrProp",["column.type=expand"]),t.recalculate()})},staticColumns:function(e){this.handleColumn(e)},tableColumn:function(){this.analyColumnWidth()},showHeader:function(){var e=this;this.$nextTick(function(){e.recalculate(!0).then(function(){return e.refreshScroll()})})},showFooter:function(){var e=this;this.$nextTick(function(){e.recalculate(!0).then(function(){return e.refreshScroll()})})},height:function(){var e=this;this.$nextTick(function(){return e.recalculate(!0)})},maxHeight:function(){var e=this;this.$nextTick(function(){return e.recalculate(!0)})},syncResize:function(e){var t=this;e&&(handleUupdateResize(this),this.$nextTick(function(){handleUupdateResize(t),setTimeout(function(){return handleUupdateResize(t)})}))},mergeCells:function(e){var t=this;this.clearMergeCells(),this.$nextTick(function(){return t.setMergeCells(e)})},mergeFooterItems:function(e){var t=this;this.clearMergeFooterItems(),this.$nextTick(function(){return t.setMergeFooterItems(e)})}},created:function(){var e=this,t=Object.assign(this,{tZindex:0,elemStore:{},scrollXStore:{},scrollYStore:{},tableWidth:0,tableHeight:0,headerHeight:0,footerHeight:0,lastScrollLeft:0,lastScrollTop:0,radioReserveRow:null,checkboxReserveRowMap:{},rowExpandedReserveRowMap:{},treeExpandedReserveRowMap:{},tableFullData:[],afterFullData:[],collectColumn:[],tableFullColumn:[],visibleColumn:[],fullAllDataRowMap:new Map,fullAllDataRowIdData:{},fullDataRowMap:new Map,fullDataRowIdData:{},fullColumnMap:new Map,fullColumnIdData:{},fullColumnFieldData:{}}),o=t.scrollXStore,n=t.sYOpts,i=t.scrollYStore,r=t.data,l=t.editOpts,s=t.treeOpts,a=t.treeConfig,u=t.showOverflow,t=t.rowOpts;if("development"===process.env.NODE_ENV&&(this.rowId||t.keyField||!(this.checkboxOpts.reserve||this.checkboxOpts.checkRowKeys||this.radioOpts.reserve||this.radioOpts.checkRowKey||this.expandOpts.expandRowKeys||this.treeOpts.expandRowKeys)||(0,_log.warnLog)("vxe.error.reqProp",["row-config.keyField"]),this.editConfig&&l.showStatus&&!this.keepSource&&(0,_log.warnLog)("vxe.error.reqProp",["keep-source"]),!a||!s.line||(this.rowKey||t.useKey)&&u||(0,_log.warnLog)("vxe.error.reqProp",["row-config.useKey | show-overflow"]),this.showFooter&&!this.footerMethod&&(0,_log.warnLog)("vxe.error.reqProp",["footer-method"]),a&&this.stripe&&(0,_log.warnLog)("vxe.error.noTree",["stripe"]),this.tooltipOpts.enabled&&(0,_log.warnLog)("vxe.error.delProp",["tooltip-config.enabled","tooltip-config.showAll"]),t=this.exportConfig,c=this.exportOpts,u=this.importConfig,a=this.importOpts,u&&a.types&&!a.importMethod&&!_xeUtils.default.includeArrays(_vXETable.default.config.importTypes,a.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types=".concat(a.types.join(",")),a.types.filter(function(e){return _xeUtils.default.includes(_vXETable.default.config.importTypes,e)}).join(",")||_vXETable.default.config.importTypes.join(",")]),t&&c.types&&!c.exportMethod&&!_xeUtils.default.includeArrays(_vXETable.default.config.exportTypes,c.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types=".concat(c.types.join(",")),c.types.filter(function(e){return _xeUtils.default.includes(_vXETable.default.config.exportTypes,e)}).join(",")||_vXETable.default.config.exportTypes.join(",")])),"development"===process.env.NODE_ENV){var c=this.customOpts;if(!this.id&&this.customConfig&&(!0===c.storage||c.storage&&c.storage.resizable||c.storage&&c.storage.visible)&&(0,_log.errLog)("vxe.error.reqProp",["id"]),this.treeConfig&&this.checkboxOpts.range&&(0,_log.errLog)("vxe.error.noTree",["checkbox-config.range"]),this.rowOpts.height&&!this.showOverflow&&(0,_log.warnLog)("vxe.error.notProp",["table.show-overflow"]),!this.handleUpdateCellAreas&&(this.clipConfig&&(0,_log.warnLog)("vxe.error.notProp",["clip-config"]),this.fnrConfig&&(0,_log.warnLog)("vxe.error.notProp",["fnr-config"]),this.mouseOpts.area))return void(0,_log.errLog)("vxe.error.notProp",["mouse-config.area"]);this.mouseOpts.area&&this.mouseOpts.selected&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","mouse-config.selected"]),this.mouseOpts.area&&this.checkboxOpts.range&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","checkbox-config.range"]),this.treeConfig&&this.mouseOpts.area&&(0,_log.errLog)("vxe.error.noTree",["mouse-config.area"])}"development"===process.env.NODE_ENV&&(this.contextMenu&&((0,_log.warnLog)("vxe.error.delProp",["context-menu","menu-config"]),_xeUtils.default.isObject(this.contextMenu)||(0,_log.warnLog)("vxe.error.errProp",["table.context-menu=".concat(this.contextMenu),"table.context-menu={}"])),this.menuConfig&&!_xeUtils.default.isObject(this.menuConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.menu-config=".concat(this.menuConfig),"table.menu-config={}"]),this.exportConfig&&!_xeUtils.default.isObject(this.exportConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.export-config=".concat(this.exportConfig),"table.export-config={}"]),this.importConfig&&!_xeUtils.default.isObject(this.importConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.import-config=".concat(this.importConfig),"table.import-config={}"]),this.printConfig&&!_xeUtils.default.isObject(this.printConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.print-config=".concat(this.printConfig),"table.print-config={}"]),this.treeConfig&&!_xeUtils.default.isObject(this.treeConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.tree-config=".concat(this.treeConfig),"table.tree-config={}"]),this.customConfig&&!_xeUtils.default.isObject(this.customConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.custom-config=".concat(this.customConfig),"table.custom-config={}"]),this.editConfig&&!_xeUtils.default.isObject(this.editConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.edit-config=".concat(this.editConfig),"table.edit-config={}"]),this.emptyRender&&!_xeUtils.default.isObject(this.emptyRender)&&(0,_log.warnLog)("vxe.error.errProp",["table.empty-render=".concat(this.emptyRender),"table.empty-render={}"])),"development"===process.env.NODE_ENV&&(this.editConfig&&!this._insert&&(0,_log.errLog)("vxe.error.reqModule",["Edit"]),this.editRules&&!this._validate&&(0,_log.errLog)("vxe.error.reqModule",["Validator"]),(this.checkboxOpts.range||this.keyboardConfig||this.mouseConfig)&&!this.triggerCellMousedownEvent&&(0,_log.errLog)("vxe.error.reqModule",["Keyboard"]),(this.printConfig||this.importConfig||this.exportConfig)&&!this._exportData&&(0,_log.errLog)("vxe.error.reqModule",["Export"])),Object.assign(i,{startIndex:0,endIndex:1,visibleSize:0,adaptive:!1!==n.adaptive}),Object.assign(o,{startIndex:0,endIndex:1,visibleSize:0}),this.loadTableData(r).then(function(){r&&r.length&&(e.inited=!0,e.initStatus=!0,e.handleLoadDefaults(),e.handleInitDefaults()),e.updateStyle()}),_event.GlobalEvent.on(this,"paste",this.handleGlobalPasteEvent),_event.GlobalEvent.on(this,"copy",this.handleGlobalCopyEvent),_event.GlobalEvent.on(this,"cut",this.handleGlobalCutEvent),_event.GlobalEvent.on(this,"mousedown",this.handleGlobalMousedownEvent),_event.GlobalEvent.on(this,"blur",this.handleGlobalBlurEvent),_event.GlobalEvent.on(this,"mousewheel",this.handleGlobalMousewheelEvent),_event.GlobalEvent.on(this,"keydown",this.handleGlobalKeydownEvent),_event.GlobalEvent.on(this,"resize",this.handleGlobalResizeEvent),_event.GlobalEvent.on(this,"contextmenu",this.handleGlobalContextmenuEvent),this.preventEvent(null,"created")},mounted:function(){var e,t=this;"development"===process.env.NODE_ENV&&(e=this.$listeners,!this.menuConfig&&(e["menu-click"]||e["cell-menu"]||e["header-cell-menu"]||e["footer-cell-menu"])&&(0,_log.warnLog)("vxe.error.reqProp",["menu-config"]),this.tooltipConfig||!e["cell-mouseenter"]&&!e["cell-mouseleave"]||(0,_log.warnLog)("vxe.error.reqProp",["tooltip-config"])),this.autoResize&&((e=(0,_resize.createResizeEvent)(function(){return t.recalculate(!0)})).observe(this.$el),e.observe(this.getParentElem()),this.$resize=e),this.preventEvent(null,"mounted")},activated:function(){var e=this;this.recalculate().then(function(){return e.refreshScroll()}),this.preventEvent(null,"activated")},deactivated:function(){this.preventEvent(null,"deactivated")},beforeDestroy:function(){this.$resize&&this.$resize.disconnect(),this.closeFilter(),this.closeMenu(),this.preventEvent(null,"beforeDestroy")},destroyed:function(){_event.GlobalEvent.off(this,"paste"),_event.GlobalEvent.off(this,"copy"),_event.GlobalEvent.off(this,"cut"),_event.GlobalEvent.off(this,"mousedown"),_event.GlobalEvent.off(this,"blur"),_event.GlobalEvent.off(this,"mousewheel"),_event.GlobalEvent.off(this,"keydown"),_event.GlobalEvent.off(this,"resize"),_event.GlobalEvent.off(this,"contextmenu"),this.preventEvent(null,"destroyed")},render:function(e){var t=this._e,o=this.tId,n=this.tableData,i=this.tableColumn,r=this.tableGroupColumn,l=this.isGroup,s=this.loading,a=this.stripe,u=this.showHeader,c=this.height,f=this.tableBorder,d=this.treeOpts,h=this.treeConfig,p=this.mouseConfig,g=this.mouseOpts,b=this.vSize,v=this.validOpts,m=this.showFooter,x=this.overflowX,C=this.overflowY,O=this.scrollXLoad,_=this.scrollYLoad,y=this.scrollbarHeight,w=this.highlightCell,j=this.highlightHoverRow,S=this.highlightHoverColumn,E=this.editConfig,L=this.validTipOpts,M=this.initStore,R=this.columnStore,D=this.filterStore,T=this.ctxMenuStore,z=this.ctxMenuOpts,P=this.footerTableData,F=this.hasTip,k=this.columnOpts,B=this.rowOpts,G=R.leftList,R=R.rightList;return e("div",{class:["vxe-table","vxe-table--render-default","tid_".concat(o),b?"size--".concat(b):"","border--".concat(f),{"vxe-editable":!!E,"cell--highlight":w,"cell--selected":p&&g.selected,"cell--area":p&&g.area,"row--highlight":B.isHover||j,"column--highlight":k.isHover||S,"is--header":u,"is--footer":m,"is--group":l,"is--tree-line":h&&d.line,"is--fixed-left":G.length,"is--fixed-right":R.length,"is--animat":!!this.animat,"is--round":this.round,"is--stripe":!h&&a,"is--loading":s,"is--empty":!s&&!n.length,"is--scroll-y":C,"is--scroll-x":x,"is--virtual-x":O,"is--virtual-y":_}],on:{keydown:this.keydownEvent}},[e("div",{class:"vxe-table-slots",ref:"hideColumn"},this.$slots.default),e("div",{class:"vxe-table--render-wrapper"},[e("div",{class:"vxe-table--main-wrapper"},[u?e("vxe-table-header",{ref:"tableHeader",props:{tableData:n,tableColumn:i,tableGroupColumn:r,size:b}}):t(),e("vxe-table-body",{ref:"tableBody",props:{tableData:n,tableColumn:i,size:b}}),m?e("vxe-table-footer",{ref:"tableFooter",props:{footerTableData:P,tableColumn:i,size:b}}):t()]),e("div",{class:"vxe-table--fixed-wrapper"},[G&&G.length&&x?renderFixed(e,this,"left"):t(),R&&R.length&&x?renderFixed(e,this,"right"):t()])]),e("div",{ref:"emptyPlaceholder",class:"vxe-table--empty-placeholder"},[e("div",{class:"vxe-table--empty-content"},renderEmptyContenet(e,this))]),e("div",{class:"vxe-table--border-line"}),e("div",{class:"vxe-table--resizable-bar",style:x?{"padding-bottom":"".concat(y,"px")}:null,ref:"resizeBar"}),e("div",{class:["vxe-table--loading vxe-loading",{"is--visible":s}]},[e("div",{class:"vxe-loading--spinner"})]),M.filter?e("vxe-table-filter",{ref:"filterWrapper",props:{filterStore:D}}):t(),M.import&&this.importConfig?e("vxe-import-panel",{props:{defaultOptions:this.importParams,storeData:this.importStore}}):t(),M.export&&(this.exportConfig||this.printConfig)?e("vxe-export-panel",{props:{defaultOptions:this.exportParams,storeData:this.exportStore}}):t(),T.visible&&this.isCtxMenu?e("vxe-table-context-menu",{ref:"ctxWrapper",props:{ctxMenuStore:T,ctxMenuOpts:z}}):t(),F?e("vxe-tooltip",{ref:"commTip",props:{isArrow:!1,enterable:!1}}):t(),F?e("vxe-tooltip",{ref:"tooltip",props:this.tipConfig}):t(),F&&this.editRules&&v.showMessage&&("default"===v.message?!c:"tooltip"===v.message)?e("vxe-tooltip",{ref:"validTip",class:"vxe-table--valid-error",props:"tooltip"===v.message||1===n.length?L:null}):t()])},methods:_methods.default};exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_body=_interopRequireDefault(require("./body")),_header=_interopRequireDefault(require("../../header")),_size=_interopRequireDefault(require("../../mixins/size")),_utils=require("../../tools/utils"),_resize=require("../../tools/resize"),_event=require("../../tools/event"),_methods=_interopRequireDefault(require("./methods")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var o,n=Object.keys(t);return Object.getOwnPropertySymbols&&(o=Object.getOwnPropertySymbols(t),e&&(o=o.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,o)),n}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(o),!0).forEach(function(e){_defineProperty(t,e,o[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):ownKeys(Object(o)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))})}return t}function _defineProperty(e,t,o){return t in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}function renderFixed(e,t,o){var n=t._e,i=t.tableData,r=t.tableColumn,l=t.tableGroupColumn,s=t.vSize,a=t.showHeader,u=t.showFooter,c=t.columnStore,t=t.footerTableData,c=c["".concat(o,"List")];return e("div",{class:"vxe-table--fixed-".concat(o,"-wrapper"),ref:"".concat(o,"Container")},[a?e(_header.default,{props:{fixedType:o,tableData:i,tableColumn:r,tableGroupColumn:l,size:s,fixedColumn:c},ref:"".concat(o,"Header")}):n(),e("vxe-table-body",{props:{fixedType:o,tableData:i,tableColumn:r,fixedColumn:c,size:s},ref:"".concat(o,"Body")}),u?e("vxe-table-footer",{props:{footerTableData:t,tableColumn:r,fixedColumn:c,fixedType:o,size:s},ref:"".concat(o,"Footer")}):n()])}function renderEmptyContenet(e,t){var o=t.$scopedSlots,n=t.emptyOpts,i={$table:t};return o.empty?o.empty.call(t,i,e):(o=(o=n.name?_vXETable.default.renderer.get(n.name):null)?o.renderEmpty:null)?o.call(t,e,n,i):(0,_utils.getFuncText)(t.emptyText)||_conf.default.i18n("vxe.table.emptyText")}function handleUupdateResize(e){var t=e.$el;t&&t.clientWidth&&t.clientHeight&&e.recalculate()}var _default2={name:"VxeTable",mixins:[_size.default],props:{id:String,data:Array,height:[Number,String],maxHeight:[Number,String],resizable:{type:Boolean,default:function(){return _conf.default.table.resizable}},stripe:{type:Boolean,default:function(){return _conf.default.table.stripe}},border:{type:[Boolean,String],default:function(){return _conf.default.table.border}},round:{type:Boolean,default:function(){return _conf.default.table.round}},size:{type:String,default:function(){return _conf.default.table.size||_conf.default.size}},fit:{type:Boolean,default:function(){return _conf.default.table.fit}},loading:Boolean,align:{type:String,default:function(){return _conf.default.table.align}},headerAlign:{type:String,default:function(){return _conf.default.table.headerAlign}},footerAlign:{type:String,default:function(){return _conf.default.table.footerAlign}},showHeader:{type:Boolean,default:function(){return _conf.default.table.showHeader}},highlightCurrentRow:{type:Boolean,default:function(){return _conf.default.table.highlightCurrentRow}},highlightHoverRow:{type:Boolean,default:function(){return _conf.default.table.highlightHoverRow}},highlightCurrentColumn:{type:Boolean,default:function(){return _conf.default.table.highlightCurrentColumn}},highlightHoverColumn:{type:Boolean,default:function(){return _conf.default.table.highlightHoverColumn}},highlightCell:Boolean,showFooter:Boolean,footerMethod:Function,rowClassName:[String,Function],cellClassName:[String,Function],headerRowClassName:[String,Function],headerCellClassName:[String,Function],footerRowClassName:[String,Function],footerCellClassName:[String,Function],cellStyle:[Object,Function],headerCellStyle:[Object,Function],footerCellStyle:[Object,Function],rowStyle:[Object,Function],headerRowStyle:[Object,Function],footerRowStyle:[Object,Function],mergeCells:Array,mergeFooterItems:Array,spanMethod:Function,footerSpanMethod:Function,showOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showOverflow}},showHeaderOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showHeaderOverflow}},showFooterOverflow:{type:[Boolean,String],default:function(){return _conf.default.table.showFooterOverflow}},columnKey:Boolean,rowKey:Boolean,rowId:{type:String,default:function(){return _conf.default.table.rowId}},zIndex:Number,emptyText:{type:String,default:function(){return _conf.default.table.emptyText}},keepSource:{type:Boolean,default:function(){return _conf.default.table.keepSource}},autoResize:{type:Boolean,default:function(){return _conf.default.table.autoResize}},syncResize:[Boolean,String,Number],columnConfig:Object,rowConfig:Object,resizableConfig:Object,seqConfig:Object,sortConfig:Object,filterConfig:Object,radioConfig:Object,checkboxConfig:Object,tooltipConfig:Object,exportConfig:[Boolean,Object],importConfig:[Boolean,Object],printConfig:Object,expandConfig:Object,treeConfig:[Boolean,Object],menuConfig:[Boolean,Object],contextMenu:[Boolean,Object],mouseConfig:Object,areaConfig:Object,keyboardConfig:Object,clipConfig:Object,fnrConfig:Object,editConfig:[Boolean,Object],validConfig:Object,editRules:Object,emptyRender:[Boolean,Object],customConfig:[Boolean,Object],scrollX:Object,scrollY:Object,animat:{type:Boolean,default:function(){return _conf.default.table.animat}},delayHover:{type:Number,default:function(){return _conf.default.table.delayHover}},params:Object},components:{VxeTableBody:_body.default},provide:function(){return{$xetable:this,xecolgroup:null}},inject:{$xegrid:{default:null}},data:function(){return{tId:"".concat(_xeUtils.default.uniqueId()),staticColumns:[],tableGroupColumn:[],tableColumn:[],tableData:[],scrollXLoad:!1,scrollYLoad:!1,overflowY:!0,overflowX:!1,scrollbarWidth:0,scrollbarHeight:0,rowHeight:0,parentHeight:0,isGroup:!1,isAllOverflow:!1,isAllSelected:!1,isIndeterminate:!1,selection:[],currentRow:null,currentColumn:null,selectRow:null,footerTableData:[],expandColumn:null,hasFixedColumn:!1,treeNodeColumn:null,rowExpandeds:[],expandLazyLoadeds:[],treeExpandeds:[],treeLazyLoadeds:[],treeIndeterminates:[],mergeList:[],mergeFooterList:[],initStore:{filter:!1,import:!1,export:!1},filterStore:{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1,maxHeight:null},columnStore:{leftList:[],centerList:[],rightList:[],resizeList:[],pxList:[],pxMinList:[],scaleList:[],scaleMinList:[],autoList:[]},ctxMenuStore:{selected:null,visible:!1,showChild:!1,selectChild:null,list:[],style:null},editStore:{indexs:{columns:[]},titles:{columns:[]},selected:{row:null,column:null},copyed:{cut:!1,rows:[],columns:[]},actived:{row:null,column:null},insertList:[],removeList:[]},tooltipStore:{row:null,column:null,visible:!1,currOpts:null},validStore:{visible:!1,row:null,column:null,content:"",rule:null,isArrow:!1},importStore:{inited:!1,file:null,type:"",modeList:[],typeList:[],filename:"",visible:!1},importParams:{mode:"",types:null,message:!0},exportStore:{inited:!1,name:"",modeList:[],typeList:[],columns:[],isPrint:!1,hasFooter:!1,hasTree:!1,hasMerge:!1,hasColgroup:!1,visible:!1},exportParams:{filename:"",sheetName:"",mode:"",type:"",isColgroup:!1,isMerge:!1,isAllExpand:!1,useStyle:!1,original:!1,message:!0,isHeader:!1,isFooter:!1}}},computed:{validOpts:function(){return Object.assign({message:"default"},_conf.default.table.validConfig,this.validConfig)},sXOpts:function(){return Object.assign({},_conf.default.table.scrollX,this.scrollX)},sYOpts:function(){return Object.assign({},_conf.default.table.scrollY,this.scrollY)},rowHeightMaps:function(){return{default:48,medium:44,small:40,mini:36}},columnOpts:function(){return Object.assign({},_conf.default.table.columnConfig,this.columnConfig)},rowOpts:function(){return Object.assign({},_conf.default.table.rowConfig,this.rowConfig)},resizableOpts:function(){return Object.assign({},_conf.default.table.resizableConfig,this.resizableConfig)},seqOpts:function(){return Object.assign({startIndex:0},_conf.default.table.seqConfig,this.seqConfig)},radioOpts:function(){return Object.assign({},_conf.default.table.radioConfig,this.radioConfig)},checkboxOpts:function(){return Object.assign({},_conf.default.table.checkboxConfig,this.checkboxConfig)},tooltipOpts:function(){return Object.assign({},_conf.default.tooltip,_conf.default.table.tooltipConfig,this.tooltipConfig)},tipConfig:function(){return _objectSpread(_objectSpread({},this.tooltipOpts),this.tooltipStore.currOpts)},validTipOpts:function(){return Object.assign({isArrow:!1},this.tooltipOpts)},editOpts:function(){return Object.assign({},_conf.default.table.editConfig,this.editConfig)},sortOpts:function(){return Object.assign({orders:["asc","desc",null]},_conf.default.table.sortConfig,this.sortConfig)},filterOpts:function(){return Object.assign({},_conf.default.table.filterConfig,this.filterConfig)},mouseOpts:function(){return Object.assign({},_conf.default.table.mouseConfig,this.mouseConfig)},areaOpts:function(){return Object.assign({},_conf.default.table.areaConfig,this.areaConfig)},keyboardOpts:function(){return Object.assign({},_conf.default.table.keyboardConfig,this.keyboardConfig)},clipOpts:function(){return Object.assign({},_conf.default.table.clipConfig,this.clipConfig)},fnrOpts:function(){return Object.assign({},_conf.default.table.fnrConfig,this.fnrConfig)},hasTip:function(){return _vXETable.default._tooltip},headerCtxMenu:function(){var e=this.ctxMenuOpts.header;return e&&e.options?e.options:[]},bodyCtxMenu:function(){var e=this.ctxMenuOpts.body;return e&&e.options?e.options:[]},footerCtxMenu:function(){var e=this.ctxMenuOpts.footer;return e&&e.options?e.options:[]},isCtxMenu:function(){return!(!this.contextMenu&&!this.menuConfig||!(0,_utils.isEnableConf)(this.ctxMenuOpts)||!(this.headerCtxMenu.length||this.bodyCtxMenu.length||this.footerCtxMenu.length))},ctxMenuOpts:function(){return Object.assign({},_conf.default.table.menuConfig,this.contextMenu,this.menuConfig)},ctxMenuList:function(){var t=[];return this.ctxMenuStore.list.forEach(function(e){e.forEach(function(e){t.push(e)})}),t},exportOpts:function(){return Object.assign({},_conf.default.table.exportConfig,this.exportConfig)},importOpts:function(){return Object.assign({},_conf.default.table.importConfig,this.importConfig)},printOpts:function(){return Object.assign({},_conf.default.table.printConfig,this.printConfig)},expandOpts:function(){return Object.assign({},_conf.default.table.expandConfig,this.expandConfig)},treeOpts:function(){return Object.assign({},_conf.default.table.treeConfig,this.treeConfig)},emptyOpts:function(){return Object.assign({},_conf.default.table.emptyRender,this.emptyRender)},cellOffsetWidth:function(){return this.border?Math.max(2,Math.ceil(this.scrollbarWidth/this.tableColumn.length)):1},customOpts:function(){return Object.assign({},_conf.default.table.customConfig,this.customConfig)},tableBorder:function(){var e=this.border;return!0===e?"full":e||"default"},isAllCheckboxDisabled:function(){var e=this.tableFullData,t=this.tableData,o=(this.treeConfig,this.checkboxOpts),n=o.strict,i=o.checkMethod;return!!n&&(!t.length&&!e.length||!!i&&e.every(function(e){return!i({row:e})}))}},watch:{data:function(e){var t=this,o=this.inited,n=this.initStatus;this.loadTableData(e).then(function(){t.inited=!0,t.initStatus=!0,n||t.handleLoadDefaults(),o||t.handleInitDefaults(),(t.scrollXLoad||t.scrollYLoad)&&t.expandColumn&&(0,_log.warnLog)("vxe.error.scrollErrProp",["column.type=expand"]),t.recalculate()})},staticColumns:function(e){this.handleColumn(e)},tableColumn:function(){this.analyColumnWidth()},showHeader:function(){var e=this;this.$nextTick(function(){e.recalculate(!0).then(function(){return e.refreshScroll()})})},showFooter:function(){var e=this;this.$nextTick(function(){e.recalculate(!0).then(function(){return e.refreshScroll()})})},height:function(){var e=this;this.$nextTick(function(){return e.recalculate(!0)})},maxHeight:function(){var e=this;this.$nextTick(function(){return e.recalculate(!0)})},syncResize:function(e){var t=this;e&&(handleUupdateResize(this),this.$nextTick(function(){handleUupdateResize(t),setTimeout(function(){return handleUupdateResize(t)})}))},mergeCells:function(e){var t=this;this.clearMergeCells(),this.$nextTick(function(){return t.setMergeCells(e)})},mergeFooterItems:function(e){var t=this;this.clearMergeFooterItems(),this.$nextTick(function(){return t.setMergeFooterItems(e)})}},created:function(){var e=this,t=Object.assign(this,{tZindex:0,elemStore:{},scrollXStore:{},scrollYStore:{},tableWidth:0,tableHeight:0,headerHeight:0,footerHeight:0,lastScrollLeft:0,lastScrollTop:0,radioReserveRow:null,checkboxReserveRowMap:{},rowExpandedReserveRowMap:{},treeExpandedReserveRowMap:{},tableFullData:[],afterFullData:[],collectColumn:[],tableFullColumn:[],visibleColumn:[],fullAllDataRowMap:new Map,fullAllDataRowIdData:{},fullDataRowMap:new Map,fullDataRowIdData:{},fullColumnMap:new Map,fullColumnIdData:{},fullColumnFieldData:{}}),o=t.scrollXStore,n=t.sYOpts,i=t.scrollYStore,r=t.data,l=t.editOpts,s=t.treeOpts,a=t.treeConfig,u=t.showOverflow,t=t.rowOpts;if("development"===process.env.NODE_ENV&&(this.rowId||t.keyField||!(this.checkboxOpts.reserve||this.checkboxOpts.checkRowKeys||this.radioOpts.reserve||this.radioOpts.checkRowKey||this.expandOpts.expandRowKeys||this.treeOpts.expandRowKeys)||(0,_log.warnLog)("vxe.error.reqProp",["row-config.keyField"]),this.editConfig&&l.showStatus&&!this.keepSource&&(0,_log.warnLog)("vxe.error.reqProp",["keep-source"]),!a||!s.line||(this.rowKey||t.useKey)&&u||(0,_log.warnLog)("vxe.error.reqProp",["row-config.useKey | show-overflow"]),this.showFooter&&!this.footerMethod&&(0,_log.warnLog)("vxe.error.reqProp",["footer-method"]),a&&this.stripe&&(0,_log.warnLog)("vxe.error.noTree",["stripe"]),this.tooltipOpts.enabled&&(0,_log.warnLog)("vxe.error.delProp",["tooltip-config.enabled","tooltip-config.showAll"]),t=this.exportConfig,c=this.exportOpts,u=this.importConfig,a=this.importOpts,u&&a.types&&!a.importMethod&&!_xeUtils.default.includeArrays(_vXETable.default.config.importTypes,a.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types=".concat(a.types.join(",")),a.types.filter(function(e){return _xeUtils.default.includes(_vXETable.default.config.importTypes,e)}).join(",")||_vXETable.default.config.importTypes.join(",")]),t&&c.types&&!c.exportMethod&&!_xeUtils.default.includeArrays(_vXETable.default.config.exportTypes,c.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types=".concat(c.types.join(",")),c.types.filter(function(e){return _xeUtils.default.includes(_vXETable.default.config.exportTypes,e)}).join(",")||_vXETable.default.config.exportTypes.join(",")])),"development"===process.env.NODE_ENV){var c=this.customOpts;if(!this.id&&this.customConfig&&(!0===c.storage||c.storage&&c.storage.resizable||c.storage&&c.storage.visible)&&(0,_log.errLog)("vxe.error.reqProp",["id"]),this.treeConfig&&this.checkboxOpts.range&&(0,_log.errLog)("vxe.error.noTree",["checkbox-config.range"]),this.rowOpts.height&&!this.showOverflow&&(0,_log.warnLog)("vxe.error.notProp",["table.show-overflow"]),!this.handleUpdateCellAreas&&(this.clipConfig&&(0,_log.warnLog)("vxe.error.notProp",["clip-config"]),this.fnrConfig&&(0,_log.warnLog)("vxe.error.notProp",["fnr-config"]),this.mouseOpts.area))return void(0,_log.errLog)("vxe.error.notProp",["mouse-config.area"]);this.mouseOpts.area&&this.mouseOpts.selected&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","mouse-config.selected"]),this.mouseOpts.area&&this.checkboxOpts.range&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","checkbox-config.range"]),this.treeConfig&&this.mouseOpts.area&&(0,_log.errLog)("vxe.error.noTree",["mouse-config.area"])}"development"===process.env.NODE_ENV&&(this.contextMenu&&((0,_log.warnLog)("vxe.error.delProp",["context-menu","menu-config"]),_xeUtils.default.isObject(this.contextMenu)||(0,_log.warnLog)("vxe.error.errProp",["table.context-menu=".concat(this.contextMenu),"table.context-menu={}"])),this.menuConfig&&!_xeUtils.default.isObject(this.menuConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.menu-config=".concat(this.menuConfig),"table.menu-config={}"]),this.exportConfig&&!_xeUtils.default.isObject(this.exportConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.export-config=".concat(this.exportConfig),"table.export-config={}"]),this.importConfig&&!_xeUtils.default.isObject(this.importConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.import-config=".concat(this.importConfig),"table.import-config={}"]),this.printConfig&&!_xeUtils.default.isObject(this.printConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.print-config=".concat(this.printConfig),"table.print-config={}"]),this.treeConfig&&!_xeUtils.default.isObject(this.treeConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.tree-config=".concat(this.treeConfig),"table.tree-config={}"]),this.customConfig&&!_xeUtils.default.isObject(this.customConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.custom-config=".concat(this.customConfig),"table.custom-config={}"]),this.editConfig&&!_xeUtils.default.isObject(this.editConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.edit-config=".concat(this.editConfig),"table.edit-config={}"]),this.emptyRender&&!_xeUtils.default.isObject(this.emptyRender)&&(0,_log.warnLog)("vxe.error.errProp",["table.empty-render=".concat(this.emptyRender),"table.empty-render={}"])),"development"===process.env.NODE_ENV&&(this.editConfig&&!this._insert&&(0,_log.errLog)("vxe.error.reqModule",["Edit"]),this.editRules&&!this._validate&&(0,_log.errLog)("vxe.error.reqModule",["Validator"]),(this.checkboxOpts.range||this.keyboardConfig||this.mouseConfig)&&!this.triggerCellMousedownEvent&&(0,_log.errLog)("vxe.error.reqModule",["Keyboard"]),(this.printConfig||this.importConfig||this.exportConfig)&&!this._exportData&&(0,_log.errLog)("vxe.error.reqModule",["Export"])),Object.assign(i,{startIndex:0,endIndex:1,visibleSize:0,adaptive:!1!==n.adaptive}),Object.assign(o,{startIndex:0,endIndex:1,visibleSize:0}),this.loadTableData(r).then(function(){r&&r.length&&(e.inited=!0,e.initStatus=!0,e.handleLoadDefaults(),e.handleInitDefaults()),e.updateStyle()}),_event.GlobalEvent.on(this,"paste",this.handleGlobalPasteEvent),_event.GlobalEvent.on(this,"copy",this.handleGlobalCopyEvent),_event.GlobalEvent.on(this,"cut",this.handleGlobalCutEvent),_event.GlobalEvent.on(this,"mousedown",this.handleGlobalMousedownEvent),_event.GlobalEvent.on(this,"blur",this.handleGlobalBlurEvent),_event.GlobalEvent.on(this,"mousewheel",this.handleGlobalMousewheelEvent),_event.GlobalEvent.on(this,"keydown",this.handleGlobalKeydownEvent),_event.GlobalEvent.on(this,"resize",this.handleGlobalResizeEvent),_event.GlobalEvent.on(this,"contextmenu",this.handleGlobalContextmenuEvent),this.preventEvent(null,"created")},mounted:function(){var e,t=this;"development"===process.env.NODE_ENV&&(e=this.$listeners,!this.menuConfig&&(e["menu-click"]||e["cell-menu"]||e["header-cell-menu"]||e["footer-cell-menu"])&&(0,_log.warnLog)("vxe.error.reqProp",["menu-config"]),this.tooltipConfig||!e["cell-mouseenter"]&&!e["cell-mouseleave"]||(0,_log.warnLog)("vxe.error.reqProp",["tooltip-config"])),this.autoResize&&((e=(0,_resize.createResizeEvent)(function(){return t.recalculate(!0)})).observe(this.$el),e.observe(this.getParentElem()),this.$resize=e),this.preventEvent(null,"mounted")},activated:function(){var e=this;this.recalculate().then(function(){return e.refreshScroll()}),this.preventEvent(null,"activated")},deactivated:function(){this.preventEvent(null,"deactivated")},beforeDestroy:function(){this.$resize&&this.$resize.disconnect(),this.closeFilter(),this.closeMenu(),this.preventEvent(null,"beforeDestroy")},destroyed:function(){_event.GlobalEvent.off(this,"paste"),_event.GlobalEvent.off(this,"copy"),_event.GlobalEvent.off(this,"cut"),_event.GlobalEvent.off(this,"mousedown"),_event.GlobalEvent.off(this,"blur"),_event.GlobalEvent.off(this,"mousewheel"),_event.GlobalEvent.off(this,"keydown"),_event.GlobalEvent.off(this,"resize"),_event.GlobalEvent.off(this,"contextmenu"),this.preventEvent(null,"destroyed")},render:function(e){var t=this._e,o=this.tId,n=this.tableData,i=this.tableColumn,r=this.tableGroupColumn,l=this.isGroup,s=this.loading,a=this.stripe,u=this.showHeader,c=this.height,f=this.tableBorder,d=this.treeOpts,h=this.treeConfig,p=this.mouseConfig,g=this.mouseOpts,b=this.vSize,v=this.validOpts,m=this.showFooter,x=this.overflowX,C=this.overflowY,O=this.scrollXLoad,_=this.scrollYLoad,y=this.scrollbarHeight,w=this.highlightCell,j=this.highlightHoverRow,S=this.highlightHoverColumn,E=this.editConfig,L=this.validTipOpts,M=this.initStore,R=this.columnStore,D=this.filterStore,T=this.ctxMenuStore,z=this.ctxMenuOpts,P=this.footerTableData,F=this.hasTip,k=this.columnOpts,B=this.rowOpts,q=R.leftList,R=R.rightList;return e("div",{class:["vxe-table","vxe-table--render-default","tid_".concat(o),b?"size--".concat(b):"","border--".concat(f),{"vxe-editable":!!E,"cell--highlight":w,"cell--selected":p&&g.selected,"cell--area":p&&g.area,"row--highlight":B.isHover||j,"column--highlight":k.isHover||S,"is--header":u,"is--footer":m,"is--group":l,"is--tree-line":h&&d.line,"is--fixed-left":q.length,"is--fixed-right":R.length,"is--animat":!!this.animat,"is--round":this.round,"is--stripe":!h&&a,"is--loading":s,"is--empty":!s&&!n.length,"is--scroll-y":C,"is--scroll-x":x,"is--virtual-x":O,"is--virtual-y":_}],on:{keydown:this.keydownEvent}},[e("div",{class:"vxe-table-slots",ref:"hideColumn"},this.$slots.default),e("div",{class:"vxe-table--render-wrapper"},[e("div",{class:"vxe-table--main-wrapper"},[u?e(_header.default,{ref:"tableHeader",props:{tableData:n,tableColumn:i,tableGroupColumn:r,size:b}}):t(),e("vxe-table-body",{ref:"tableBody",props:{tableData:n,tableColumn:i,size:b}}),m?e("vxe-table-footer",{ref:"tableFooter",props:{footerTableData:P,tableColumn:i,size:b}}):t()]),e("div",{class:"vxe-table--fixed-wrapper"},[q&&q.length&&x?renderFixed(e,this,"left"):t(),R&&R.length&&x?renderFixed(e,this,"right"):t()])]),e("div",{ref:"emptyPlaceholder",class:"vxe-table--empty-placeholder"},[e("div",{class:"vxe-table--empty-content"},renderEmptyContenet(e,this))]),e("div",{class:"vxe-table--border-line"}),e("div",{class:"vxe-table--resizable-bar",style:x?{"padding-bottom":"".concat(y,"px")}:null,ref:"resizeBar"}),e("div",{class:["vxe-table--loading vxe-loading",{"is--visible":s}]},[e("div",{class:"vxe-loading--spinner"})]),M.filter?e("vxe-table-filter",{ref:"filterWrapper",props:{filterStore:D}}):t(),M.import&&this.importConfig?e("vxe-import-panel",{props:{defaultOptions:this.importParams,storeData:this.importStore}}):t(),M.export&&(this.exportConfig||this.printConfig)?e("vxe-export-panel",{props:{defaultOptions:this.exportParams,storeData:this.exportStore}}):t(),T.visible&&this.isCtxMenu?e("vxe-table-context-menu",{ref:"ctxWrapper",props:{ctxMenuStore:T,ctxMenuOpts:z}}):t(),F?e("vxe-tooltip",{ref:"commTip",props:{isArrow:!1,enterable:!1}}):t(),F?e("vxe-tooltip",{ref:"tooltip",props:this.tipConfig}):t(),F&&this.editRules&&v.showMessage&&("default"===v.message?!c:"tooltip"===v.message)?e("vxe-tooltip",{ref:"validTip",class:"vxe-table--valid-error",props:"tooltip"===v.message||1===n.length?L:null}):t()])},methods:_methods.default};exports.default=_default2;

package/lib/tools/log.js

@@ -12,7 +12,7 @@ var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.6", "] ", _conf.default.i18n(message, params));
+  return "[vxe-table v".concat("3.5.7-beta.1", "] ", _conf.default.i18n(message, params));
 }
 
 function outLog(type) {

package/lib/tools/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.6","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,r){return"[vxe-table v".concat("3.5.7-beta.1","] ",_conf.default.i18n(e,r))}function outLog(o){return function(e,r){r=getLog(e,r);return console[o](r),r}}var warnLog=outLog("warn");exports.warnLog=warnLog;var errLog=outLog("error");exports.errLog=errLog;

package/lib/v-x-e-table/index.js

@@ -221,7 +221,7 @@ var v = 'v3';
 exports.v = v;
 var VXETable = {
   v: v,
-  version: "3.5.6",
+  version: "3.5.7-beta.1",
   reg: reg,
   use: use,
   setup: _setup.setup,

package/lib/v-x-e-table/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.6",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,config:!0,t:!0,_t:!0,v:!0,VXETable:!0};exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor");Object.keys(_interceptor).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}}))});var _renderer=require("./src/renderer");Object.keys(_renderer).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}}))});var _commands=require("./src/commands");Object.keys(_commands).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}}))});var _menus=require("./src/menus");Object.keys(_menus).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}}))});var _formats=require("./src/formats");Object.keys(_formats).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}}))});var _setup=require("./src/setup");Object.keys(_setup).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}}))});var _utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),e}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var VXETableConfig=function(){function e(){_classCallCheck(this,e)}return _createClass(e,[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}]),e}(),config=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}exports.config=config;var v="v3",VXETable={v:exports.v=v,version:"3.5.7-beta.1",reg:reg,use:use,setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,config:config,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.5.6",
+  "version": "3.5.7-beta.1",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",

package/packages/all.js

@@ -8,7 +8,6 @@ import { Edit } from './edit'
 import { Export } from './export'
 import { Keyboard } from './keyboard'
 import { Validator } from './validator'
-import { Header } from './header'
 import { Footer } from './footer'
 
 import { Column } from './column'
@@ -43,7 +42,6 @@ import zhCN from './locale/lang/zh-CN'
 // 按需加载的组件
 const components = [
   // 功能模块
-  Header,
   Footer,
   Icon,
   Filter,

package/packages/edit/src/mixin.js

@@ -473,10 +473,17 @@ export default {
         }
       }
     },
+    _clearActived (evnt) {
+      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      //   warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
+      // }
+      // 即将废弃
+      return this.clearEdit(evnt)
+    },
     /**
      * 清除激活的编辑
      */
-    _clearActived (evnt) {
+    _clearEdit (evnt) {
       const { editStore } = this
       const { actived } = editStore
       const { row, column } = actived
@@ -498,6 +505,13 @@ export default {
       return VXETable._valid ? this.clearValidate() : this.$nextTick()
     },
     _getActiveRecord () {
+      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      //   warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord'])
+      // }
+      // 即将废弃
+      return this.getEditRecord()
+    },
+    _getEditRecord () {
       const { $el, editStore, afterFullData } = this
       const { actived } = editStore
       const { args, row } = actived
@@ -506,11 +520,18 @@ export default {
       }
       return null
     },
+    _isActiveByRow (row) {
+      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      //   warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow'])
+      // }
+      // 即将废弃
+      return this.isEditByRow(row)
+    },
     /**
      * 判断行是否为激活编辑状态
      * @param {Row} row 行对象
      */
-    _isActiveByRow (row) {
+    _isEditByRow (row) {
       return this.editStore.actived.row === row
     },
     /**
@@ -549,16 +570,30 @@ export default {
         }
       }
     },
+    _setActiveRow (row) {
+      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      //   warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow'])
+      // }
+      // 即将废弃
+      return this.setEditRow(row)
+    },
     /**
      * 激活行编辑
      */
-    _setActiveRow (row) {
+    _setEditRow (row) {
       return this.setActiveCell(row, XEUtils.find(this.visibleColumn, column => isEnableConf(column.editRender)))
     },
+    _setActiveCell (row) {
+      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      //   warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell'])
+      // }
+      // 即将废弃
+      return this.setEditCell(row)
+    },
     /**
      * 激活单元格编辑
      */
-    _setActiveCell (row, fieldOrColumn) {
+    _setEditCell (row, fieldOrColumn) {
       const { editConfig } = this
       const column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn
       if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {

package/packages/table/src/body.js

@@ -327,15 +327,27 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     const rowLevel = rest ? rest.level : 0
     const seq = rest ? rest.seq : -1
     const params = { $table: $xetable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
+    // 行是否被展开
+    const isExpandRow = expandColumn && rowExpandeds.length && rowExpandeds.indexOf(row) > -1
+    // 树节点是否被展开
+    let isExpandTree = false
+    let rowChildren = []
+    // 是否新增行
     let isNewRow = false
     if (editConfig) {
       isNewRow = editStore.insertList.indexOf(row) > -1
     }
+    if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
+      rowChildren = row[treeOpts.children]
+      isExpandTree = rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1
+    }
     rows.push(
       h('tr', {
-        class: ['vxe-body--row', {
+        class: ['vxe-body--row', treeConfig ? `row--level-${rowLevel}` : '', {
           'row--stripe': stripe && ($xetable.getVTRowIndex(row) + 1) % 2 === 0,
           'is--new': isNewRow,
+          'is--expand-row': isExpandRow,
+          'is--expand-tree': isExpandTree,
           'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
           'row--radio': radioOpts.highlight && $xetable.selectRow === row,
           'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
@@ -351,7 +363,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
       }))
     )
     // 如果行被展开了
-    if (expandColumn && rowExpandeds.length && rowExpandeds.indexOf(row) > -1) {
+    if (isExpandRow) {
       let cellStyle
       if (treeConfig) {
         cellStyle = {
@@ -388,11 +400,8 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
       )
     }
     // 如果是树形表格
-    if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
-      const rowChildren = row[treeOpts.children]
-      if (rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1) {
-        rows.push(...renderRows(h, _vm, $xetable, fixedType, rowChildren, tableColumn))
-      }
+    if (isExpandTree) {
+      rows.push(...renderRows(h, _vm, $xetable, fixedType, rowChildren, tableColumn))
     }
   })
   return rows

package/packages/table/src/methods.js

@@ -4644,7 +4644,7 @@ const Methods = {
 }
 
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',')
 
 funcs.forEach(name => {
   Methods[name] = function (...args) {

package/packages/table/src/table.js

@@ -2,6 +2,7 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import VxeTableBody from './body'
+import VxeTableHeader from '../../header'
 import vSize from '../../mixins/size'
 import { isEnableConf, getFuncText } from '../../tools/utils'
 import { createResizeEvent } from '../../tools/resize'
@@ -24,7 +25,7 @@ function renderFixed (h, $xetable, fixedType) {
     class: `vxe-table--fixed-${fixedType}-wrapper`,
     ref: `${fixedType}Container`
   }, [
-    showHeader ? h('vxe-table-header', {
+    showHeader ? h(VxeTableHeader, {
       props: {
         fixedType,
         tableData,
@@ -1007,7 +1008,7 @@ export default {
           /**
            * 表头
            */
-          showHeader ? h('vxe-table-header', {
+          showHeader ? h(VxeTableHeader, {
             ref: 'tableHeader',
             props: {
               tableData,

package/types/all.d.ts

@@ -42,7 +42,6 @@ declare global {
 export * from './v-x-e-table'
 export * from './component'
 
-export * from './header'
 export * from './footer'
 export * from './icon'
 export * from './filter'