vxe-table 3.18.0-beta.6 → 3.18.0-beta.8

package/lib/table/module/custom/panel.js

@@ -789,8 +789,6 @@ var _default = exports.default = {
     const VxeUIRadioGroupComponent = _ui.VxeUI.getComponent('VxeRadioGroup');
     $xeTableCustomPanel.$nextTick(() => {
       const $xeTable = $xeTableCustomPanel.$xeTable;
-      const $xeGantt = $xeTable.$xeGantt;
-      const tableInternalData = $xeTable;
       const {
         customOpts
       } = $xeTable;
@@ -812,28 +810,8 @@ var _default = exports.default = {
       if (!VxeUIRadioGroupComponent) {
         (0, _log.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;
-    const $xeTable = $xeTableCustomPanel.$xeTable;
-    const $xeGantt = $xeTable.$xeGantt;
-    if ($xeGantt) {
-      const el = $xeTableCustomPanel.$refs.refElem;
-      if (el && el.parentElement) {
-        el.parentElement.removeChild(el);
-      }
-    }
-  },
   render(h) {
     const $xeTableCustomPanel = this;
     const $xeTable = $xeTableCustomPanel.$xeTable;

package/lib/table/module/custom/panel.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;function showDropTip(e,t,l,o,a){var s,r,i,n=e.internalData,d=e.$refs.refBodyWrapperElem;d&&(i=e.$refs.refCustomBodyElem)&&(n=n.prevDragToChild,s=d.getBoundingClientRect(),i=i.getBoundingClientRect(),r=e.$refs.refDragLineElem,l?r&&(o?(l=l.getBoundingClientRect(),r.style.display="block",r.style.left=Math.max(0,i.x-s.x)+"px",r.style.top=Math.max(1,l.y+d.scrollTop-s.y)+"px",r.style.height=l.height+"px",r.style.width=l.width+"px",r.setAttribute("drag-pos",a),r.setAttribute("drag-to-child",n?"y":"n")):r.style.display=""):r&&(r.style.display="node"),i=e.$refs.refDragTipElem)&&(i.style.display="block",i.style.top=Math.min(d.clientHeight+d.scrollTop-i.clientHeight,t.clientY+d.scrollTop-s.y)+"px",i.style.left=Math.min(d.clientWidth+d.scrollLeft-i.clientWidth,t.clientX+d.scrollLeft-s.x)+"px",i.setAttribute("drag-status",o?n?"sub":"normal":"disabled"))}function hideDropTip(e){var t=e.$refs.refDragTipElem,e=e.$refs.refDragLineElem;t&&(t.style.display=""),e&&(e.style.display="")}let renderDragTip=(e,t)=>{var l=t.$xeTable,t=t.reactData.dragTipText;return e("div",{},[e("div",{ref:"refDragLineElem",class:["vxe-table-custom-popup--drag-line",{"is--guides":l.computeColumnDragOpts.showGuidesStatus}]}),e("div",{ref:"refDragTipElem",class:"vxe-table-custom-popup--drag-tip"},[e("div",{class:"vxe-table-custom-popup--drag-tip-wrapper"},[e("div",{class:"vxe-table-custom-popup--drag-tip-status"},[e("span",{class:["vxe-table-custom-popup--drag-tip-normal-status",getIcon().TABLE_DRAG_STATUS_ROW]}),e("span",{class:["vxe-table-custom-popup--drag-tip-sub-status",getIcon().TABLE_DRAG_STATUS_SUB_ROW]}),e("span",{class:["vxe-table-custom-popup--drag-tip-group-status",getIcon().TABLE_DRAG_STATUS_AGG_GROUP]}),e("span",{class:["vxe-table-custom-popup--drag-tip-values-status",getIcon().TABLE_DRAG_STATUS_AGG_VALUES]}),e("span",{class:["vxe-table-custom-popup--drag-tip-disabled-status",getIcon().TABLE_DRAG_DISABLED]})]),e("div",{class:"vxe-table-custom-popup--drag-tip-content"},""+(t||""))])])])},renderSimplePanel=(c,u)=>{let m=_ui.VxeUI.getComponent("VxeButton");let p=u.$xeTable;var e=p,t=p,l=p.$xeGrid,o=p.$xeGantt,a=u.customStore,{treeConfig:e,rowGroupConfig:s,aggregateConfig:r}=e,{isCustomStatus:t,customColumnList:i}=t,n=p.computeCustomOpts;let g=n.immediate;var d=p.computeColumnDragOpts,v=a.maxHeight;let{checkMethod:x,visibleMethod:b,allowVisible:h,allowSort:C,allowFixed:E,trigger:T,placement:f}=n,_=p.computeIsMaxFixedColumn,I=d.isCrossDrag;var d=n.slots||{},D=d.header,y=d.top,O=d.bottom,A=d.default,d=d.footer;let k=[];var S={},F=a.isAll,B=a.isIndeterminate,l=("hover"===T&&(S.mouseenter=u.handleWrapperMouseenterEvent,S.mouseleave=u.handleWrapperMouseleaveEvent),{$table:p,$grid:l,$gantt:o,columns:i,isAllChecked:F,isAllIndeterminate:B,isCustomStatus:t});return _xeUtils.default.eachTree(i,(l,e,t,o,a)=>{if(!b||b({$table:p,column:l})){var s=l.renderVisible,r=l.halfVisible,i=l.children&&l.children.length,n=(0,_utils.formatText)(l.getTitle(),1);let t=!!x&&!x({$table:p,column:l});var d=!s;k.push(c("li",{key:l.id,attrs:{colid:l.id},class:["vxe-table-custom--option","level--"+l.level,{"is--hidden":t||d,"is--group":i}],on:{dragstart:u.sortDragstartEvent,dragend:u.sortDragendEvent,dragover:u.sortDragoverEvent}},[h?c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":r,"is--disabled":t}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:e=>{t||u.changeCheckboxOption(l,e)}}},[c("span",{class:["vxe-checkbox--icon",r?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):renderEmptyElement(p),c("div",{class:"vxe-table-custom--name-option"},[C&&(I&&g||1===l.level)?c("div",{class:"vxe-table-custom--sort-option"},[c("span",{class:["vxe-table-custom--sort-btn",{"is--disabled":t||d||l.renderFixed}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:t||d||l.renderFixed?{}:{mousedown:u.sortMousedownEvent,mouseup:u.sortMouseupEvent}},[c("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):renderEmptyElement(p),"html"===l.type?c("div",{key:"1",class:"vxe-table-custom--checkbox-label",domProps:{innerHTML:n}}):c("div",{key:"0",class:"vxe-table-custom--checkbox-label",attrs:{title:n}},n)]),!a&&E?c("div",{class:"vxe-table-custom--fixed-option"},[c(m,{props:{mode:"text",icon:"left"===l.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===l.renderFixed?"primary":"",disabled:t||d||_&&!l.renderFixed,title:getI18n("left"===l.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft")},on:{click:({$event:e})=>{u.changeFixedOption(l,"left",e)}}}),c(m,{props:{mode:"text",icon:"right"===l.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===l.renderFixed?"primary":"",disabled:t||d||_&&!l.renderFixed,title:getI18n("right"===l.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight")},on:{click:({$event:e})=>{u.changeFixedOption(l,"right",e)}}})]):renderEmptyElement(p)]))}}),c("div",{ref:"refElem",key:"simple",class:["vxe-table-custom-wrapper","placement--"+f,{"is--active":a.visible}],style:v&&!["left","right"].includes(f||"")?{maxHeight:v+"px"}:{}},a.visible?[c("div",{ref:"refBodyWrapperElem",class:"vxe-table-custom-simple--body-wrapper"},[!e&&(r||s)&&p.getPivotTableAggregateSimplePanel?c(p.getPivotTableAggregateSimplePanel(),{props:{customStore:a}}):renderEmptyElement(p),c("div",{ref:"refCustomBodyElem",class:"vxe-table-custom--handle-wrapper"},[c("div",{class:"vxe-table-custom--header"},D?p.callSlot(D,l,c):[c("ul",{class:"vxe-table-custom--panel-list"},[c("li",{class:"vxe-table-custom--option"},[h?c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":F,"is--indeterminate":B}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:u.allOptionEvent}},[c("span",{class:["vxe-checkbox--icon",B?getIcon().TABLE_CHECKBOX_INDETERMINATE:F?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),c("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):c("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),c("div",{class:"vxe-table-custom--body"},[y?c("div",{class:"vxe-table-custom--panel-top"},p.callSlot(y,l,c)):renderEmptyElement(p),A?c("div",{class:"vxe-table-custom--panel-body"},p.callSlot(A,l,c)):c("transition-group",{class:"vxe-table-custom--panel-list",props:{name:"vxe-table-custom--list",tag:"ul"},on:S},k),O?c("div",{class:"vxe-table-custom--panel-bottom"},p.callSlot(O,l,c)):renderEmptyElement(p)]),n.showFooter?c("div",{class:"vxe-table-custom--footer"},d?p.callSlot(d,l,c):[c("div",{class:"vxe-table-custom--footer-buttons"},[c(m,{props:{mode:"text",content:n.resetButtonText||getI18n("vxe.table.customRestore"),disabled:!t},on:{click:u.resetCustomEvent}}),g?c(m,{props:{mode:"text",content:n.closeButtonText||getI18n("vxe.table.customClose")},on:{click:u.cancelCloseEvent}}):c(m,{props:{mode:"text",content:n.resetButtonText||getI18n("vxe.table.customCancel")},on:{click:u.cancelCustomEvent}}),g?renderEmptyElement(p):c(m,{props:{mode:"text",status:"primary",content:n.confirmButtonText||getI18n("vxe.table.customConfirm")},on:{click:u.confirmCustomEvent}})])]):null]),renderDragTip(c,u)])]:[])},renderPopupPanel=(c,u)=>{var e=_ui.VxeUI.getComponent("VxeModal"),t=_ui.VxeUI.getComponent("VxeDrawer");let l=_ui.VxeUI.getComponent("VxeButton"),m=_ui.VxeUI.getComponent("VxeNumberInput"),p=u,g=u.$xeTable;var o=g,a=g,s=g.$xeGrid,U=g.$xeGantt;let r=u.customStore,{treeConfig:L,rowGroupConfig:M,aggregateConfig:R,resizable:H}=o,{isCustomStatus:i,customColumnList:n}=a,d=g.computeCustomOpts,v=d.immediate;o=g.computeColumnDragOpts;let{mode:P,modalOptions:W,drawerOptions:G,allowVisible:x,allowSort:z,allowFixed:b,allowResizable:h,checkMethod:C,visibleMethod:E}=d,T=g.computeColumnOpts,f=T.maxFixedSize,{minWidth:_,maxWidth:I}=g.computeResizableOpts;var a=Object.assign({},W),D=Object.assign({},G);let y=g.computeIsMaxFixedColumn,N=o.isCrossDrag;o=d.slots||{};let O=o.header,A=o.top,k=o.bottom,S=o.default,F=o.footer,B=[],w=r.isAll,$=r.isIndeterminate,V={$table:g,$grid:s,$gantt:U,columns:n,isAllChecked:w,isAllIndeterminate:$,isCustomStatus:i};_xeUtils.default.eachTree(n,(o,a,e,t,s)=>{if(!E||E({$table:g,column:o})){let e=0,t=0;h&&(a={$table:g,column:o,columnIndex:a,$columnIndex:a,$rowIndex:-1},_&&(e=_xeUtils.default.toNumber(_xeUtils.default.isFunction(_)?_(a):_)),I)&&(t=_xeUtils.default.toNumber(_xeUtils.default.isFunction(I)?I(a):I));var a=o.renderVisible,r=o.halfVisible,i=(0,_utils.formatText)(o.getTitle(),1),n=o.children&&o.children.length;let l=!!C&&!C({$table:g,column:o});var d=!a;B.push(c("tr",{key:o.id,attrs:{colid:o.id},class:["vxe-table-custom-popup--row level--"+o.level,{"is--group":n}],on:{dragstart:p.sortDragstartEvent,dragend:p.sortDragendEvent,dragover:p.sortDragoverEvent}},[x?c("td",{class:"vxe-table-custom-popup--column-item col--visible"},[c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":a,"is--indeterminate":r,"is--disabled":l}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:e=>{l||p.changeCheckboxOption(o,e)}}},[c("span",{class:["vxe-checkbox--icon",r?getIcon().TABLE_CHECKBOX_INDETERMINATE:a?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):renderEmptyElement(g),c("td",{class:"vxe-table-custom-popup--column-item col--name"},[c("div",{class:"vxe-table-custom-popup--name"},[z?N&&v||1===o.level?c("div",{class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":l||d||o.renderFixed}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:l||d||o.renderFixed?{}:{mousedown:p.sortMousedownEvent,mouseup:p.sortMouseupEvent}},[c("i",{class:getIcon().TABLE_CUSTOM_SORT})]):c("div",{class:"vxe-table-custom-popup--column-sort-placeholder"}):renderEmptyElement(g),"html"===o.type?c("div",{key:"1",class:"vxe-table-custom-popup--title",domProps:{innerHTML:i}}):c("div",{key:"0",class:"vxe-table-custom-popup--title",attrs:{title:i}},i)])]),h?c("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[o.children&&o.children.length||!(_xeUtils.default.isBoolean(o.resizable)?o.resizable:T.resizable||H)?c("span","-"):m?c(m,{props:{type:"integer",immediate:!1,disabled:l||d,value:o.renderResizeWidth,min:e||void 0,max:t||void 0},on:{modelValue(e){o.renderResizeWidth=Math.max(0,Number(e))},change(){p.changeColumnWidth(o)}}}):renderEmptyElement(u)]):renderEmptyElement(g),b?c("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[s?c("span","-"):c("vxe-radio-group",{props:{value:o.renderFixed||"",type:"button",size:"mini",disabled:l||d,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:l||d||y},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:l||d},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:l||d||y}]},on:{change({label:e,$event:t}){p.changeFixedOption(o,e,t)}}})]):renderEmptyElement(g)]))}});o={default:()=>c("div",{ref:"refBodyWrapperElem",class:"vxe-table-custom-popup--body-wrapper"},S?g.callSlot(S,V,c):[c("div",{ref:"refCustomBodyElem",class:"vxe-table-custom-popup--handle-wrapper"},[A?c("div",{class:"vxe-table-custom-popup--table-top"},g.callSlot(A,V,c)):renderEmptyElement(g),c("div",{class:"vxe-table-custom-popup--table-wrapper"},[c("table",{},[c("colgroup",{},[x?c("col",{class:"vxe-table-custom-popup--table-col-seq"}):renderEmptyElement(g),c("col",{class:"vxe-table-custom-popup--table-col-title"}),h?c("col",{class:"vxe-table-custom-popup--table-col-width"}):renderEmptyElement(g),b?c("col",{class:"vxe-table-custom-popup--table-col-fixed"}):renderEmptyElement(g)]),c("thead",{},[c("tr",{},[x?c("th",{},[c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":w,"is--indeterminate":$}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:p.allOptionEvent}},[c("span",{class:["vxe-checkbox--icon",$?getIcon().TABLE_CHECKBOX_INDETERMINATE:w?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),c("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):renderEmptyElement(g),c("th",{},getI18n("vxe.custom.setting.colTitle")),h?c("th",{},getI18n("vxe.custom.setting.colResizable")):renderEmptyElement(g),b?c("th",{},getI18n("vxe.custom.setting."+(f?"colFixedMax":"colFixed"),[f])):renderEmptyElement(g)])]),c("transition-group",{class:"vxe-table-custom--panel-list",props:{tag:"tbody",name:"vxe-table-custom--list"}},B)])]),k?c("div",{class:"vxe-table-custom-popup--table-bottom"},g.callSlot(k,V,c)):renderEmptyElement(g),renderDragTip(c,p)]),!L&&(R||M)&&g.getPivotTableAggregatePopupPanel?c(g.getPivotTableAggregatePopupPanel(),{props:{customStore:r}}):renderEmptyElement(g)]),footer:()=>F?g.callSlot(F,V,c):c("div",{class:"vxe-table-custom-popup--footer"},[c(l,{props:{content:d.resetButtonText||getI18n("vxe.custom.cstmRestore"),disabled:!i},on:{click:p.resetCustomEvent}}),v?c(l,{props:{content:d.resetButtonText||getI18n("vxe.table.customClose")},on:{click:p.cancelCloseEvent}}):c(l,{props:{content:d.resetButtonText||getI18n("vxe.custom.cstmCancel")},on:{click:p.cancelCustomEvent}}),v?renderEmptyElement(g):c(l,{props:{status:"primary",content:d.confirmButtonText||getI18n("vxe.custom.cstmConfirm")},on:{click:p.confirmCustomEvent}})])};return O&&(o.header=()=>g.callSlot(O,V,c)),"drawer"===P?t?c(t,{key:"drawer",props:{className:["vxe-table-custom-drawer-wrapper","vxe-table--ignore-clear",D.className||""].join(" "),value:r.visible,title:D.title||getI18n("vxe.custom.cstmTitle"),width:D.width||Math.min(880,Math.floor(.6*document.documentElement.clientWidth)),position:D.position,resize:!!D.resize,escClosable:!!D.escClosable,maskClosable:!!D.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){r.visible=e}},scopedSlots:o}):renderEmptyElement(u):e?c(e,{key:"modal",props:{className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",a.className||""].join(" "),value:r.visible,title:a.title||getI18n("vxe.custom.cstmTitle"),width:a.width||Math.min(880,document.documentElement.clientWidth),minWidth:a.minWidth||700,height:a.height||Math.min(680,document.documentElement.clientHeight),minHeight:a.minHeight||400,showZoom:a.showZoom,showMaximize:a.showMaximize,showMinimize:a.showMinimize,mask:a.mask,lockView:a.lockView,resize:a.resize,escClosable:!!a.escClosable,maskClosable:!!a.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){r.visible=e}},scopedSlots:o}):renderEmptyElement(u)};var _default=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},provide(){return{$xeTableCustomPanel:this}},inject:{$xeTable:{default:null}},data(){return{reactData:{dragCol:null,dragGroupField:null,dragAggFnCol:null,dragTipText:""},internalData:{}}},computed:{},created(){let o=this,a=_ui.VxeUI.getComponent("VxeModal"),s=_ui.VxeUI.getComponent("VxeDrawer"),r=_ui.VxeUI.getComponent("VxeButton"),i=_ui.VxeUI.getComponent("VxeNumberInput"),n=_ui.VxeUI.getComponent("VxeRadioGroup");o.$nextTick(()=>{var e=o.$xeTable,t=e.$xeGantt,l=e,e=e.customOpts,e=e.mode;a||"modal"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),s||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),r||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),i||(0,_log.errLog)("vxe.error.reqComp",["vxe-number-input"]),n||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"]),t&&(e=l.teleportToWrapperElem,t=o.$refs.refElem)&&e&&e.appendChild(t)})},beforeDestroy(){var e;this.$xeTable.$xeGantt&&(e=this.$refs.refElem)&&e.parentElement&&e.parentElement.removeChild(e)},render(e){var t=this.$xeTable.computeCustomOpts;return(["modal","drawer","popup"].includes(""+t.mode)?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent(e){var t=this.$xeTable,l=this.customStore;l.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent(e){let t=this.$xeTable;let l=this.customStore;l.activeWrapper=!1,setTimeout(()=>{l.activeBtn||l.activeWrapper||t.customCloseEvent(e)},300)},getStoreData(){return{}},confirmCustomEvent({$event:e}){var t=this.$xeTable;t.isCustomStatus=!0,t.saveCustom(),t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCloseEvent({$event:e}){var t=this.$xeTable;t.closeCustom(),t.emitCustomEvent("close",e)},cancelCustomEvent({$event:e}){var t=this.$xeTable;t.cancelCustom(),t.closeCustom(),t.emitCustomEvent("cancel",e)},handleResetCustomEvent(e){var t=this.$xeTable;t.resetCustom(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.handleResetCustomEvent(t)}):this.handleResetCustomEvent(t)},handleOptionCheck(t){var e=this.$xeTable.customColumnList,e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e.parent,e.children)&&e.children.length&&(e.renderVisible=e.children.every(e=>e.renderVisible),e.halfVisible=!e.renderVisible&&e.children.some(e=>e.renderVisible||e.halfVisible),this.handleOptionCheck(e))},changeCheckboxOption(e,t){var l=this.$xeTable,o=l;let a=!e.renderVisible;l.computeCustomOpts.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=a,e.renderVisible=a,e.halfVisible=!1}),o.isCustomStatus=!0,l.handleCustom(),l.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=a,e.halfVisible=!1}),this.handleOptionCheck(e),l.checkCustomStatus(),l.dispatchEvent("custom-visible-change",{column:e,checked:a},t)},changeColumnWidth(e){var t=this.$xeTable,l=t;t.computeCustomOpts.immediate&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth,l.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:width"))},changeFixedOption(e,t,l){var o=this.$xeTable,a=o,s=o.computeIsMaxFixedColumn;let r=null;o.computeCustomOpts.immediate?(e.renderFixed===t?(r="",_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""})):s&&!e.renderFixed||(r=t,_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t})),a.isCustomStatus=!0,o.handleCustom(),o.saveCustomStore("update:fixed")):e.renderFixed===t?(r="",_xeUtils.default.eachTree([e],e=>{e.renderFixed=""})):s&&!e.renderFixed||(r=t,_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})),null!==r&&o.dispatchEvent("custom-fixed-change",{column:e,fixed:r},l)},allOptionEvent(e){var t=this.$xeTable,l=t.customStore,l=!l.isAll;t.toggleCustomAllCheckbox(),t.dispatchEvent("custom-visible-all",{checked:l},e)},updateColDropTipContent(){var e=this.$xeTable,t=this.reactData,l=t.dragCol,o=e.computeColumnDragOpts.tooltipMethod;let a="";a=o?""+(o({$table:e,column:l})||""):getI18n("vxe.custom.cstmDragTarget",[l&&"html"!==l.type?l.getTitle():""]),t.dragTipText=a},sortMousedownEvent(e){var t=this.$xeTable,l=this.reactData,e=e.currentTarget.parentElement.parentElement.parentElement,o=e.getAttribute("colid"),t=t.getColumnById(o);e.draggable=!0,l.dragCol=t,l.dragGroupField=null,l.dragAggFnCol=null,this.updateColDropTipContent(),(0,_dom.addClass)(e,"active--drag-origin")},sortMouseupEvent(e){var t=this.reactData,e=e.currentTarget.parentElement.parentElement.parentElement;hideDropTip(this),e.draggable=!1,t.dragCol=null,t.dragGroupField=null,(t.dragAggFnCol=null,_dom.removeClass)(e,"active--drag-origin")},sortDragstartEvent(e){var t=this.internalData;e.dataTransfer&&e.dataTransfer.setDragImage((0,_dom.getTpImg)(),0,0),t.prevDragGroupField=null,t.prevDragAggFnColid=null},sortDragendEvent(c){let u=this.$xeTable;var e=u;let m=u;var t=u,l=this.reactData,o=this.internalData;let p=e.mouseConfig,g=m.customColumnList,v=t.collectColumn,x=u.computeCustomOpts.immediate;e=c.currentTarget;let{isCrossDrag:b,isSelfToChildDrag:h,isToChildDrag:C,dragEndMethod:a}=u.computeColumnDragOpts;t=l.dragCol;let{prevDragCol:s,prevDragGroupField:r,prevDragAggFnColid:i,prevDragPos:E,prevDragToChild:T}=o,f="bottom"===E?1:0;if(r||i)u.handlePivotTableAggregatePanelDragendEvent&&u.handlePivotTableAggregatePanelDragendEvent(c);else if(s&&t&&s!==t){let n=t,d=s;Promise.resolve(!a||a({oldColumn:n,newColumn:d,dragColumn:n,dragPos:E,dragToChild:!!T,offsetIndex:f})).then(a=>{if(a){let e=-1,t=-1,l={},o=(_xeUtils.default.eachTree([n],e=>{l[e.id]=e}),!1);if(x){if(n.parentId&&d.parentId){if(!b)return;if(l[d.id]&&(o=!0,!b||!h))return void(_ui.VxeUI.modal&&_ui.VxeUI.modal.message({status:"error",content:getI18n("vxe.error.treeDragChild")}))}else if(n.parentId){if(!b)return}else if(d.parentId){if(!b)return;if(l[d.id]&&(o=!0,!b||!h))return void(_ui.VxeUI.modal&&_ui.VxeUI.modal.message({status:"error",content:getI18n("vxe.error.treeDragChild")}))}var s,r,i,a=_xeUtils.default.findTree(v,e=>e.id===n.id),a=(o&&b&&h?a&&({items:s,index:i}=a,(r=n.children||[]).forEach(e=>{e.parentId=n.parentId}),s.splice(i,1,...r),n.children=[]):a&&({items:s,index:i,parent:r}=a,s.splice(i,1),r||(e=i)),_xeUtils.default.findTree(v,e=>e.id===d.id));a&&({items:s,index:r,parent:i}=a,b&&C&&T?(n.parentId=d.id,d.children=(d.children||[]).concat([n])):(n.parentId=d.parentId,s.splice(r+f,0,n)),i||(t=r)),_xeUtils.default.eachTree(v,(e,t,l,o,a)=>{a||(e.renderSortNumber=t+1)})}else e=_xeUtils.default.findIndexOf(g,e=>e.id===n.id),g.splice(e,1),t=_xeUtils.default.findIndexOf(g,e=>e.id===d.id),g.splice(t+f,0,n);p&&(u.clearSelected&&u.clearSelected(),u.clearCellAreas)&&(u.clearCellAreas(),u.clearCopyCellArea()),u.dispatchEvent("column-dragend",{oldColumn:n,newColumn:d,dragColumn:n,dragPos:E,offsetIndex:f,_index:{newIndex:t,oldIndex:e}},c),x&&(m.customColumnList=v.slice(0),u.handleColDragSwapColumn())}}).catch(()=>{})}hideDropTip(this),l.dragCol=null,l.dragGroupField=null,l.dragAggFnCol=null,o.prevDragGroupField=null,o.prevDragAggFnColid=null,e.draggable=!1,e.removeAttribute("drag-pos"),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin")},sortDragoverEvent(e){var t=this,l=t.$xeTable,o=t.internalData,a=t.reactData.dragCol,s=l.computeCustomOpts.immediate,{isCrossDrag:r,isToChildDrag:i}=l.computeColumnDragOpts,n=e.currentTarget,d=(0,_dom.hasControlKey)(e),c=n.getAttribute("colid"),l=l.getColumnById(c);o.prevDragGroupField=null,o.prevDragAggFnColid=null,l&&(r||1===l.level)&&(e.preventDefault(),c=e.clientY-n.getBoundingClientRect().y<n.clientHeight/2?"top":"bottom",!a||a.id===l.id||!r&&1<l.level||!s&&1<l.level||l.renderFixed?showDropTip(t,e,n,!1,c):(o.prevDragToChild=!!(r&&i&&d&&s),o.prevDragCol=l,showDropTip(t,e,n,!0,o.prevDragPos=c)))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;function showDropTip(e,t,l,o,s){var a,r,i,n=e.internalData,d=e.$refs.refBodyWrapperElem;d&&(i=e.$refs.refCustomBodyElem)&&(n=n.prevDragToChild,a=d.getBoundingClientRect(),i=i.getBoundingClientRect(),r=e.$refs.refDragLineElem,l?r&&(o?(l=l.getBoundingClientRect(),r.style.display="block",r.style.left=Math.max(0,i.x-a.x)+"px",r.style.top=Math.max(1,l.y+d.scrollTop-a.y)+"px",r.style.height=l.height+"px",r.style.width=l.width+"px",r.setAttribute("drag-pos",s),r.setAttribute("drag-to-child",n?"y":"n")):r.style.display=""):r&&(r.style.display="node"),i=e.$refs.refDragTipElem)&&(i.style.display="block",i.style.top=Math.min(d.clientHeight+d.scrollTop-i.clientHeight,t.clientY+d.scrollTop-a.y)+"px",i.style.left=Math.min(d.clientWidth+d.scrollLeft-i.clientWidth,t.clientX+d.scrollLeft-a.x)+"px",i.setAttribute("drag-status",o?n?"sub":"normal":"disabled"))}function hideDropTip(e){var t=e.$refs.refDragTipElem,e=e.$refs.refDragLineElem;t&&(t.style.display=""),e&&(e.style.display="")}let renderDragTip=(e,t)=>{var l=t.$xeTable,t=t.reactData.dragTipText;return e("div",{},[e("div",{ref:"refDragLineElem",class:["vxe-table-custom-popup--drag-line",{"is--guides":l.computeColumnDragOpts.showGuidesStatus}]}),e("div",{ref:"refDragTipElem",class:"vxe-table-custom-popup--drag-tip"},[e("div",{class:"vxe-table-custom-popup--drag-tip-wrapper"},[e("div",{class:"vxe-table-custom-popup--drag-tip-status"},[e("span",{class:["vxe-table-custom-popup--drag-tip-normal-status",getIcon().TABLE_DRAG_STATUS_ROW]}),e("span",{class:["vxe-table-custom-popup--drag-tip-sub-status",getIcon().TABLE_DRAG_STATUS_SUB_ROW]}),e("span",{class:["vxe-table-custom-popup--drag-tip-group-status",getIcon().TABLE_DRAG_STATUS_AGG_GROUP]}),e("span",{class:["vxe-table-custom-popup--drag-tip-values-status",getIcon().TABLE_DRAG_STATUS_AGG_VALUES]}),e("span",{class:["vxe-table-custom-popup--drag-tip-disabled-status",getIcon().TABLE_DRAG_DISABLED]})]),e("div",{class:"vxe-table-custom-popup--drag-tip-content"},""+(t||""))])])])},renderSimplePanel=(c,u)=>{let m=_ui.VxeUI.getComponent("VxeButton");let p=u.$xeTable;var e=p,t=p,l=p.$xeGrid,o=p.$xeGantt,s=u.customStore,{treeConfig:e,rowGroupConfig:a,aggregateConfig:r}=e,{isCustomStatus:t,customColumnList:i}=t,n=p.computeCustomOpts;let g=n.immediate;var d=p.computeColumnDragOpts,v=s.maxHeight;let{checkMethod:x,visibleMethod:b,allowVisible:h,allowSort:C,allowFixed:E,trigger:T,placement:f}=n,_=p.computeIsMaxFixedColumn,I=d.isCrossDrag;var d=n.slots||{},D=d.header,y=d.top,O=d.bottom,A=d.default,d=d.footer;let k=[];var S={},F=s.isAll,B=s.isIndeterminate,l=("hover"===T&&(S.mouseenter=u.handleWrapperMouseenterEvent,S.mouseleave=u.handleWrapperMouseleaveEvent),{$table:p,$grid:l,$gantt:o,columns:i,isAllChecked:F,isAllIndeterminate:B,isCustomStatus:t});return _xeUtils.default.eachTree(i,(l,e,t,o,s)=>{if(!b||b({$table:p,column:l})){var a=l.renderVisible,r=l.halfVisible,i=l.children&&l.children.length,n=(0,_utils.formatText)(l.getTitle(),1);let t=!!x&&!x({$table:p,column:l});var d=!a;k.push(c("li",{key:l.id,attrs:{colid:l.id},class:["vxe-table-custom--option","level--"+l.level,{"is--hidden":t||d,"is--group":i}],on:{dragstart:u.sortDragstartEvent,dragend:u.sortDragendEvent,dragover:u.sortDragoverEvent}},[h?c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":a,"is--indeterminate":r,"is--disabled":t}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:e=>{t||u.changeCheckboxOption(l,e)}}},[c("span",{class:["vxe-checkbox--icon",r?getIcon().TABLE_CHECKBOX_INDETERMINATE:a?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):renderEmptyElement(p),c("div",{class:"vxe-table-custom--name-option"},[C&&(I&&g||1===l.level)?c("div",{class:"vxe-table-custom--sort-option"},[c("span",{class:["vxe-table-custom--sort-btn",{"is--disabled":t||d||l.renderFixed}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:t||d||l.renderFixed?{}:{mousedown:u.sortMousedownEvent,mouseup:u.sortMouseupEvent}},[c("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):renderEmptyElement(p),"html"===l.type?c("div",{key:"1",class:"vxe-table-custom--checkbox-label",domProps:{innerHTML:n}}):c("div",{key:"0",class:"vxe-table-custom--checkbox-label",attrs:{title:n}},n)]),!s&&E?c("div",{class:"vxe-table-custom--fixed-option"},[c(m,{props:{mode:"text",icon:"left"===l.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===l.renderFixed?"primary":"",disabled:t||d||_&&!l.renderFixed,title:getI18n("left"===l.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft")},on:{click:({$event:e})=>{u.changeFixedOption(l,"left",e)}}}),c(m,{props:{mode:"text",icon:"right"===l.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===l.renderFixed?"primary":"",disabled:t||d||_&&!l.renderFixed,title:getI18n("right"===l.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight")},on:{click:({$event:e})=>{u.changeFixedOption(l,"right",e)}}})]):renderEmptyElement(p)]))}}),c("div",{ref:"refElem",key:"simple",class:["vxe-table-custom-wrapper","placement--"+f,{"is--active":s.visible}],style:v&&!["left","right"].includes(f||"")?{maxHeight:v+"px"}:{}},s.visible?[c("div",{ref:"refBodyWrapperElem",class:"vxe-table-custom-simple--body-wrapper"},[!e&&(r||a)&&p.getPivotTableAggregateSimplePanel?c(p.getPivotTableAggregateSimplePanel(),{props:{customStore:s}}):renderEmptyElement(p),c("div",{ref:"refCustomBodyElem",class:"vxe-table-custom--handle-wrapper"},[c("div",{class:"vxe-table-custom--header"},D?p.callSlot(D,l,c):[c("ul",{class:"vxe-table-custom--panel-list"},[c("li",{class:"vxe-table-custom--option"},[h?c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":F,"is--indeterminate":B}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:u.allOptionEvent}},[c("span",{class:["vxe-checkbox--icon",B?getIcon().TABLE_CHECKBOX_INDETERMINATE:F?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),c("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):c("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),c("div",{class:"vxe-table-custom--body"},[y?c("div",{class:"vxe-table-custom--panel-top"},p.callSlot(y,l,c)):renderEmptyElement(p),A?c("div",{class:"vxe-table-custom--panel-body"},p.callSlot(A,l,c)):c("transition-group",{class:"vxe-table-custom--panel-list",props:{name:"vxe-table-custom--list",tag:"ul"},on:S},k),O?c("div",{class:"vxe-table-custom--panel-bottom"},p.callSlot(O,l,c)):renderEmptyElement(p)]),n.showFooter?c("div",{class:"vxe-table-custom--footer"},d?p.callSlot(d,l,c):[c("div",{class:"vxe-table-custom--footer-buttons"},[c(m,{props:{mode:"text",content:n.resetButtonText||getI18n("vxe.table.customRestore"),disabled:!t},on:{click:u.resetCustomEvent}}),g?c(m,{props:{mode:"text",content:n.closeButtonText||getI18n("vxe.table.customClose")},on:{click:u.cancelCloseEvent}}):c(m,{props:{mode:"text",content:n.resetButtonText||getI18n("vxe.table.customCancel")},on:{click:u.cancelCustomEvent}}),g?renderEmptyElement(p):c(m,{props:{mode:"text",status:"primary",content:n.confirmButtonText||getI18n("vxe.table.customConfirm")},on:{click:u.confirmCustomEvent}})])]):null]),renderDragTip(c,u)])]:[])},renderPopupPanel=(c,u)=>{var e=_ui.VxeUI.getComponent("VxeModal"),t=_ui.VxeUI.getComponent("VxeDrawer");let l=_ui.VxeUI.getComponent("VxeButton"),m=_ui.VxeUI.getComponent("VxeNumberInput"),p=u,g=u.$xeTable;var o=g,s=g,a=g.$xeGrid,U=g.$xeGantt;let r=u.customStore,{treeConfig:L,rowGroupConfig:M,aggregateConfig:R,resizable:H}=o,{isCustomStatus:i,customColumnList:n}=s,d=g.computeCustomOpts,v=d.immediate;o=g.computeColumnDragOpts;let{mode:P,modalOptions:W,drawerOptions:G,allowVisible:x,allowSort:z,allowFixed:b,allowResizable:h,checkMethod:C,visibleMethod:E}=d,T=g.computeColumnOpts,f=T.maxFixedSize,{minWidth:_,maxWidth:I}=g.computeResizableOpts;var s=Object.assign({},W),D=Object.assign({},G);let y=g.computeIsMaxFixedColumn,N=o.isCrossDrag;o=d.slots||{};let O=o.header,A=o.top,k=o.bottom,S=o.default,F=o.footer,B=[],w=r.isAll,V=r.isIndeterminate,$={$table:g,$grid:a,$gantt:U,columns:n,isAllChecked:w,isAllIndeterminate:V,isCustomStatus:i};_xeUtils.default.eachTree(n,(o,s,e,t,a)=>{if(!E||E({$table:g,column:o})){let e=0,t=0;h&&(s={$table:g,column:o,columnIndex:s,$columnIndex:s,$rowIndex:-1},_&&(e=_xeUtils.default.toNumber(_xeUtils.default.isFunction(_)?_(s):_)),I)&&(t=_xeUtils.default.toNumber(_xeUtils.default.isFunction(I)?I(s):I));var s=o.renderVisible,r=o.halfVisible,i=(0,_utils.formatText)(o.getTitle(),1),n=o.children&&o.children.length;let l=!!C&&!C({$table:g,column:o});var d=!s;B.push(c("tr",{key:o.id,attrs:{colid:o.id},class:["vxe-table-custom-popup--row level--"+o.level,{"is--group":n}],on:{dragstart:p.sortDragstartEvent,dragend:p.sortDragendEvent,dragover:p.sortDragoverEvent}},[x?c("td",{class:"vxe-table-custom-popup--column-item col--visible"},[c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":r,"is--disabled":l}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:e=>{l||p.changeCheckboxOption(o,e)}}},[c("span",{class:["vxe-checkbox--icon",r?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):renderEmptyElement(g),c("td",{class:"vxe-table-custom-popup--column-item col--name"},[c("div",{class:"vxe-table-custom-popup--name"},[z?N&&v||1===o.level?c("div",{class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":l||d||o.renderFixed}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:l||d||o.renderFixed?{}:{mousedown:p.sortMousedownEvent,mouseup:p.sortMouseupEvent}},[c("i",{class:getIcon().TABLE_CUSTOM_SORT})]):c("div",{class:"vxe-table-custom-popup--column-sort-placeholder"}):renderEmptyElement(g),"html"===o.type?c("div",{key:"1",class:"vxe-table-custom-popup--title",domProps:{innerHTML:i}}):c("div",{key:"0",class:"vxe-table-custom-popup--title",attrs:{title:i}},i)])]),h?c("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[o.children&&o.children.length||!(_xeUtils.default.isBoolean(o.resizable)?o.resizable:T.resizable||H)?c("span","-"):m?c(m,{props:{type:"integer",immediate:!1,disabled:l||d,value:o.renderResizeWidth,min:e||void 0,max:t||void 0},on:{modelValue(e){o.renderResizeWidth=Math.max(0,Number(e))},change(){p.changeColumnWidth(o)}}}):renderEmptyElement(u)]):renderEmptyElement(g),b?c("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[a?c("span","-"):c("vxe-radio-group",{props:{value:o.renderFixed||"",type:"button",size:"mini",disabled:l||d,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:l||d||y},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:l||d},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:l||d||y}]},on:{change({label:e,$event:t}){p.changeFixedOption(o,e,t)}}})]):renderEmptyElement(g)]))}});o={default:()=>c("div",{ref:"refBodyWrapperElem",class:"vxe-table-custom-popup--body-wrapper"},S?g.callSlot(S,$,c):[c("div",{ref:"refCustomBodyElem",class:"vxe-table-custom-popup--handle-wrapper"},[A?c("div",{class:"vxe-table-custom-popup--table-top"},g.callSlot(A,$,c)):renderEmptyElement(g),c("div",{class:"vxe-table-custom-popup--table-wrapper"},[c("table",{},[c("colgroup",{},[x?c("col",{class:"vxe-table-custom-popup--table-col-seq"}):renderEmptyElement(g),c("col",{class:"vxe-table-custom-popup--table-col-title"}),h?c("col",{class:"vxe-table-custom-popup--table-col-width"}):renderEmptyElement(g),b?c("col",{class:"vxe-table-custom-popup--table-col-fixed"}):renderEmptyElement(g)]),c("thead",{},[c("tr",{},[x?c("th",{},[c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":w,"is--indeterminate":V}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:p.allOptionEvent}},[c("span",{class:["vxe-checkbox--icon",V?getIcon().TABLE_CHECKBOX_INDETERMINATE:w?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),c("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):renderEmptyElement(g),c("th",{},getI18n("vxe.custom.setting.colTitle")),h?c("th",{},getI18n("vxe.custom.setting.colResizable")):renderEmptyElement(g),b?c("th",{},getI18n("vxe.custom.setting."+(f?"colFixedMax":"colFixed"),[f])):renderEmptyElement(g)])]),c("transition-group",{class:"vxe-table-custom--panel-list",props:{tag:"tbody",name:"vxe-table-custom--list"}},B)])]),k?c("div",{class:"vxe-table-custom-popup--table-bottom"},g.callSlot(k,$,c)):renderEmptyElement(g),renderDragTip(c,p)]),!L&&(R||M)&&g.getPivotTableAggregatePopupPanel?c(g.getPivotTableAggregatePopupPanel(),{props:{customStore:r}}):renderEmptyElement(g)]),footer:()=>F?g.callSlot(F,$,c):c("div",{class:"vxe-table-custom-popup--footer"},[c(l,{props:{content:d.resetButtonText||getI18n("vxe.custom.cstmRestore"),disabled:!i},on:{click:p.resetCustomEvent}}),v?c(l,{props:{content:d.resetButtonText||getI18n("vxe.table.customClose")},on:{click:p.cancelCloseEvent}}):c(l,{props:{content:d.resetButtonText||getI18n("vxe.custom.cstmCancel")},on:{click:p.cancelCustomEvent}}),v?renderEmptyElement(g):c(l,{props:{status:"primary",content:d.confirmButtonText||getI18n("vxe.custom.cstmConfirm")},on:{click:p.confirmCustomEvent}})])};return O&&(o.header=()=>g.callSlot(O,$,c)),"drawer"===P?t?c(t,{key:"drawer",props:{className:["vxe-table-custom-drawer-wrapper","vxe-table--ignore-clear",D.className||""].join(" "),value:r.visible,title:D.title||getI18n("vxe.custom.cstmTitle"),width:D.width||Math.min(880,Math.floor(.6*document.documentElement.clientWidth)),position:D.position,resize:!!D.resize,escClosable:!!D.escClosable,maskClosable:!!D.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){r.visible=e}},scopedSlots:o}):renderEmptyElement(u):e?c(e,{key:"modal",props:{className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",s.className||""].join(" "),value:r.visible,title:s.title||getI18n("vxe.custom.cstmTitle"),width:s.width||Math.min(880,document.documentElement.clientWidth),minWidth:s.minWidth||700,height:s.height||Math.min(680,document.documentElement.clientHeight),minHeight:s.minHeight||400,showZoom:s.showZoom,showMaximize:s.showMaximize,showMinimize:s.showMinimize,mask:s.mask,lockView:s.lockView,resize:s.resize,escClosable:!!s.escClosable,maskClosable:!!s.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){r.visible=e}},scopedSlots:o}):renderEmptyElement(u)};var _default=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},provide(){return{$xeTableCustomPanel:this}},inject:{$xeTable:{default:null}},data(){return{reactData:{dragCol:null,dragGroupField:null,dragAggFnCol:null,dragTipText:""},internalData:{}}},computed:{},created(){let t=this,l=_ui.VxeUI.getComponent("VxeModal"),o=_ui.VxeUI.getComponent("VxeDrawer"),s=_ui.VxeUI.getComponent("VxeButton"),a=_ui.VxeUI.getComponent("VxeNumberInput"),r=_ui.VxeUI.getComponent("VxeRadioGroup");t.$nextTick(()=>{var e=t.$xeTable.customOpts,e=e.mode;l||"modal"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),o||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),s||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),a||(0,_log.errLog)("vxe.error.reqComp",["vxe-number-input"]),r||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])})},render(e){var t=this.$xeTable.computeCustomOpts;return(["modal","drawer","popup"].includes(""+t.mode)?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent(e){var t=this.$xeTable,l=this.customStore;l.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent(e){let t=this.$xeTable;let l=this.customStore;l.activeWrapper=!1,setTimeout(()=>{l.activeBtn||l.activeWrapper||t.customCloseEvent(e)},300)},getStoreData(){return{}},confirmCustomEvent({$event:e}){var t=this.$xeTable;t.isCustomStatus=!0,t.saveCustom(),t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCloseEvent({$event:e}){var t=this.$xeTable;t.closeCustom(),t.emitCustomEvent("close",e)},cancelCustomEvent({$event:e}){var t=this.$xeTable;t.cancelCustom(),t.closeCustom(),t.emitCustomEvent("cancel",e)},handleResetCustomEvent(e){var t=this.$xeTable;t.resetCustom(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.handleResetCustomEvent(t)}):this.handleResetCustomEvent(t)},handleOptionCheck(t){var e=this.$xeTable.customColumnList,e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e.parent,e.children)&&e.children.length&&(e.renderVisible=e.children.every(e=>e.renderVisible),e.halfVisible=!e.renderVisible&&e.children.some(e=>e.renderVisible||e.halfVisible),this.handleOptionCheck(e))},changeCheckboxOption(e,t){var l=this.$xeTable,o=l;let s=!e.renderVisible;l.computeCustomOpts.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=s,e.renderVisible=s,e.halfVisible=!1}),o.isCustomStatus=!0,l.handleCustom(),l.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=s,e.halfVisible=!1}),this.handleOptionCheck(e),l.checkCustomStatus(),l.dispatchEvent("custom-visible-change",{column:e,checked:s},t)},changeColumnWidth(e){var t=this.$xeTable,l=t;t.computeCustomOpts.immediate&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth,l.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:width"))},changeFixedOption(e,t,l){var o=this.$xeTable,s=o,a=o.computeIsMaxFixedColumn;let r=null;o.computeCustomOpts.immediate?(e.renderFixed===t?(r="",_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""})):a&&!e.renderFixed||(r=t,_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t})),s.isCustomStatus=!0,o.handleCustom(),o.saveCustomStore("update:fixed")):e.renderFixed===t?(r="",_xeUtils.default.eachTree([e],e=>{e.renderFixed=""})):a&&!e.renderFixed||(r=t,_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})),null!==r&&o.dispatchEvent("custom-fixed-change",{column:e,fixed:r},l)},allOptionEvent(e){var t=this.$xeTable,l=t.customStore,l=!l.isAll;t.toggleCustomAllCheckbox(),t.dispatchEvent("custom-visible-all",{checked:l},e)},updateColDropTipContent(){var e=this.$xeTable,t=this.reactData,l=t.dragCol,o=e.computeColumnDragOpts.tooltipMethod;let s="";s=o?""+(o({$table:e,column:l})||""):getI18n("vxe.custom.cstmDragTarget",[l&&"html"!==l.type?l.getTitle():""]),t.dragTipText=s},sortMousedownEvent(e){var t=this.$xeTable,l=this.reactData,e=e.currentTarget.parentElement.parentElement.parentElement,o=e.getAttribute("colid"),t=t.getColumnById(o);e.draggable=!0,l.dragCol=t,l.dragGroupField=null,l.dragAggFnCol=null,this.updateColDropTipContent(),(0,_dom.addClass)(e,"active--drag-origin")},sortMouseupEvent(e){var t=this.reactData,e=e.currentTarget.parentElement.parentElement.parentElement;hideDropTip(this),e.draggable=!1,t.dragCol=null,t.dragGroupField=null,(t.dragAggFnCol=null,_dom.removeClass)(e,"active--drag-origin")},sortDragstartEvent(e){var t=this.internalData;e.dataTransfer&&e.dataTransfer.setDragImage((0,_dom.getTpImg)(),0,0),t.prevDragGroupField=null,t.prevDragAggFnColid=null},sortDragendEvent(c){let u=this.$xeTable;var e=u;let m=u;var t=u,l=this.reactData,o=this.internalData;let p=e.mouseConfig,g=m.customColumnList,v=t.collectColumn,x=u.computeCustomOpts.immediate;e=c.currentTarget;let{isCrossDrag:b,isSelfToChildDrag:h,isToChildDrag:C,dragEndMethod:s}=u.computeColumnDragOpts;t=l.dragCol;let{prevDragCol:a,prevDragGroupField:r,prevDragAggFnColid:i,prevDragPos:E,prevDragToChild:T}=o,f="bottom"===E?1:0;if(r||i)u.handlePivotTableAggregatePanelDragendEvent&&u.handlePivotTableAggregatePanelDragendEvent(c);else if(a&&t&&a!==t){let n=t,d=a;Promise.resolve(!s||s({oldColumn:n,newColumn:d,dragColumn:n,dragPos:E,dragToChild:!!T,offsetIndex:f})).then(s=>{if(s){let e=-1,t=-1,l={},o=(_xeUtils.default.eachTree([n],e=>{l[e.id]=e}),!1);if(x){if(n.parentId&&d.parentId){if(!b)return;if(l[d.id]&&(o=!0,!b||!h))return void(_ui.VxeUI.modal&&_ui.VxeUI.modal.message({status:"error",content:getI18n("vxe.error.treeDragChild")}))}else if(n.parentId){if(!b)return}else if(d.parentId){if(!b)return;if(l[d.id]&&(o=!0,!b||!h))return void(_ui.VxeUI.modal&&_ui.VxeUI.modal.message({status:"error",content:getI18n("vxe.error.treeDragChild")}))}var a,r,i,s=_xeUtils.default.findTree(v,e=>e.id===n.id),s=(o&&b&&h?s&&({items:a,index:i}=s,(r=n.children||[]).forEach(e=>{e.parentId=n.parentId}),a.splice(i,1,...r),n.children=[]):s&&({items:a,index:i,parent:r}=s,a.splice(i,1),r||(e=i)),_xeUtils.default.findTree(v,e=>e.id===d.id));s&&({items:a,index:r,parent:i}=s,b&&C&&T?(n.parentId=d.id,d.children=(d.children||[]).concat([n])):(n.parentId=d.parentId,a.splice(r+f,0,n)),i||(t=r)),_xeUtils.default.eachTree(v,(e,t,l,o,s)=>{s||(e.renderSortNumber=t+1)})}else e=_xeUtils.default.findIndexOf(g,e=>e.id===n.id),g.splice(e,1),t=_xeUtils.default.findIndexOf(g,e=>e.id===d.id),g.splice(t+f,0,n);p&&(u.clearSelected&&u.clearSelected(),u.clearCellAreas)&&(u.clearCellAreas(),u.clearCopyCellArea()),u.dispatchEvent("column-dragend",{oldColumn:n,newColumn:d,dragColumn:n,dragPos:E,offsetIndex:f,_index:{newIndex:t,oldIndex:e}},c),x&&(m.customColumnList=v.slice(0),u.handleColDragSwapColumn())}}).catch(()=>{})}hideDropTip(this),l.dragCol=null,l.dragGroupField=null,l.dragAggFnCol=null,o.prevDragGroupField=null,o.prevDragAggFnColid=null,e.draggable=!1,e.removeAttribute("drag-pos"),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin")},sortDragoverEvent(e){var t=this,l=t.$xeTable,o=t.internalData,s=t.reactData.dragCol,a=l.computeCustomOpts.immediate,{isCrossDrag:r,isToChildDrag:i}=l.computeColumnDragOpts,n=e.currentTarget,d=(0,_dom.hasControlKey)(e),c=n.getAttribute("colid"),l=l.getColumnById(c);o.prevDragGroupField=null,o.prevDragAggFnColid=null,l&&(r||1===l.level)&&(e.preventDefault(),c=e.clientY-n.getBoundingClientRect().y<n.clientHeight/2?"top":"bottom",!s||s.id===l.id||!r&&1<l.level||!a&&1<l.level||l.renderFixed?showDropTip(t,e,n,!1,c):(o.prevDragToChild=!!(r&&i&&d&&a),o.prevDragCol=l,showDropTip(t,e,n,!0,o.prevDragPos=c)))}}};

package/lib/table/src/anime.js

@@ -26,10 +26,10 @@ function moveRowAnimateToTb(elemList, offsetTop) {
     });
   });
 }
