vxe-table 3.11.18 → 3.11.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/module/custom/panel.js +3 -0
  3. package/es/table/src/body.js +2 -1
  4. package/es/table/src/methods.js +64 -33
  5. package/es/table/src/table.js +7 -2
  6. package/es/ui/index.js +8 -1
  7. package/es/ui/src/log.js +1 -1
  8. package/lib/index.umd.js +93 -42
  9. package/lib/index.umd.min.js +1 -1
  10. package/lib/style.css +1 -1
  11. package/lib/table/module/custom/panel.js +3 -0
  12. package/lib/table/module/custom/panel.min.js +1 -1
  13. package/lib/table/src/body.js +2 -1
  14. package/lib/table/src/body.min.js +1 -1
  15. package/lib/table/src/methods.js +71 -37
  16. package/lib/table/src/methods.min.js +1 -1
  17. package/lib/table/src/table.js +7 -2
  18. package/lib/table/src/table.min.js +1 -1
  19. package/lib/ui/index.js +8 -1
  20. package/lib/ui/index.min.js +1 -1
  21. package/lib/ui/src/log.js +1 -1
  22. package/lib/ui/src/log.min.js +1 -1
  23. package/package.json +2 -2
  24. package/packages/table/module/custom/panel.ts +3 -0
  25. package/packages/table/src/body.ts +2 -1
  26. package/packages/table/src/methods.ts +74 -38
  27. package/packages/table/src/table.ts +7 -2
  28. package/packages/ui/index.ts +7 -0
  29. /package/es/{iconfont.1733356525791.ttf → iconfont.1733469864818.ttf} +0 -0
  30. /package/es/{iconfont.1733356525791.woff → iconfont.1733469864818.woff} +0 -0
  31. /package/es/{iconfont.1733356525791.woff2 → iconfont.1733469864818.woff2} +0 -0
  32. /package/lib/{iconfont.1733356525791.ttf → iconfont.1733469864818.ttf} +0 -0
  33. /package/lib/{iconfont.1733356525791.woff → iconfont.1733469864818.woff} +0 -0
  34. /package/lib/{iconfont.1733356525791.woff2 → iconfont.1733469864818.woff2} +0 -0
