vxe-table 4.17.17 → 4.17.19

package/lib/table/module/menu/hook.min.js

@@ -1 +1 @@
-var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_dom=require("../../../ui/src/dom"),_utils=require("../../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{menus,hooks,globalEvents,GLOBAL_EVENT_KEYS}=_ui.VxeUI,tableMenuMethodKeys=["closeMenu"];hooks.add("tableMenuModule",{setupTable(p){let{xID:M,props:x,reactData:E,internalData:_}=p,{refElem:C,refTableFilter:T,refTableMenu:y}=p.getRefMaps(),{computeMouseOpts:w,computeIsContentMenu:l,computeMenuOpts:L}=p.getComputeMaps();let i=p.xeGrid||p.xeGantt,N;var e;let O=(v,t,g)=>{let f=E.ctxMenuStore;var n=l.value,e=L.value,t=e[t];let{transfer:h,visibleMethod:o}=e;if(t){let{options:l,disabled:e}=t;e?v.preventDefault():n&&l&&l.length&&(g.options=l,p.preventEvent(v,"event.showMenu",g,()=>{if(!o||o(g)){v.preventDefault(),p.updateZindex();var t=(i?i.getRefMaps().refElem:C).value;if(t){t=t.getBoundingClientRect();let{scrollTop:o,scrollLeft:i,visibleHeight:u,visibleWidth:s}=(0,_dom.getDomNode)(),r=v.clientY-t.y,a=v.clientX-t.x,n=(h&&(r=v.clientY+o,a=v.clientX+i),()=>{_._currMenuParams=g,Object.assign(f,{visible:!0,list:l,selected:null,selectChild:null,showChild:!1,style:{zIndex:_.tZindex,top:r+"px",left:a+"px"}}),(0,_vue.nextTick)(()=>{var e=y.value.getRefMaps().refElem.value,t=e.clientHeight,l=e.clientWidth,{boundingTop:e,boundingLeft:n}=(0,_dom.getAbsolutePos)(e),e=e+t-u,n=n+l-s;-10<e&&(f.style.top=Math.max(o+2,r-t-2)+"px"),-10<n&&(f.style.left=Math.max(i+2,a-l-2)+"px")})}),{keyboard:e,row:d,column:c}=g;e&&d&&c?p.scrollToRow(d,c).then(()=>{var e,t,l=p.getCellElement(d,c);l&&({boundingTop:e,boundingLeft:t}=(0,_dom.getAbsolutePos)(l),r=e+o+Math.floor(l.offsetHeight/2),a=t+i+Math.floor(l.offsetWidth/2)),n()}):n()}}else N.closeMenu()}))}p.closeFilter()};return N={closeMenu(){return Object.assign(E.ctxMenuStore,{visible:!1,selected:null,selectChild:null,showChild:!1}),(0,_vue.nextTick)()}},e={moveCtxMenu(e,t,l,n,o,i){let u;var s=_xeUtils.default.findIndexOf(i,e=>t[l]===e);if(n)o&&(0,_utils.hasChildrenList)(t.selected)?t.showChild=!0:(t.showChild=!1,t.selectChild=null);else if(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ARROW_UP)){for(let e=s-1;0<=e;e--)if(!1!==i[e].visible){u=i[e];break}t[l]=u||i[i.length-1]}else if(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ARROW_DOWN)){for(let e=s+1;e<i.length;e++)if(!1!==i[e].visible){u=i[e];break}t[l]=u||i[0]}else t[l]&&(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ENTER)||globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.SPACEBAR))&&p.ctxMenuLinkEvent(e,t[l])},handleOpenMenuEvent:O,handleGlobalContextmenuEvent(t){var l=p.xeGrid,n=p.xeGantt,{mouseConfig:e,menuConfig:o}=x,{editStore:i,ctxMenuStore:u}=E,s=_.visibleColumn,r=T.value,a=y.value,d=w.value,c=L.value,v=C.value,i=i.selected,g=["header","body","footer"];if((0,_utils.isEnableConf)(o)){if(u.visible&&a&&(0,_dom.getEventTargetNode)(t,a.getRefMaps().refElem.value).flag)return void t.preventDefault();if(_._keyCtx){o="body",u={source:"table",type:o,$table:p,$grid:l,$gantt:n,keyboard:!0,columns:s.slice(0),$event:t};if(e&&d.area){a=p.getActiveCellArea();if(a&&a.row&&a.column)return u.row=a.row,u.column=a.column,void O(t,o,u)}else if(e&&d.selected&&i.row&&i.column)return u.row=i.row,u.column=i.column,void O(t,o,u)}for(let e=0;e<g.length;e++){var f=g[e],h=(0,_dom.getEventTargetNode)(t,v,`vxe-${f}--column`,e=>e.parentNode.parentNode.parentNode.getAttribute("xid")===M),b={source:"table",type:f,$table:p,$grid:l,$gantt:n,columns:s.slice(0),$event:t};if(h.flag){var h=h.targetElem,m=p.getColumnNode(h),m=m?m.item:null;let e=f+"-";m&&Object.assign(b,{column:m,columnIndex:p.getColumnIndex(m),cell:h}),"body"===f&&(h=(m=p.getRowNode(h.parentNode))?m.item:null,e="",h)&&(b.row=h,b.rowIndex=p.getRowIndex(h));m=e+"cell-menu";return O(t,f,b),void p.dispatchEvent(m,b,t)}if((0,_dom.getEventTargetNode)(t,v,`vxe-table--${f}-wrapper`,e=>e.getAttribute("xid")===M).flag)return void("cell"===c.trigger?t.preventDefault():O(t,f,b))}}r&&!(0,_dom.getEventTargetNode)(t,r.getRefMaps().refElem.value).flag&&p.closeFilter(),N.closeMenu()},ctxMenuMouseoverEvent(e,t,l){let a=e.currentTarget;var n=E.ctxMenuStore;e.preventDefault(),e.stopPropagation(),n.selected=t,(n.selectChild=l)||(n.showChild=(0,_utils.hasChildrenList)(t),n.showChild&&(0,_vue.nextTick)(()=>{var o=a.nextElementSibling;if(o){var{boundingTop:i,boundingLeft:u,visibleHeight:s,visibleWidth:r}=(0,_dom.getAbsolutePos)(a),i=i+a.offsetHeight;let e="",t="",l=(u+a.offsetWidth+o.offsetWidth>r-10&&(e="auto",t=a.offsetWidth+"px"),""),n="";i+o.offsetHeight>s-10&&(l="auto",n="0"),o.style.left=e,o.style.right=t,o.style.top=l,o.style.bottom=n}}))},ctxMenuMouseoutEvent(e,t){var l=E.ctxMenuStore;t.children||(l.selected=null),l.selectChild=null},ctxMenuLinkEvent(e,t){var l,n=p.xeGrid,o=p.xeGantt;t.loading||t.disabled||!t.code&&t.children&&t.children.length||(l=menus.get(t.code),t=Object.assign({},_._currMenuParams,{menu:t,$table:p,$grid:n,$gantt:o,$event:e}),(n=l?l.tableMenuMethod||l.menuMethod:null)&&n(t,e),p.dispatchEvent("menu-click",t,e),N.closeMenu())}},Object.assign(Object.assign({},N),e)},setupGrid(e){return e.extendTableMethods(tableMenuMethodKeys)},setupGantt(e){return e.extendTableMethods(tableMenuMethodKeys)}});
+var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_dom=require("../../../ui/src/dom"),_utils=require("../../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{menus,hooks,globalEvents,GLOBAL_EVENT_KEYS}=_ui.VxeUI,tableMenuMethodKeys=["closeMenu"];hooks.add("tableMenuModule",{setupTable(p){let{xID:x,props:M,reactData:E,internalData:_}=p,{refElem:C,refTableFilter:y,refTableMenu:T}=p.getRefMaps(),{computeMouseOpts:w,computeIsContentMenu:l,computeMenuOpts:N}=p.getComputeMaps();let i=p.xeGrid||p.xeGantt,L;var e;let O=(v,t,g)=>{let f=E.ctxMenuStore;var n=l.value,e=N.value,t=e[t];let{transfer:h,visibleMethod:o}=e;if(t){let{options:l,disabled:e}=t;e?v.preventDefault():n&&l&&l.length&&(g.options=l,p.preventEvent(v,"event.showMenu",g,()=>{if(!o||o(g)){v.preventDefault(),p.updateZindex();var t=(i?i.getRefMaps().refElem:C).value;if(t){t=t.getBoundingClientRect();let{scrollTop:o,scrollLeft:i,visibleHeight:u,visibleWidth:r}=(0,_dom.getDomNode)(),s=v.clientY-t.y,a=v.clientX-t.x,n=(h&&(s=v.clientY+o,a=v.clientX+i),()=>{_._currMenuParams=g,Object.assign(f,{visible:!0,list:l,selected:null,selectChild:null,showChild:!1,style:{zIndex:_.tZindex,top:s+"px",left:a+"px"}}),(0,_vue.nextTick)(()=>{var e=T.value.getRefMaps().refElem.value,t=e.clientHeight,l=e.clientWidth,{boundingTop:e,boundingLeft:n}=(0,_dom.getAbsolutePos)(e),e=e+t-u,n=n+l-r;-10<e&&(f.style.top=Math.max(o+2,s-t-2)+"px"),-10<n&&(f.style.left=Math.max(i+2,a-l-2)+"px")})}),{keyboard:e,row:d,column:c}=g;e&&d&&c?p.scrollToRow(d,c).then(()=>{var e,t,l=p.getCellElement(d,c);l&&({boundingTop:e,boundingLeft:t}=(0,_dom.getAbsolutePos)(l),s=e+o+Math.floor(l.offsetHeight/2),a=t+i+Math.floor(l.offsetWidth/2)),n()}):n()}}else L.closeMenu()}))}p.closeFilter()};return L={closeMenu(){return Object.assign(E.ctxMenuStore,{visible:!1,selected:null,selectChild:null,showChild:!1}),(0,_vue.nextTick)()}},e={moveCtxMenu(e,t,l,n,o,i){let u;var r=_xeUtils.default.findIndexOf(i,e=>t[l]===e);if(n)o&&(0,_utils.hasChildrenList)(t.selected)?t.showChild=!0:(t.showChild=!1,t.selectChild=null);else if(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ARROW_UP)){for(let e=r-1;0<=e;e--)if(!1!==i[e].visible){u=i[e];break}t[l]=u||i[i.length-1]}else if(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ARROW_DOWN)){for(let e=r+1;e<i.length;e++)if(!1!==i[e].visible){u=i[e];break}t[l]=u||i[0]}else t[l]&&(globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ENTER)||globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.SPACEBAR))&&p.ctxMenuLinkEvent(e,t[l])},handleOpenMenuEvent:O,handleGlobalContextmenuEvent(t){var l=p.xeGrid,n=p.xeGantt,{mouseConfig:e,menuConfig:o}=M,{editStore:i,ctxMenuStore:u}=E,r=_.visibleColumn,s=y.value,a=T.value,d=w.value,c=N.value,v=C.value,i=i.selected,g=["header","body","footer"];if((0,_utils.isEnableConf)(o)){if(u.visible&&a&&(0,_dom.getEventTargetNode)(t,a.getRefMaps().refElem.value).flag)return void t.preventDefault();if(_._keyCtx){o="body",u={source:"table",type:o,$table:p,$grid:l,$gantt:n,keyboard:!0,columns:r.slice(0),$event:t};if(e&&d.area){a=p.getActiveCellArea();if(a&&a.row&&a.column)return u.row=a.row,u.column=a.column,void O(t,o,u)}else if(e&&d.selected&&i.row&&i.column)return u.row=i.row,u.column=i.column,void O(t,o,u)}for(let e=0;e<g.length;e++){var f=g[e],h=(0,_dom.getEventTargetNode)(t,v,`vxe-${f}--column`,e=>e.parentNode.parentNode.parentNode.getAttribute("xid")===x),b={source:"table",type:f,$table:p,$grid:l,$gantt:n,columns:r.slice(0),$event:t};if(h.flag){var h=h.targetElem,m=p.getColumnNode(h),m=m?m.item:null;let e=f+"-";m&&Object.assign(b,{column:m,columnIndex:p.getColumnIndex(m),cell:h}),"body"===f&&(h=(m=p.getRowNode(h.parentNode))?m.item:null,e="",h)&&(b.row=h,b.rowIndex=p.getRowIndex(h));m=e+"cell-menu";return O(t,f,b),void p.dispatchEvent(m,b,t)}if((0,_dom.getEventTargetNode)(t,v,`vxe-table--${f}-wrapper`,e=>e.getAttribute("xid")===x).flag||"body"===f&&(0,_dom.getEventTargetNode)(t,v,"vxe-table--empty-place-wrapper",e=>e.getAttribute("xid")===x).flag)return void("cell"===c.trigger?t.preventDefault():O(t,f,b))}}s&&!(0,_dom.getEventTargetNode)(t,s.getRefMaps().refElem.value).flag&&p.closeFilter(),L.closeMenu()},ctxMenuMouseoverEvent(e,t,l){let a=e.currentTarget;var n=E.ctxMenuStore;e.preventDefault(),e.stopPropagation(),n.selected=t,(n.selectChild=l)||(n.showChild=(0,_utils.hasChildrenList)(t),n.showChild&&(0,_vue.nextTick)(()=>{var o=a.nextElementSibling;if(o){var{boundingTop:i,boundingLeft:u,visibleHeight:r,visibleWidth:s}=(0,_dom.getAbsolutePos)(a),i=i+a.offsetHeight;let e="",t="",l=(u+a.offsetWidth+o.offsetWidth>s-10&&(e="auto",t=a.offsetWidth+"px"),""),n="";i+o.offsetHeight>r-10&&(l="auto",n="0"),o.style.left=e,o.style.right=t,o.style.top=l,o.style.bottom=n}}))},ctxMenuMouseoutEvent(e,t){var l=E.ctxMenuStore;t.children||(l.selected=null),l.selectChild=null},ctxMenuLinkEvent(e,t){var l,n=p.xeGrid,o=p.xeGantt;t.loading||t.disabled||!t.code&&t.children&&t.children.length||(l=menus.get(t.code),t=Object.assign({},_._currMenuParams,{menu:t,$table:p,$grid:n,$gantt:o,$event:e}),(n=l?l.tableMenuMethod||l.menuMethod:null)&&n(t,e),p.dispatchEvent("menu-click",t,e),L.closeMenu())}},Object.assign(Object.assign({},L),e)},setupGrid(e){return e.extendTableMethods(tableMenuMethodKeys)},setupGantt(e){return e.extendTableMethods(tableMenuMethodKeys)}});

package/lib/table/src/header.js

@@ -18,24 +18,6 @@ const {
 } = _ui.VxeUI;
 const sourceType = 'table';
 const renderType = 'header';
-function getColumnFirstChild(column) {
-  const {
-    children
-  } = column;
-  if (children && children.length) {
-    return getColumnFirstChild(children[0]);
-  }
-  return column;
-}
-function getColumnLastChild(column) {
-  const {
-    children
-  } = column;
-  if (children && children.length) {
-    return getColumnLastChild(children[children.length - 1]);
-  }
-  return column;
-}
 var _default = exports.default = (0, _comp.defineVxeComponent)({
   name: 'VxeTableHeader',
   props: {
@@ -266,15 +248,13 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         if (showCustomHeader) {
           // custom
         } else if (isColGroup && !isLastRow) {
-          const firstCol = getColumnFirstChild(column);
-          const lastCol = getColumnLastChild(column);
-          if (firstCol && lastCol && firstCol.id !== lastCol.id) {
-            const firstColRest = fullColumnIdData[firstCol.id];
-            const lastColRest = fullColumnIdData[lastCol.id];
-            if (firstColRest && lastColRest) {
-              tcStyle.width = `${lastColRest.oLeft - firstColRest.oLeft + lastCol.renderWidth}px`;
+          let childWidth = 0;
+          _xeUtils.default.eachTree(column.children, childRow => {
+            if (childRow.visible && (!childRow.children || !childRow.children.length)) {
+              childWidth += childRow.renderWidth;
             }
-          }
+          });
+          tcStyle.width = `${childWidth}px`;
         }
         return (0, _vue.h)('th', Object.assign(Object.assign(Object.assign({
           class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,sourceType="table",renderType="header";function getColumnFirstChild(e){var l=e.children;return l&&l.length?getColumnFirstChild(l[0]):e}function getColumnLastChild(e){var l=e.children;return l&&l.length?getColumnLastChild(l[l.length-1]):e}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup(g){let pe=(0,_vue.inject)("$xeTable",{}),{xID:x,props:m,reactData:f,internalData:_}=pe,{computeColumnOpts:r,computeColumnDragOpts:a,computeCellOpts:t,computeMouseOpts:C,computeHeaderCellOpts:i,computeDefaultRowHeight:n,computeVirtualXOpts:d,computeFloatingFilterOpts:b,computeIsHeaderRenderOptimize:w}=pe.getComputeMaps(),y=(0,_vue.ref)([]),H=(0,_vue.ref)(),D=(0,_vue.ref)(),E=(0,_vue.ref)(),T=(0,_vue.ref)(),S=(0,_vue.ref)(),F=(0,_vue.ref)(),o=(0,_vue.ref)(),u=()=>{var e=m.showCustomHeader,{collectColumn:l,visibleColumn:r}=_,a=g.tableGroupColumn,t=f.isGroup;let i=t?(0,_util.convertHeaderColumnToRows)(a):[],n=[];e&&1<i.length&&(n=(0,_util.convertHeaderToGridRows)(i),i=n),y.value=i,pe.dispatchEvent("columns-change",{visibleColgroups:n,collectColumn:l,visibleColumn:r},null)},O=(F,O,e,I,R)=>{let $=pe.xeGrid,k=pe.xeGantt,M=g.fixedType,{resizable:U,columnKey:z,showCustomHeader:A,headerCellClassName:q,headerCellStyle:L,showHeaderOverflow:G,headerAlign:X,align:j,mouseConfig:N}=m,{currentColumn:W,dragCol:V,scrollXLoad:B,scrollYLoad:K,overflowX:P,mergeHeadFlag:Y,tableColumn:J}=f,{fullColumnIdData:Q,scrollXStore:Z,mergeHeaderList:ee,mergeHeaderCellMaps:le}=_,re=d.value,ae=r.value,te=a.value,ie=t.value;var l=n.value;let ne=i.value,de=(0,_util.getCalcHeight)(ne.height)||l,{disabledMethod:oe,isCrossDrag:se,isPeerDrag:ce}=te,ue=I===e.length-1;return R.map((e,l)=>{var{type:r,showHeaderOverflow:a,headerAlign:t,align:i,filters:n,headerClassName:d,editRender:o,cellRender:u}=e,s=e.id,c=Q[s]||{},o=o||u,u=o?renderer.get(o.name):null,o=e.children&&e.children.length,p=P&&!o&&(M?e.fixed!==M:!!e.fixed),v=(_xeUtils.default.isBoolean(ne.padding)?ne:ie).padding,a=_xeUtils.default.eqNull(a)?G:a,t=t||(u?u.tableHeaderCellAlign:"")||X||i||(u?u.tableCellAlign:"")||j,i="ellipsis"===a,u="title"===a,a=!0===a||"tooltip"===a,h=u||a||i;let g=!1,x=null;n&&(x=n[0],g=n.some(e=>e.checked));var m=c.index,c=c._index;let f={$table:pe,$grid:$,$gantt:k,$rowIndex:I,column:e,columnIndex:m,$columnIndex:l,_columnIndex:c,firstFilterOption:x,fixed:M,source:sourceType,type:renderType,isHidden:p,hasFilter:g};m={colid:s};let _=!1;if(A||(m.colspan=1<e.colSpan?e.colSpan:null,m.rowspan=1<e.rowSpan?e.rowSpan:null),Y&&ee.length&&(A||ue)){var C=le[I+":"+(A?l:c)];if(C){var{rowspan:C,colspan:b}=C;if(!C||!b)return null;1<C&&(_=!0,m.rowspan=C),1<b&&(_=!0,m.colspan=b)}}C={onClick:e=>pe.triggerHeaderCellClickEvent(e,f),onDblclick:e=>pe.triggerHeaderCellDblclickEvent(e,f)},b=ae.drag&&"cell"===te.trigger;let w=!1;b&&(w=!(!oe||!oe(f))),(N||b)&&(C.onMousedown=e=>pe.triggerHeaderCellMousedownEvent(e,f)),ae.drag&&(C.onDragstart=pe.handleHeaderCellDragDragstartEvent,C.onDragend=pe.handleHeaderCellDragDragendEvent,C.onDragover=pe.handleHeaderCellDragDragoverEvent,b)&&(C.onMouseup=pe.handleHeaderCellDragMouseupEvent);var b=l===R.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:ae.resizable||U,H=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let D=!1;!O||!P||F||_||V&&V.id===s||B&&10<J.length&&!e.fixed&&!re.immediate&&(c<Z.visibleStartIndex-Z.preloadSize||c>Z.visibleEndIndex+Z.preloadSize)&&(D=!0);var E,T,S,c={};return h?c.height=de+"px":c.minHeight=de+"px",A||o&&!ue&&(T=getColumnFirstChild(e),E=getColumnLastChild(e),T)&&E&&T.id!==E.id&&(T=Q[T.id],S=Q[E.id],T)&&S&&(c.width=S.oLeft-T.oLeft+E.renderWidth+"px"),(0,_vue.h)("th",Object.assign(Object.assign(Object.assign({class:["vxe-table--column vxe-header--column",s,p?"fixed--hidden":"fixed--visible",{["col--"+t]:t,["col--"+r]:r,"col--last":b,"col--fixed":e.fixed,"col--group":o,"col--ellipsis":h,"fixed--width":!H,"is--padding":v,"is--sortable":e.sortable,"col--filter":!!n,"is--filter-active":g,"is--drag-active":ae.drag&&!e.fixed&&!w&&(se||ce||!e.parentId),"is--drag-disabled":ae.drag&&w,"col--current":W===e},d?_xeUtils.default.isFunction(d)?d(f):d:"",q?_xeUtils.default.isFunction(q)?q(f):q:""],style:L?_xeUtils.default.isFunction(L)?L(f):L:null},m),C),{key:A?""+s+l:z||B||K||ae.useKey||ae.drag||o?s:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":u,"c--tooltip":a,"c--ellipsis":i}],style:c},D||O&&p?[]:[(0,_vue.h)("div",{colid:s,class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader(f))]),p||!y||A&&!ue?renderEmptyElement(pe):(0,_vue.h)("div",{class:"vxe-cell--col-resizable",onMousedown:e=>pe.handleColResizeMousedownEvent(e,M,f),onDblclick:e=>pe.handleColResizeDblclickEvent(e,f)})])})},I=(b,w)=>{let y=pe.xeGrid,H=pe.xeGantt,D=g.fixedType,{showHeaderOverflow:E,headerAlign:T,align:S}=m,{currentColumn:F,overflowX:O}=f,I=_.fullColumnIdData,R=t.value;var e=n.value;let $=i.value,k=(0,_util.getCalcHeight)($.height)||e;return w.map((e,l)=>{var{type:r,showHeaderOverflow:a,headerAlign:t,align:i,filters:n,editRender:d,cellRender:o,floatingFilters:u,filterRender:s,slots:c}=e,p=e.id,v=I[p]||{},d=d||o,o=c?c.floatingFilter||c["floating-filter"]:null,c=d?renderer.get(d.name):null,d=(0,_utils.isEnableConf)(s)?renderer.get(s.name):null,d=d?d.renderTableFloatingFilter:null,h=O&&(D?e.fixed!==D:!!e.fixed),g=(_xeUtils.default.isBoolean($.padding)?$:R).padding,a=_xeUtils.default.eqNull(a)?E:a,t=t||(c?c.tableHeaderCellAlign:"")||T||i||(c?c.tableCellAlign:"")||S,i="ellipsis"===a,c="title"===a,a=!0===a||"tooltip"===a,x=c||a||i;let m=!1,f=null;n&&(f=n[0],m=n.some(e=>e.checked));var n=v.index,v=v._index,n={$table:pe,$grid:y,$gantt:H,column:e,columnIndex:n,$columnIndex:l,_columnIndex:v,option:f,fixed:D,source:sourceType,type:renderType,isHidden:h,hasFilter:m},v={colid:p},l=l===w.length-1,_=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width),C={};return x?C.height=k+"px":C.minHeight=k+"px",(0,_vue.h)("th",Object.assign({class:["vxe-table--column vxe-header--column",p,h?"fixed--hidden":"fixed--visible",{["col--"+t]:t,["col--"+r]:r,"col--last":l,"col--fixed":e.fixed,"col--ellipsis":x,"fixed--width":!_,"is--padding":g,"is--sortable":e.sortable,"col--current":F===e}],key:p},v),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":c,"c--tooltip":a,"c--ellipsis":i}],style:C},b&&h&&!u?[]:[(0,_vue.h)("div",{colid:p,class:"vxe-cell--wrapper vxe-header-cell--wrapper"},o?pe.callSlot(o,n):d&&f?(0,_vn.getSlotVNs)(d(s,n)):[])])])})};return(0,_vue.watch)(()=>g.tableColumn,u),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=g.fixedType,l=pe.internalData,l=l.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=H,l[e+"scroll"]=D,l[e+"table"]=E,l[e+"colgroup"]=T,l[e+"list"]=S,l[e+"xSpace"]=F,l[e+"repair"]=o,u()})}),(0,_vue.onUnmounted)(()=>{var e=g.fixedType,l=pe.internalData,l=l.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}),()=>{let{fixedType:l,fixedColumn:e,tableColumn:r}=g;var a=m.mouseConfig,{isGroup:t,isColLoading:i,overflowX:n,scrollXLoad:d,dragCol:o}=f,{visibleColumn:u,fullColumnIdData:s}=_,c=C.value,p=w.value;let v=y.value||[],h=r;return t?h=u:(p&&(i||!l&&n)||(h=u),l&&p&&(h=e||[]),v=[h]),l||t||d&&o&&2<h.length&&(i=s[o.id])&&(n=i._index,u=h[0],d=h[h.length-1],i=s[u.id],u=s[d.id],i)&&u&&(s=i._index,d=u._index,n<s?(h=[o].concat(h),v=[[o].concat(v[0])].concat(v.slice(1))):d<n&&(h=h.concat([o]),v=[v[0].concat([o])].concat(v.slice(1)))),(0,_vue.h)("div",{ref:H,class:["vxe-table--header-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:x},[(0,_vue.h)("div",{ref:D,class:"vxe-table--header-inner-wrapper",onScroll(e){pe.triggerHeaderScrollEvent(e,l)}},[l?renderEmptyElement(pe):(0,_vue.h)("div",{ref:F,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:E,class:"vxe-table--header",xid:x,cellspacing:0,cellpadding:0,border:0,xvm:p?"1":null},[(0,_vue.h)("colgroup",{ref:T},h.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),(0,_vue.h)("thead",{ref:S},((a,t,i)=>{let n=g.fixedType,{headerRowClassName:d,headerRowStyle:o}=m;var e=b.value,l=i.map((e,l)=>{var r={$table:pe,$rowIndex:l,fixed:n,type:renderType};return(0,_vue.h)("tr",{key:l,class:["vxe-header--row",d?_xeUtils.default.isFunction(d)?d(r):d:""],style:o?_xeUtils.default.isFunction(o)?o(r):o:null},O(a,t,i,l,e))});return e.enabled&&l.push((0,_vue.h)("tr",{key:"ff",class:["vxe-header--row"]},I(t,i[i.length-1]))),l})(t,p,v))]),a&&c.area?(0,_vue.h)("div",{class:"vxe-table--cell-area",xid:x},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-clip-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(pe)])])}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,sourceType="table",renderType="header";var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup(x){let ue=(0,_vue.inject)("$xeTable",{}),{xID:g,props:f,reactData:m,internalData:_}=ue,{computeColumnOpts:a,computeColumnDragOpts:r,computeCellOpts:t,computeMouseOpts:b,computeHeaderCellOpts:i,computeDefaultRowHeight:n,computeVirtualXOpts:d,computeFloatingFilterOpts:C,computeIsHeaderRenderOptimize:w}=ue.getComputeMaps(),y=(0,_vue.ref)([]),H=(0,_vue.ref)(),D=(0,_vue.ref)(),E=(0,_vue.ref)(),T=(0,_vue.ref)(),S=(0,_vue.ref)(),O=(0,_vue.ref)(),o=(0,_vue.ref)(),u=()=>{var e=f.showCustomHeader,{collectColumn:l,visibleColumn:a}=_,r=x.tableGroupColumn,t=m.isGroup;let i=t?(0,_util.convertHeaderColumnToRows)(r):[],n=[];e&&1<i.length&&(n=(0,_util.convertHeaderToGridRows)(i),i=n),y.value=i,ue.dispatchEvent("columns-change",{visibleColgroups:n,collectColumn:l,visibleColumn:a},null)},I=(E,T,e,S,O)=>{let I=ue.xeGrid,F=ue.xeGantt,R=x.fixedType,{resizable:$,columnKey:k,showCustomHeader:U,headerCellClassName:M,headerCellStyle:z,showHeaderOverflow:A,headerAlign:q,align:G,mouseConfig:X}=f,{currentColumn:j,dragCol:N,scrollXLoad:W,scrollYLoad:L,overflowX:V,mergeHeadFlag:B,tableColumn:K}=m,{fullColumnIdData:P,scrollXStore:Y,mergeHeaderList:J,mergeHeaderCellMaps:Q}=_,Z=d.value,ee=a.value,le=r.value,ae=t.value;var l=n.value;let re=i.value,te=(0,_util.getCalcHeight)(re.height)||l,{disabledMethod:ie,isCrossDrag:de,isPeerDrag:oe}=le,ne=S===e.length-1;return O.map((e,l)=>{var{type:a,showHeaderOverflow:r,headerAlign:t,align:i,filters:n,headerClassName:d,editRender:o,cellRender:u}=e,s=e.id,c=P[s]||{},o=o||u,u=o?renderer.get(o.name):null,o=e.children&&e.children.length,p=V&&!o&&(R?e.fixed!==R:!!e.fixed),v=(_xeUtils.default.isBoolean(re.padding)?re:ae).padding,r=_xeUtils.default.eqNull(r)?A:r,t=t||(u?u.tableHeaderCellAlign:"")||q||i||(u?u.tableCellAlign:"")||G,i="ellipsis"===r,u="title"===r,r=!0===r||"tooltip"===r,h=u||r||i;let x=!1,g=null;n&&(g=n[0],x=n.some(e=>e.checked));var f=c.index,c=c._index;let m={$table:ue,$grid:I,$gantt:F,$rowIndex:S,column:e,columnIndex:f,$columnIndex:l,_columnIndex:c,firstFilterOption:g,fixed:R,source:sourceType,type:renderType,isHidden:p,hasFilter:x};f={colid:s};let _=!1;if(U||(f.colspan=1<e.colSpan?e.colSpan:null,f.rowspan=1<e.rowSpan?e.rowSpan:null),B&&J.length&&(U||ne)){var b=Q[S+":"+(U?l:c)];if(b){var{rowspan:b,colspan:C}=b;if(!b||!C)return null;1<b&&(_=!0,f.rowspan=b),1<C&&(_=!0,f.colspan=C)}}b={onClick:e=>ue.triggerHeaderCellClickEvent(e,m),onDblclick:e=>ue.triggerHeaderCellDblclickEvent(e,m)},C=ee.drag&&"cell"===le.trigger;let w=!1;C&&(w=!(!ie||!ie(m))),(X||C)&&(b.onMousedown=e=>ue.triggerHeaderCellMousedownEvent(e,m)),ee.drag&&(b.onDragstart=ue.handleHeaderCellDragDragstartEvent,b.onDragend=ue.handleHeaderCellDragDragendEvent,b.onDragover=ue.handleHeaderCellDragDragoverEvent,C)&&(b.onMouseup=ue.handleHeaderCellDragMouseupEvent);var C=l===O.length-1,y=_xeUtils.default.isBoolean(e.resizable)?e.resizable:ee.resizable||$,H=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let D=!1;!T||!V||E||_||N&&N.id===s||W&&10<K.length&&!e.fixed&&!Z.immediate&&(c<Y.visibleStartIndex-Y.preloadSize||c>Y.visibleEndIndex+Y.preloadSize)&&(D=!0);c={};if(h?c.height=te+"px":c.minHeight=te+"px",!U&&o&&!ne){let l=0;_xeUtils.default.eachTree(e.children,e=>{!e.visible||e.children&&e.children.length||(l+=e.renderWidth)}),c.width=l+"px"}return(0,_vue.h)("th",Object.assign(Object.assign(Object.assign({class:["vxe-table--column vxe-header--column",s,p?"fixed--hidden":"fixed--visible",{["col--"+t]:t,["col--"+a]:a,"col--last":C,"col--fixed":e.fixed,"col--group":o,"col--ellipsis":h,"fixed--width":!H,"is--padding":v,"is--sortable":e.sortable,"col--filter":!!n,"is--filter-active":x,"is--drag-active":ee.drag&&!e.fixed&&!w&&(de||oe||!e.parentId),"is--drag-disabled":ee.drag&&w,"col--current":j===e},d?_xeUtils.default.isFunction(d)?d(m):d:"",M?_xeUtils.default.isFunction(M)?M(m):M:""],style:z?_xeUtils.default.isFunction(z)?z(m):z:null},f),b),{key:U?""+s+l:k||W||L||ee.useKey||ee.drag||o?s:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":u,"c--tooltip":r,"c--ellipsis":i}],style:c},D||T&&p?[]:[(0,_vue.h)("div",{colid:s,class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader(m))]),p||!y||U&&!ne?renderEmptyElement(ue):(0,_vue.h)("div",{class:"vxe-cell--col-resizable",onMousedown:e=>ue.handleColResizeMousedownEvent(e,R,m),onDblclick:e=>ue.handleColResizeDblclickEvent(e,m)})])})},F=(C,w)=>{let y=ue.xeGrid,H=ue.xeGantt,D=x.fixedType,{showHeaderOverflow:E,headerAlign:T,align:S}=f,{currentColumn:O,overflowX:I}=m,F=_.fullColumnIdData,R=t.value;var e=n.value;let $=i.value,k=(0,_util.getCalcHeight)($.height)||e;return w.map((e,l)=>{var{type:a,showHeaderOverflow:r,headerAlign:t,align:i,filters:n,editRender:d,cellRender:o,floatingFilters:u,filterRender:s,slots:c}=e,p=e.id,v=F[p]||{},d=d||o,o=c?c.floatingFilter||c["floating-filter"]:null,c=d?renderer.get(d.name):null,d=(0,_utils.isEnableConf)(s)?renderer.get(s.name):null,d=d?d.renderTableFloatingFilter:null,h=I&&(D?e.fixed!==D:!!e.fixed),x=(_xeUtils.default.isBoolean($.padding)?$:R).padding,r=_xeUtils.default.eqNull(r)?E:r,t=t||(c?c.tableHeaderCellAlign:"")||T||i||(c?c.tableCellAlign:"")||S,i="ellipsis"===r,c="title"===r,r=!0===r||"tooltip"===r,g=c||r||i;let f=!1,m=null;n&&(m=n[0],f=n.some(e=>e.checked));var n=v.index,v=v._index,n={$table:ue,$grid:y,$gantt:H,column:e,columnIndex:n,$columnIndex:l,_columnIndex:v,option:m,fixed:D,source:sourceType,type:renderType,isHidden:h,hasFilter:f},v={colid:p},l=l===w.length-1,_=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width),b={};return g?b.height=k+"px":b.minHeight=k+"px",(0,_vue.h)("th",Object.assign({class:["vxe-table--column vxe-header--column",p,h?"fixed--hidden":"fixed--visible",{["col--"+t]:t,["col--"+a]:a,"col--last":l,"col--fixed":e.fixed,"col--ellipsis":g,"fixed--width":!_,"is--padding":x,"is--sortable":e.sortable,"col--current":O===e}],key:p},v),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":c,"c--tooltip":r,"c--ellipsis":i}],style:b},C&&h&&!u?[]:[(0,_vue.h)("div",{colid:p,class:"vxe-cell--wrapper vxe-header-cell--wrapper"},o?ue.callSlot(o,n):d&&m?(0,_vn.getSlotVNs)(d(s,n)):[])])])})};return(0,_vue.watch)(()=>x.tableColumn,u),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=x.fixedType,l=ue.internalData,l=l.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=H,l[e+"scroll"]=D,l[e+"table"]=E,l[e+"colgroup"]=T,l[e+"list"]=S,l[e+"xSpace"]=O,l[e+"repair"]=o,u()})}),(0,_vue.onUnmounted)(()=>{var e=x.fixedType,l=ue.internalData,l=l.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}),()=>{let{fixedType:l,fixedColumn:e,tableColumn:a}=x;var r=f.mouseConfig,{isGroup:t,isColLoading:i,overflowX:n,scrollXLoad:d,dragCol:o}=m,{visibleColumn:u,fullColumnIdData:s}=_,c=b.value,p=w.value;let v=y.value||[],h=a;return t?h=u:(p&&(i||!l&&n)||(h=u),l&&p&&(h=e||[]),v=[h]),l||t||d&&o&&2<h.length&&(i=s[o.id])&&(n=i._index,u=h[0],d=h[h.length-1],i=s[u.id],u=s[d.id],i)&&u&&(s=i._index,d=u._index,n<s?(h=[o].concat(h),v=[[o].concat(v[0])].concat(v.slice(1))):d<n&&(h=h.concat([o]),v=[v[0].concat([o])].concat(v.slice(1)))),(0,_vue.h)("div",{ref:H,class:["vxe-table--header-wrapper",l?`fixed-${l}--wrapper`:"body--wrapper"],xid:g},[(0,_vue.h)("div",{ref:D,class:"vxe-table--header-inner-wrapper",onScroll(e){ue.triggerHeaderScrollEvent(e,l)}},[l?renderEmptyElement(ue):(0,_vue.h)("div",{ref:O,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:E,class:"vxe-table--header",xid:g,cellspacing:0,cellpadding:0,border:0,xvm:p?"1":null},[(0,_vue.h)("colgroup",{ref:T},h.map((e,l)=>(0,_vue.h)("col",{name:e.id,key:l,style:{width:e.renderWidth+"px"}}))),(0,_vue.h)("thead",{ref:S},((r,t,i)=>{let n=x.fixedType,{headerRowClassName:d,headerRowStyle:o}=f;var e=C.value,l=i.map((e,l)=>{var a={$table:ue,$rowIndex:l,fixed:n,type:renderType};return(0,_vue.h)("tr",{key:l,class:["vxe-header--row",d?_xeUtils.default.isFunction(d)?d(a):d:""],style:o?_xeUtils.default.isFunction(o)?o(a):o:null},I(r,t,i,l,e))});return e.enabled&&l.push((0,_vue.h)("tr",{key:"ff",class:["vxe-header--row"]},F(t,i[i.length-1]))),l})(t,p,v))]),r&&c.area?(0,_vue.h)("div",{class:"vxe-table--cell-area",xid:g},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-clip-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(ue)])])}}});

package/lib/table/src/table.js

@@ -882,7 +882,7 @@ Object.assign($xeTable,tableMethods,tablePrivateMethods);/**
                  * 隐藏列
                  */(0,_vue.h)('div',{class:'vxe-table-slots'},slots.default?slots.default({}):[]),(0,_vue.h)('div',{ref:refVarElem,class:'vxe-table-vars'},[(0,_vue.h)('div',{class:'vxe-table-var-default'}),(0,_vue.h)('div',{class:'vxe-table-var-medium'}),(0,_vue.h)('div',{class:'vxe-table-var-small'}),(0,_vue.h)('div',{class:'vxe-table-var-mini'})]),(0,_vue.h)('div',{key:'tw',class:'vxe-table--render-wrapper'},scrollbarXToTop?[renderScrollX(),renderBody()]:[renderBody(),renderScrollX()]),/**
                  * 空数据
-                 */(0,_vue.h)('div',{key:'tn',ref:refEmptyPlaceholder,class:'vxe-table--empty-place-wrapper'},[(0,_vue.h)('div',{class:'vxe-table--empty-placeholder'},[(0,_vue.h)('div',{class:'vxe-table--empty-content'},renderEmptyBody())])]),/**
+                 */(0,_vue.h)('div',{key:'tn',ref:refEmptyPlaceholder,class:'vxe-table--empty-place-wrapper',xid:xID},[(0,_vue.h)('div',{class:'vxe-table--empty-placeholder'},[(0,_vue.h)('div',{class:'vxe-table--empty-content'},renderEmptyBody())])]),/**
                  * 边框线
                  */(0,_vue.h)('div',{key:'tl',class:'vxe-table--border-line'}),/**
                  * 列宽线