-function clearRowAnimate(elem) {
+function clearRowAnimate(elem, clss) {
   setTimeout(() => {
     if (elem) {
-      _xeUtils.default.arrayEach(elem.querySelectorAll(`.vxe-body--row.${rowMoveCls}`), elem => (0, _dom.removeClass)(elem, rowMoveCls));
+      _xeUtils.default.arrayEach(elem.querySelectorAll(clss.map(cls => `${cls}.${rowMoveCls}`).join(',')), elem => (0, _dom.removeClass)(elem, rowMoveCls));
     }
   }, 500);
 }
@@ -47,10 +47,10 @@ function moveColAnimateToLr(elemList, offsetLeft) {
     });
   });
 }
-function clearColAnimate(elem) {
+function clearColAnimate(elem, clss) {
   setTimeout(() => {
     if (elem) {
-      _xeUtils.default.arrayEach(elem.querySelectorAll(`.vxe-table--column.${colMoveClass}`), elem => (0, _dom.removeClass)(elem, colMoveClass));
+      _xeUtils.default.arrayEach(elem.querySelectorAll(clss.map(cls => `${cls}.${rowMoveCls}`).join(',')), elem => (0, _dom.removeClass)(elem, colMoveClass));
     }
   }, 500);
 }

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.clearColAnimate=clearColAnimate,exports.clearRowAnimate=clearRowAnimate,exports.moveColAnimateToLr=moveColAnimateToLr,exports.moveRowAnimateToTb=moveRowAnimateToTb;var _xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let rowMoveCls="row--drag-move",colMoveClass="col--drag-move";function moveRowAnimateToTb(e,o){_xeUtils.default.arrayEach(e,e=>{e.style.transform=`translateY(${o}px)`}),requestAnimationFrame(()=>{_xeUtils.default.arrayEach(e,e=>{(0,_dom.addClass)(e,rowMoveCls),e.style.transform=""})})}function clearRowAnimate(e){setTimeout(()=>{e&&_xeUtils.default.arrayEach(e.querySelectorAll(".vxe-body--row."+rowMoveCls),e=>(0,_dom.removeClass)(e,rowMoveCls))},500)}function moveColAnimateToLr(e,o){_xeUtils.default.arrayEach(e,e=>{e.style.transform=`translateX(${o}px)`}),requestAnimationFrame(()=>{_xeUtils.default.arrayEach(e,e=>{(0,_dom.addClass)(e,colMoveClass),e.style.transform=""})})}function clearColAnimate(e){setTimeout(()=>{e&&_xeUtils.default.arrayEach(e.querySelectorAll(".vxe-table--column."+colMoveClass),e=>(0,_dom.removeClass)(e,colMoveClass))},500)}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.clearColAnimate=clearColAnimate,exports.clearRowAnimate=clearRowAnimate,exports.moveColAnimateToLr=moveColAnimateToLr,exports.moveRowAnimateToTb=moveRowAnimateToTb;var _xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let rowMoveCls="row--drag-move",colMoveClass="col--drag-move";function moveRowAnimateToTb(e,o){_xeUtils.default.arrayEach(e,e=>{e.style.transform=`translateY(${o}px)`}),requestAnimationFrame(()=>{_xeUtils.default.arrayEach(e,e=>{(0,_dom.addClass)(e,rowMoveCls),e.style.transform=""})})}function clearRowAnimate(e,o){setTimeout(()=>{e&&_xeUtils.default.arrayEach(e.querySelectorAll(o.map(e=>e+"."+rowMoveCls).join(",")),e=>(0,_dom.removeClass)(e,rowMoveCls))},500)}function moveColAnimateToLr(e,o){_xeUtils.default.arrayEach(e,e=>{e.style.transform=`translateX(${o}px)`}),requestAnimationFrame(()=>{_xeUtils.default.arrayEach(e,e=>{(0,_dom.addClass)(e,colMoveClass),e.style.transform=""})})}function clearColAnimate(e,o){setTimeout(()=>{e&&_xeUtils.default.arrayEach(e.querySelectorAll(o.map(e=>e+"."+rowMoveCls).join(",")),e=>(0,_dom.removeClass)(e,colMoveClass))},500)}

package/lib/table/src/footer.js

@@ -60,7 +60,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const cellOpts = $xeTable.computeCellOpts;
   const footerCellOpts = $xeTable.computeFooterCellOpts;
-  const currCellHeight = (0, _util.getCellHeight)(footerCellOpts.height) || defaultRowHeight;
+  const currCellHeight = (0, _util.getCalcHeight)(footerCellOpts.height) || defaultRowHeight;
   return tableColumn.map((column, $columnIndex) => {
     const {
       type,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(C,e,_,F,T,$,S,E){let I=e.$parent;var l=I,t=I,r=I;let O=I.$xeGrid,z=I.$xeGantt,R=e.fixedType,{resizable:D,border:k,footerCellClassName:A,footerCellStyle:q,footerAlign:U,footerSpanMethod:X,align:M,columnKey:L,showFooterOverflow:H}=l,{scrollXLoad:N,scrollYLoad:j,overflowX:G,currentColumn:V,mergeFootFlag:W}=t,{fullColumnIdData:B,mergeFooterList:K,mergeFooterCellMaps:P,scrollXStore:Y}=r,ee=I.computeVirtualXOpts,le=I.computeTooltipOpts,te=I.resizableOpts.isAllColumnDrag,J=I.computeColumnOpts;e=I.computeDefaultRowHeight;let re=I.computeCellOpts,Q=I.computeFooterCellOpts,Z=(0,_util.getCellHeight)(Q.height)||e;return F.map((l,e)=>{var{type:t,showFooterOverflow:r,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=B[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=le.showAll;var n=G&&(R?l.fixed!==R:!!l.fixed),c=(_xeUtils.default.isBoolean(Q.padding)?Q:re).padding,r=_xeUtils.default.eqNull(r)?H:r,o=o||(s?s.tableFooterCellAlign:"")||U||i||(s?s.tableCellAlign:"")||M,i="ellipsis"===r;let f="title"===r,x=!0===r||"tooltip"===r;var s=f||x||i,r=_xeUtils.default.isBoolean(l.resizable)?l.resizable:J.resizable||D,m={colid:d},v={},g=u.index,u=u._index,w=u;let b={$table:I,$grid:O,$gantt:z,row:$,rowIndex:E,_rowIndex:E,$rowIndex:S,column:l,columnIndex:g,$columnIndex:e,_columnIndex:u,itemIndex:w,items:$,fixed:R,type:renderType,data:T},h=((f||x||p)&&(v.mouseenter=e=>{f?(0,_dom.updateCellTitle)(e.currentTarget,l):(x||p)&&I.triggerFooterTooltipEvent(e,b)}),(x||p)&&(v.mouseleave=e=>{(x||p)&&I.handleTargetLeaveEvent(e)}),v.click=e=>{I.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},b),e)},!(v.dblclick=e=>{I.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},b),e)}));if(W&&K.length){g=P[E+":"+u];if(g){var{rowspan:w,colspan:g}=g;if(!w||!g)return null;1<w&&(h=!0,m.rowspan=w),1<g&&(h=!0,m.colspan=g)}}else if(X){var{rowspan:w=1,colspan:g=1}=X(b)||{};if(!w||!g)return null;1<w&&(m.rowspan=w),1<g&&(m.colspan=g)}w=e===F.length-1,g=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let y=!1;_&&G&&!h&&N&&10<F.length&&!l.fixed&&!ee.immediate&&(u<Y.visibleStartIndex-Y.preloadSize||u>Y.visibleEndIndex+Y.preloadSize)&&(y=!0);u={};return s?u.height=Z+"px":u.minHeight=Z+"px",C("td",{class:["vxe-table--column vxe-footer--column",l.id,{["col--"+o]:o,["col--"+t]:t,"col--last":w,"fixed--width":!g,"fixed--hidden":n,"is--padding":c,"col--ellipsis":s,"col--current":V===l},(0,_utils.getClass)(a,b),(0,_utils.getClass)(A,b)],attrs:m,style:q?_xeUtils.default.isFunction(q)?q(b):q:void 0,on:v,key:L||N||j||J.useKey||J.drag?l.id:e},[C("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":x,"c--ellipsis":i}],style:u},y?[]:[C("div",{attrs:{colid:d},class:"vxe-cell--wrapper vxe-footer-cell--wrapper"},l.renderFooter(C,b))]),!n&&r&&te?C("div",{class:["vxe-cell--col-resizable",{"is--line":!k||"none"===k}],on:{mousedown:e=>I.handleColResizeMousedownEvent(e,R,b),dblclick:e=>I.handleColResizeDblclickEvent(e,b)}}):renderEmptyElement(I)])})}function renderHeads(o,i,a,n){let s=i.$parent;var e=s;let{fixedType:d,footerTableData:u}=i,{footerRowClassName:p,footerRowStyle:c}=e;return u.map((e,l)=>{var t=l,r={$table:s,row:e,_rowIndex:t,$rowIndex:l,fixed:d,type:renderType};return o("tr",{key:l,class:["vxe-footer--row",p?_xeUtils.default.isFunction(p)?p(r):p:""],style:c?_xeUtils.default.isFunction(c)?c(r):c:void 0},renderRows(o,i,a,n,u,e,l,t))})}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,t=e.$parent.elemStore,l=`${l||"main"}-footer-`;t[l+"wrapper"]=e.$refs.refElem,t[l+"scroll"]=e.$refs.refFooterScroll,t[l+"table"]=e.$refs.refFooterTable,t[l+"colgroup"]=e.$refs.refFooterColgroup,t[l+"list"]=e.$refs.refFooterTFoot,t[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(t){let l=this.$parent;var e=l,r=l,o=l,i=l.xID;let{fixedType:a,fixedColumn:n,tableColumn:s}=this;var{spanMethod:e,footerSpanMethod:d,showFooterOverflow:u}=e,{visibleColumn:o,fullColumnIdData:p}=o,{isGroup:r,isColLoading:c,overflowX:f,scrollXLoad:x,dragCol:m}=r;let v=s,g=!1;return x&&u&&(e||d||(g=!0)),g&&(c||!a&&f)||(v=o),a&&g&&(v=n||[]),a||r||x&&m&&2<v.length&&(u=p[m.id])&&(e=u._index,d=v[0],c=v[v.length-1],f=p[d.id],o=p[c.id],f)&&o&&(r=f._index,x=o._index,e<r?v=[m].concat(v):x<e&&(v=v.concat([m]))),t("div",{ref:"refElem",class:["vxe-table--footer-wrapper",a?`fixed-${a}--wrapper`:"body--wrapper"],attrs:{xid:i}},[t("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,a)}}},[a?renderEmptyElement(l):t("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),t("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0,xvm:g?"1":null}},[t("colgroup",{ref:"refFooterColgroup"},v.map((e,l)=>t("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),t("tfoot",{ref:"refFooterTFoot"},renderHeads(t,this,g,v))])])])}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(C,e,_,F,T,$,S,E){let I=e.$parent;var l=I,t=I,r=I;let O=I.$xeGrid,z=I.$xeGantt,R=e.fixedType,{resizable:D,border:k,footerCellClassName:A,footerCellStyle:q,footerAlign:U,footerSpanMethod:X,align:M,columnKey:L,showFooterOverflow:H}=l,{scrollXLoad:N,scrollYLoad:j,overflowX:G,currentColumn:V,mergeFootFlag:W}=t,{fullColumnIdData:B,mergeFooterList:K,mergeFooterCellMaps:P,scrollXStore:Y}=r,ee=I.computeVirtualXOpts,le=I.computeTooltipOpts,te=I.resizableOpts.isAllColumnDrag,J=I.computeColumnOpts;e=I.computeDefaultRowHeight;let re=I.computeCellOpts,Q=I.computeFooterCellOpts,Z=(0,_util.getCalcHeight)(Q.height)||e;return F.map((l,e)=>{var{type:t,showFooterOverflow:r,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=B[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=le.showAll;var n=G&&(R?l.fixed!==R:!!l.fixed),c=(_xeUtils.default.isBoolean(Q.padding)?Q:re).padding,r=_xeUtils.default.eqNull(r)?H:r,o=o||(s?s.tableFooterCellAlign:"")||U||i||(s?s.tableCellAlign:"")||M,i="ellipsis"===r;let f="title"===r,x=!0===r||"tooltip"===r;var s=f||x||i,r=_xeUtils.default.isBoolean(l.resizable)?l.resizable:J.resizable||D,m={colid:d},v={},g=u.index,u=u._index,w=u;let b={$table:I,$grid:O,$gantt:z,row:$,rowIndex:E,_rowIndex:E,$rowIndex:S,column:l,columnIndex:g,$columnIndex:e,_columnIndex:u,itemIndex:w,items:$,fixed:R,type:renderType,data:T},h=((f||x||p)&&(v.mouseenter=e=>{f?(0,_dom.updateCellTitle)(e.currentTarget,l):(x||p)&&I.triggerFooterTooltipEvent(e,b)}),(x||p)&&(v.mouseleave=e=>{(x||p)&&I.handleTargetLeaveEvent(e)}),v.click=e=>{I.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},b),e)},!(v.dblclick=e=>{I.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},b),e)}));if(W&&K.length){g=P[E+":"+u];if(g){var{rowspan:w,colspan:g}=g;if(!w||!g)return null;1<w&&(h=!0,m.rowspan=w),1<g&&(h=!0,m.colspan=g)}}else if(X){var{rowspan:w=1,colspan:g=1}=X(b)||{};if(!w||!g)return null;1<w&&(m.rowspan=w),1<g&&(m.colspan=g)}w=e===F.length-1,g=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let y=!1;_&&G&&!h&&N&&10<F.length&&!l.fixed&&!ee.immediate&&(u<Y.visibleStartIndex-Y.preloadSize||u>Y.visibleEndIndex+Y.preloadSize)&&(y=!0);u={};return s?u.height=Z+"px":u.minHeight=Z+"px",C("td",{class:["vxe-table--column vxe-footer--column",l.id,{["col--"+o]:o,["col--"+t]:t,"col--last":w,"fixed--width":!g,"fixed--hidden":n,"is--padding":c,"col--ellipsis":s,"col--current":V===l},(0,_utils.getClass)(a,b),(0,_utils.getClass)(A,b)],attrs:m,style:q?_xeUtils.default.isFunction(q)?q(b):q:void 0,on:v,key:L||N||j||J.useKey||J.drag?l.id:e},[C("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":x,"c--ellipsis":i}],style:u},y?[]:[C("div",{attrs:{colid:d},class:"vxe-cell--wrapper vxe-footer-cell--wrapper"},l.renderFooter(C,b))]),!n&&r&&te?C("div",{class:["vxe-cell--col-resizable",{"is--line":!k||"none"===k}],on:{mousedown:e=>I.handleColResizeMousedownEvent(e,R,b),dblclick:e=>I.handleColResizeDblclickEvent(e,b)}}):renderEmptyElement(I)])})}function renderHeads(o,i,a,n){let s=i.$parent;var e=s;let{fixedType:d,footerTableData:u}=i,{footerRowClassName:p,footerRowStyle:c}=e;return u.map((e,l)=>{var t=l,r={$table:s,row:e,_rowIndex:t,$rowIndex:l,fixed:d,type:renderType};return o("tr",{key:l,class:["vxe-footer--row",p?_xeUtils.default.isFunction(p)?p(r):p:""],style:c?_xeUtils.default.isFunction(c)?c(r):c:void 0},renderRows(o,i,a,n,u,e,l,t))})}var _default=exports.default={name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,t=e.$parent.elemStore,l=`${l||"main"}-footer-`;t[l+"wrapper"]=e.$refs.refElem,t[l+"scroll"]=e.$refs.refFooterScroll,t[l+"table"]=e.$refs.refFooterTable,t[l+"colgroup"]=e.$refs.refFooterColgroup,t[l+"list"]=e.$refs.refFooterTFoot,t[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(t){let l=this.$parent;var e=l,r=l,o=l,i=l.xID;let{fixedType:a,fixedColumn:n,tableColumn:s}=this;var{spanMethod:e,footerSpanMethod:d,showFooterOverflow:u}=e,{visibleColumn:o,fullColumnIdData:p}=o,{isGroup:r,isColLoading:c,overflowX:f,scrollXLoad:x,dragCol:m}=r;let v=s,g=!1;return x&&u&&(e||d||(g=!0)),g&&(c||!a&&f)||(v=o),a&&g&&(v=n||[]),a||r||x&&m&&2<v.length&&(u=p[m.id])&&(e=u._index,d=v[0],c=v[v.length-1],f=p[d.id],o=p[c.id],f)&&o&&(r=f._index,x=o._index,e<r?v=[m].concat(v):x<e&&(v=v.concat([m]))),t("div",{ref:"refElem",class:["vxe-table--footer-wrapper",a?`fixed-${a}--wrapper`:"body--wrapper"],attrs:{xid:i}},[t("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,a)}}},[a?renderEmptyElement(l):t("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),t("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0,xvm:g?"1":null}},[t("colgroup",{ref:"refFooterColgroup"},v.map((e,l)=>t("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),t("tfoot",{ref:"refFooterTFoot"},renderHeads(t,this,g,v))])])])}};

