vxe-table 3.18.0-beta.3 → 3.18.0-beta.4

package/lib/ui/index.min.js

@@ -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.18.0-beta.3",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,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{multiple:!0,showIcon:!0},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},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:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{},gantt:{}}),"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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});var _default=exports.default=_core.VxeUI;
+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.18.0-beta.4",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,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{multiple:!0,showIcon:!0},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0,maxGroupSize:4,showAggFuncTitle:!0},treeConfig:{padding:!0,rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},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:{isAll:!0,isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{gt:24,preSize:0,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},scrollbarConfig:{x:{visible:!0},y:{visible:!0}}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{},gantt:{}}),"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_CHECKBOX_DISABLED_UNCHECKED:iconPrefix+"checkbox-unchecked-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_RADIO_DISABLED_UNCHECKED:iconPrefix+"radio-unchecked-fill",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_AGG_GROUP:iconPrefix+"grouping",TABLE_DRAG_STATUS_AGG_VALUES:iconPrefix+"values",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATE_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATE_VALUES:iconPrefix+"values",TABLE_AGGREGATE_SORT:iconPrefix+"drag-handle",TABLE_AGGREGATE_DELETE:iconPrefix+"close",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,i){return _core.VxeUI.modal.alert(e,o,i)},confirm(e,o,i){return _core.VxeUI.modal.confirm(e,o,i)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,i){return _core.VxeUI.modal.notification(e,o,i)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"3.18.0-beta.3"}`;
+const version = `table v${"3.18.0-beta.4"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -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.18.0-beta.3",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+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.18.0-beta.4",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.18.0-beta.3",
+  "version": "3.18.0-beta.4",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/grid/src/grid.ts

@@ -414,7 +414,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         }
       }
     },
-    callSlot (slotFunc: any, params: any, h: CreateElement, vNodes: any) {
+    callSlot (slotFunc: any, params: any, h: CreateElement) {
       const $xeGrid = this
       const slots = $xeGrid.$scopedSlots
 
@@ -423,7 +423,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           slotFunc = slots[slotFunc] || null
         }
         if (XEUtils.isFunction(slotFunc)) {
-          return getSlotVNs(slotFunc.call(this, params, h, vNodes))
+          return getSlotVNs(slotFunc.call(this, params, h))
         }
       }
       return []

package/packages/table/module/custom/mixin.ts

@@ -4,14 +4,21 @@ import { getColumnList } from '../../src/util'
 import type { VxeColumnPropTypes, VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, TableReactData, TableInternalData } from '../../../../types'
 
 function calcMaxHeight ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+  const $xeGantt = $xeTable.$xeGantt
   const reactData = $xeTable as unknown as TableReactData
 
   const { customStore } = reactData
-  const el = $xeTable.$refs.refElem as HTMLDivElement
+  let wrapperEl = $xeTable.$refs.refElem as HTMLDivElement
   // 判断面板不能大于表格高度
   let tableHeight = 0
-  if (el) {
-    tableHeight = el.clientHeight - 28
+  if ($xeGantt) {
+    const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem as HTMLDivElement
+    if (ganttContainerElem) {
+      wrapperEl = ganttContainerElem
+    }
+  }
+  if (wrapperEl) {
+    tableHeight = wrapperEl.clientHeight - 28
   }
   customStore.maxHeight = Math.max(88, tableHeight)
 }

package/packages/table/module/custom/panel.ts

@@ -287,6 +287,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
     }
   })
   return h('div', {
+    ref: 'refElem',
     key: 'simple',
     class: ['vxe-table-custom-wrapper', `placement--${placement}`, {
       'is--active': customStore.visible
@@ -440,7 +441,7 @@ const renderPopupPanel = (h: CreateElement, $xeTableCustomPanel: VxeTableCustomP
   const VxeUIModalComponent = VxeUI.getComponent('VxeModal')
   const VxeUIDrawerComponent = VxeUI.getComponent('VxeDrawer')
   const VxeUIButtonComponent = VxeUI.getComponent('VxeButton')
-  const VxeUINumberInputComponent = VxeUI.getComponent('VxeInput')
+  const VxeUINumberInputComponent = VxeUI.getComponent('VxeNumberInput')
 
   const _vm = $xeTableCustomPanel as any
   const props = $xeTableCustomPanel
@@ -925,6 +926,8 @@ export default {
 
     $xeTableCustomPanel.$nextTick(() => {
       const $xeTable = $xeTableCustomPanel.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+      const $xeGantt = $xeTable.$xeGantt
+      const tableInternalData = $xeTable as unknown as TableInternalData
 
       const { customOpts } = $xeTable
       const { mode } = customOpts
@@ -938,13 +941,32 @@ export default {
         errLog('vxe.error.reqComp', ['vxe-button'])
       }
       if (!VxeUINumberInputComponent) {
-        errLog('vxe.error.reqComp', ['vxe-input'])
+        errLog('vxe.error.reqComp', ['vxe-number-input'])
       }
       if (!VxeUIRadioGroupComponent) {
         errLog('vxe.error.reqComp', ['vxe-radio-group'])
       }
+
+      if ($xeGantt) {
+        const { teleportToWrapperElem } = tableInternalData
+        const el = $xeTableCustomPanel.$refs.refElem
+        if (el && teleportToWrapperElem) {
+          teleportToWrapperElem.appendChild(el)
+        }
+      }
     })
   },
+  beforeDestroy () {
+    const $xeTableCustomPanel = this as any
+    const $xeTable = $xeTableCustomPanel.$xeTable as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGantt = $xeTable.$xeGantt
+    if ($xeGantt) {
+      const el = $xeTableCustomPanel.$refs.refElem
+      if (el && el.parentElement) {
+        el.parentElement.removeChild(el)
+      }
+    }
+  },
   render (h: CreateElement) {
     const $xeTableCustomPanel = this as unknown as VxeTableCustomPanelConstructor
     const $xeTable = $xeTableCustomPanel.$xeTable

package/packages/table/module/keyboard/mixin.ts

@@ -346,8 +346,8 @@ export default {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
       const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, mouseConfig, mouseOpts } = this
-      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModownEvent) {
-        return $xeTable.triggerCellAreaModownEvent(evnt, params)
+      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModnEvent) {
+        return $xeTable.triggerCellAreaModnEvent(evnt, params)
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           this.handleCheckboxRangeEvent(evnt, params)

package/packages/table/src/methods.ts

@@ -422,7 +422,7 @@ function updateScrollYStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMet
   // 如果gt为0，则总是启用
   const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length)
   reactData.scrollYLoad = scrollYLoad
-  if ($xeGanttView) {
+  if ($xeGanttView && $xeGanttView.handleUpdateSYStatus) {
     $xeGanttView.handleUpdateSYStatus(scrollYLoad)
   }
   return scrollYLoad
@@ -1278,7 +1278,7 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
     $xeTable.addCellSelectedClass()
   }
-  if ($xeGanttView) {
+  if ($xeGanttView && $xeGanttView.handleUpdateStyle) {
     $xeGanttView.handleUpdateStyle()
   }
   return $xeTable.$nextTick()
@@ -2884,7 +2884,7 @@ function handleLazyRecalculate ($xeTable: VxeTableConstructor & VxeTablePrivateM
         handleRecalculateStyle($xeTable, reFull, reWidth, reHeight)
       )
     }
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleLazyRecalculate) {
       $xeGanttView.handleLazyRecalculate()
     }
     internalData.rceTimeout = setTimeout(() => {
@@ -4071,7 +4071,7 @@ const Methods = {
     })
     reactData.tableData = tableData
     internalData.visibleDataRowIdData = visibleDataRowIdMaps
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.updateViewData) {
       $xeGanttView.updateViewData()
     }
     return $xeTable.$nextTick()
@@ -5062,6 +5062,32 @@ const Methods = {
     }
     return []
   },
+  /**
+   * 只对 tree-config 有效，用于树形结构，获取指定行的层级
+   */
+  getTreeRowLevel (rowOrRowid: any) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeConfig } = props
+    const { fullAllDataRowIdData } = internalData
+    if (rowOrRowid && treeConfig) {
+      let rowid
+      if (XEUtils.isString(rowOrRowid)) {
+        rowid = rowOrRowid
+      } else {
+        rowid = getRowid($xeTable, rowOrRowid)
+      }
+      if (rowid) {
+        const rest = fullAllDataRowIdData[rowid]
+        if (rest) {
+          return rest.level
+        }
+      }
+    }
+    return -1
+  },
   /**
    * 只对 tree-config 有效，获取行的父级
    */
@@ -5081,7 +5107,9 @@ const Methods = {
       }
       if (rowid) {
         const rest = fullAllDataRowIdData[rowid]
-        return rest ? rest.parent : null
+        if (rest) {
+          return rest.parent
+        }
       }
     }
     return null
@@ -7802,7 +7830,7 @@ const Methods = {
         XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'))
       }
     }
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
       $xeGanttView.handleUpdateCurrentRow(row)
     }
     return this.$nextTick()
@@ -7866,7 +7894,7 @@ const Methods = {
     if (el) {
       XEUtils.arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'))
     }
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
       $xeGanttView.handleUpdateCurrentRow()
     }
     return $xeTable.$nextTick()
@@ -7940,7 +7968,7 @@ const Methods = {
       XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--hover'))
     }
     internalData.hoverRow = row
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
       $xeGanttView.handleUpdateHoverRow(row)
     }
   },
@@ -7954,7 +7982,7 @@ const Methods = {
       XEUtils.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'))
     }
     internalData.hoverRow = null
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
       $xeGanttView.handleUpdateHoverRow()
     }
   },
@@ -10807,7 +10835,7 @@ const Methods = {
       if (isScrollXBig && mouseOpts.area) {
         errLog('vxe.error.notProp', ['mouse-config.area'])
       }
-      if ($xeGanttView) {
+      if ($xeGanttView && $xeGanttView.handleUpdateSXSpace) {
         $xeGanttView.handleUpdateSXSpace()
       }
       return $xeTable.$nextTick(() => {
@@ -10932,7 +10960,7 @@ const Methods = {
     if (isScrollYBig && mouseOpts.area) {
       errLog('vxe.error.notProp', ['mouse-config.area'])
     }
-    if ($xeGanttView) {
+    if ($xeGanttView && $xeGanttView.handleUpdateSYSpace) {
       $xeGanttView.handleUpdateSYSpace()
     }
     return $xeTable.$nextTick().then(() => {

package/packages/table/src/table.ts

@@ -1607,7 +1607,7 @@ export default {
     if (rowOpts.height && !this.showOverflow) {
       warnLog('vxe.error.notProp', ['table.show-overflow'])
     }
-    if (!$xeTable.triggerCellAreaModownEvent) {
+    if (!$xeTable.triggerCellAreaModnEvent) {
       if (props.areaConfig) {
         warnLog('vxe.error.notProp', ['area-config'])
       }
@@ -1783,12 +1783,21 @@ export default {
   mounted () {
     const $xeTable = this
     const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
+    const $xeGantt = $xeTable.$xeGantt
 
     const columnOpts = $xeTable.computeColumnOpts
     const rowOpts = $xeTable.computeRowOpts
     const customOpts = $xeTable.computeCustomOpts
     const virtualYOpts = $xeTable.computeVirtualYOpts
 
+    if ($xeGantt) {
+      const classifyWrapperEl = $xeGantt.$refs.refClassifyWrapperElem as HTMLDivElement
+      if (classifyWrapperEl) {
+        internalData.teleportToWrapperElem = classifyWrapperEl
+      }
+    }
+
     if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
       initTpImg()
     }

package/packages/table/src/util.ts

@@ -122,6 +122,8 @@ export function createInternalData (): TableInternalData {
     // 表尾高度
     tFooterHeight: 0,
 
+    teleportToWrapperElem: null,
+
     inited: false,
     tooltipTimeout: null,
     initStatus: false,

package/packages/toolbar/src/toolbar.ts

@@ -56,6 +56,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
   inject: {
     $xeGrid: {
       default: null
+    },
+    $xeGantt: {
+      default: null
     }
   },
   data () {
@@ -76,6 +79,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
     ...({} as {
       computeSize(): VxeComponentSizeType
       $xeGrid(): (VxeGridConstructor & GridPrivateMethods) | null
+      $xeGantt(): any
     }),
     computeRefreshOpts () {
       const $xeToolbar = this
@@ -212,6 +216,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeToolbar = this
       const reactData = $xeToolbar.reactData
       const $xeGrid = $xeToolbar.$xeGrid
+      const $xeGantt = $xeToolbar.$xeGantt
+      const $xeGGWrapper = $xeGrid || $xeGantt
 
       const { isRefresh } = reactData
       const refreshOpts = $xeToolbar.computeRefreshOpts
@@ -226,9 +232,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
           } catch (e) {
             reactData.isRefresh = false
           }
-        } else if ($xeGrid) {
+        } else if ($xeGGWrapper) {
           reactData.isRefresh = true
-          $xeGrid.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, $event).catch((e) => e).then(() => {
+          $xeGGWrapper.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, $event).catch(() => {}).then(() => {
             reactData.isRefresh = false
           })
         }
@@ -237,9 +243,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
     zoomEvent ({ $event }: any) {
       const $xeToolbar = this
       const $xeGrid = $xeToolbar.$xeGrid
+      const $xeGantt = $xeToolbar.$xeGantt
+      const $xeGGWrapper = $xeGrid || $xeGantt
 
-      if ($xeGrid) {
-        $xeGrid.triggerZoomEvent($event)
+      if ($xeGGWrapper) {
+        $xeGGWrapper.triggerZoomEvent($event)
       } else {
         warnLog('vxe.error.notProp', ['zoom'])
       }
@@ -356,6 +364,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeToolbar = this
       const internalData = $xeToolbar.internalData
       const $xeGrid = $xeToolbar.$xeGrid
+      const $xeGantt = $xeToolbar.$xeGantt
+      const $xeGGWrapper = $xeGrid || $xeGantt
 
       const { $event } = eventParams
       const { connectTable } = internalData
@@ -363,11 +373,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { code } = item
       if (code) {
         $xeToolbar.handleDefaultCodeEvent(eventParams, item, () => {
-          if ($xeGrid) {
-            $xeGrid.triggerToolbarBtnEvent(item, $event)
+          if ($xeGGWrapper) {
+            $xeGGWrapper.triggerToolbarBtnEvent(item, $event)
           } else {
             const gCommandOpts = commands.get(code)
-            const params = { code, button: item, $table: $table as VxeTableConstructor, $grid: $xeGrid, $gantt: null, $event }
+            const params = { code, button: item, $table: $table as VxeTableConstructor, $grid: $xeGrid, $gantt: $xeGantt, $event }
             if (gCommandOpts) {
               const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod
               if (tCommandMethod) {
@@ -385,6 +395,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeToolbar = this
       const internalData = $xeToolbar.internalData
       const $xeGrid = $xeToolbar.$xeGrid
+      const $xeGantt = $xeToolbar.$xeGantt
+      const $xeGGWrapper = $xeGrid || $xeGantt
 
       const { $event } = eventParams
       const { connectTable } = internalData
@@ -392,11 +404,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { code } = item
       if (code) {
         $xeToolbar.handleDefaultCodeEvent(eventParams, item, () => {
-          if ($xeGrid) {
-            $xeGrid.triggerToolbarTolEvent(item, $event)
+          if ($xeGGWrapper) {
+            $xeGGWrapper.triggerToolbarTolEvent(item, $event)
           } else {
             const gCommandOpts = commands.get(code)
-            const params = { code, button: null, tool: item, $table: $table as VxeTableConstructor, $grid: $xeGrid, $gantt: null, $event }
+            const params = { code, button: null, tool: item, $table: $table as VxeTableConstructor, $grid: $xeGrid, $gantt: $xeGantt, $event }
             if (gCommandOpts) {
               const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod
               if (tCommandMethod) {
@@ -467,6 +479,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const slots = $xeToolbar.$scopedSlots
       const internalData = $xeToolbar.internalData
       const $xeGrid = $xeToolbar.$xeGrid
+      const $xeGantt = $xeToolbar.$xeGantt
 
       const { buttons } = props
       const { connectTable } = internalData
@@ -475,7 +488,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix']
       const btnVNs: VxeComponentSlotType[] = []
       if (buttonPrefixSlot) {
-        btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $table: $table })))
+        btnVNs.push(...getSlotVNs(buttonPrefixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
       }
       if (buttons) {
         buttons.forEach((item) => {
@@ -484,7 +497,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             const compConf = buttonRender ? renderer.get(buttonRender.name) : null
             if (buttonRender && compConf && compConf.renderToolbarButton) {
               const toolbarButtonClassName = compConf.toolbarButtonClassName
-              const params = { $grid: $xeGrid, $table: $table!, button: item }
+              const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, button: item }
               btnVNs.push(
                 h('span', {
                   class: ['vxe-button--item', toolbarButtonClassName ? (XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName) : '']
@@ -529,7 +542,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         })
       }
       if (buttonSuffixSlot) {
-        btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $table: $table })))
+        btnVNs.push(...getSlotVNs(buttonSuffixSlot.call($xeToolbar, { buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
       }
       return btnVNs
     },
@@ -545,6 +558,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const slots = $xeToolbar.$scopedSlots
       const internalData = $xeToolbar.internalData
       const $xeGrid = $xeToolbar.$xeGrid
+      const $xeGantt = $xeToolbar.$xeGantt
 
       const { tools } = props
       const { connectTable } = internalData
@@ -553,7 +567,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix']
       const btnVNs: VxeComponentSlotType[] = []
       if (toolPrefixSlot) {
-        btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $table: $table })))
+        btnVNs.push(...getSlotVNs(toolPrefixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
       }
       if (tools) {
         tools.forEach((item, tIndex) => {
@@ -563,7 +577,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             const compConf = toolRender ? renderer.get(rdName) : null
             if (toolRender && compConf && compConf.renderToolbarTool) {
               const toolbarToolClassName = compConf.toolbarToolClassName
-              const params = { $grid: $xeGrid, $table: $table!, tool: item }
+              const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, tool: item }
               btnVNs.push(
                 h('span', {
                   key: rdName as string,
@@ -610,7 +624,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         })
       }
       if (toolSuffixSlot) {
-        btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $table: $table })))
+        btnVNs.push(...getSlotVNs(toolSuffixSlot.call($xeToolbar, { tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })))
       }
       return btnVNs
     },
@@ -705,15 +719,17 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       const $xeToolbar = this
       const $xeGrid = $xeToolbar.$xeGrid
+      const $xeGantt = $xeToolbar.$xeGantt
+      const $xeGGWrapper = $xeGrid || $xeGantt
 
       const zoomOpts = $xeToolbar.computeZoomOpts
-      return $xeGrid && VxeUIButtonComponent
+      return $xeGGWrapper && VxeUIButtonComponent
         ? h(VxeUIButtonComponent, {
           key: 'zoom',
           props: {
             circle: true,
-            icon: $xeGrid.isMaximized() ? (zoomOpts.iconOut || getIcon().TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || getIcon().TOOLBAR_TOOLS_FULLSCREEN),
-            title: getI18n(`vxe.toolbar.zoom${$xeGrid.isMaximized() ? 'Out' : 'In'}`)
+            icon: $xeGGWrapper.isMaximized() ? (zoomOpts.iconOut || getIcon().TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || getIcon().TOOLBAR_TOOLS_FULLSCREEN),
+            title: getI18n(`vxe.toolbar.zoom${$xeGGWrapper.isMaximized() ? 'Out' : 'In'}`)
           },
           on: {
             click: $xeToolbar.zoomEvent
@@ -763,6 +779,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const slots = $xeToolbar.$scopedSlots
       const internalData = $xeToolbar.internalData
       const $xeGrid = $xeToolbar.$xeGrid
+      const $xeGantt = $xeToolbar.$xeGantt
+      const $xeGGWrapper = $xeGrid || $xeGantt
 
       const { perfect, loading, refresh, zoom, custom, className } = props
       const { connectTable } = internalData
@@ -780,10 +798,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }, [
         h('div', {
           class: 'vxe-buttons--wrapper'
-        }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $table: $table }) : $xeToolbar.renderLeftBtns(h)),
+        }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $gantt: $xeGantt, $table: $table }) : $xeToolbar.renderLeftBtns(h)),
         h('div', {
           class: 'vxe-tools--wrapper'
-        }, toolsSlot ? toolsSlot({ $grid: $xeGrid, $table: $table }) : $xeToolbar.renderRightTools(h)),
+        }, toolsSlot ? toolsSlot({ $grid: $xeGrid, $gantt: $xeGantt, $table: $table }) : $xeToolbar.renderRightTools(h)),
         h('div', {
           class: 'vxe-tools--operate'
         }, [
@@ -791,7 +809,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           props.export ? $xeToolbar.renderToolExport(h) : renderEmptyElement($xeToolbar),
           props.print ? $xeToolbar.renderToolPrint(h) : renderEmptyElement($xeToolbar),
           refresh ? $xeToolbar.renderToolRefresh(h) : renderEmptyElement($xeToolbar),
-          zoom && $xeGrid ? $xeToolbar.renderToolZoom(h) : renderEmptyElement($xeToolbar),
+          zoom && $xeGGWrapper ? $xeToolbar.renderToolZoom(h) : renderEmptyElement($xeToolbar),
           custom ? $xeToolbar.renderToolCustom(h) : renderEmptyElement($xeToolbar)
         ])
       ])
@@ -801,12 +819,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
     const $xeToolbar = this
     const props = $xeToolbar
     const $xeGrid = $xeToolbar.$xeGrid
+    const $xeGantt = $xeToolbar.$xeGantt
+    const $xeGGWrapper = $xeGrid || $xeGantt
 
     $xeToolbar.$nextTick(() => {
       const refreshOpts = $xeToolbar.computeRefreshOpts
       const $xeTable = $xeToolbar.fintTable() as any
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query
-      if (props.refresh && !$xeGrid && !queryMethod) {
+      if (props.refresh && !$xeGGWrapper && !queryMethod) {
         warnLog('vxe.error.notFunc', ['queryMethod'])
       }