vxe-table 3.9.21 → 3.10.0-beta.0

package/lib/table/src/table.js

@@ -33,7 +33,8 @@ const {
   renderer,
   globalResize,
   globalEvents,
-  globalMixins
+  globalMixins,
+  renderEmptyElement
 } = _ui.VxeUI;
 /**
  * 渲染浮固定列
@@ -89,7 +90,7 @@ function renderFixed(h, $xetable, fixedType) {
     ref: `${fixedType}Footer`
   }) : _e()]);
 }
-function renderEmptyContenet(h, _vm) {
+function renderEmptyBody(h, _vm) {
   const {
     $scopedSlots,
     emptyOpts
@@ -663,6 +664,20 @@ var _default = exports.default = {
       }
       return false;
     },
+    computeVirtualScrollBars() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const {
+        overflowX,
+        scrollXLoad,
+        overflowY,
+        scrollYLoad
+      } = reactData;
+      return {
+        x: overflowX && scrollXLoad,
+        y: overflowY && scrollYLoad
+      };
+    },
     tabsResizeFlag() {
       const $xeTable = this;
       const $xeTabs = $xeTable.$xeTabs;
@@ -1065,6 +1080,7 @@ var _default = exports.default = {
     // 使用已安装的组件，如果未安装则不渲染
     const VxeUILoadingComponent = _ui.VxeUI.getComponent('VxeLoading');
     const VxeUITooltipComponent = _ui.VxeUI.getComponent('VxeTooltip');
+    const $xeTable = this;
     const {
       _e,
       $scopedSlots,
@@ -1108,13 +1124,14 @@ var _default = exports.default = {
       checkboxOpts,
       loadingOpts,
       editRules
-    } = this;
+    } = $xeTable;
     const {
       leftList,
       rightList
     } = columnStore;
     const currLoading = this._isLoading || loading;
     const vSize = computeSize;
+    const virtualScrollBars = $xeTable.computeVirtualScrollBars;
     return h('div', {
       class: ['vxe-table', 'vxe-table--render-default', `tid_${tId}`, vSize ? `size--${vSize}` : '', `border--${tableBorder}`, {
         [`valid-msg--${validOpts.msgMode}`]: !!editRules,
@@ -1158,6 +1175,7 @@ var _default = exports.default = {
       class: 'vxe-table-slots',
       ref: 'hideColumn'
     }, this.$slots.default), h('div', {
+      key: 'tw',
       class: 'vxe-table--render-wrapper'
     }, [h('div', {
       class: 'vxe-table--main-wrapper'
@@ -1197,34 +1215,55 @@ var _default = exports.default = {
       }
     }) : _e()]), h('div', {
       class: 'vxe-table--fixed-wrapper'
-    }, [
-    /**
-     * 左侧固定区域
-     */
-    leftList && leftList.length && overflowX ? renderFixed(h, this, 'left') : _e(),
-    /**
-     * 右侧固定区域
-     */
-    rightList && rightList.length && overflowX ? renderFixed(h, this, 'right') : _e()])]),
+    }, [leftList && leftList.length && overflowX ? renderFixed(h, this, 'left') : _e(), rightList && rightList.length && overflowX ? renderFixed(h, this, 'right') : _e()])]), virtualScrollBars.x ? h('div', {
+      key: 'vx',
+      ref: 'refScrollXVirtualElem',
+      class: 'vxe-table--scroll-x-virtual'
+    }, [h('div', {
+      ref: 'refScrollXHandleElem',
+      class: 'vxe-table--scroll-x-handle',
+      on: {
+        scroll: $xeTable.scrollXEvent
+      }
+    }, [h('div', {
+      ref: 'refScrollXSpaceElem',
+      class: 'vxe-table--scroll-x-space'
+    })])]) : renderEmptyElement($xeTable), virtualScrollBars.y ? h('div', {
+      key: 'vy',
+      ref: 'refScrollYVirtualElem',
+      class: 'vxe-table--scroll-y-virtual'
+    }, [h('div', {
+      ref: 'refScrollYHandleElem',
+      class: 'vxe-table--scroll-y-handle',
+      on: {
+        scroll: $xeTable.scrollYEvent
+      }
+    }, [h('div', {
+      ref: 'refScrollYSpaceElem',
+      class: 'vxe-table--scroll-x-space'
+    })])]) : renderEmptyElement($xeTable),
     /**
      * 空数据
      */
     h('div', {
+      key: 'tn',
       ref: 'emptyPlaceholder',
       class: 'vxe-table--empty-placeholder'
     }, [h('div', {
       class: 'vxe-table--empty-content'
-    }, renderEmptyContenet(h, this))]),
+    }, renderEmptyBody(h, this))]),
     /**
      * 边框线
      */
     h('div', {
+      key: 'tl',
       class: 'vxe-table--border-line'
     }),
     /**
      * 列宽线
      */
     h('div', {
+      key: 'cl',
       class: 'vxe-table--resizable-bar',
       style: overflowX ? {
         'padding-bottom': `${scrollbarHeight}px`
@@ -1235,6 +1274,7 @@ var _default = exports.default = {
      * 加载中
      */
     VxeUILoadingComponent ? h(VxeUILoadingComponent, {
+      key: 'lg',
       class: 'vxe-table--loading',
       props: {
         value: currLoading,
@@ -1246,6 +1286,7 @@ var _default = exports.default = {
      * 自定义列
      */
     initStore.custom ? h(_panel.default, {
+      key: 'cs',
       ref: 'customWrapper',
       props: {
         customStore
@@ -1255,6 +1296,7 @@ var _default = exports.default = {
      * 筛选
      */
     initStore.filter ? h(_panel2.default, {
+      key: 'tf',
       ref: 'filterWrapper',
       props: {
         filterStore
@@ -1264,6 +1306,7 @@ var _default = exports.default = {
      * 导入
      */
     initStore.import && this.importConfig ? h(_importPanel.default, {
+      key: 'it',
       props: {
         defaultOptions: this.importParams,
         storeData: this.importStore
@@ -1273,6 +1316,7 @@ var _default = exports.default = {
      * 导出
      */
     initStore.export && (this.exportConfig || this.printConfig) ? h(_exportPanel.default, {
+      key: 'et',
       props: {
         defaultOptions: this.exportParams,
         storeData: this.exportStore
@@ -1282,6 +1326,7 @@ var _default = exports.default = {
      * 快捷菜单
      */
     ctxMenuStore.visible && this.isCtxMenu ? h(_panel3.default, {
+      key: 'tm',
       ref: 'ctxWrapper',
       props: {
         ctxMenuStore,
@@ -1292,6 +1337,7 @@ var _default = exports.default = {
      * 通用提示
      */
     VxeUITooltipComponent ? h(VxeUITooltipComponent, {
+      key: 'ctp',
       ref: 'commTip',
       props: {
         isArrow: false,
@@ -1302,6 +1348,7 @@ var _default = exports.default = {
      * 工具提示
      */
     VxeUITooltipComponent ? h(VxeUITooltipComponent, {
+      key: 'btp',
       ref: 'tooltip',
       props: Object.assign({}, this.tipConfig, this.tooltipStore.currOpts)
     }) : _e(),
@@ -1309,6 +1356,7 @@ var _default = exports.default = {
      * 校验提示
      */
     VxeUITooltipComponent && this.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? h(VxeUITooltipComponent, {
+      key: 'vtp',
       ref: 'validTip',
       class: [{
         'old-cell-valid': editRules && getConfig().cellVaildMode === 'obsolete'

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_ui=require("../../ui"),_methods=_interopRequireDefault(require("./methods")),_body=_interopRequireDefault(require("./body")),_header=_interopRequireDefault(require("./header")),_footer=_interopRequireDefault(require("./footer")),_props=_interopRequireDefault(require("./props")),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log"),_panel=_interopRequireDefault(require("../module/custom/panel")),_panel2=_interopRequireDefault(require("../module/filter/panel")),_importPanel=_interopRequireDefault(require("../module/export/import-panel")),_exportPanel=_interopRequireDefault(require("../module/export/export-panel")),_panel3=_interopRequireDefault(require("../module/menu/panel")),_mixin=_interopRequireDefault(require("../module/filter/mixin")),_mixin2=_interopRequireDefault(require("../module/menu/mixin")),_mixin3=_interopRequireDefault(require("../module/edit/mixin")),_mixin4=_interopRequireDefault(require("../module/export/mixin")),_mixin5=_interopRequireDefault(require("../module/keyboard/mixin")),_mixin6=_interopRequireDefault(require("../module/validator/mixin")),_mixin7=_interopRequireDefault(require("../module/custom/mixin"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getI18n,renderer,globalResize,globalEvents,globalMixins}=_ui.VxeUI;function renderFixed(e,t,o){var{_e:t,tableData:i,tableColumn:r,tableGroupColumn:s,vSize:l,showHeader:n,showFooter:a,columnStore:u,footerTableData:p}=t,u=u[o+"List"];return e("div",{class:`vxe-table--fixed-${o}-wrapper`,ref:o+"Container"},[n?e(_header.default,{props:{fixedType:o,tableData:i,tableColumn:r,tableGroupColumn:s,size:l,fixedColumn:u},ref:o+"Header"}):t(),e(_body.default,{props:{fixedType:o,tableData:i,tableColumn:r,fixedColumn:u,size:l},ref:o+"Body"}),a?e(_footer.default,{props:{footerTableData:p,tableColumn:r,fixedColumn:u,fixedType:o,size:l},ref:o+"Footer"}):t()])}function renderEmptyContenet(e,t){var{$scopedSlots:o,emptyOpts:i}=t;let r="";var s={$table:t};return r=o.empty?o.empty.call(t,s,e):(o=(o=i.name?renderer.get(i.name):null)?o.renderTableEmpty||o.renderTableEmptyView||o.renderEmpty:null)?(0,_vn.getSlotVNs)(o.call(t,e,i,s)):(0,_utils.getFuncText)(t.emptyText)||getI18n("vxe.table.emptyText")}function handleUupdateResize(e){var t=e.$el;t&&t.clientWidth&&t.clientHeight&&e.recalculate()}var _default=exports.default={name:"VxeTable",mixins:[globalMixins.sizeMixin,_mixin.default,_mixin2.default,_mixin3.default,_mixin4.default,_mixin5.default,_mixin6.default,_mixin7.default],props:_props.default,provide(){return{$xetable:this,$xeTable:this,xecolgroup:null}},inject:{$xeTabs:{default:null},$xeGrid:{default:null},$xegrid:{default:null}},data(){return{tId:""+_xeUtils.default.uniqueId(),isCalcColumn:!1,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,selectCheckboxMaps:{},currentRow:null,currentColumn:null,selectRadioRow:null,footerTableData:[],expandColumn:null,hasFixedColumn:!1,treeNodeColumn:null,rowExpandedMaps:{},rowExpandLazyLoadedMaps:{},treeExpandedMaps:{},treeExpandLazyLoadedMaps:{},treeIndeterminateMaps:{},mergeList:[],mergeFooterList:[],initStore:{filter:!1,import:!1,export:!1,custom:!1},customColumnList:[],upDataFlag:0,reColumnFlag:0,pendingRowMaps:{},pendingRowList:[],customStore:{btnEl:null,isAll:!1,isIndeterminate:!1,activeBtn:!1,activeWrapper:!1,visible:!1,maxHeight:0,oldSortMaps:{},oldFixedMaps:{},oldVisibleMaps:{}},filterStore:{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1,maxHeight:null},columnStore:{leftList:[],centerList:[],rightList:[],resizeList:[],pxList:[],pxMinList:[],autoMinList:[],scaleList:[],scaleMinList:[],autoList:[],remainList:[]},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},focused:{row:null,column:null},insertList:[],insertMaps:{},removeList:[],removeMaps:{}},tooltipStore:{row:null,column:null,visible:!1,currOpts:{}},validStore:{visible:!1},validErrorMaps:{},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},_isLoading:!1}},computed:Object.assign(Object.assign({},{}),{tableId(){var e=this.id;return e?_xeUtils.default.isFunction(e)?""+(e({$table:this})||""):""+e:""},validOpts(){return this.computeValidOpts},computeValidOpts(){return Object.assign({message:"default"},getConfig().table.validConfig,this.validConfig)},sXOpts(){return this.computeSXOpts},computeSXOpts(){return Object.assign({},getConfig().table.scrollX,this.scrollX)},sYOpts(){return this.computeSYOpts},computeSYOpts(){return Object.assign({},getConfig().table.scrollY,this.scrollY)},rowHeightMaps(){return{default:48,medium:44,small:40,mini:36}},columnOpts(){return this.computeColumnOpts},computeColumnOpts(){return Object.assign({},getConfig().table.columnConfig,this.columnConfig)},rowOpts(){return this.computeRowOpts},computeRowOpts(){return Object.assign({},getConfig().table.rowConfig,this.rowConfig)},resizeOpts(){return this.computeResizeOpts},computeResizeOpts(){return Object.assign({},getConfig().table.resizeConfig,this.resizeConfig)},resizableOpts(){return this.computeResizableOpts},computeResizableOpts(){return Object.assign({},getConfig().table.resizableConfig,this.resizableConfig)},seqOpts(){return this.computeSeqOpts},computeSeqOpts(){return Object.assign({startIndex:0},getConfig().table.seqConfig,this.seqConfig)},radioOpts(){return this.computeRadioOpts},computeRadioOpts(){return Object.assign({},getConfig().table.radioConfig,this.radioConfig)},checkboxOpts(){return this.computeCheckboxOpts},computeCheckboxOpts(){return Object.assign({},getConfig().table.checkboxConfig,this.checkboxConfig)},tooltipOpts(){return this.computeTooltipOpts},computeTooltipOpts(){return Object.assign({},getConfig().tooltip,getConfig().table.tooltipConfig,this.tooltipConfig)},tipConfig(){return Object.assign({},this.tooltipOpts)},validTipOpts(){return Object.assign({isArrow:!1},this.tooltipOpts)},editOpts(){return this.computeEditOpts},computeEditOpts(){return Object.assign({},getConfig().table.editConfig,this.editConfig)},sortOpts(){return this.computeSortOpts},computeSortOpts(){return Object.assign({orders:["asc","desc",null]},getConfig().table.sortConfig,this.sortConfig)},filterOpts(){return this.computeFilterOpts},computeFilterOpts(){return Object.assign({},getConfig().table.filterConfig,this.filterConfig)},mouseOpts(){return this.computeMouseOpts},computeMouseOpts(){return Object.assign({},getConfig().table.mouseConfig,this.mouseConfig)},areaOpts(){return this.computeAreaOpts},computeAreaOpts(){return Object.assign({},getConfig().table.areaConfig,this.areaConfig)},keyboardOpts(){return this.computeKeyboardOpts},computeKeyboardOpts(){return Object.assign({},getConfig().table.keyboardConfig,this.keyboardConfig)},clipOpts(){return this.computeClipOpts},computeClipOpts(){return Object.assign({},getConfig().table.clipConfig,this.clipConfig)},fnrOpts(){return this.computeFNROpts},computeFNROpts(){return Object.assign({},getConfig().table.fnrConfig,this.fnrConfig)},headerCtxMenu(){var e=this.ctxMenuOpts.header;return e&&e.options?e.options:[]},bodyCtxMenu(){var e=this.ctxMenuOpts.body;return e&&e.options?e.options:[]},footerCtxMenu(){var e=this.ctxMenuOpts.footer;return e&&e.options?e.options:[]},isCtxMenu(){return!(!this.contextMenu&&!this.menuConfig||!(0,_utils.isEnableConf)(this.ctxMenuOpts)||!(this.headerCtxMenu.length||this.bodyCtxMenu.length||this.footerCtxMenu.length))},ctxMenuList(){let t=[];return this.ctxMenuStore.list.forEach(e=>{e.forEach(e=>{t.push(e)})}),t},ctxMenuOpts(){return this.computeMenuOpts},computeMenuOpts(){return Object.assign({},getConfig().table.menuConfig,this.contextMenu,this.menuConfig)},exportOpts(){return this.computeExportOpts},computeExportOpts(){return Object.assign({},getConfig().table.exportConfig,this.exportConfig)},importOpts(){return this.computeImportOpts},computeImportOpts(){return Object.assign({},getConfig().table.importConfig,this.importConfig)},printOpts(){return this.computePrintOpts},computePrintOpts(){return Object.assign({},getConfig().table.printConfig,this.printConfig)},expandOpts(){return this.computeExpandOpts},computeExpandOpts(){return Object.assign({},getConfig().table.expandConfig,this.expandConfig)},treeOpts(){return this.computeTreeOpts},computeTreeOpts(){return Object.assign({},getConfig().table.treeConfig,this.treeConfig)},emptyOpts(){return this.computeEmptyOpts},computeEmptyOpts(){return Object.assign({},getConfig().table.emptyRender,this.emptyRender)},loadingOpts(){return this.computeLoadingOpts},computeLoadingOpts(){return Object.assign({},getConfig().table.loadingConfig,this.loadingConfig)},cellOffsetWidth(){return this.border?Math.max(2,Math.ceil(this.scrollbarWidth/this.tableColumn.length)):1},customOpts(){return this.computeCustomOpts},computeCustomOpts(){return Object.assign({},getConfig().table.customConfig,this.customConfig)},autoWidthColumnList(){var{tableColumn:e,visibleColumn:t}=this;return e.length||t.length?t.filter(e=>"auto"===e.width||"auto"===e.minWidth):[]},fixedColumnSize(){var e=this.collectColumn;let t=0;return e.forEach(e=>{e.renderFixed&&t++}),t},isMaxFixedColumn(){var e=this.columnOpts.maxFixedSize;return!!e&&this.fixedColumnSize>=e},tableBorder(){var e=this.border;return!0===e?"full":e||"default"},isAllCheckboxDisabled(){var{tableFullData:e,tableData:t,checkboxOpts:o}=this;let{strict:i,checkMethod:r}=o;return!!i&&(!t.length&&!e.length||!!r&&e.every(e=>!r({row:e})))},tabsResizeFlag(){var e=this.$xeTabs;return e?e.reactData.resizeFlag:null}}),watch:{data(e){let{inited:t,initStatus:o}=this;this.loadTableData(e).then(()=>{this.inited=!0,this.initStatus=!0,o||this.handleLoadDefaults(),t||this.handleInitDefaults(),(this.scrollXLoad||this.scrollYLoad)&&this.expandColumn&&(0,_log.warnLog)("vxe.error.scrollErrProp",["column.type=expand"]),this.recalculate()})},staticColumns(e){this.handleColumn(e)},tableColumn(){this.analyColumnWidth()},upDataFlag(){this.$nextTick().then(()=>this.updateData())},reColumnFlag(){this.$nextTick().then(()=>this.refreshColumn())},showHeader(){this.$nextTick(()=>{this.recalculate(!0).then(()=>this.refreshScroll())})},showFooter(){this.$nextTick(()=>{this.recalculate(!0).then(()=>this.refreshScroll())})},height(){this.$nextTick(()=>this.recalculate(!0))},maxHeight(){this.$nextTick(()=>this.recalculate(!0))},syncResize(e){e&&(handleUupdateResize(this),this.$nextTick(()=>{handleUupdateResize(this),setTimeout(()=>handleUupdateResize(this))}))},tabsResizeFlag(){this.handleGlobalResizeEvent()},mergeCells(e){this.clearMergeCells(),this.$nextTick(()=>this.setMergeCells(e))},mergeFooterItems(e){this.clearMergeFooterItems(),this.$nextTick(()=>this.setMergeFooterItems(e))}},created(){let{scrollXStore:e,sYOpts:t,scrollYStore:o,data:i,editOpts:r,treeOpts:s,treeConfig:l,showOverflow:n,rowOpts:a}=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:[],afterFullRowMaps:{},collectColumn:[],tableFullColumn:[],visibleColumn:[],fullAllDataRowIdData:{},fullDataRowMap:new Map,fullDataRowIdData:{},fullColumnMap:new Map,fullColumnIdData:{},fullColumnFieldData:{}});if("development"===process.env.NODE_ENV){this.rowId&&(0,_log.warnLog)("vxe.error.delProp",["row-id","row-config.keyField"]),this.rowKey&&(0,_log.warnLog)("vxe.error.delProp",["row-key","row-config.useKey"]),this.columnKey&&(0,_log.warnLog)("vxe.error.delProp",["column-id","column-config.useKey"]),this.rowId||a.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&&r.showStatus&&!this.keepSource&&(0,_log.warnLog)("vxe.error.reqProp",["keep-source"]),!l||!s.showLine&&!s.line||(this.rowKey||a.useKey)&&n||(0,_log.warnLog)("vxe.error.reqProp",["row-config.useKey | show-overflow"]),!this.showFooter||this.footerMethod||this.footerData||(0,_log.warnLog)("vxe.error.reqProp",["footer-data | footer-method"]),l&&this.stripe&&(0,_log.warnLog)("vxe.error.noTree",["stripe"]),this.tooltipOpts.enabled&&(0,_log.warnLog)("vxe.error.delProp",["tooltip-config.enabled","tooltip-config.showAll"]);let{exportConfig:e,exportOpts:t,importConfig:o,importOpts:i}=this;o&&i.types&&!i.importMethod&&!_xeUtils.default.includeArrays(_xeUtils.default.keys(i._typeMaps),i.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types="+i.types.join(","),i.types.filter(e=>_xeUtils.default.includes(_xeUtils.default.keys(i._typeMaps),e)).join(",")||_xeUtils.default.keys(i._typeMaps).join(",")]),e&&t.types&&!t.exportMethod&&!_xeUtils.default.includeArrays(_xeUtils.default.keys(t._typeMaps),t.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types="+t.types.join(","),t.types.filter(e=>_xeUtils.default.includes(_xeUtils.default.keys(t._typeMaps),e)).join(",")||_xeUtils.default.keys(t._typeMaps).join(",")])}if("development"===process.env.NODE_ENV){var u=this.customOpts;if(!this.id&&this.customConfig&&(!0===u.storage||u.storage&&u.storage.resizable||u.storage&&u.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.treeConfig&&s.children&&(0,_log.warnLog)("vxe.error.delProp",["tree-config.children","tree-config.childrenField"]),this.treeConfig&&s.line&&(0,_log.warnLog)("vxe.error.delProp",["tree-config.line","tree-config.showLine"]),this.mouseOpts.area&&this.mouseOpts.selected&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","mouse-config.selected"]),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="+this.contextMenu,"table.context-menu={}"])),this.menuConfig&&!_xeUtils.default.isObject(this.menuConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.menu-config="+this.menuConfig,"table.menu-config={}"]),this.exportConfig&&!_xeUtils.default.isObject(this.exportConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.export-config="+this.exportConfig,"table.export-config={}"]),this.importConfig&&!_xeUtils.default.isObject(this.importConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.import-config="+this.importConfig,"table.import-config={}"]),this.printConfig&&!_xeUtils.default.isObject(this.printConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.print-config="+this.printConfig,"table.print-config={}"]),this.treeConfig&&!_xeUtils.default.isObject(this.treeConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.tree-config="+this.treeConfig,"table.tree-config={}"]),this.customConfig&&!_xeUtils.default.isObject(this.customConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.custom-config="+this.customConfig,"table.custom-config={}"]),this.editConfig&&!_xeUtils.default.isObject(this.editConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.edit-config="+this.editConfig,"table.edit-config={}"]),this.emptyRender&&!_xeUtils.default.isObject(this.emptyRender)&&(0,_log.warnLog)("vxe.error.errProp",["table.empty-render="+this.emptyRender,"table.empty-render={}"]),this.editConfig&&this.editOpts.activeMethod&&(0,_log.warnLog)("vxe.error.delProp",["table.edit-config.activeMethod","table.edit-config.beforeEditMethod"]),this.treeConfig&&this.checkboxOpts.isShiftKey&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config","checkbox-config.isShiftKey"]),this.checkboxOpts.halfField)&&(0,_log.warnLog)("vxe.error.delProp",["checkbox-config.halfField","checkbox-config.indeterminateField"]),"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(o,{startIndex:0,endIndex:1,visibleSize:0,adaptive:!1!==t.adaptive}),Object.assign(e,{startIndex:0,endIndex:1,visibleSize:0}),this.loadTableData(i).then(()=>{i&&i.length&&(this.inited=!0,this.initStatus=!0,this.handleLoadDefaults(),this.handleInitDefaults()),this.updateStyle()}),globalEvents.on(this,"paste",this.handleGlobalPasteEvent),globalEvents.on(this,"copy",this.handleGlobalCopyEvent),globalEvents.on(this,"cut",this.handleGlobalCutEvent),globalEvents.on(this,"mousedown",this.handleGlobalMousedownEvent),globalEvents.on(this,"blur",this.handleGlobalBlurEvent),globalEvents.on(this,"mousewheel",this.handleGlobalMousewheelEvent),globalEvents.on(this,"keydown",this.handleGlobalKeydownEvent),globalEvents.on(this,"resize",this.handleGlobalResizeEvent),globalEvents.on(this,"contextmenu",this.handleGlobalContextmenuEvent),this.preventEvent(null,"created")},mounted(){let o=this;if("development"===process.env.NODE_ENV&&(t=this.$listeners,!this.menuConfig&&(t["menu-click"]||t["cell-menu"]||t["header-cell-menu"]||t["footer-cell-menu"])&&(0,_log.warnLog)("vxe.error.reqProp",["menu-config"]),this.tooltipConfig||!t["cell-mouseenter"]&&!t["cell-mouseleave"]||(0,_log.warnLog)("vxe.error.reqProp",["tooltip-config"])),"development"===process.env.NODE_ENV){let e=_ui.VxeUI.getComponent("VxeLoading"),t=_ui.VxeUI.getComponent("VxeTooltip");this.$nextTick(()=>{o.loading&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-loading"]),!0!==o.showOverflow&&"tooltip"!==o.showOverflow&&!0!==o.showHeaderOverflow&&"tooltip"!==o.showHeaderOverflow&&!0!==o.showFooterOverflow&&"tooltip"!==o.showFooterOverflow&&!o.tooltipConfig&&!o.editRules||t||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"])})}if(this.autoResize){let e=this.resizeOpts.refreshDelay?_xeUtils.default.throttle(()=>this.recalculate(!0),this.resizeOpts.refreshDelay,{leading:!0,trailing:!0}):null;var t=globalResize.create(e?()=>{this.autoResize&&e()}:()=>{this.autoResize&&this.recalculate(!0)});t.observe(this.$el),t.observe(this.getParentElem()),this.$resize=t}this.preventEvent(null,"mounted")},activated(){this.recalculate().then(()=>this.refreshScroll()),this.preventEvent(null,"activated")},deactivated(){this.preventEvent(null,"deactivated")},beforeDestroy(){this.$resize&&this.$resize.disconnect(),this.closeFilter(),this.closeMenu(),this.preventEvent(null,"beforeDestroy")},destroyed(){globalEvents.off(this,"paste"),globalEvents.off(this,"copy"),globalEvents.off(this,"cut"),globalEvents.off(this,"mousedown"),globalEvents.off(this,"blur"),globalEvents.off(this,"mousewheel"),globalEvents.off(this,"keydown"),globalEvents.off(this,"resize"),globalEvents.off(this,"contextmenu"),this.preventEvent(null,"destroyed")},render(e){var t=_ui.VxeUI.getComponent("VxeLoading"),o=_ui.VxeUI.getComponent("VxeTooltip"),{_e:i,$scopedSlots:r,tId:s,isCalcColumn:l,tableData:n,tableColumn:a,tableGroupColumn:u,isGroup:p,loading:h,stripe:g,showHeader:d,height:c,tableBorder:f,treeOpts:m,treeConfig:x,mouseConfig:b,mouseOpts:C,computeSize:v,validOpts:O,showFooter:_,overflowX:w,overflowY:y,scrollXLoad:M,scrollYLoad:L,scrollbarHeight:E,highlightCell:R,highlightHoverRow:D,highlightHoverColumn:P,editConfig:T,validTipOpts:U,initStore:S,columnStore:q,filterStore:I,customStore:$,ctxMenuStore:k,ctxMenuOpts:H,footerTableData:V,columnOpts:G,rowOpts:K,checkboxOpts:N,loadingOpts:j,editRules:z}=this,{leftList:q,rightList:F}=q,h=this._isLoading||h;return e("div",{class:["vxe-table","vxe-table--render-default","tid_"+s,v?"size--"+v:"","border--"+f,{["valid-msg--"+O.msgMode]:!!z,"vxe-editable":!!T,"old-cell-valid":z&&"obsolete"===getConfig().cellVaildMode,"cell--highlight":R,"cell--selected":b&&C.selected,"cell--area":b&&C.area,"row--highlight":K.isHover||D,"column--highlight":G.isHover||P,"checkbox--range":N.range,"column--calc":l,"is--header":d,"is--footer":_,"is--group":p,"is--tree-line":x&&(m.showLine||m.line),"is--fixed-left":q.length,"is--fixed-right":F.length,"is--animat":!!this.animat,"is--padding":this.padding,"is--round":this.round,"is--stripe":!x&&g,"is--loading":h,"is--empty":!h&&!n.length,"is--scroll-y":y,"is--scroll-x":w,"is--virtual-x":M,"is--virtual-y":L}],attrs:{spellcheck:!1},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"},[d?e(_header.default,{ref:"tableHeader",props:{tableData:n,tableColumn:a,tableGroupColumn:u,size:v}}):i(),e(_body.default,{ref:"tableBody",props:{tableData:n,tableColumn:a,size:v}}),_?e(_footer.default,{ref:"tableFooter",props:{footerTableData:V,tableColumn:a,size:v}}):i()]),e("div",{class:"vxe-table--fixed-wrapper"},[q&&q.length&&w?renderFixed(e,this,"left"):i(),F&&F.length&&w?renderFixed(e,this,"right"):i()])]),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:w?{"padding-bottom":E+"px"}:{},ref:"resizeBar"}),t?e(t,{class:"vxe-table--loading",props:{value:h,icon:j.icon,text:j.text}},this.callSlot(r.loading,{},e)):i(),S.custom?e(_panel.default,{ref:"customWrapper",props:{customStore:$}}):i(),S.filter?e(_panel2.default,{ref:"filterWrapper",props:{filterStore:I}}):i(),S.import&&this.importConfig?e(_importPanel.default,{props:{defaultOptions:this.importParams,storeData:this.importStore}}):i(),S.export&&(this.exportConfig||this.printConfig)?e(_exportPanel.default,{props:{defaultOptions:this.exportParams,storeData:this.exportStore}}):i(),k.visible&&this.isCtxMenu?e(_panel3.default,{ref:"ctxWrapper",props:{ctxMenuStore:k,ctxMenuOpts:H}}):i(),e("div",{},[o?e(o,{ref:"commTip",props:{isArrow:!1,enterable:!1}}):i(),o?e(o,{ref:"tooltip",props:Object.assign({},this.tipConfig,this.tooltipStore.currOpts)}):i(),o&&this.editRules&&O.showMessage&&("default"===O.message?!c:"tooltip"===O.message)?e(o,{ref:"validTip",class:[{"old-cell-valid":z&&"obsolete"===getConfig().cellVaildMode},"vxe-table--valid-error"],props:"tooltip"===O.message||1===n.length?U:null}):i()])])},methods:_methods.default};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_ui=require("../../ui"),_methods=_interopRequireDefault(require("./methods")),_body=_interopRequireDefault(require("./body")),_header=_interopRequireDefault(require("./header")),_footer=_interopRequireDefault(require("./footer")),_props=_interopRequireDefault(require("./props")),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log"),_panel=_interopRequireDefault(require("../module/custom/panel")),_panel2=_interopRequireDefault(require("../module/filter/panel")),_importPanel=_interopRequireDefault(require("../module/export/import-panel")),_exportPanel=_interopRequireDefault(require("../module/export/export-panel")),_panel3=_interopRequireDefault(require("../module/menu/panel")),_mixin=_interopRequireDefault(require("../module/filter/mixin")),_mixin2=_interopRequireDefault(require("../module/menu/mixin")),_mixin3=_interopRequireDefault(require("../module/edit/mixin")),_mixin4=_interopRequireDefault(require("../module/export/mixin")),_mixin5=_interopRequireDefault(require("../module/keyboard/mixin")),_mixin6=_interopRequireDefault(require("../module/validator/mixin")),_mixin7=_interopRequireDefault(require("../module/custom/mixin"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getI18n,renderer,globalResize,globalEvents,globalMixins,renderEmptyElement}=_ui.VxeUI;function renderFixed(e,t,o){var{_e:t,tableData:i,tableColumn:r,tableGroupColumn:s,vSize:l,showHeader:n,showFooter:a,columnStore:u,footerTableData:p}=t,u=u[o+"List"];return e("div",{class:`vxe-table--fixed-${o}-wrapper`,ref:o+"Container"},[n?e(_header.default,{props:{fixedType:o,tableData:i,tableColumn:r,tableGroupColumn:s,size:l,fixedColumn:u},ref:o+"Header"}):t(),e(_body.default,{props:{fixedType:o,tableData:i,tableColumn:r,fixedColumn:u,size:l},ref:o+"Body"}),a?e(_footer.default,{props:{footerTableData:p,tableColumn:r,fixedColumn:u,fixedType:o,size:l},ref:o+"Footer"}):t()])}function renderEmptyBody(e,t){var{$scopedSlots:o,emptyOpts:i}=t;let r="";var s={$table:t};return r=o.empty?o.empty.call(t,s,e):(o=(o=i.name?renderer.get(i.name):null)?o.renderTableEmpty||o.renderTableEmptyView||o.renderEmpty:null)?(0,_vn.getSlotVNs)(o.call(t,e,i,s)):(0,_utils.getFuncText)(t.emptyText)||getI18n("vxe.table.emptyText")}function handleUupdateResize(e){var t=e.$el;t&&t.clientWidth&&t.clientHeight&&e.recalculate()}var _default=exports.default={name:"VxeTable",mixins:[globalMixins.sizeMixin,_mixin.default,_mixin2.default,_mixin3.default,_mixin4.default,_mixin5.default,_mixin6.default,_mixin7.default],props:_props.default,provide(){return{$xetable:this,$xeTable:this,xecolgroup:null}},inject:{$xeTabs:{default:null},$xeGrid:{default:null},$xegrid:{default:null}},data(){return{tId:""+_xeUtils.default.uniqueId(),isCalcColumn:!1,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,selectCheckboxMaps:{},currentRow:null,currentColumn:null,selectRadioRow:null,footerTableData:[],expandColumn:null,hasFixedColumn:!1,treeNodeColumn:null,rowExpandedMaps:{},rowExpandLazyLoadedMaps:{},treeExpandedMaps:{},treeExpandLazyLoadedMaps:{},treeIndeterminateMaps:{},mergeList:[],mergeFooterList:[],initStore:{filter:!1,import:!1,export:!1,custom:!1},customColumnList:[],upDataFlag:0,reColumnFlag:0,pendingRowMaps:{},pendingRowList:[],customStore:{btnEl:null,isAll:!1,isIndeterminate:!1,activeBtn:!1,activeWrapper:!1,visible:!1,maxHeight:0,oldSortMaps:{},oldFixedMaps:{},oldVisibleMaps:{}},filterStore:{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1,maxHeight:null},columnStore:{leftList:[],centerList:[],rightList:[],resizeList:[],pxList:[],pxMinList:[],autoMinList:[],scaleList:[],scaleMinList:[],autoList:[],remainList:[]},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},focused:{row:null,column:null},insertList:[],insertMaps:{},removeList:[],removeMaps:{}},tooltipStore:{row:null,column:null,visible:!1,currOpts:{}},validStore:{visible:!1},validErrorMaps:{},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},_isLoading:!1}},computed:Object.assign(Object.assign({},{}),{tableId(){var e=this.id;return e?_xeUtils.default.isFunction(e)?""+(e({$table:this})||""):""+e:""},validOpts(){return this.computeValidOpts},computeValidOpts(){return Object.assign({message:"default"},getConfig().table.validConfig,this.validConfig)},sXOpts(){return this.computeSXOpts},computeSXOpts(){return Object.assign({},getConfig().table.scrollX,this.scrollX)},sYOpts(){return this.computeSYOpts},computeSYOpts(){return Object.assign({},getConfig().table.scrollY,this.scrollY)},rowHeightMaps(){return{default:48,medium:44,small:40,mini:36}},columnOpts(){return this.computeColumnOpts},computeColumnOpts(){return Object.assign({},getConfig().table.columnConfig,this.columnConfig)},rowOpts(){return this.computeRowOpts},computeRowOpts(){return Object.assign({},getConfig().table.rowConfig,this.rowConfig)},resizeOpts(){return this.computeResizeOpts},computeResizeOpts(){return Object.assign({},getConfig().table.resizeConfig,this.resizeConfig)},resizableOpts(){return this.computeResizableOpts},computeResizableOpts(){return Object.assign({},getConfig().table.resizableConfig,this.resizableConfig)},seqOpts(){return this.computeSeqOpts},computeSeqOpts(){return Object.assign({startIndex:0},getConfig().table.seqConfig,this.seqConfig)},radioOpts(){return this.computeRadioOpts},computeRadioOpts(){return Object.assign({},getConfig().table.radioConfig,this.radioConfig)},checkboxOpts(){return this.computeCheckboxOpts},computeCheckboxOpts(){return Object.assign({},getConfig().table.checkboxConfig,this.checkboxConfig)},tooltipOpts(){return this.computeTooltipOpts},computeTooltipOpts(){return Object.assign({},getConfig().tooltip,getConfig().table.tooltipConfig,this.tooltipConfig)},tipConfig(){return Object.assign({},this.tooltipOpts)},validTipOpts(){return Object.assign({isArrow:!1},this.tooltipOpts)},editOpts(){return this.computeEditOpts},computeEditOpts(){return Object.assign({},getConfig().table.editConfig,this.editConfig)},sortOpts(){return this.computeSortOpts},computeSortOpts(){return Object.assign({orders:["asc","desc",null]},getConfig().table.sortConfig,this.sortConfig)},filterOpts(){return this.computeFilterOpts},computeFilterOpts(){return Object.assign({},getConfig().table.filterConfig,this.filterConfig)},mouseOpts(){return this.computeMouseOpts},computeMouseOpts(){return Object.assign({},getConfig().table.mouseConfig,this.mouseConfig)},areaOpts(){return this.computeAreaOpts},computeAreaOpts(){return Object.assign({},getConfig().table.areaConfig,this.areaConfig)},keyboardOpts(){return this.computeKeyboardOpts},computeKeyboardOpts(){return Object.assign({},getConfig().table.keyboardConfig,this.keyboardConfig)},clipOpts(){return this.computeClipOpts},computeClipOpts(){return Object.assign({},getConfig().table.clipConfig,this.clipConfig)},fnrOpts(){return this.computeFNROpts},computeFNROpts(){return Object.assign({},getConfig().table.fnrConfig,this.fnrConfig)},headerCtxMenu(){var e=this.ctxMenuOpts.header;return e&&e.options?e.options:[]},bodyCtxMenu(){var e=this.ctxMenuOpts.body;return e&&e.options?e.options:[]},footerCtxMenu(){var e=this.ctxMenuOpts.footer;return e&&e.options?e.options:[]},isCtxMenu(){return!(!this.contextMenu&&!this.menuConfig||!(0,_utils.isEnableConf)(this.ctxMenuOpts)||!(this.headerCtxMenu.length||this.bodyCtxMenu.length||this.footerCtxMenu.length))},ctxMenuList(){let t=[];return this.ctxMenuStore.list.forEach(e=>{e.forEach(e=>{t.push(e)})}),t},ctxMenuOpts(){return this.computeMenuOpts},computeMenuOpts(){return Object.assign({},getConfig().table.menuConfig,this.contextMenu,this.menuConfig)},exportOpts(){return this.computeExportOpts},computeExportOpts(){return Object.assign({},getConfig().table.exportConfig,this.exportConfig)},importOpts(){return this.computeImportOpts},computeImportOpts(){return Object.assign({},getConfig().table.importConfig,this.importConfig)},printOpts(){return this.computePrintOpts},computePrintOpts(){return Object.assign({},getConfig().table.printConfig,this.printConfig)},expandOpts(){return this.computeExpandOpts},computeExpandOpts(){return Object.assign({},getConfig().table.expandConfig,this.expandConfig)},treeOpts(){return this.computeTreeOpts},computeTreeOpts(){return Object.assign({},getConfig().table.treeConfig,this.treeConfig)},emptyOpts(){return this.computeEmptyOpts},computeEmptyOpts(){return Object.assign({},getConfig().table.emptyRender,this.emptyRender)},loadingOpts(){return this.computeLoadingOpts},computeLoadingOpts(){return Object.assign({},getConfig().table.loadingConfig,this.loadingConfig)},cellOffsetWidth(){return this.border?Math.max(2,Math.ceil(this.scrollbarWidth/this.tableColumn.length)):1},customOpts(){return this.computeCustomOpts},computeCustomOpts(){return Object.assign({},getConfig().table.customConfig,this.customConfig)},autoWidthColumnList(){var{tableColumn:e,visibleColumn:t}=this;return e.length||t.length?t.filter(e=>"auto"===e.width||"auto"===e.minWidth):[]},fixedColumnSize(){var e=this.collectColumn;let t=0;return e.forEach(e=>{e.renderFixed&&t++}),t},isMaxFixedColumn(){var e=this.columnOpts.maxFixedSize;return!!e&&this.fixedColumnSize>=e},tableBorder(){var e=this.border;return!0===e?"full":e||"default"},isAllCheckboxDisabled(){var{tableFullData:e,tableData:t,checkboxOpts:o}=this;let{strict:i,checkMethod:r}=o;return!!i&&(!t.length&&!e.length||!!r&&e.every(e=>!r({row:e})))},computeVirtualScrollBars(){var{overflowX:e,scrollXLoad:t,overflowY:o,scrollYLoad:i}=this;return{x:e&&t,y:o&&i}},tabsResizeFlag(){var e=this.$xeTabs;return e?e.reactData.resizeFlag:null}}),watch:{data(e){let{inited:t,initStatus:o}=this;this.loadTableData(e).then(()=>{this.inited=!0,this.initStatus=!0,o||this.handleLoadDefaults(),t||this.handleInitDefaults(),(this.scrollXLoad||this.scrollYLoad)&&this.expandColumn&&(0,_log.warnLog)("vxe.error.scrollErrProp",["column.type=expand"]),this.recalculate()})},staticColumns(e){this.handleColumn(e)},tableColumn(){this.analyColumnWidth()},upDataFlag(){this.$nextTick().then(()=>this.updateData())},reColumnFlag(){this.$nextTick().then(()=>this.refreshColumn())},showHeader(){this.$nextTick(()=>{this.recalculate(!0).then(()=>this.refreshScroll())})},showFooter(){this.$nextTick(()=>{this.recalculate(!0).then(()=>this.refreshScroll())})},height(){this.$nextTick(()=>this.recalculate(!0))},maxHeight(){this.$nextTick(()=>this.recalculate(!0))},syncResize(e){e&&(handleUupdateResize(this),this.$nextTick(()=>{handleUupdateResize(this),setTimeout(()=>handleUupdateResize(this))}))},tabsResizeFlag(){this.handleGlobalResizeEvent()},mergeCells(e){this.clearMergeCells(),this.$nextTick(()=>this.setMergeCells(e))},mergeFooterItems(e){this.clearMergeFooterItems(),this.$nextTick(()=>this.setMergeFooterItems(e))}},created(){let{scrollXStore:e,sYOpts:t,scrollYStore:o,data:i,editOpts:r,treeOpts:s,treeConfig:l,showOverflow:n,rowOpts:a}=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:[],afterFullRowMaps:{},collectColumn:[],tableFullColumn:[],visibleColumn:[],fullAllDataRowIdData:{},fullDataRowMap:new Map,fullDataRowIdData:{},fullColumnMap:new Map,fullColumnIdData:{},fullColumnFieldData:{}});if("development"===process.env.NODE_ENV){this.rowId&&(0,_log.warnLog)("vxe.error.delProp",["row-id","row-config.keyField"]),this.rowKey&&(0,_log.warnLog)("vxe.error.delProp",["row-key","row-config.useKey"]),this.columnKey&&(0,_log.warnLog)("vxe.error.delProp",["column-id","column-config.useKey"]),this.rowId||a.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&&r.showStatus&&!this.keepSource&&(0,_log.warnLog)("vxe.error.reqProp",["keep-source"]),!l||!s.showLine&&!s.line||(this.rowKey||a.useKey)&&n||(0,_log.warnLog)("vxe.error.reqProp",["row-config.useKey | show-overflow"]),!this.showFooter||this.footerMethod||this.footerData||(0,_log.warnLog)("vxe.error.reqProp",["footer-data | footer-method"]),l&&this.stripe&&(0,_log.warnLog)("vxe.error.noTree",["stripe"]),this.tooltipOpts.enabled&&(0,_log.warnLog)("vxe.error.delProp",["tooltip-config.enabled","tooltip-config.showAll"]);let{exportConfig:e,exportOpts:t,importConfig:o,importOpts:i}=this;o&&i.types&&!i.importMethod&&!_xeUtils.default.includeArrays(_xeUtils.default.keys(i._typeMaps),i.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types="+i.types.join(","),i.types.filter(e=>_xeUtils.default.includes(_xeUtils.default.keys(i._typeMaps),e)).join(",")||_xeUtils.default.keys(i._typeMaps).join(",")]),e&&t.types&&!t.exportMethod&&!_xeUtils.default.includeArrays(_xeUtils.default.keys(t._typeMaps),t.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types="+t.types.join(","),t.types.filter(e=>_xeUtils.default.includes(_xeUtils.default.keys(t._typeMaps),e)).join(",")||_xeUtils.default.keys(t._typeMaps).join(",")])}if("development"===process.env.NODE_ENV){var u=this.customOpts;if(!this.id&&this.customConfig&&(!0===u.storage||u.storage&&u.storage.resizable||u.storage&&u.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.treeConfig&&s.children&&(0,_log.warnLog)("vxe.error.delProp",["tree-config.children","tree-config.childrenField"]),this.treeConfig&&s.line&&(0,_log.warnLog)("vxe.error.delProp",["tree-config.line","tree-config.showLine"]),this.mouseOpts.area&&this.mouseOpts.selected&&(0,_log.warnLog)("vxe.error.errConflicts",["mouse-config.area","mouse-config.selected"]),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="+this.contextMenu,"table.context-menu={}"])),this.menuConfig&&!_xeUtils.default.isObject(this.menuConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.menu-config="+this.menuConfig,"table.menu-config={}"]),this.exportConfig&&!_xeUtils.default.isObject(this.exportConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.export-config="+this.exportConfig,"table.export-config={}"]),this.importConfig&&!_xeUtils.default.isObject(this.importConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.import-config="+this.importConfig,"table.import-config={}"]),this.printConfig&&!_xeUtils.default.isObject(this.printConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.print-config="+this.printConfig,"table.print-config={}"]),this.treeConfig&&!_xeUtils.default.isObject(this.treeConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.tree-config="+this.treeConfig,"table.tree-config={}"]),this.customConfig&&!_xeUtils.default.isObject(this.customConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.custom-config="+this.customConfig,"table.custom-config={}"]),this.editConfig&&!_xeUtils.default.isObject(this.editConfig)&&(0,_log.warnLog)("vxe.error.errProp",["table.edit-config="+this.editConfig,"table.edit-config={}"]),this.emptyRender&&!_xeUtils.default.isObject(this.emptyRender)&&(0,_log.warnLog)("vxe.error.errProp",["table.empty-render="+this.emptyRender,"table.empty-render={}"]),this.editConfig&&this.editOpts.activeMethod&&(0,_log.warnLog)("vxe.error.delProp",["table.edit-config.activeMethod","table.edit-config.beforeEditMethod"]),this.treeConfig&&this.checkboxOpts.isShiftKey&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config","checkbox-config.isShiftKey"]),this.checkboxOpts.halfField)&&(0,_log.warnLog)("vxe.error.delProp",["checkbox-config.halfField","checkbox-config.indeterminateField"]),"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(o,{startIndex:0,endIndex:1,visibleSize:0,adaptive:!1!==t.adaptive}),Object.assign(e,{startIndex:0,endIndex:1,visibleSize:0}),this.loadTableData(i).then(()=>{i&&i.length&&(this.inited=!0,this.initStatus=!0,this.handleLoadDefaults(),this.handleInitDefaults()),this.updateStyle()}),globalEvents.on(this,"paste",this.handleGlobalPasteEvent),globalEvents.on(this,"copy",this.handleGlobalCopyEvent),globalEvents.on(this,"cut",this.handleGlobalCutEvent),globalEvents.on(this,"mousedown",this.handleGlobalMousedownEvent),globalEvents.on(this,"blur",this.handleGlobalBlurEvent),globalEvents.on(this,"mousewheel",this.handleGlobalMousewheelEvent),globalEvents.on(this,"keydown",this.handleGlobalKeydownEvent),globalEvents.on(this,"resize",this.handleGlobalResizeEvent),globalEvents.on(this,"contextmenu",this.handleGlobalContextmenuEvent),this.preventEvent(null,"created")},mounted(){let o=this;if("development"===process.env.NODE_ENV&&(t=this.$listeners,!this.menuConfig&&(t["menu-click"]||t["cell-menu"]||t["header-cell-menu"]||t["footer-cell-menu"])&&(0,_log.warnLog)("vxe.error.reqProp",["menu-config"]),this.tooltipConfig||!t["cell-mouseenter"]&&!t["cell-mouseleave"]||(0,_log.warnLog)("vxe.error.reqProp",["tooltip-config"])),"development"===process.env.NODE_ENV){let e=_ui.VxeUI.getComponent("VxeLoading"),t=_ui.VxeUI.getComponent("VxeTooltip");this.$nextTick(()=>{o.loading&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-loading"]),!0!==o.showOverflow&&"tooltip"!==o.showOverflow&&!0!==o.showHeaderOverflow&&"tooltip"!==o.showHeaderOverflow&&!0!==o.showFooterOverflow&&"tooltip"!==o.showFooterOverflow&&!o.tooltipConfig&&!o.editRules||t||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"])})}if(this.autoResize){let e=this.resizeOpts.refreshDelay?_xeUtils.default.throttle(()=>this.recalculate(!0),this.resizeOpts.refreshDelay,{leading:!0,trailing:!0}):null;var t=globalResize.create(e?()=>{this.autoResize&&e()}:()=>{this.autoResize&&this.recalculate(!0)});t.observe(this.$el),t.observe(this.getParentElem()),this.$resize=t}this.preventEvent(null,"mounted")},activated(){this.recalculate().then(()=>this.refreshScroll()),this.preventEvent(null,"activated")},deactivated(){this.preventEvent(null,"deactivated")},beforeDestroy(){this.$resize&&this.$resize.disconnect(),this.closeFilter(),this.closeMenu(),this.preventEvent(null,"beforeDestroy")},destroyed(){globalEvents.off(this,"paste"),globalEvents.off(this,"copy"),globalEvents.off(this,"cut"),globalEvents.off(this,"mousedown"),globalEvents.off(this,"blur"),globalEvents.off(this,"mousewheel"),globalEvents.off(this,"keydown"),globalEvents.off(this,"resize"),globalEvents.off(this,"contextmenu"),this.preventEvent(null,"destroyed")},render(e){var t=_ui.VxeUI.getComponent("VxeLoading"),o=_ui.VxeUI.getComponent("VxeTooltip"),i=this,{_e:r,$scopedSlots:s,tId:l,isCalcColumn:n,tableData:a,tableColumn:u,tableGroupColumn:p,isGroup:d,loading:c,stripe:h,showHeader:g,height:f,tableBorder:m,treeOpts:x,treeConfig:b,mouseConfig:v,mouseOpts:C,computeSize:O,validOpts:_,showFooter:w,overflowX:y,overflowY:E,scrollXLoad:L,scrollYLoad:M,scrollbarHeight:R,highlightCell:P,highlightHoverRow:T,highlightHoverColumn:U,editConfig:I,validTipOpts:V,initStore:S,columnStore:k,filterStore:$,customStore:H,ctxMenuStore:D,ctxMenuOpts:Y,footerTableData:G,columnOpts:X,rowOpts:K,checkboxOpts:N,loadingOpts:q,editRules:j}=i,{leftList:k,rightList:z}=k,c=this._isLoading||c,F=i.computeVirtualScrollBars;return e("div",{class:["vxe-table","vxe-table--render-default","tid_"+l,O?"size--"+O:"","border--"+m,{["valid-msg--"+_.msgMode]:!!j,"vxe-editable":!!I,"old-cell-valid":j&&"obsolete"===getConfig().cellVaildMode,"cell--highlight":P,"cell--selected":v&&C.selected,"cell--area":v&&C.area,"row--highlight":K.isHover||T,"column--highlight":X.isHover||U,"checkbox--range":N.range,"column--calc":n,"is--header":g,"is--footer":w,"is--group":d,"is--tree-line":b&&(x.showLine||x.line),"is--fixed-left":k.length,"is--fixed-right":z.length,"is--animat":!!this.animat,"is--padding":this.padding,"is--round":this.round,"is--stripe":!b&&h,"is--loading":c,"is--empty":!c&&!a.length,"is--scroll-y":E,"is--scroll-x":y,"is--virtual-x":L,"is--virtual-y":M}],attrs:{spellcheck:!1},on:{keydown:this.keydownEvent}},[e("div",{class:"vxe-table-slots",ref:"hideColumn"},this.$slots.default),e("div",{key:"tw",class:"vxe-table--render-wrapper"},[e("div",{class:"vxe-table--main-wrapper"},[g?e(_header.default,{ref:"tableHeader",props:{tableData:a,tableColumn:u,tableGroupColumn:p,size:O}}):r(),e(_body.default,{ref:"tableBody",props:{tableData:a,tableColumn:u,size:O}}),w?e(_footer.default,{ref:"tableFooter",props:{footerTableData:G,tableColumn:u,size:O}}):r()]),e("div",{class:"vxe-table--fixed-wrapper"},[k&&k.length&&y?renderFixed(e,this,"left"):r(),z&&z.length&&y?renderFixed(e,this,"right"):r()])]),F.x?e("div",{key:"vx",ref:"refScrollXVirtualElem",class:"vxe-table--scroll-x-virtual"},[e("div",{ref:"refScrollXHandleElem",class:"vxe-table--scroll-x-handle",on:{scroll:i.scrollXEvent}},[e("div",{ref:"refScrollXSpaceElem",class:"vxe-table--scroll-x-space"})])]):renderEmptyElement(i),F.y?e("div",{key:"vy",ref:"refScrollYVirtualElem",class:"vxe-table--scroll-y-virtual"},[e("div",{ref:"refScrollYHandleElem",class:"vxe-table--scroll-y-handle",on:{scroll:i.scrollYEvent}},[e("div",{ref:"refScrollYSpaceElem",class:"vxe-table--scroll-x-space"})])]):renderEmptyElement(i),e("div",{key:"tn",ref:"emptyPlaceholder",class:"vxe-table--empty-placeholder"},[e("div",{class:"vxe-table--empty-content"},renderEmptyBody(e,this))]),e("div",{key:"tl",class:"vxe-table--border-line"}),e("div",{key:"cl",class:"vxe-table--resizable-bar",style:y?{"padding-bottom":R+"px"}:{},ref:"resizeBar"}),t?e(t,{key:"lg",class:"vxe-table--loading",props:{value:c,icon:q.icon,text:q.text}},this.callSlot(s.loading,{},e)):r(),S.custom?e(_panel.default,{key:"cs",ref:"customWrapper",props:{customStore:H}}):r(),S.filter?e(_panel2.default,{key:"tf",ref:"filterWrapper",props:{filterStore:$}}):r(),S.import&&this.importConfig?e(_importPanel.default,{key:"it",props:{defaultOptions:this.importParams,storeData:this.importStore}}):r(),S.export&&(this.exportConfig||this.printConfig)?e(_exportPanel.default,{key:"et",props:{defaultOptions:this.exportParams,storeData:this.exportStore}}):r(),D.visible&&this.isCtxMenu?e(_panel3.default,{key:"tm",ref:"ctxWrapper",props:{ctxMenuStore:D,ctxMenuOpts:Y}}):r(),e("div",{},[o?e(o,{key:"ctp",ref:"commTip",props:{isArrow:!1,enterable:!1}}):r(),o?e(o,{key:"btp",ref:"tooltip",props:Object.assign({},this.tipConfig,this.tooltipStore.currOpts)}):r(),o&&this.editRules&&_.showMessage&&("default"===_.message?!f:"tooltip"===_.message)?e(o,{key:"vtp",ref:"validTip",class:[{"old-cell-valid":j&&"obsolete"===getConfig().cellVaildMode},"vxe-table--valid-error"],props:"tooltip"===_.message||1===a.length?V:null}):r()])])},methods:_methods.default};

package/lib/table/src/util.js

@@ -21,8 +21,6 @@ exports.getRowkey = getRowkey;
 exports.handleFieldOrColumn = handleFieldOrColumn;
 exports.isColumnInfo = isColumnInfo;
 exports.mergeBodyMethod = mergeBodyMethod;
-exports.removeScrollListener = removeScrollListener;
-exports.restoreScrollListener = restoreScrollListener;
 exports.restoreScrollLocation = restoreScrollLocation;
 exports.rowToVisible = rowToVisible;
 exports.setCellValue = setCellValue;
@@ -109,16 +107,6 @@ function restoreScrollLocation(_vm, scrollLeft, scrollTop) {
 function toTreePathSeq(path) {
   return path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
 }
-function removeScrollListener(scrollElem) {
-  if (scrollElem && scrollElem._onscroll) {
-    scrollElem.onscroll = null;
-  }
-}
-function restoreScrollListener(scrollElem) {
-  if (scrollElem && scrollElem._onscroll) {
-    scrollElem.onscroll = scrollElem._onscroll;
-  }
-}
 /**
  * 生成行的唯一主键
  */
@@ -395,30 +383,75 @@ function isColumnInfo(column) {
 function createColumn($xeTable, options, renderOptions) {
   return isColumnInfo(options) ? options : new _columnInfo.ColumnInfo($xeTable, options, renderOptions);
 }
-function rowToVisible($xetable, row) {
+function rowToVisible($xeTable, row) {
+  const {
+    reactData,
+    internalData
+  } = $xeTable;
+  const tableProps = $xeTable;
+  const {
+    showOverflow
+  } = tableProps;
+  const tableBody = $xeTable.$refs.tableBody;
   const {
-    tableBody
-  } = $xetable.$refs;
+    columnStore,
+    scrollYLoad
+  } = reactData;
+  const {
+    afterFullData,
+    scrollYStore,
+    fullAllDataRowIdData
+  } = internalData;
+  const {
+    leftList,
+    rightList
+  } = columnStore;
   const bodyElem = tableBody ? tableBody.$el : null;
+  const rowid = getRowid($xeTable, row);
+  let offsetFixedLeft = 0;
+  leftList.forEach(item => {
+    offsetFixedLeft += item.renderWidth;
+  });
+  let offsetFixedRight = 0;
+  rightList.forEach(item => {
+    offsetFixedRight += item.renderWidth;
+  });
   if (bodyElem) {
-    const trElem = bodyElem.querySelector(`[rowid="${getRowid($xetable, row)}"]`);
+    const bodyHeight = bodyElem.clientHeight;
+    const bodyScrollTop = bodyElem.scrollTop;
+    const trElem = bodyElem.querySelector(`[rowid="${rowid}"]`);
     if (trElem) {
-      const bodyHeight = bodyElem.clientHeight;
-      const bodySrcollTop = bodyElem.scrollTop;
-      const trOffsetTop = trElem.offsetTop + (trElem.offsetParent ? trElem.offsetParent.offsetTop : 0);
+      const trOffsetParent = trElem.offsetParent;
+      const trOffsetTop = trElem.offsetTop + (trOffsetParent ? trOffsetParent.offsetTop : 0);
       const trHeight = trElem.clientHeight;
       // 检测行是否在可视区中
-      if (trOffsetTop < bodySrcollTop || trOffsetTop > bodySrcollTop + bodyHeight) {
-        // 向上定位
-        return $xetable.scrollTo(null, trOffsetTop);
-      } else if (trOffsetTop + trHeight >= bodyHeight + bodySrcollTop) {
-        // 向下定位
-        return $xetable.scrollTo(null, bodySrcollTop + trHeight);
+      if (trOffsetTop < bodyScrollTop || trOffsetTop > bodyScrollTop + bodyHeight) {
+        return $xeTable.scrollTo(null, trOffsetTop);
+      } else if (trOffsetTop + trHeight >= bodyHeight + bodyScrollTop) {
+        return $xeTable.scrollTo(null, bodyScrollTop + trHeight);
       }
     } else {
-      // 如果是虚拟渲染跨行滚动
-      if ($xetable.scrollYLoad) {
-        return $xetable.scrollTo(null, ($xetable.afterFullData.indexOf(row) - 1) * $xetable.scrollYStore.rowHeight);
+      // 如果是虚拟渲染滚动
+      if (scrollYLoad) {
+        if (showOverflow) {
+          return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * scrollYStore.rowHeight);
+        }
+        let scrollTop = 0;
+        const rest = fullAllDataRowIdData[rowid];
+        const rHeight = rest ? rest.height : 0;
+        for (let i = 0; i < afterFullData.length; i++) {
+          const currRow = afterFullData[i];
+          const currRowid = getRowid($xeTable, currRow);
+          if (currRow === row || currRowid === rowid) {
+            break;
+          }
+          const rest = fullAllDataRowIdData[currRowid];
+          scrollTop += rest ? rest.height : 0;
+        }
+        if (scrollTop < bodyScrollTop) {
+          return $xeTable.scrollTo(null, scrollTop - offsetFixedLeft - 1);
+        }
+        return $xeTable.scrollTo(null, scrollTop + rHeight - (bodyHeight - offsetFixedRight - 1));
       }
     }
   }
@@ -430,14 +463,15 @@ function colToVisible($xeTable, column) {
     scrollXLoad,
     visibleColumn
   } = $xeTable;
-  const {
-    tableBody
-  } = $xeTable.$refs;
+  const tableBody = $xeTable.$refs.tableBody;
   const {
     leftList,
     rightList
   } = columnStore;
   const bodyElem = tableBody ? tableBody.$el : null;
+  if (column.fixed) {
+    return Promise.resolve();
+  }
   let offsetFixedLeft = 0;
   leftList.forEach(item => {
     offsetFixedLeft += item.renderWidth;
@@ -448,15 +482,15 @@ function colToVisible($xeTable, column) {
   });
   if (bodyElem) {
     const bodyWidth = bodyElem.clientWidth;
-    const bodySrcollLeft = bodyElem.scrollLeft;
+    const bodyScrollLeft = bodyElem.scrollLeft;
     const tdElem = bodyElem.querySelector(`.${column.id}`);
     if (tdElem) {
       const tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0);
       const cellWidth = tdElem.clientWidth;
       // 检测是否在可视区中
-      if (tdOffsetLeft < bodySrcollLeft + offsetFixedLeft) {
+      if (tdOffsetLeft < bodyScrollLeft + offsetFixedLeft) {
         return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - 1);
-      } else if (tdOffsetLeft + cellWidth - bodySrcollLeft > bodyWidth - offsetFixedRight) {
+      } else if (tdOffsetLeft + cellWidth - bodyScrollLeft > bodyWidth - offsetFixedRight) {
         return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
       }
     } else {
@@ -464,13 +498,13 @@ function colToVisible($xeTable, column) {
       if (scrollXLoad) {
         let scrollLeft = 0;
         const cellWidth = column.renderWidth;
-        for (let index = 0; index < visibleColumn.length; index++) {
-          if (visibleColumn[index] === column) {
+        for (let i = 0; i < visibleColumn.length; i++) {
+          if (visibleColumn[i] === column) {
             break;
           }
-          scrollLeft += visibleColumn[index].renderWidth;
+          scrollLeft += visibleColumn[i].renderWidth;
         }
-        if (scrollLeft < bodySrcollLeft) {
+        if (scrollLeft < bodyScrollLeft) {
           return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - 1);
         }
         return $xeTable.scrollTo(scrollLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.assembleColumn=assembleColumn,exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.createColumn=createColumn,exports.destroyColumn=destroyColumn,exports.getCellValue=getCellValue,exports.getColReMinWidth=getColReMinWidth,exports.getOffsetSize=getOffsetSize,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq;var _xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../ui/src/dom"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getAllConvertColumns=(e,l)=>{let t=[];return e.forEach(e=>{e.parentId=l?l.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(t.push(e),t.push(...getAllConvertColumns(e.children,e))):t.push(e))}),t},convertHeaderColumnToRows=e=>{let l=1,r=(t,e)=>{if(e&&(t.level=e.level+1,l<t.level)&&(l=t.level),t.children&&t.children.length&&t.children.some(e=>e.visible)){let l=0;t.children.forEach(e=>{e.visible&&(r(e,t),l+=e.colSpan)}),t.colSpan=l}else t.colSpan=1},t=(e.forEach(e=>{e.level=1,r(e)}),[]);for(let e=0;e<l;e++)t.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=l-e.level+1,t[e.level-1].push(e)}),t},lineOffsetSizes=(exports.convertHeaderColumnToRows=convertHeaderColumnToRows,{mini:3,small:2,medium:1});function restoreScrollLocation(e,l,t){return e.clearScroll().then(()=>{if(l||t)return e.lastScrollLeft=0,e.lastScrollTop=0,e.scrollTo(l,t)})}function toTreePathSeq(e){return e.map((e,l)=>l%2==0?Number(e)+1:".").join("")}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function getRowkey(e){return e.rowOpts.keyField||e.rowId||"_X_ROW_KEY"}function getRowid(e,l){l=_xeUtils.default.get(l,getRowkey(e));return _xeUtils.default.eqNull(l)?"":encodeURIComponent(l)}function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElemenMarginWidth(e){var l,t;return e?(t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight),e.offsetWidth+l+t):0}function handleFieldOrColumn(e,l){return l?_xeUtils.default.isString(l)?e.getColumnByField(l):l:null}function assembleColumn(e){var{$el:l,$xetable:t,$xecolumn:r,columnConfig:o}=e,n=r?r.columnConfig:null;o.slots=e.$scopedSlots,n?("development"===process.env.NODE_ENV&&("vxe-table-column"===r.$options._componentTag?(0,_log.errLog)("vxe.error.groupTag",[`<vxe-table-colgroup title=${r.title} ...>`,`<vxe-table-column title=${r.title} ...>`]):"vxe-column"===r.$options._componentTag&&(0,_log.warnLog)("vxe.error.groupTag",[`<vxe-colgroup title=${r.title} ...>`,`<vxe-column title=${r.title} ...>`])),n.children||(n.children=[]),n.children.splice(_xeUtils.default.arrayIndexOf(r.$el.children,l),0,o)):t.staticColumns.splice(_xeUtils.default.arrayIndexOf(t.$refs.hideColumn.children,l),0,o)}function destroyColumn(e){let{$xetable:l,columnConfig:t}=e;e=_xeUtils.default.findTree(l.staticColumns,e=>e===t);e&&e.items.splice(e.index,1)}function getRootColumn(e,l){var t=e.fullColumnIdData;if(!l)return null;let r=l.parentId;for(;t[r];){let e=t[r].column;if(!(r=e.parentId))return e}return l}function queryCellElement(e,l){return e.querySelector(".vxe-cell"+l)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(({label:e,value:l,data:t,resetValue:r,checked:o})=>({label:e,value:l,data:t,resetValue:r,checked:!!o,_checked:!!o})):e}function getColReMinWidth(e){var{$table:l,column:t,cell:r}=e,{showHeaderOverflow:o,resizableOpts:n}=l,n=n.minWidth;if(n){e=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var i,u,a,{showHeaderOverflow:n,minWidth:e}=t,t=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?o:n,o="title"===t||(!0===t||"tooltip"===t)||"ellipsis"===t;let s=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(o&&(n=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),t=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),o=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),i=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-prefix-icon")),u=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-suffix-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),r=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter")),s+=n+t+o+i+u+r+a),e){n=l.$refs.tableBody,t=n?n.$el:null;if(t){if((0,_dom.isScale)(e))return o=(t.clientWidth-1)/100,Math.max(s,Math.floor(_xeUtils.default.toInteger(e)*o));if((0,_dom.isPx)(e))return Math.max(s,_xeUtils.default.toInteger(e))}}return s}function countTreeExpand(e,l){let t=1;if(e){var r=l.$table,o=r.treeOpts,n=e[o.children||o.childrenField];if(n&&r.isTreeExpandByRow(e))for(let e=0;e<n.length;e++)t+=countTreeExpand(n[e],l)}return t}function getOffsetSize(e){e=e.computeSize;return lineOffsetSizes[e]||0}function calcTreeLine(e,l,t){var r=e.$table;let o=1;return t&&(o=countTreeExpand(l[t-1],e)),r.rowHeight*o-(t?1:12-getOffsetSize(r))}function mergeBodyMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:n,rowspan:i,colspan:u}=l[e];if(-1<n&&-1<o&&i&&u){if(o===t&&n===r)return{rowspan:i,colspan:u};if(o<=t&&t<o+i&&n<=r&&r<n+u)return{rowspan:0,colspan:0}}}}function getCellValue(e,l){return _xeUtils.default.get(e,l.field)}function setCellValue(e,l,t){return _xeUtils.default.set(e,l.field,t)}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearEdit&&e.clearEdit(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function createColumn(e,l,t){return isColumnInfo(l)?l:new _columnInfo.ColumnInfo(e,l,t)}function rowToVisible(e,l){var t=e.$refs.tableBody,t=t?t.$el:null;if(t){var r=t.querySelector(`[rowid="${getRowid(e,l)}"]`);if(r){var o=t.clientHeight,t=t.scrollTop,n=r.offsetTop+(r.offsetParent?r.offsetParent.offsetTop:0),r=r.clientHeight;if(n<t||t+o<n)return e.scrollTo(null,n);if(o+t<=n+r)return e.scrollTo(null,t+r)}else if(e.scrollYLoad)return e.scrollTo(null,(e.afterFullData.indexOf(l)-1)*e.scrollYStore.rowHeight)}return Promise.resolve()}function colToVisible(e,t){var{columnStore:r,scrollXLoad:l,visibleColumn:o}=e,n=e.$refs.tableBody,{leftList:r,rightList:i}=r,n=n?n.$el:null;let u=0,a=(r.forEach(e=>{u+=e.renderWidth}),0);if(i.forEach(e=>{a+=e.renderWidth}),n){r=n.clientWidth,i=n.scrollLeft,n=n.querySelector("."+t.id);if(n){var s=n.offsetLeft+(n.offsetParent?n.offsetParent.offsetLeft:0),n=n.clientWidth;if(s<i+u)return e.scrollTo(s-u-1);if(s+n-i>r-a)return e.scrollTo(s+n-(r-a-1))}else if(l){let l=0;s=t.renderWidth;for(let e=0;e<o.length&&o[e]!==t;e++)l+=o[e].renderWidth;return l<i?e.scrollTo(l-u-1):e.scrollTo(l+s-(r-a-1))}}return Promise.resolve()}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.assembleColumn=assembleColumn,exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.createColumn=createColumn,exports.destroyColumn=destroyColumn,exports.getCellValue=getCellValue,exports.getColReMinWidth=getColReMinWidth,exports.getOffsetSize=getOffsetSize,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq;var _xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../ui/src/dom"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getAllConvertColumns=(e,l)=>{let t=[];return e.forEach(e=>{e.parentId=l?l.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(t.push(e),t.push(...getAllConvertColumns(e.children,e))):t.push(e))}),t},convertHeaderColumnToRows=e=>{let l=1,r=(t,e)=>{if(e&&(t.level=e.level+1,l<t.level)&&(l=t.level),t.children&&t.children.length&&t.children.some(e=>e.visible)){let l=0;t.children.forEach(e=>{e.visible&&(r(e,t),l+=e.colSpan)}),t.colSpan=l}else t.colSpan=1},t=(e.forEach(e=>{e.level=1,r(e)}),[]);for(let e=0;e<l;e++)t.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=l-e.level+1,t[e.level-1].push(e)}),t},lineOffsetSizes=(exports.convertHeaderColumnToRows=convertHeaderColumnToRows,{mini:3,small:2,medium:1});function restoreScrollLocation(e,l,t){return e.clearScroll().then(()=>{if(l||t)return e.lastScrollLeft=0,e.lastScrollTop=0,e.scrollTo(l,t)})}function toTreePathSeq(e){return e.map((e,l)=>l%2==0?Number(e)+1:".").join("")}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function getRowkey(e){return e.rowOpts.keyField||e.rowId||"_X_ROW_KEY"}function getRowid(e,l){l=_xeUtils.default.get(l,getRowkey(e));return _xeUtils.default.eqNull(l)?"":encodeURIComponent(l)}function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElemenMarginWidth(e){var l,t;return e?(t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight),e.offsetWidth+l+t):0}function handleFieldOrColumn(e,l){return l?_xeUtils.default.isString(l)?e.getColumnByField(l):l:null}function assembleColumn(e){var{$el:l,$xetable:t,$xecolumn:r,columnConfig:o}=e,n=r?r.columnConfig:null;o.slots=e.$scopedSlots,n?("development"===process.env.NODE_ENV&&("vxe-table-column"===r.$options._componentTag?(0,_log.errLog)("vxe.error.groupTag",[`<vxe-table-colgroup title=${r.title} ...>`,`<vxe-table-column title=${r.title} ...>`]):"vxe-column"===r.$options._componentTag&&(0,_log.warnLog)("vxe.error.groupTag",[`<vxe-colgroup title=${r.title} ...>`,`<vxe-column title=${r.title} ...>`])),n.children||(n.children=[]),n.children.splice(_xeUtils.default.arrayIndexOf(r.$el.children,l),0,o)):t.staticColumns.splice(_xeUtils.default.arrayIndexOf(t.$refs.hideColumn.children,l),0,o)}function destroyColumn(e){let{$xetable:l,columnConfig:t}=e;e=_xeUtils.default.findTree(l.staticColumns,e=>e===t);e&&e.items.splice(e.index,1)}function getRootColumn(e,l){var t=e.fullColumnIdData;if(!l)return null;let r=l.parentId;for(;t[r];){let e=t[r].column;if(!(r=e.parentId))return e}return l}function queryCellElement(e,l){return e.querySelector(".vxe-cell"+l)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(({label:e,value:l,data:t,resetValue:r,checked:o})=>({label:e,value:l,data:t,resetValue:r,checked:!!o,_checked:!!o})):e}function getColReMinWidth(e){var{$table:l,column:t,cell:r}=e,{showHeaderOverflow:o,resizableOpts:n}=l,n=n.minWidth;if(n){e=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var i,u,a,{showHeaderOverflow:n,minWidth:e}=t,t=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?o:n,o="title"===t||(!0===t||"tooltip"===t)||"ellipsis"===t;let s=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(o&&(n=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),t=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),o=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),i=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-prefix-icon")),u=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-suffix-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),r=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter")),s+=n+t+o+i+u+r+a),e){n=l.$refs.tableBody,t=n?n.$el:null;if(t){if((0,_dom.isScale)(e))return o=(t.clientWidth-1)/100,Math.max(s,Math.floor(_xeUtils.default.toInteger(e)*o));if((0,_dom.isPx)(e))return Math.max(s,_xeUtils.default.toInteger(e))}}return s}function countTreeExpand(e,l){let t=1;if(e){var r=l.$table,o=r.treeOpts,n=e[o.children||o.childrenField];if(n&&r.isTreeExpandByRow(e))for(let e=0;e<n.length;e++)t+=countTreeExpand(n[e],l)}return t}function getOffsetSize(e){e=e.computeSize;return lineOffsetSizes[e]||0}function calcTreeLine(e,l,t){var r=e.$table;let o=1;return t&&(o=countTreeExpand(l[t-1],e)),r.rowHeight*o-(t?1:12-getOffsetSize(r))}function mergeBodyMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:n,rowspan:i,colspan:u}=l[e];if(-1<n&&-1<o&&i&&u){if(o===t&&n===r)return{rowspan:i,colspan:u};if(o<=t&&t<o+i&&n<=r&&r<n+u)return{rowspan:0,colspan:0}}}}function getCellValue(e,l){return _xeUtils.default.get(e,l.field)}function setCellValue(e,l,t){return _xeUtils.default.set(e,l.field,t)}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearEdit&&e.clearEdit(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function createColumn(e,l,t){return isColumnInfo(l)?l:new _columnInfo.ColumnInfo(e,l,t)}function rowToVisible(t,r){var{reactData:e,internalData:o}=t,n=t.showOverflow,i=t.$refs.tableBody,{columnStore:e,scrollYLoad:l}=e,{afterFullData:u,scrollYStore:o,fullAllDataRowIdData:a}=o,{leftList:e,rightList:s}=e,i=i?i.$el:null,c=getRowid(t,r);let f=0,d=(e.forEach(e=>{f+=e.renderWidth}),0);if(s.forEach(e=>{d+=e.renderWidth}),i){e=i.clientHeight,s=i.scrollTop,i=i.querySelector(`[rowid="${c}"]`);if(i){var m=i.offsetParent,m=i.offsetTop+(m?m.offsetTop:0),i=i.clientHeight;if(m<s||s+e<m)return t.scrollTo(null,m);if(e+s<=m+i)return t.scrollTo(null,s+i)}else if(l){if(n)return t.scrollTo(null,(t.findRowIndexOf(u,r)-1)*o.rowHeight);let l=0;m=a[c],i=m?m.height:0;for(let e=0;e<u.length;e++){var g=u[e],h=getRowid(t,g);if(g===r||h===c)break;g=a[h];l+=g?g.height:0}return l<s?t.scrollTo(null,l-f-1):t.scrollTo(null,l+i-(e-d-1))}}return Promise.resolve()}function colToVisible(e,o){var{columnStore:n,scrollXLoad:l,visibleColumn:i}=e,u=e.$refs.tableBody,{leftList:n,rightList:a}=n,u=u?u.$el:null;if(!o.fixed){let t=0,r=(n.forEach(e=>{t+=e.renderWidth}),0);if(a.forEach(e=>{r+=e.renderWidth}),u){n=u.clientWidth,a=u.scrollLeft,u=u.querySelector("."+o.id);if(u){var s=u.offsetLeft+(u.offsetParent?u.offsetParent.offsetLeft:0),u=u.clientWidth;if(s<a+t)return e.scrollTo(s-t-1);if(s+u-a>n-r)return e.scrollTo(s+u-(n-r-1))}else if(l){let l=0;s=o.renderWidth;for(let e=0;e<i.length&&i[e]!==o;e++)l+=i[e].renderWidth;return l<a?e.scrollTo(l-t-1):e.scrollTo(l+s-(n-r-1))}}}return Promise.resolve()}

package/lib/table/style/style.css

@@ -1373,7 +1373,7 @@
   border-radius: var(--vxe-ui-border-radius);
   background-color: var(--vxe-ui-layout-background-color);
   border: 1px solid var(--vxe-ui-base-popup-border-color);
-  box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
+  box-shadow: var(--vxe-ui-base-popup-box-shadow);
   z-index: 10;
 }
 .vxe-table--filter-wrapper:not(.is--multiple) {
@@ -2045,10 +2045,10 @@
   /*单元格编辑状态*/
   /*可编辑*/
 }
-.vxe-table--render-default .vxe-table--body-wrapper > table {
+.vxe-table--render-default .vxe-table--body-wrapper {
   background-color: var(--vxe-ui-layout-background-color);
 }
-.vxe-table--render-default .vxe-table--footer-wrapper > table {
+.vxe-table--render-default .vxe-table--footer-wrapper {
   background-color: var(--vxe-ui-table-footer-background-color);
 }
 .vxe-table--render-default .vxe-table--header,
@@ -2277,6 +2277,48 @@
 .vxe-table--render-default.size--mini .vxe-cell .vxe-default-input[type=date]::-webkit-inner-spin-button {
   margin-top: 1px;
 }
+.vxe-table--render-default .vxe-table--scroll-x-virtual,
+.vxe-table--render-default .vxe-table--scroll-y-virtual {
+  position: absolute;
+  z-index: 7;
+  overflow: hidden;
+}
+.vxe-table--render-default .vxe-table--scroll-x-handle,
+.vxe-table--render-default .vxe-table--scroll-y-handle {
+  position: absolute;
+}
+.vxe-table--render-default .vxe-table--scroll-x-handle div,
+.vxe-table--render-default .vxe-table--scroll-y-handle div {
+  display: block;
+}
+.vxe-table--render-default .vxe-table--scroll-x-virtual,
+.vxe-table--render-default .vxe-table--scroll-x-handle {
+  width: 100%;
+  left: 0;
+  bottom: 0;
+}
+.vxe-table--render-default .vxe-table--scroll-x-handle {
+  overflow-y: hidden;
+  overflow-x: auto;
+  height: 18px;
+}
+.vxe-table--render-default .vxe-table--scroll-y-virtual,
+.vxe-table--render-default .vxe-table--scroll-y-handle {
+  height: 100%;
+  right: 0;
+  top: 0;
+}
+.vxe-table--render-default .vxe-table--scroll-y-handle {
+  overflow-y: auto;
+  overflow-x: hidden;
+  width: 18px;
+}
+.vxe-table--render-default .vxe-table--scroll-x-space {
+  height: 1px;
+}
+.vxe-table--render-default .vxe-table--scroll-y-space {
+  width: 1px;
+}
 .vxe-table--render-default.is--padding .vxe-cell {
   padding-left: var(--vxe-ui-table-cell-padding-left);
   padding-right: var(--vxe-ui-table-cell-padding-right);
@@ -2375,6 +2417,7 @@
   background-color: inherit;
   transition: 0.3s box-shadow;
   outline: 0;
+  background-color: var(--vxe-ui-layout-background-color);
 }
 .vxe-table--render-default .vxe-table--fixed-left-wrapper .vxe-table--body-wrapper,
 .vxe-table--render-default .vxe-table--fixed-right-wrapper .vxe-table--body-wrapper {