package/lib/table/src/header.js

@@ -53,7 +53,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
   const cellOpts = $xeTable.computeCellOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const headerCellOpts = $xeTable.computeHeaderCellOpts;
-  const currCellHeight = (0, _util.getCellHeight)(headerCellOpts.height) || defaultRowHeight;
+  const currCellHeight = (0, _util.getCalcHeight)(headerCellOpts.height) || defaultRowHeight;
   const {
     disabledMethod: dragDisabledMethod,
     isCrossDrag,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,cellType="header",renderRows=($,e,E,S,D,T)=>{let R=e.$parent,I=R.$xeGrid,O=R.$xeGantt;var l=R,r=R,a=R;let k=e.fixedType,{resizable:z,columnKey:U,headerCellClassName:M,headerCellStyle:A,showHeaderOverflow:X,headerAlign:q,align:G,mouseConfig:F}=l,{currentColumn:L,dragCol:N,scrollXLoad:B,scrollYLoad:V,overflowX:W,tableColumn:K}=r,{fullColumnIdData:P,scrollXStore:j}=a,Y=R.computeVirtualXOpts,J=R.computeColumnOpts,Q=R.computeColumnDragOpts,Z=R.computeCellOpts;e=R.computeDefaultRowHeight;let ee=R.computeHeaderCellOpts,le=(0,_util.getCellHeight)(ee.height)||e,{disabledMethod:re,isCrossDrag:ae,isPeerDrag:te}=Q;return D.map((e,l)=>{var{type:r,showHeaderOverflow:a,headerAlign:t,align:d,filters:i,headerClassName:n,editRender:s,cellRender:o}=e,u=e.id,c=P[u]||{},s=s||o,o=s?renderer.get(s.name):null,s=e.children&&e.children.length,p=W&&!s&&(k?e.fixed!==k:!!e.fixed),f=(_xeUtils.default.isBoolean(ee.padding)?ee:Z).padding,a=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?X:a,t=t||(o?o.tableHeaderCellAlign:"")||q||d||(o?o.tableCellAlign:"")||G,d="ellipsis"===a,o="title"===a,a=!0===a||"tooltip"===a,x=o||a||d;let m=!1,h=null;i&&(h=i[0],m=i.some(e=>e.checked));var g=c.index,c=c._index;let v={$table:R,$grid:I,$gantt:O,$rowIndex:T,column:e,columnIndex:g,$columnIndex:l,_columnIndex:c,firstFilterOption:h,fixed:k,type:cellType,isHidden:p,hasFilter:m};var g={colid:u,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},C={click:e=>R.triggerHeaderCellClickEvent(e,v),dblclick:e=>R.triggerHeaderCellDblclickEvent(e,v)},b=J.drag&&"cell"===Q.trigger;let w=!1;b&&(w=!(!re||!re(v))),(F||b)&&(C.mousedown=e=>R.triggerHeaderCellMousedownEvent(e,v)),J.drag&&(C.dragstart=R.handleHeaderCellDragDragstartEvent,C.dragend=R.handleHeaderCellDragDragendEvent,C.dragover=R.handleHeaderCellDragDragoverEvent,b)&&(C.mouseup=R.handleHeaderCellDragMouseupEvent);var b=l===D.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:J.resizable||z,H=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let _=!1;!S||!W||E||N&&N.id===u||B&&10<K.length&&!e.fixed&&!Y.immediate&&(c<j.visibleStartIndex-j.preloadSize||c>j.visibleEndIndex+j.preloadSize)&&(_=!0);c={};return x?c.height=le+"px":c.minHeight=le+"px",$("th",{class:["vxe-table--column vxe-header--column",u,{["col--"+t]:t,["col--"+r]:r,"col--last":b,"col--fixed":e.fixed,"col--group":s,"col--ellipsis":x,"fixed--width":!H,"fixed--hidden":p,"is--padding":f,"is--sortable":e.sortable,"col--filter":!!i,"is--filter-active":m,"is--drag-active":J.drag&&!e.fixed&&!w&&(ae||te||!e.parentId),"is--drag-disabled":J.drag&&w,"col--current":L===e},(0,_utils.getClass)(n,v),(0,_utils.getClass)(M,v)],attrs:g,style:A?_xeUtils.default.isFunction(A)?A(v):A:void 0,on:C,key:U||B||V||J.useKey||J.drag||s?u:l},[$("div",{class:["vxe-cell",{"c--title":o,"c--tooltip":a,"c--ellipsis":d}],style:c},_||S&&p?[]:[$("div",{attrs:{colid:u},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader($,v))]),!p&&y?$("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>R.handleColResizeMousedownEvent(e,k,v),dblclick:e=>R.handleColResizeDblclickEvent(e,v)}}):renderEmptyElement(R)])})};function renderHeads(a,t,d,i,e){let n=t.$parent;var l=n;let s=t.fixedType,{headerRowClassName:o,headerRowStyle:u}=l;return e.map((e,l)=>{var r={$table:n,$rowIndex:l,fixed:s,type:cellType};return a("tr",{key:l,class:["vxe-header--row",o?_xeUtils.default.isFunction(o)?o(r):o:""],style:u?_xeUtils.default.isFunction(u)?u(r):u:void 0},renderRows(a,t,d,i,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null},render(r){let l=this.$parent;var e=l,a=l,t=l,d=l.xID;let{fixedType:i,fixedColumn:n,tableColumn:s}=this;var o=this.headerColumn,{mouseConfig:e,showHeaderOverflow:u,spanMethod:c,footerSpanMethod:p}=e,{isGroup:a,isColLoading:f,overflowX:x,scrollXLoad:m,dragCol:h}=a,{visibleColumn:t,fullColumnIdData:g}=t,v=l.computeMouseOpts;let C=o,b=s,w=!1;return a?b=t:(m&&u&&(c||p||(w=!0)),w&&(f||!i&&x)||(b=t),i&&w&&(b=n||[]),C=[b]),i||a||m&&h&&2<b.length&&(o=g[h.id])&&(u=o._index,c=b[0],p=b[b.length-1],f=g[c.id],x=g[p.id],f)&&x&&(t=f._index,m=x._index,u<t?(b=[h].concat(b),C=[[h].concat(C[0])].concat(C.slice(1))):m<u&&(b=b.concat([h]),C=[C[0].concat([h])].concat(C.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:d}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:d,cellspacing:0,cellpadding:0,border:0,xvm:w?"1":null}},[r("colgroup",{ref:"refHeaderColgroup"},b.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,a,w,C))]),e&&v.area?r("div",{class:"vxe-table--cell-area"},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-clip-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])},methods:{uploadColumn(){var e=this.$parent.isGroup;this.headerColumn=e?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,cellType="header",renderRows=($,e,E,S,D,T)=>{let R=e.$parent,I=R.$xeGrid,O=R.$xeGantt;var l=R,r=R,a=R;let k=e.fixedType,{resizable:z,columnKey:U,headerCellClassName:M,headerCellStyle:A,showHeaderOverflow:X,headerAlign:q,align:G,mouseConfig:F}=l,{currentColumn:L,dragCol:N,scrollXLoad:B,scrollYLoad:V,overflowX:W,tableColumn:K}=r,{fullColumnIdData:P,scrollXStore:j}=a,Y=R.computeVirtualXOpts,J=R.computeColumnOpts,Q=R.computeColumnDragOpts,Z=R.computeCellOpts;e=R.computeDefaultRowHeight;let ee=R.computeHeaderCellOpts,le=(0,_util.getCalcHeight)(ee.height)||e,{disabledMethod:re,isCrossDrag:ae,isPeerDrag:te}=Q;return D.map((e,l)=>{var{type:r,showHeaderOverflow:a,headerAlign:t,align:d,filters:i,headerClassName:n,editRender:s,cellRender:o}=e,u=e.id,c=P[u]||{},s=s||o,o=s?renderer.get(s.name):null,s=e.children&&e.children.length,p=W&&!s&&(k?e.fixed!==k:!!e.fixed),f=(_xeUtils.default.isBoolean(ee.padding)?ee:Z).padding,a=_xeUtils.default.isUndefined(a)||_xeUtils.default.isNull(a)?X:a,t=t||(o?o.tableHeaderCellAlign:"")||q||d||(o?o.tableCellAlign:"")||G,d="ellipsis"===a,o="title"===a,a=!0===a||"tooltip"===a,x=o||a||d;let m=!1,h=null;i&&(h=i[0],m=i.some(e=>e.checked));var g=c.index,c=c._index;let v={$table:R,$grid:I,$gantt:O,$rowIndex:T,column:e,columnIndex:g,$columnIndex:l,_columnIndex:c,firstFilterOption:h,fixed:k,type:cellType,isHidden:p,hasFilter:m};var g={colid:u,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},C={click:e=>R.triggerHeaderCellClickEvent(e,v),dblclick:e=>R.triggerHeaderCellDblclickEvent(e,v)},b=J.drag&&"cell"===Q.trigger;let w=!1;b&&(w=!(!re||!re(v))),(F||b)&&(C.mousedown=e=>R.triggerHeaderCellMousedownEvent(e,v)),J.drag&&(C.dragstart=R.handleHeaderCellDragDragstartEvent,C.dragend=R.handleHeaderCellDragDragendEvent,C.dragover=R.handleHeaderCellDragDragoverEvent,b)&&(C.mouseup=R.handleHeaderCellDragMouseupEvent);var b=l===D.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:J.resizable||z,H=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let _=!1;!S||!W||E||N&&N.id===u||B&&10<K.length&&!e.fixed&&!Y.immediate&&(c<j.visibleStartIndex-j.preloadSize||c>j.visibleEndIndex+j.preloadSize)&&(_=!0);c={};return x?c.height=le+"px":c.minHeight=le+"px",$("th",{class:["vxe-table--column vxe-header--column",u,{["col--"+t]:t,["col--"+r]:r,"col--last":b,"col--fixed":e.fixed,"col--group":s,"col--ellipsis":x,"fixed--width":!H,"fixed--hidden":p,"is--padding":f,"is--sortable":e.sortable,"col--filter":!!i,"is--filter-active":m,"is--drag-active":J.drag&&!e.fixed&&!w&&(ae||te||!e.parentId),"is--drag-disabled":J.drag&&w,"col--current":L===e},(0,_utils.getClass)(n,v),(0,_utils.getClass)(M,v)],attrs:g,style:A?_xeUtils.default.isFunction(A)?A(v):A:void 0,on:C,key:U||B||V||J.useKey||J.drag||s?u:l},[$("div",{class:["vxe-cell",{"c--title":o,"c--tooltip":a,"c--ellipsis":d}],style:c},_||S&&p?[]:[$("div",{attrs:{colid:u},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader($,v))]),!p&&y?$("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>R.handleColResizeMousedownEvent(e,k,v),dblclick:e=>R.handleColResizeDblclickEvent(e,v)}}):renderEmptyElement(R)])})};function renderHeads(a,t,d,i,e){let n=t.$parent;var l=n;let s=t.fixedType,{headerRowClassName:o,headerRowStyle:u}=l;return e.map((e,l)=>{var r={$table:n,$rowIndex:l,fixed:s,type:cellType};return a("tr",{key:l,class:["vxe-header--row",o?_xeUtils.default.isFunction(o)?o(r):o:""],style:u?_xeUtils.default.isFunction(u)?u(r):u:void 0},renderRows(a,t,d,i,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null},render(r){let l=this.$parent;var e=l,a=l,t=l,d=l.xID;let{fixedType:i,fixedColumn:n,tableColumn:s}=this;var o=this.headerColumn,{mouseConfig:e,showHeaderOverflow:u,spanMethod:c,footerSpanMethod:p}=e,{isGroup:a,isColLoading:f,overflowX:x,scrollXLoad:m,dragCol:h}=a,{visibleColumn:t,fullColumnIdData:g}=t,v=l.computeMouseOpts;let C=o,b=s,w=!1;return a?b=t:(m&&u&&(c||p||(w=!0)),w&&(f||!i&&x)||(b=t),i&&w&&(b=n||[]),C=[b]),i||a||m&&h&&2<b.length&&(o=g[h.id])&&(u=o._index,c=b[0],p=b[b.length-1],f=g[c.id],x=g[p.id],f)&&x&&(t=f._index,m=x._index,u<t?(b=[h].concat(b),C=[[h].concat(C[0])].concat(C.slice(1))):m<u&&(b=b.concat([h]),C=[C[0].concat([h])].concat(C.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:d}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:d,cellspacing:0,cellpadding:0,border:0,xvm:w?"1":null}},[r("colgroup",{ref:"refHeaderColgroup"},b.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,a,w,C))]),e&&v.area?r("div",{class:"vxe-table--cell-area"},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-clip-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])},methods:{uploadColumn(){var e=this.$parent.isGroup;this.headerColumn=e?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]}}};