@@ -1 +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,renderEmptyElement}=_ui.VxeUI;function renderFixed(e,t,o){var{_e:t,tableData:r,tableColumn:i,tableGroupColumn:l,vSize:s,showHeader:n,showFooter:a,columnStore:p,footerTableData:u}=t,p=p[o+"List"];return e("div",{class:`vxe-table--fixed-${o}-wrapper`,ref:o+"Container"},[n?e(_header.default,{props:{fixedType:o,tableData:r,tableColumn:i,tableGroupColumn:l,size:s,fixedColumn:p},ref:o+"Header"}):t(),e(_body.default,{props:{fixedType:o,tableData:r,tableColumn:i,fixedColumn:p,size:s},ref:o+"Body"}),a?e(_footer.default,{props:{footerTableData:u,tableColumn:i,fixedColumn:p,fixedType:o,size:s},ref:o+"Footer"}):t()])}function renderEmptyBody(e,t){var{$scopedSlots:o,emptyOpts:r}=t;let i="";var l={$table:t};return i=o.empty?o.empty.call(t,l,e):(o=(o=r.name?renderer.get(r.name):null)?o.renderTableEmpty||o.renderTableEmptyView||o.renderEmpty:null)?(0,_vn.getSlotVNs)(o.call(t,e,r,l)):(0,_utils.getFuncText)(t.emptyText)||getI18n("vxe.table.emptyText")}let renderDragTipContents=(e,t)=>{var o=t.dragConfig,{dragRow:r,dragCol:i,dragTipText:l}=t,s=t.computeColumnDragOpts,o=(t.computeRowDragOpts.slots||{}).tip||(o&&o.slots?o.slots.rowTip:null),s=(s.slots||{}).tip;return r&&o?t.callSlot(o,{row:r},e):i&&s?t.callSlot(s,{column:i},e):[e("span",l)]},renderDragTip=(e,t)=>t.computeRowOpts.drag||t.computeColumnOpts.drag?e("div",{class:"vxe-table--drag-wrapper"},[e("div",{ref:"refDragRowLineElem",class:"vxe-table--drag-row-line"}),e("div",{ref:"refDragColLineElem",class:"vxe-table--drag-col-line"}),e("div",{ref:"refDragTipElem",class:"vxe-table--drag-sort-tip"},renderDragTipContents(e,t))]):renderEmptyElement(t);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},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},scrollVMLoading:!1,isDragRowMove:!1,dragRow:null,isDragColMove:!1,dragCol:null,dragTipText:"",_isResize:!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)},computeScrollXThreshold(){var e=this.computeSXOpts.threshold;return e?_xeUtils.default.toNumber(e):0},sYOpts(){return this.computeSYOpts},computeSYOpts(){return Object.assign({},getConfig().table.scrollY,this.scrollY)},computeScrollYThreshold(){var e=this.computeSYOpts.threshold;return e?_xeUtils.default.toNumber(e):0},rowHeightMaps(){return{default:48,medium:44,small:40,mini:36}},columnOpts(){return this.computeColumnOpts},computeColumnOpts(){return Object.assign({},getConfig().table.columnConfig,this.columnConfig)},computeCellOpts(){return Object.assign({},getConfig().table.cellConfig,this.cellConfig)},rowOpts(){return this.computeRowOpts},computeRowOpts(){return Object.assign({},getConfig().table.rowConfig,this.rowConfig)},computeRowDragOpts(){return Object.assign({},getConfig().table.rowDragConfig,this.rowDragConfig)},computeColumnDragOpts(){return Object.assign({},getConfig().table.columnDragConfig,this.columnDragConfig)},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:r,checkMethod:i}=o;return!!r&&(!t.length&&!e.length||!!i&&e.every(e=>!i({row:e})))},computeVirtualScrollBars(){var{overflowX:e,scrollXLoad:t,overflowY:o,scrollYLoad:r}=this;return{x:e&&t,y:o&&r}},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:r,editOpts:i,treeOpts:l,treeConfig:s,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&&i.showStatus&&!this.keepSource&&(0,_log.warnLog)("vxe.error.reqProp",["keep-source"]),!s||!l.showLine&&!l.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"]),s&&!l.transform&&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:r}=this;o&&r.types&&!r.importMethod&&!_xeUtils.default.includeArrays(_xeUtils.default.keys(r._typeMaps),r.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types="+r.types.join(","),r.types.filter(e=>_xeUtils.default.includes(_xeUtils.default.keys(r._typeMaps),e)).join(",")||_xeUtils.default.keys(r._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 p=this.customOpts;if(!this.id&&this.customConfig&&(!0===p.storage||p.storage&&p.storage.resizable||p.storage&&p.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.handleMousedownCellAreaEvent&&(this.areaConfig&&(0,_log.warnLog)("vxe.error.notProp",["area-config"]),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.dragConfig&&(0,_log.warnLog)("vxe.error.delProp",["drag-config","row-drag-config"]),this.treeConfig&&l.children&&(0,_log.warnLog)("vxe.error.delProp",["tree-config.children","tree-config.childrenField"]),this.treeConfig&&l.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.mouseOpts.area&&this.treeConfig&&!l.transform&&(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(r).then(()=>{r&&r.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||this.$scopedSlots.loading||(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");let r=this,i=r.$xeGrid;var{_e:l,$scopedSlots:s,tId:n,isCalcColumn:a,tableData:p,tableColumn:u,tableGroupColumn:g,isGroup:d,loading:c,stripe:h,showHeader:f,height:m,tableBorder:x,treeOpts:b,treeConfig:v,mouseConfig:C,mouseOpts:O,areaOpts:_,computeSize:w,validOpts:y,showFooter:E,overflowX:L,overflowY:M,scrollXLoad:F,scrollYLoad:P,scrollbarHeight:U,highlightCell:$,highlightHoverRow:I,highlightHoverColumn:V,editConfig:H,validTipOpts:Y,initStore:D,columnStore:R,filterStore:X,customStore:G,ctxMenuStore:S,ctxMenuOpts:N,footerTableData:K,columnOpts:A,rowOpts:B,checkboxOpts:W,loadingOpts:k,resizableOpts:Z,editRules:q}=r,{leftList:R,rightList:T}=R;let z=s.loading,j=this._isLoading||c;s=w,c=r.computeVirtualScrollBars,w=C&&O.area;return e("div",{ref:"refElem",class:["vxe-table","vxe-table--render-default","tid_"+n,s?"size--"+s:"","border--"+x,{["valid-msg--"+y.msgMode]:!!q,"vxe-editable":!!H,"old-cell-valid":q&&"obsolete"===getConfig().cellVaildMode,"cell--highlight":$,"cell--selected":C&&O.selected,"cell--area":w,"header-cell--area":w&&_.selectCellByHeader,"body-cell--area":w&&_.selectCellByBody,"row--highlight":B.isHover||I,"column--highlight":A.isHover||V,"checkbox--range":W.range,"column--calc":a,"is--header":f,"is--footer":E,"is--group":d,"is--tree-line":v&&(b.showLine||b.line),"is--fixed-left":R.length,"is--fixed-right":T.length,"is--animat":!!this.animat,"is--padding":this.padding,"is--round":this.round,"is--stripe":!v&&h,"is--loading":j,"is--empty":!j&&!p.length,"is--scroll-y":M,"is--scroll-x":L,"is--virtual-x":F,"is--virtual-y":P}],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"},[f?e(_header.default,{ref:"tableHeader",props:{tableData:p,tableColumn:u,tableGroupColumn:g,size:s}}):l(),e(_body.default,{ref:"tableBody",props:{tableData:p,tableColumn:u,size:s}}),E?e(_footer.default,{ref:"tableFooter",props:{footerTableData:K,tableColumn:u,size:s}}):l()]),e("div",{class:"vxe-table--fixed-wrapper"},[R&&R.length&&L?renderFixed(e,this,"left"):l(),T&&T.length&&L?renderFixed(e,this,"right"):l()])]),c.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:r.scrollXEvent}},[e("div",{ref:"refScrollXSpaceElem",class:"vxe-table--scroll-x-space"})])]):renderEmptyElement(r),c.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:r.scrollYEvent}},[e("div",{ref:"refScrollYSpaceElem",class:"vxe-table--scroll-y-space"})])]):renderEmptyElement(r),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:L?{"padding-bottom":U+"px"}:{},ref:"resizeBar"},Z.showDragTip?[e("div",{ref:"refCellResizeTip",class:"vxe-table--resizable-number-tip"},"23432px")]:[]),t?e(t,{key:"lg",class:"vxe-table--loading",props:{value:j,icon:k.icon,text:k.text},scopedSlots:z?{default:()=>r.callSlot(z,{$table:r,$grid:i,loading:j},e)}:{}}):z?e("div",{class:["vxe-loading--custom-wrapper",{"is--visible":j}]},r.callSlot(z,{$table:r,$grid:i,loading:j},e)):renderEmptyElement(r),D.custom?e(_panel.default,{key:"cs",ref:"customWrapper",props:{customStore:G}}):renderEmptyElement(r),D.filter?e(_panel2.default,{key:"tf",ref:"filterWrapper",props:{filterStore:X}}):l(),D.import&&this.importConfig?e(_importPanel.default,{key:"it",props:{defaultOptions:this.importParams,storeData:this.importStore}}):l(),D.export&&(this.exportConfig||this.printConfig)?e(_exportPanel.default,{key:"et",props:{defaultOptions:this.exportParams,storeData:this.exportStore}}):l(),S.visible&&this.isCtxMenu?e(_panel3.default,{key:"tm",ref:"ctxWrapper",props:{ctxMenuStore:S,ctxMenuOpts:N}}):l(),renderDragTip(e,this),e("div",{},[o?e(o,{key:"ctp",ref:"commTip",props:{isArrow:!1,enterable:!1}}):l(),o?e(o,{key:"btp",ref:"tooltip",props:Object.assign({},this.tipConfig,this.tooltipStore.currOpts)}):l(),o&&this.editRules&&y.showMessage&&("default"===y.message?!m:"tooltip"===y.message)?e(o,{key:"vtp",ref:"validTip",class:[{"old-cell-valid":q&&"obsolete"===getConfig().cellVaildMode},"vxe-table--valid-error"],props:"tooltip"===y.message||1===p.length?Y:null}):l()])])},methods:_methods.default};
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,renderEmptyElement}=_ui.VxeUI;function renderFixed(e,t,o){var{_e:t,tableData:r,tableColumn:i,tableGroupColumn:l,vSize:s,showHeader:n,showFooter:a,columnStore:p,footerTableData:u}=t,p=p[o+"List"];return e("div",{class:`vxe-table--fixed-${o}-wrapper`,ref:o+"Container"},[n?e(_header.default,{props:{fixedType:o,tableData:r,tableColumn:i,tableGroupColumn:l,size:s,fixedColumn:p},ref:o+"Header"}):t(),e(_body.default,{props:{fixedType:o,tableData:r,tableColumn:i,fixedColumn:p,size:s},ref:o+"Body"}),a?e(_footer.default,{props:{footerTableData:u,tableColumn:i,fixedColumn:p,fixedType:o,size:s},ref:o+"Footer"}):t()])}function renderEmptyBody(e,t){var{$scopedSlots:o,emptyOpts:r}=t;let i="";var l={$table:t};return i=o.empty?o.empty.call(t,l,e):(o=(o=r.name?renderer.get(r.name):null)?o.renderTableEmpty||o.renderTableEmptyView||o.renderEmpty:null)?(0,_vn.getSlotVNs)(o.call(t,e,r,l)):(0,_utils.getFuncText)(t.emptyText)||getI18n("vxe.table.emptyText")}let renderDragTipContents=(e,t)=>{var o=t.dragConfig,{dragRow:r,dragCol:i,dragTipText:l}=t,s=t.computeColumnDragOpts,o=(t.computeRowDragOpts.slots||{}).tip||(o&&o.slots?o.slots.rowTip:null),s=(s.slots||{}).tip;return r&&o?t.callSlot(o,{row:r},e):i&&s?t.callSlot(s,{column:i},e):[e("span",l)]},renderDragTip=(e,t)=>t.computeRowOpts.drag||t.computeColumnOpts.drag?e("div",{class:"vxe-table--drag-wrapper"},[e("div",{ref:"refDragRowLineElem",class:"vxe-table--drag-row-line"}),e("div",{ref:"refDragColLineElem",class:"vxe-table--drag-col-line"}),e("div",{ref:"refDragTipElem",class:"vxe-table--drag-sort-tip"},renderDragTipContents(e,t))]):renderEmptyElement(t);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},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},scrollVMLoading:!1,isDragRowMove:!1,dragRow:null,isDragColMove:!1,dragCol:null,dragTipText:"",_isResize:!1,_isLoading:!1}},computed:Object.assign(Object.assign({},{}),{tableId(){return this.computeTableId},computeTableId(){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)},computeScrollXThreshold(){var e=this.computeSXOpts.threshold;return e?_xeUtils.default.toNumber(e):0},sYOpts(){return this.computeSYOpts},computeSYOpts(){return Object.assign({},getConfig().table.scrollY,this.scrollY)},computeScrollYThreshold(){var e=this.computeSYOpts.threshold;return e?_xeUtils.default.toNumber(e):0},rowHeightMaps(){return{default:48,medium:44,small:40,mini:36}},columnOpts(){return this.computeColumnOpts},computeColumnOpts(){return Object.assign({},getConfig().table.columnConfig,this.columnConfig)},computeCellOpts(){return Object.assign({},getConfig().table.cellConfig,this.cellConfig)},rowOpts(){return this.computeRowOpts},computeRowOpts(){return Object.assign({},getConfig().table.rowConfig,this.rowConfig)},computeRowDragOpts(){return Object.assign({},getConfig().table.rowDragConfig,this.rowDragConfig)},computeColumnDragOpts(){return Object.assign({},getConfig().table.columnDragConfig,this.columnDragConfig)},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:r,checkMethod:i}=o;return!!r&&(!t.length&&!e.length||!!i&&e.every(e=>!i({row:e})))},computeVirtualScrollBars(){var{overflowX:e,scrollXLoad:t,overflowY:o,scrollYLoad:r}=this;return{x:e&&t,y:o&&r}},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:r,editOpts:i,treeOpts:l,treeConfig:s,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&&i.showStatus&&!this.keepSource&&(0,_log.warnLog)("vxe.error.reqProp",["keep-source"]),!s||!l.showLine&&!l.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"]),s&&!l.transform&&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:r}=this;o&&r.types&&!r.importMethod&&!_xeUtils.default.includeArrays(_xeUtils.default.keys(r._typeMaps),r.types)&&(0,_log.warnLog)("vxe.error.errProp",["export-config.types="+r.types.join(","),r.types.filter(e=>_xeUtils.default.includes(_xeUtils.default.keys(r._typeMaps),e)).join(",")||_xeUtils.default.keys(r._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 p=this.customOpts;if(this.id||(this.customConfig?(0,_utils.isEnableConf)(p):p.enabled)&&p.storage&&(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.handleMousedownCellAreaEvent&&(this.areaConfig&&(0,_log.warnLog)("vxe.error.notProp",["area-config"]),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.dragConfig&&(0,_log.warnLog)("vxe.error.delProp",["drag-config","row-drag-config"]),this.treeConfig&&l.children&&(0,_log.warnLog)("vxe.error.delProp",["tree-config.children","tree-config.childrenField"]),this.treeConfig&&l.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.mouseOpts.area&&this.treeConfig&&!l.transform&&(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(r).then(()=>{r&&r.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||this.$scopedSlots.loading||(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");let r=this,i=r.$xeGrid;var{_e:l,$scopedSlots:s,tId:n,isCalcColumn:a,tableData:p,tableColumn:u,tableGroupColumn:d,isGroup:g,loading:c,stripe:h,showHeader:f,height:m,tableBorder:x,treeOpts:b,treeConfig:v,mouseConfig:C,mouseOpts:O,areaOpts:_,computeSize:w,validOpts:y,showFooter:E,overflowX:L,overflowY:M,scrollXLoad:F,scrollYLoad:P,scrollbarHeight:I,highlightCell:U,highlightHoverRow:$,highlightHoverColumn:V,editConfig:H,validTipOpts:Y,initStore:D,columnStore:R,filterStore:X,customStore:G,ctxMenuStore:S,ctxMenuOpts:N,footerTableData:K,columnOpts:A,rowOpts:B,checkboxOpts:W,loadingOpts:k,resizableOpts:Z,editRules:T}=r,{leftList:R,rightList:q}=R;let j=s.loading,z=this._isLoading||c;s=w,c=r.computeVirtualScrollBars,w=C&&O.area;return e("div",{ref:"refElem",class:["vxe-table","vxe-table--render-default","tid_"+n,s?"size--"+s:"","border--"+x,{["valid-msg--"+y.msgMode]:!!T,"vxe-editable":!!H,"old-cell-valid":T&&"obsolete"===getConfig().cellVaildMode,"cell--highlight":U,"cell--selected":C&&O.selected,"cell--area":w,"header-cell--area":w&&_.selectCellByHeader,"body-cell--area":w&&_.selectCellByBody,"row--highlight":B.isHover||$,"column--highlight":A.isHover||V,"checkbox--range":W.range,"column--calc":a,"is--header":f,"is--footer":E,"is--group":g,"is--tree-line":v&&(b.showLine||b.line),"is--fixed-left":R.length,"is--fixed-right":q.length,"is--animat":!!this.animat,"is--padding":this.padding,"is--round":this.round,"is--stripe":!v&&h,"is--loading":z,"is--empty":!z&&!p.length,"is--scroll-y":M,"is--scroll-x":L,"is--virtual-x":F,"is--virtual-y":P}],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"},[f?e(_header.default,{ref:"tableHeader",props:{tableData:p,tableColumn:u,tableGroupColumn:d,size:s}}):l(),e(_body.default,{ref:"tableBody",props:{tableData:p,tableColumn:u,size:s}}),E?e(_footer.default,{ref:"tableFooter",props:{footerTableData:K,tableColumn:u,size:s}}):l()]),e("div",{class:"vxe-table--fixed-wrapper"},[R&&R.length&&L?renderFixed(e,this,"left"):l(),q&&q.length&&L?renderFixed(e,this,"right"):l()])]),c.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:r.scrollXEvent}},[e("div",{ref:"refScrollXSpaceElem",class:"vxe-table--scroll-x-space"})])]):renderEmptyElement(r),c.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:r.scrollYEvent}},[e("div",{ref:"refScrollYSpaceElem",class:"vxe-table--scroll-y-space"})])]):renderEmptyElement(r),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:L?{"padding-bottom":I+"px"}:{},ref:"resizeBar"},Z.showDragTip?[e("div",{ref:"refCellResizeTip",class:"vxe-table--resizable-number-tip"},"23432px")]:[]),t?e(t,{key:"lg",class:"vxe-table--loading",props:{value:z,icon:k.icon,text:k.text},scopedSlots:j?{default:()=>r.callSlot(j,{$table:r,$grid:i,loading:z},e)}:{}}):j?e("div",{class:["vxe-loading--custom-wrapper",{"is--visible":z}]},r.callSlot(j,{$table:r,$grid:i,loading:z},e)):renderEmptyElement(r),D.custom?e(_panel.default,{key:"cs",ref:"customWrapper",props:{customStore:G}}):renderEmptyElement(r),D.filter?e(_panel2.default,{key:"tf",ref:"filterWrapper",props:{filterStore:X}}):l(),D.import&&this.importConfig?e(_importPanel.default,{key:"it",props:{defaultOptions:this.importParams,storeData:this.importStore}}):l(),D.export&&(this.exportConfig||this.printConfig)?e(_exportPanel.default,{key:"et",props:{defaultOptions:this.exportParams,storeData:this.exportStore}}):l(),S.visible&&this.isCtxMenu?e(_panel3.default,{key:"tm",ref:"ctxWrapper",props:{ctxMenuStore:S,ctxMenuOpts:N}}):l(),renderDragTip(e,this),e("div",{},[o?e(o,{key:"ctp",ref:"commTip",props:{isArrow:!1,enterable:!1}}):l(),o?e(o,{key:"btp",ref:"tooltip",props:Object.assign({},this.tipConfig,this.tooltipStore.currOpts)}):l(),o&&this.editRules&&y.showMessage&&("default"===y.message?!m:"tooltip"===y.message)?e(o,{key:"vtp",ref:"validTip",class:[{"old-cell-valid":T&&"obsolete"===getConfig().cellVaildMode},"vxe-table--valid-error"],props:"tooltip"===y.message||1===p.length?Y:null}):l()])])},methods:_methods.default};
package/lib/ui/index.js CHANGED
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
13
13
  exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
14
14
  var _core = require("@vxe-ui/core");
15
15
  var _utils = require("./src/utils");
16
- const version = exports.version = "3.11.18";
16
+ const version = exports.version = "3.11.21";
17
17
  _core.VxeUI.version = version;
18
18
  _core.VxeUI.tableVersion = version;
19
19
  _core.VxeUI.setConfig({
@@ -82,6 +82,7 @@ _core.VxeUI.setConfig({
82
82
  // visibleMethod () {}
83
83
  // },
84
84
  customConfig: {
85
+ // enabled: false,
85
86
  allowVisible: true,
86
87
  allowResizable: true,
87
88
  allowFixed: true,
@@ -96,6 +97,12 @@ _core.VxeUI.setConfig({
96
97
  lockView: true,
97
98
  resize: true,
98
99
  escClosable: true
100
+ },
101
+ drawerOptions: {
102
+ mask: true,
103
+ lockView: true,
104
+ escClosable: true,
105
+ resize: true
99
106
  }
100
107
  },
101
108
  sortConfig: {
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.11.18",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0},columnDragConfig:{showIcon:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.11.21",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0},columnDragConfig:{showIcon:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
package/lib/ui/src/log.js CHANGED
@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
8
8
  const {
9
9
  log
10
10
  } = _core.VxeUI;
11
- const version = `table v${"3.11.18"}`;
11
+ const version = `table v${"3.11.21"}`;
12
12
  const warnLog = exports.warnLog = log.create('warn', version);
13
13
  const errLog = exports.errLog = log.create('error', version);
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.11.18",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.11.21",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "3.11.18",
3
+ "version": "3.11.21",
4
4
  "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、拖拽排序,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
28
28
  "style": "lib/style.css",
29
29
  "typings": "types/index.d.ts",
30
30
  "dependencies": {
31
- "vxe-pc-ui": "^3.3.18"
31
+ "vxe-pc-ui": "^3.3.22"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@babel/plugin-transform-modules-commonjs": "^7.25.7",
@@ -691,7 +691,9 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
691
691
  title: drawerOpts.title || getI18n('vxe.custom.cstmTitle'),
692
692
  width: drawerOpts.width || Math.min(880, Math.floor(document.documentElement.clientWidth * 0.6)),
693
693
  position: drawerOpts.position,
694
+ resize: !!drawerOpts.resize,
694
695
  escClosable: !!drawerOpts.escClosable,
696
+ maskClosable: !!drawerOpts.maskClosable,
695
697
  destroyOnClose: true,
696
698
  showFooter: true
697
699
  },
@@ -722,6 +724,7 @@ const renderPopupPanel = (h: CreateElement, _vm: any) => {
722
724
  lockView: modalOpts.lockView,
723
725
  resize: modalOpts.resize,
724
726
  escClosable: !!modalOpts.escClosable,
727
+ maskClosable: !!modalOpts.maskClosable,
725
728
  destroyOnClose: true,
726
729
  showFooter: true
727
730
  },
@@ -113,7 +113,8 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
113
113
  const showEllipsis = cellOverflow === 'ellipsis'
114
114
  const showTitle = cellOverflow === 'title'
115
115
  const showTooltip = cellOverflow === true || cellOverflow === 'tooltip'
116
- const hasEllipsis = showTitle || showTooltip || showEllipsis
116
+ // 如果表格加上 showOverflow 则不再支持列单独设置
117
+ const hasEllipsis = allColumnOverflow || showTitle || showTooltip || showEllipsis
117
118
  let isDirty: any
118
119
  const tdOns: any = {}
119
120
  const rest = fullAllDataRowIdData[rowid]
@@ -666,8 +666,11 @@ const Methods = {
666
666
  * @param {Array} datas 数据
667
667
  */
668
668
  loadTableData (datas: any) {
669
+ const $xeTable = this
670
+
669
671
  const { keepSource, showOverflow, treeConfig, treeOpts, editStore, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop, scrollYLoad: oldScrollYLoad, sXOpts, sYOpts } = this
670
672
  const childrenField = treeOpts.children || treeOpts.childrenField
673
+ const rowOpts = $xeTable.computeRowOpts
671
674
  let treeData = []
672
675
  let fullData = datas ? datas.slice(0) : []
673
676
  if (treeConfig) {
@@ -729,9 +732,11 @@ const Methods = {
729
732
  }
730
733
  if (sYLoad) {
731
734
  if (showOverflow) {
732
- const errColumn = this.tableFullColumn.find((column: any) => column.showOverflow === false)
733
- if (errColumn) {
734
- errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
735
+ if (!rowOpts.height) {
736
+ const errColumn = this.tableFullColumn.find((column: any) => column.showOverflow === false)
737
+ if (errColumn) {
738
+ errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
739
+ }
735
740
  }
736
741
  }
737
742
 
@@ -2257,7 +2262,7 @@ const Methods = {
2257
2262
  const isCustomVisible = isAllCustom || storageOpts.visible
2258
2263
  const isCustomFixed = isAllCustom || storageOpts.fixed
2259
2264
  const isCustomSort = isAllCustom || storageOpts.sort
2260
- if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
2265
+ if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
2261
2266
  if (!tableId) {
2262
2267
  errLog('vxe.error.reqProp', ['id'])
2263
2268
  return
@@ -2354,7 +2359,12 @@ const Methods = {
2354
2359
  return storeData
2355
2360
  },
2356
2361
  saveCustomStore (type: any) {
2357
- const { tableId, customOpts } = this
2362
+ const $xeTable = this
2363
+ const props = $xeTable
2364
+
2365
+ const { customConfig } = props
2366
+ const tableId = $xeTable.computeTableId
2367
+ const customOpts = $xeTable.computeCustomOpts
2358
2368
  const { updateStore, storage } = customOpts
2359
2369
  const isAllCustom = storage === true
2360
2370
  const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {})
@@ -2362,7 +2372,7 @@ const Methods = {
2362
2372
  const isCustomVisible = isAllCustom || storageOpts.visible
2363
2373
  const isCustomFixed = isAllCustom || storageOpts.fixed
2364
2374
  const isCustomSort = isAllCustom || storageOpts.sort
2365
- if (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort) {
2375
+ if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
2366
2376
  if (!tableId) {
2367
2377
  errLog('vxe.error.reqProp', ['id'])
2368
2378
  return this.$nextTick()
@@ -2415,6 +2425,12 @@ const Methods = {
2415
2425
  * 将固定的列左边、右边分别靠边
2416
2426
  */
2417
2427
  parseColumns () {
2428
+ const $xeTable = this
2429
+ const props = $xeTable
2430
+ const internalData = $xeTable
2431
+
2432
+ const { showOverflow } = props
2433
+ const rowOpts = $xeTable.computeRowOpts
2418
2434
  const leftList: any[] = []
2419
2435
  const centerList: any[] = []
2420
2436
  const rightList: any[] = []
@@ -2477,6 +2493,14 @@ const Methods = {
2477
2493
  this.hasFixedColumn = leftList.length > 0 || rightList.length > 0
2478
2494
  Object.assign(columnStore, { leftList, centerList, rightList })
2479
2495
  if (scrollXLoad) {
2496
+ if (showOverflow) {
2497
+ if (!rowOpts.height) {
2498
+ const errColumn = internalData.tableFullColumn.find((column: any) => column.showOverflow === false)
2499
+ if (errColumn) {
2500
+ errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
2501
+ }
2502
+ }
2503
+ }
2480
2504
  if (process.env.VUE_APP_VXE_ENV === 'development') {
2481
2505
  // if (this.showHeader && !this.showHeaderOverflow) {
2482
2506
  // warnLog('vxe.error.reqProp', ['show-header-overflow'])
@@ -2619,11 +2643,7 @@ const Methods = {
2619
2643
  calcCellWidth () {
2620
2644
  const $xeTable = this
2621
2645
 
2622
- const { autoWidthColumnList, tableData } = this
2623
- if (!tableData.length || !autoWidthColumnList.length) {
2624
- this.isCalcColumn = false
2625
- return this.$nextTick()
2626
- }
2646
+ const { autoWidthColumnList } = this
2627
2647
  this.isCalcColumn = true
2628
2648
  return this.$nextTick().then(() => {
2629
2649
  const internalData = $xeTable
@@ -3173,7 +3193,7 @@ const Methods = {
3173
3193
 
3174
3194
  const { tableBody, leftContainer, rightContainer } = $xeTable.$refs
3175
3195
  const bodyElem = tableBody ? tableBody.$el : null
3176
- const xHandleEl = $xeTable.$refs.refScrollXHandleElem
3196
+ const xHandleEl = $xeTable.$refs.refScrollXHandleElem as HTMLDivElement
3177
3197
  const bodtTargetEl = xHandleEl || bodyElem
3178
3198
  if (bodtTargetEl) {
3179
3199
  if (leftContainer) {
@@ -3475,27 +3495,29 @@ const Methods = {
3475
3495
  } else {
3476
3496
  // 如果是激活状态,退则出到上一行/下一行
3477
3497
  if (selected.row || actived.row) {
3478
- const targetArgs = selected.row ? selected.args : actived.args
3498
+ const activeParams = selected.row ? selected.args : actived.args
3479
3499
  if (hasShiftKey) {
3480
3500
  if (keyboardOpts.enterToTab) {
3481
- this.moveTabSelected(targetArgs, hasShiftKey, evnt)
3501
+ this.moveTabSelected(activeParams, hasShiftKey, evnt)
3482
3502
  } else {
3483
- this.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt)
3503
+ this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt)
3484
3504
  }
3485
3505
  } else {
3486
3506
  if (keyboardOpts.enterToTab) {
3487
- this.moveTabSelected(targetArgs, hasShiftKey, evnt)
3507
+ this.moveTabSelected(activeParams, hasShiftKey, evnt)
3488
3508
  } else {
3489
- const _rowIndex = $xeTable.getVTRowIndex(selected.row)
3509
+ const activeRow = selected.row || actived.row
3510
+ const activeColumn = selected.column || actived.column
3511
+ const _rowIndex = $xeTable.getVTRowIndex(activeRow)
3490
3512
  const etrParams = {
3491
- row: selected.row,
3492
- rowIndex: $xeTable.getRowIndex(selected.row),
3493
- $rowIndex: $xeTable.getVMRowIndex(selected.row),
3513
+ row: activeRow,
3514
+ rowIndex: $xeTable.getRowIndex(activeRow),
3515
+ $rowIndex: $xeTable.getVMRowIndex(activeRow),
3494
3516
  _rowIndex,
3495
- column: selected.column,
3496
- columnIndex: $xeTable.getColumnIndex(selected.column),
3497
- $columnIndex: $xeTable.getVMColumnIndex(selected.column),
3498
- _columnIndex: $xeTable.getVTColumnIndex(selected.column),
3517
+ column: activeColumn,
3518
+ columnIndex: $xeTable.getColumnIndex(activeColumn),
3519
+ $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
3520
+ _columnIndex: $xeTable.getVTColumnIndex(activeColumn),
3499
3521
  $table: $xeTable
3500
3522
  }
3501
3523
  if (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
@@ -3504,13 +3526,13 @@ const Methods = {
3504
3526
  if (_rowIndex >= afterFullData.length - 1) {
3505
3527
  $xeTable.insertAt({}, -1).then(({ row: newRow }: any) => {
3506
3528
  $xeTable.scrollToRow(newRow, selected.column)
3507
- $xeTable.setSelectCell(newRow, selected.column)
3529
+ $xeTable.handleSelected({ ...activeParams, row: newRow }, evnt)
3508
3530
  })
3509
3531
  $xeTable.dispatchEvent('enter-append-row', etrParams, evnt)
3510
3532
  return
3511
3533
  }
3512
3534
  }
3513
- this.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt)
3535
+ this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt)
3514
3536
  if (enterMethod) {
3515
3537
  enterMethod(etrParams)
3516
3538
  }
@@ -6190,7 +6212,8 @@ const Methods = {
6190
6212
  }
6191
6213
  $xeTable.checkScrolling()
6192
6214
  internalData.lastScrollLeft = scrollLeft
6193
- } else {
6215
+ }
6216
+ if (isRollY) {
6194
6217
  const yThreshold = $xeTable.computeScrollYThreshold
6195
6218
  isTop = scrollTop <= 0
6196
6219
  if (!isTop) {
@@ -6312,7 +6335,7 @@ const Methods = {
6312
6335
  const $xeTable = this
6313
6336
  const internalData = $xeTable
6314
6337
 
6315
- const { inFooterScroll, inBodyScroll } = internalData
6338
+ const { inFooterScroll, inBodyScroll, lastScrollTop } = internalData
6316
6339
  if (inFooterScroll) {
6317
6340
  return
6318
6341
  }
@@ -6325,10 +6348,17 @@ const Methods = {
6325
6348
  const bodyElem = tableBody.$el as HTMLDivElement
6326
6349
  const headerElem = tableHeader ? tableHeader.$el as HTMLDivElement : null
6327
6350
  const footerElem = tableFooter ? tableFooter.$el as HTMLDivElement : null
6351
+ const yHandleEl = $xeTable.$refs.refScrollYHandleElem as HTMLDivElement
6328
6352
  const wrapperEl = evnt.currentTarget as HTMLDivElement
6329
- const { scrollTop, scrollLeft } = wrapperEl
6353
+ const { scrollLeft } = wrapperEl
6354
+ const yBodyEl = yHandleEl || bodyElem
6355
+ let scrollTop = 0
6356
+ if (yBodyEl) {
6357
+ scrollTop = yBodyEl.scrollTop
6358
+ }
6330
6359
  const isRollX = true
6331
- const isRollY = false
6360
+ const isRollY = scrollTop !== lastScrollTop
6361
+
6332
6362
  internalData.inVirtualScroll = true
6333
6363
  setScrollLeft(bodyElem, scrollLeft)
6334
6364
  setScrollLeft(headerElem, scrollLeft)
@@ -6343,7 +6373,7 @@ const Methods = {
6343
6373
  const $xeTable = this
6344
6374
  const internalData = $xeTable
6345
6375
 
6346
- const { inFooterScroll, inBodyScroll } = internalData
6376
+ const { inFooterScroll, inBodyScroll, lastScrollLeft } = internalData
6347
6377
  if (inFooterScroll) {
6348
6378
  return
6349
6379
  }
@@ -6356,9 +6386,15 @@ const Methods = {
6356
6386
  const bodyElem = tableBody.$el as HTMLDivElement
6357
6387
  const leftElem = leftBody ? leftBody.$el as HTMLDivElement : null
6358
6388
  const rightElem = rightBody ? rightBody.$el as HTMLDivElement : null
6389
+ const xHandleEl = $xeTable.$refs.refScrollXHandleElem as HTMLDivElement
6359
6390
  const wrapperEl = evnt.currentTarget as HTMLDivElement
6360
- const { scrollTop, scrollLeft } = wrapperEl
6361
- const isRollX = false
6391
+ const { scrollTop } = wrapperEl
6392
+ const xBodyEl = xHandleEl || bodyElem
6393
+ let scrollLeft = 0
6394
+ if (xBodyEl) {
6395
+ scrollLeft = xBodyEl.scrollLeft
6396
+ }
6397
+ const isRollX = scrollLeft !== lastScrollLeft
6362
6398
  const isRollY = true
6363
6399
 
6364
6400
  internalData.inVirtualScroll = true
@@ -6585,7 +6621,7 @@ const Methods = {
6585
6621
  const tableHeaderElem = tableHeader ? tableHeader.$el : null
6586
6622
  const tableFooterElem = tableFooter ? tableFooter.$el : null
6587
6623
  if (XEUtils.isNumber(scrollLeft)) {
6588
- const xHandleEl = $xeTable.$refs.refScrollXHandleElem
6624
+ const xHandleEl = $xeTable.$refs.refScrollXHandleElem as HTMLDivElement
6589
6625
  if (xHandleEl) {
6590
6626
  setScrollLeft(xHandleEl, scrollLeft)
6591
6627
  } else {
@@ -6595,7 +6631,7 @@ const Methods = {
6595
6631
  }
6596
6632
  }
6597
6633
  if (XEUtils.isNumber(scrollTop)) {
6598
- const yHandleEl = $xeTable.$refs.refScrollYHandleElem
6634
+ const yHandleEl = $xeTable.$refs.refScrollYHandleElem as HTMLDivElement
6599
6635
  if (yHandleEl) {
6600
6636
  setScrollTop(yHandleEl, scrollTop)
6601
6637
  } else {
@@ -6605,7 +6641,7 @@ const Methods = {
6605
6641
  }
6606
6642
  }
6607
6643
  if (this.scrollXLoad || this.scrollYLoad) {
6608
- return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 50))
6644
+ return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30))
6609
6645
  }
6610
6646
  return this.$nextTick()
6611
6647
  },
@@ -6674,7 +6710,7 @@ const Methods = {
6674
6710
  const rightBodyElem = rightBody ? rightBody.$el : null
6675
6711
  const tableHeaderElem = tableHeader ? tableHeader.$el : null
6676
6712
  const tableFooterElem = tableFooter ? tableFooter.$el : null
6677
- const xHandleEl = $xeTable.$refs.refScrollXHandleElem
6713
+ const xHandleEl = $xeTable.$refs.refScrollXHandleElem as HTMLDivElement
6678
6714
  if (xHandleEl) {
6679
6715
  setScrollLeft(xHandleEl, 0)
6680
6716
  } else {
@@ -6682,7 +6718,7 @@ const Methods = {
6682
6718
  setScrollLeft(tableHeaderElem, 0)
6683
6719
  setScrollLeft(tableFooterElem, 0)
6684
6720
  }
6685
- const yHandleEl = $xeTable.$refs.refScrollYHandleElem
6721
+ const yHandleEl = $xeTable.$refs.refScrollYHandleElem as HTMLDivElement
6686
6722
  if (yHandleEl) {
6687
6723
  setScrollTop(yHandleEl, 0)
6688
6724
  } else {
@@ -415,6 +415,9 @@ export default {
415
415
  $xeTabs(): (VxeTabsConstructor & VxeTabsPrivateMethods) | null
416
416
  }),
417
417
  tableId () {
418
+ return this.computeTableId
419
+ },
420
+ computeTableId () {
418
421
  const { id } = this
419
422
  if (id) {
420
423
  if (XEUtils.isFunction(id)) {
@@ -903,8 +906,10 @@ export default {
903
906
 
904
907
  if (process.env.VUE_APP_VXE_ENV === 'development') {
905
908
  const customOpts = this.customOpts
906
- if (!this.id && this.customConfig && (customOpts.storage === true || (customOpts.storage && customOpts.storage.resizable) || (customOpts.storage && customOpts.storage.visible))) {
907
- errLog('vxe.error.reqProp', ['id'])
909
+ if (!this.id) {
910
+ if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
911
+ errLog('vxe.error.reqProp', ['id'])
912
+ }
908
913
  }
909
914
  if (this.treeConfig && this.checkboxOpts.range) {
910
915
  errLog('vxe.error.noTree', ['checkbox-config.range'])
@@ -75,6 +75,7 @@ VxeUI.setConfig({
75
75
  // visibleMethod () {}
76
76
  // },
77
77
  customConfig: {
78
+ // enabled: false,
78
79
  allowVisible: true,
79
80
  allowResizable: true,
80
81
  allowFixed: true,
@@ -89,6 +90,12 @@ VxeUI.setConfig({
89
90
  lockView: true,
90
91
  resize: true,
91
92
  escClosable: true
93
+ },
94
+ drawerOptions: {
95
+ mask: true,
96
+ lockView: true,
97
+ escClosable: true,
98
+ resize: true
92
99
  }
93
100
  },
94
101
  sortConfig: {