package/lib/table/src/methods.js

@@ -2965,10 +2965,17 @@ function updateColDropTipContent($xeTable, tdEl) {
   reactData.dragTipText = tipContent;
 }
 function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
+  const $xeGantt = $xeTable.$xeGantt;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const el = $xeTable.$refs.refElem;
-  if (!el) {
+  let wrapperEl = $xeTable.$refs.refElem;
+  if ($xeGantt && trEl) {
+    const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+    if (ganttContainerElem) {
+      wrapperEl = ganttContainerElem;
+    }
+  }
+  if (!wrapperEl) {
     return;
   }
   const {
@@ -2980,11 +2987,11 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
   const {
     prevDragToChild
   } = internalData;
-  const wrapperRect = el.getBoundingClientRect();
+  const wrapperRect = wrapperEl.getBoundingClientRect();
   const osbWidth = overflowY ? scrollbarWidth : 0;
   const osbHeight = overflowX ? scrollbarHeight : 0;
-  const tableWrapperWidth = el.clientWidth;
-  const tableWrapperHeight = el.clientHeight;
+  const tableWrapperWidth = wrapperEl.clientWidth;
+  const tableWrapperHeight = wrapperEl.clientHeight;
   if (trEl) {
     const rdLineEl = $xeTable.$refs.refDragRowLineElem;
     if (rdLineEl) {
@@ -3048,8 +3055,8 @@ function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
   const rdTipEl = $xeTable.$refs.refDragTipElem;
   if (rdTipEl) {
     rdTipEl.style.display = 'block';
-    rdTipEl.style.top = `${Math.min(el.clientHeight - el.scrollTop - rdTipEl.clientHeight, evnt.clientY - wrapperRect.y)}px`;
-    rdTipEl.style.left = `${Math.min(el.clientWidth - el.scrollLeft - rdTipEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`;
+    rdTipEl.style.top = `${Math.min(wrapperEl.clientHeight - wrapperEl.scrollTop - rdTipEl.clientHeight, evnt.clientY - wrapperRect.y)}px`;
+    rdTipEl.style.left = `${Math.min(wrapperEl.clientWidth - wrapperEl.scrollLeft - rdTipEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`;
     rdTipEl.setAttribute('drag-status', showLine ? prevDragToChild ? 'sub' : 'normal' : 'disabled');
   }
 }
@@ -6491,7 +6498,8 @@ const Methods = {
       return;
     }
     const cellParams = _xeUtils.default.assign(params, {
-      cell
+      cell,
+      $table: $xeTable
     });
     let dragLeft = 0;
     const tableRect = tableEl.getBoundingClientRect();
@@ -6628,7 +6636,8 @@ const Methods = {
       const dragBtnElem = evnt.target;
       const cell = dragBtnElem.parentNode;
       const cellParams = Object.assign(params, {
-        cell
+        cell,
+        $table: $xeTable
       });
       const colMinWidth = (0, _util.getColReMinWidth)(cellParams);
       el.setAttribute('data-calc-col', 'Y');
@@ -6659,6 +6668,7 @@ const Methods = {
     const internalData = $xeTable;
     evnt.stopPropagation();
     evnt.preventDefault();
+    const $xeGantt = $xeTable.$xeGantt;
     const {
       row
     } = params;
@@ -6681,7 +6691,13 @@ const Methods = {
     const resizableOpts = $xeTable.computeResizableOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const cellOpts = $xeTable.computeCellOpts;
-    const tableEl = $xeTable.$refs.refElem;
+    let tableEl = $xeTable.$refs.refElem;
+    if ($xeGantt) {
+      const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+      if (ganttContainerElem) {
+        tableEl = ganttContainerElem;
+      }
+    }
     const resizeBarElem = $xeTable.$refs.refRowResizeBar;
     if (!resizeBarElem) {
       return;
@@ -9532,6 +9548,7 @@ const Methods = {
   },
   handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
     const $xeTable = this;
+    const $xeGantt = $xeTable.$xeGantt;
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -9746,6 +9763,13 @@ const Methods = {
             const _newRowIndex = dragRowRest._index;
             const firstRow = tableData[0];
             const firstRowRest = fullAllDataRowIdData[(0, _util.getRowid)($xeTable, firstRow)];
+            let wrapperEl = el;
+            if ($xeGantt) {
+              const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+              if (ganttContainerElem) {
+                wrapperEl = ganttContainerElem;
+              }
+            }
             if (firstRowRest) {
               const _firstRowIndex = firstRowRest._index;
               const _lastRowIndex = _firstRowIndex + tableData.length;
@@ -9776,14 +9800,26 @@ const Methods = {
               }
               const dragRangeList = tableData.slice(rsIndex, reIndex);
               if (dragRangeList.length) {
-                const dtTrList = el.querySelectorAll(dragRangeList.map(row => `.vxe-body--row[rowid="${(0, _util.getRowid)($xeTable, row)}"]`).join(','));
+                const dtClss = [];
+                dragRangeList.forEach(row => {
+                  const rowid = (0, _util.getRowid)($xeTable, row);
+                  dtClss.push(`.vxe-body--row[rowid="${rowid}"]`);
+                  if ($xeGantt) {
+                    dtClss.push(`.vxe-gantt-view--body-row[rowid="${rowid}"]`, `.vxe-gantt-view--chart-row[rowid="${rowid}"]`);
+                  }
+                });
+                const dtTrList = wrapperEl.querySelectorAll(dtClss.join(','));
                 (0, _anime.moveRowAnimateToTb)(dtTrList, offsetRate * dragRowHeight);
               }
             }
-            const newTrList = el.querySelectorAll(`.vxe-body--row[rowid="${dragRowid}"]`);
-            const newTrEl = newTrList[0];
+            const drClss = [`.vxe-body--row[rowid="${dragRowid}"]`];
+            if ($xeGantt) {
+              drClss.push(`.vxe-gantt-view--body-row[rowid="${dragRowid}"]`, `.vxe-gantt-view--chart-row[rowid="${dragRowid}"]`);
+            }
+            const newDtTrList = wrapperEl.querySelectorAll(drClss.join(','));
+            const newTrEl = newDtTrList[0];
             if (dragOffsetTop > -1 && newTrEl) {
-              (0, _anime.moveRowAnimateToTb)(newTrList, dragOffsetTop - newTrEl.offsetTop);
+              (0, _anime.moveRowAnimateToTb)(newDtTrList, dragOffsetTop - newTrEl.offsetTop);
             }
           }
           updateRowOffsetTop($xeTable);
@@ -9803,6 +9839,7 @@ const Methods = {
   },
   handleRowDragDragendEvent(evnt) {
     const $xeTable = this;
+    const $xeGantt = $xeTable.$xeGantt;
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -9825,7 +9862,7 @@ const Methods = {
       prevDragRow,
       prevDragPos
     } = internalData;
-    const el = $xeTable.$refs.refElem;
+    let wrapperEl = $xeTable.$refs.refElem;
     if (treeConfig && lazy && prevDragToChild) {
       // 懒加载
       const newRowid = (0, _util.getRowid)($xeTable, prevDragRow);
@@ -9840,9 +9877,17 @@ const Methods = {
     } else {
       $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
     }
+    const dtClss = ['.vxe-body--row'];
+    if ($xeGantt) {
+      const ganttContainerElem = $xeGantt.$refs.refGanttContainerElem;
+      if (ganttContainerElem) {
+        wrapperEl = ganttContainerElem;
+      }
+      dtClss.push('.vxe-gantt-view--body-row', '.vxe-gantt-view--chart-row');
+    }
     hideDropTip($xeTable);
     clearRowDropOrigin($xeTable);
-    (0, _anime.clearRowAnimate)(el);
+    (0, _anime.clearRowAnimate)(wrapperEl, dtClss);
     internalData.prevDragToChild = false;
     reactData.dragRow = null;
     reactData.dragCol = null;
@@ -10278,7 +10323,7 @@ const Methods = {
     $xeTable.handleColDragSwapEvent(evnt, true, dragCol, prevDragCol, prevDragPos, prevDragToChild);
     hideDropTip($xeTable);
     clearColDropOrigin($xeTable);
-    (0, _anime.clearColAnimate)(el);
+    (0, _anime.clearColAnimate)(el, ['.vxe-table--column']);
     internalData.prevDragToChild = false;
     reactData.dragRow = null;
     reactData.dragCol = null;