vxe-table 3.11.31 → 3.11.33

package/lib/table/src/header.js

@@ -15,12 +15,12 @@ const {
 } = _ui.VxeUI;
 const cellType = 'header';
 const renderRows = (h, _vm, cols, $rowIndex) => {
+  const $xeTable = _vm.$parent;
+  const $xeGrid = $xeTable.xegrid;
   const {
-    $parent: $xetable,
     fixedType
   } = _vm;
   const {
-    $listeners: tableListeners,
     resizable: allResizable,
     border,
     columnKey,
@@ -29,15 +29,17 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
     showHeaderOverflow: allColumnHeaderOverflow,
     headerAlign: allHeaderAlign,
     align: allAlign,
-    highlightCurrentColumn,
     currentColumn,
     scrollXLoad,
     overflowX,
     scrollbarWidth,
-    sortOpts,
     mouseConfig,
     columnOpts
-  } = $xetable;
+  } = $xeTable;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
+  const {
+    disabledMethod: dragDisabledMethod
+  } = columnDragOpts;
   return cols.map((column, $columnIndex) => {
     const {
       type,
@@ -60,13 +62,12 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
     const showTitle = headOverflow === 'title';
     const showTooltip = headOverflow === true || headOverflow === 'tooltip';
     let hasEllipsis = showTitle || showTooltip || showEllipsis;
-    const thOns = {};
     const hasFilter = column.filters && column.filters.some(item => item.checked);
-    const columnIndex = $xetable.getColumnIndex(column);
-    const _columnIndex = $xetable.getVTColumnIndex(column);
+    const columnIndex = $xeTable.getColumnIndex(column);
+    const _columnIndex = $xeTable.getVTColumnIndex(column);
     const params = {
-      $table: $xetable,
-      $grid: $xetable.xegrid,
+      $table: $xeTable,
+      $grid: $xeGrid,
       $rowIndex,
       column,
       columnIndex,
@@ -77,25 +78,36 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
       isHidden: fixedHiddenColumn,
       hasFilter
     };
+    const thAttrs = {
+      colid,
+      colspan: column.colSpan > 1 ? column.colSpan : null,
+      rowspan: column.rowSpan > 1 ? column.rowSpan : null
+    };
+    const thOns = {
+      click: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, params),
+      dblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, params)
+    };
     // 虚拟滚动不支持动态高度
     if (scrollXLoad && !hasEllipsis) {
       showEllipsis = hasEllipsis = true;
     }
-    if (columnOpts.isCurrent || highlightCurrentColumn || tableListeners['header-cell-click'] || sortOpts.trigger === 'cell') {
-      thOns.click = evnt => $xetable.triggerHeaderCellClickEvent(evnt, params);
-    }
-    if (tableListeners['header-cell-dblclick']) {
-      thOns.dblclick = evnt => $xetable.triggerHeaderCellDblclickEvent(evnt, params);
+    const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
+    let isDisabledDrag = false;
+    if (isColDragCell) {
+      isDisabledDrag = !!(dragDisabledMethod && dragDisabledMethod(params));
     }
     // 按下事件处理
-    if (mouseConfig) {
-      thOns.mousedown = evnt => $xetable.triggerHeaderCellMousedownEvent(evnt, params);
+    if (mouseConfig || isColDragCell) {
+      thOns.mousedown = evnt => $xeTable.triggerHeaderCellMousedownEvent(evnt, params);
     }
-    // 拖拽行事件
+    // 拖拽列事件
     if (columnOpts.drag) {
-      thOns.dragstart = $xetable.handleHeaderCellDragDragstartEvent;
-      thOns.dragend = $xetable.handleHeaderCellDragDragendEvent;
-      thOns.dragover = $xetable.handleHeaderCellDragDragoverEvent;
+      thOns.dragstart = $xeTable.handleHeaderCellDragDragstartEvent;
+      thOns.dragend = $xeTable.handleHeaderCellDragDragendEvent;
+      thOns.dragover = $xeTable.handleHeaderCellDragDragoverEvent;
+      if (isColDragCell) {
+        thOns.mouseup = $xeTable.handleHeaderCellDragMouseupEvent;
+      }
     }
     return h('th', {
       class: ['vxe-header--column', colid, {
@@ -109,13 +121,10 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
         'is--sortable': column.sortable,
         'col--filter': !!column.filters,
         'is--filter-active': hasFilter,
+        'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
       }, (0, _utils.getClass)(headerClassName, params), (0, _utils.getClass)(headerCellClassName, params)],
-      attrs: {
-        colid,
-        colspan: column.colSpan > 1 ? column.colSpan : null,
-        rowspan: column.rowSpan > 1 ? column.rowSpan : null
-      },
+      attrs: thAttrs,
       style: headerCellStyle ? _xeUtils.default.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : null,
       on: thOns,
       key: columnKey || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
@@ -143,29 +152,28 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
   })] : []);
 };
 function renderHeads(h, _vm, headerGroups) {
-  const {
-    $parent: $xetable
-  } = _vm;
-  const tableProps = $xetable;
+  const $xeTable = _vm.$parent;
+  const tableProps = $xeTable;
   const {
     fixedType
   } = _vm;
+  const columnOpts = $xeTable.computeColumnOpts;
+  const columnDragOpts = $xeTable.computeColumnDragOpts;
   const {
     headerRowClassName,
     headerRowStyle
   } = tableProps;
   const {
     isDragColMove
-  } = $xetable;
-  const columnOpts = $xetable.columnOpts;
+  } = $xeTable;
   return headerGroups.map((cols, $rowIndex) => {
     const params = {
-      $table: $xetable,
+      $table: $xeTable,
       $rowIndex,
       fixed: fixedType,
       type: cellType
     };
-    if (columnOpts.drag) {
+    if (columnOpts.drag && columnDragOpts.animation) {
       return h('transition-group', {
         props: {
           tag: 'tr',

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"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderer=_ui.VxeUI.renderer,cellType="header",renderRows=(x,v,C,b)=>{let{$parent:y,fixedType:_}=v,{$listeners:w,resizable:$,border:z,columnKey:W,headerCellClassName:H,headerCellStyle:R,showHeaderOverflow:S,headerAlign:T,align:M,highlightCurrentColumn:D,currentColumn:k,scrollXLoad:O,overflowX:U,scrollbarWidth:e,sortOpts:E,mouseConfig:A,columnOpts:I}=y;return C.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:i,align:a,headerClassName:n,editRender:o,cellRender:s}=e,d=e.id,o=o||s,s=o?renderer.get(o.name):null,o=e.children&&e.children.length,u=_?e.fixed!==_&&!o:e.fixed&&U,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?S:r,i=i||(s?s.tableHeaderCellAlign:"")||T||a||(s?s.tableCellAlign:"")||M;let c="ellipsis"===r;a="title"===r,s=!0===r||"tooltip"===r;let p=a||s||c;var r={},h=e.filters&&e.filters.some(e=>e.checked),m=y.getColumnIndex(e),f=y.getVTColumnIndex(e);let g={$table:y,$grid:y.xegrid,$rowIndex:b,column:e,columnIndex:m,$columnIndex:l,_columnIndex:f,fixed:_,type:cellType,isHidden:u,hasFilter:h};return O&&!p&&(c=p=!0),(I.isCurrent||D||w["header-cell-click"]||"cell"===E.trigger)&&(r.click=e=>y.triggerHeaderCellClickEvent(e,g)),w["header-cell-dblclick"]&&(r.dblclick=e=>y.triggerHeaderCellDblclickEvent(e,g)),A&&(r.mousedown=e=>y.triggerHeaderCellMousedownEvent(e,g)),I.drag&&(r.dragstart=y.handleHeaderCellDragDragstartEvent,r.dragend=y.handleHeaderCellDragDragendEvent,r.dragover=y.handleHeaderCellDragDragoverEvent),x("th",{class:["vxe-header--column",d,{["col--"+i]:i,["col--"+t]:t,"col--last":l===C.length-1,"col--fixed":e.fixed,"col--group":o,"col--ellipsis":p,"fixed--hidden":u,"is--sortable":e.sortable,"col--filter":!!e.filters,"is--filter-active":h,"col--current":k===e},(0,_utils.getClass)(n,g),(0,_utils.getClass)(H,g)],attrs:{colid:d,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:R?_xeUtils.default.isFunction(R)?R(g):R:null,on:r,key:W||I.useKey||I.drag||o?d:l},[x("div",{class:["vxe-cell",{"c--title":a,"c--tooltip":s,"c--ellipsis":c}]},e.renderHeader(x,g)),u||o||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:I.resizable||$)?null:x("div",{class:["vxe-resizable",{"is--line":!z||"none"===z}],on:{mousedown:e=>v.resizeMousedown(e,g)}})])}).concat(e?[x("th",{key:"gr"+b,class:"vxe-header--gutter col--gutter"})]:[])};function renderHeads(r,i,e){let a=i.$parent;var l=a;let n=i.fixedType,{headerRowClassName:o,headerRowStyle:s}=l,d=a.isDragColMove,u=a.columnOpts;return e.map((e,l)=>{var t={$table:a,$rowIndex:l,fixed:n,type:cellType};return u.drag?r("transition-group",{props:{tag:"tr",name:"vxe-header--col-list"+(d?"":"-disabled"),class:["vxe-header--row",o?_xeUtils.default.isFunction(o)?o(t):o:""],style:s?_xeUtils.default.isFunction(s)?s(t):s:null}},renderRows(r,i,e,l)):r("tr",{class:["vxe-header--row",o?_xeUtils.default.isFunction(o)?o(t):o:""],style:s?_xeUtils.default.isFunction(s)?s(t):s:null},renderRows(r,i,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-header-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.thead,e[r+"xSpace"]=t.xSpace,e[r+"repair"]=t.repair},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-header-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"repair"]=null},render(t){var{_e:e,$parent:l,fixedType:r,headerColumn:i,tableColumn:a,fixedColumn:n}=this,{tId:l,isGroup:o,visibleColumn:s,showHeaderOverflow:d,scrollXLoad:u,scrollbarWidth:c}=l;let p=i,h=a;return o?h=s:(r&&(u||d)&&(h=n),p=[h]),t("div",{class:["vxe-table--header-wrapper",r?`fixed-${r}--wrapper`:"body--wrapper"],attrs:{xid:l}},[r?e():t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("table",{class:"vxe-table--header",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},h.map((e,l)=>t("col",{attrs:{name:e.id},key:l})).concat(c?[t("col",{attrs:{name:"col_gutter"}})]:[])),t("thead",{ref:"thead"},renderHeads(t,this,p))]),t("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]},resizeMousedown(e,t){var l=this.$parent;let s=t.column,{$parent:r,fixedType:d}=this,i=l.visibleColumn,{tableBody:a,leftContainer:u,rightContainer:c}=r.$refs,p=l.$el,h=r.$refs.resizeBar,m=r.$refs.refCellResizeTip,f=this.$el,{target:n,clientX:g}=e,x=t.cell=n.parentNode,v=l.computeResizableOpts,C=0,b=a.$el;var l=(0,_dom.getOffsetPos)(n,p),o=n.clientWidth,y=Math.floor(o/2);let _=(0,_util.getColReMinWidth)(t)-y,w=l.left-x.clientWidth+o+_,$=l.left+y,z=document.onmousemove,W=document.onmouseup,H="left"===d,R="right"===d,S=0;if(H||R){var T=H?"nextElementSibling":"previousElementSibling";let e=x[T];for(;e&&!(0,_dom.hasClass)(e,"fixed--hidden");)(0,_dom.hasClass)(e,"col--group")||(S+=e.offsetWidth),e=e[T];R&&c&&($=c.offsetLeft+S)}function M(l){l.stopPropagation(),l.preventDefault();var t=l.clientX-g;let e=$+t;if(t=d?0:b.scrollLeft,H?e=Math.min(e,(c?c.offsetLeft:b.clientWidth)-S-_):R?(w=(u?u.clientWidth:0)+S+_,e=Math.min(e,$+x.clientWidth-_)):w=Math.max(b.scrollLeft,w),t=(C=Math.max(e,w))-t,h.style.left=t+"px",v.showDragTip&&m){var r=p.clientWidth,i=f.getBoundingClientRect(),a=h.clientWidth,n=m.clientWidth,o=m.clientHeight;let e=-n;t<n+a?e=n+a-t:r<t&&(e+=r-t),m.style.left=e+"px",m.style.top=Math.min(p.clientHeight-o,Math.max(0,l.clientY-i.y-o/2))+"px",m.textContent=s.renderWidth+(R?$-C:C-$)+"px"}}r._isResize=!0,(0,_dom.addClass)(r.$el,"drag--resize"),h.style.display="block",document.onmousemove=M,document.onmouseup=function(e){document.onmousemove=z,document.onmouseup=W;let l=s.renderWidth+(R?$-C:C-$);s.resizeWidth=l,"fixed"===v.dragMode&&i.forEach(e=>{e.id===s.id||e.resizeWidth||(e.resizeWidth=e.renderWidth)}),h.style.display="none",r._isResize=!1,r._lastResizeTime=Date.now(),r.analyColumnWidth(),r.recalculate(!0).then(()=>{r.saveCustomStore("update:visible"),r.updateCellAreas(),r.emitEvent("resizable-change",Object.assign(Object.assign({},t),{resizeWidth:l}),e),setTimeout(()=>r.recalculate(!0),300)}),(0,_dom.removeClass)(r.$el,"drag--resize")},M(e),r.closeMenu()}}};
+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 renderer=_ui.VxeUI.renderer,cellType="header",renderRows=(v,C,b,y)=>{let _=C.$parent,w=_.xegrid,$=C.fixedType,{resizable:z,border:W,columnKey:H,headerCellClassName:M,headerCellStyle:D,showHeaderOverflow:R,headerAlign:S,align:T,currentColumn:O,scrollXLoad:E,overflowX:U,scrollbarWidth:e,mouseConfig:k,columnOpts:A}=_,I=_.computeColumnDragOpts,q=I.disabledMethod;return b.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:a,align:i,headerClassName:o,editRender:n,cellRender:s}=e,d=e.id,n=n||s,s=n?renderer.get(n.name):null,n=e.children&&e.children.length,u=$?e.fixed!==$&&!n:e.fixed&&U,r=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?R:r,a=a||(s?s.tableHeaderCellAlign:"")||S||i||(s?s.tableCellAlign:"")||T;let c="ellipsis"===r;i="title"===r,s=!0===r||"tooltip"===r;let p=i||s||c;var r=e.filters&&e.filters.some(e=>e.checked),h=_.getColumnIndex(e),m=_.getVTColumnIndex(e);let f={$table:_,$grid:w,$rowIndex:y,column:e,columnIndex:h,$columnIndex:l,_columnIndex:m,fixed:$,type:cellType,isHidden:u,hasFilter:r};var h={colid:d,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},m={click:e=>_.triggerHeaderCellClickEvent(e,f),dblclick:e=>_.triggerHeaderCellDblclickEvent(e,f)},g=(E&&!p&&(c=p=!0),A.drag&&"cell"===I.trigger);let x=!1;return g&&(x=!(!q||!q(f))),(k||g)&&(m.mousedown=e=>_.triggerHeaderCellMousedownEvent(e,f)),A.drag&&(m.dragstart=_.handleHeaderCellDragDragstartEvent,m.dragend=_.handleHeaderCellDragDragendEvent,m.dragover=_.handleHeaderCellDragDragoverEvent,g)&&(m.mouseup=_.handleHeaderCellDragMouseupEvent),v("th",{class:["vxe-header--column",d,{["col--"+a]:a,["col--"+t]:t,"col--last":l===b.length-1,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":p,"fixed--hidden":u,"is--sortable":e.sortable,"col--filter":!!e.filters,"is--filter-active":r,"is--drag-disabled":x,"col--current":O===e},(0,_utils.getClass)(o,f),(0,_utils.getClass)(M,f)],attrs:h,style:D?_xeUtils.default.isFunction(D)?D(f):D:null,on:m,key:H||A.useKey||A.drag||n?d:l},[v("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":s,"c--ellipsis":c}]},e.renderHeader(v,f)),u||n||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:A.resizable||z)?null:v("div",{class:["vxe-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>C.resizeMousedown(e,f)}})])}).concat(e?[v("th",{key:"gr"+y,class:"vxe-header--gutter col--gutter"})]:[])};function renderHeads(r,a,e){let i=a.$parent;var l=i;let o=a.fixedType,n=i.computeColumnOpts,s=i.computeColumnDragOpts,{headerRowClassName:d,headerRowStyle:u}=l,c=i.isDragColMove;return e.map((e,l)=>{var t={$table:i,$rowIndex:l,fixed:o,type:cellType};return n.drag&&s.animation?r("transition-group",{props:{tag:"tr",name:"vxe-header--col-list"+(c?"":"-disabled"),class:["vxe-header--row",d?_xeUtils.default.isFunction(d)?d(t):d:""],style:u?_xeUtils.default.isFunction(u)?u(t):u:null}},renderRows(r,a,e,l)):r("tr",{class:["vxe-header--row",d?_xeUtils.default.isFunction(d)?d(t):d:""],style:u?_xeUtils.default.isFunction(u)?u(t):u:null},renderRows(r,a,e,l))})}var _default=exports.default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-header-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.thead,e[r+"xSpace"]=t.xSpace,e[r+"repair"]=t.repair},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-header-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"repair"]=null},render(t){var{_e:e,$parent:l,fixedType:r,headerColumn:a,tableColumn:i,fixedColumn:o}=this,{tId:l,isGroup:n,visibleColumn:s,showHeaderOverflow:d,scrollXLoad:u,scrollbarWidth:c}=l;let p=a,h=i;return n?h=s:(r&&(u||d)&&(h=o),p=[h]),t("div",{class:["vxe-table--header-wrapper",r?`fixed-${r}--wrapper`:"body--wrapper"],attrs:{xid:l}},[r?e():t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("table",{class:"vxe-table--header",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},h.map((e,l)=>t("col",{attrs:{name:e.id},key:l})).concat(c?[t("col",{attrs:{name:"col_gutter"}})]:[])),t("thead",{ref:"thead"},renderHeads(t,this,p))]),t("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertHeaderColumnToRows)(this.tableGroupColumn):[]},resizeMousedown(e,t){var l=this.$parent;let s=t.column,{$parent:r,fixedType:d}=this,a=l.visibleColumn,{tableBody:i,leftContainer:u,rightContainer:c}=r.$refs,p=l.$el,h=r.$refs.resizeBar,m=r.$refs.refCellResizeTip,f=this.$el,{target:o,clientX:g}=e,x=t.cell=o.parentNode,v=l.computeResizableOpts,C=0,b=i.$el;var l=(0,_dom.getOffsetPos)(o,p),n=o.clientWidth,y=Math.floor(n/2);let _=(0,_util.getColReMinWidth)(t)-y,w=l.left-x.clientWidth+n+_,$=l.left+y,z=document.onmousemove,W=document.onmouseup,H="left"===d,M="right"===d,D=0;if(H||M){var R=H?"nextElementSibling":"previousElementSibling";let e=x[R];for(;e&&!(0,_dom.hasClass)(e,"fixed--hidden");)(0,_dom.hasClass)(e,"col--group")||(D+=e.offsetWidth),e=e[R];M&&c&&($=c.offsetLeft+D)}function S(l){l.stopPropagation(),l.preventDefault();var t=l.clientX-g;let e=$+t;if(t=d?0:b.scrollLeft,H?e=Math.min(e,(c?c.offsetLeft:b.clientWidth)-D-_):M?(w=(u?u.clientWidth:0)+D+_,e=Math.min(e,$+x.clientWidth-_)):w=Math.max(b.scrollLeft,w),t=(C=Math.max(e,w))-t,h.style.left=t+"px",v.showDragTip&&m){var r=p.clientWidth,a=f.getBoundingClientRect(),i=h.clientWidth,o=m.clientWidth,n=m.clientHeight;let e=-o;t<o+i?e=o+i-t:r<t&&(e+=r-t),m.style.left=e+"px",m.style.top=Math.min(p.clientHeight-n,Math.max(0,l.clientY-a.y-n/2))+"px",m.textContent=s.renderWidth+(M?$-C:C-$)+"px"}}r._isResize=!0,(0,_dom.addClass)(r.$el,"drag--resize"),h.style.display="block",document.onmousemove=S,document.onmouseup=function(e){document.onmousemove=z,document.onmouseup=W;let l=s.renderWidth+(M?$-C:C-$);s.resizeWidth=l,"fixed"===v.dragMode&&a.forEach(e=>{e.id===s.id||e.resizeWidth||(e.resizeWidth=e.renderWidth)}),h.style.display="none",r._isResize=!1,r._lastResizeTime=Date.now(),r.analyColumnWidth(),r.recalculate(!0).then(()=>{r.saveCustomStore("update:visible"),r.updateCellAreas(),r.emitEvent("resizable-change",Object.assign(Object.assign({},t),{resizeWidth:l}),e),setTimeout(()=>r.recalculate(!0),300)}),(0,_dom.removeClass)(r.$el,"drag--resize")},S(e),r.closeMenu()}}};

package/lib/table/src/methods.js

@@ -6074,6 +6074,94 @@ const Methods = {
       $xeTable.handleColumnSortEvent(evnt, column);
     }
   },
+  /**
+   * 表头单元格按下事件
+   */
+  triggerHeaderCellMousedownEvent(evnt, params) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const {
+      mouseConfig
+    } = props;
+    const mouseOpts = $xeTable.computeMouseOpts;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const columnDragOpts = $xeTable.computeColumnDragOpts;
+    const {
+      trigger,
+      disabledMethod
+    } = columnDragOpts;
+    const cell = evnt.currentTarget;
+    const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
+    const triggerCheckbox = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--checkbox').flag;
+    const triggerSort = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--sort').flag;
+    const triggerFilter = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--filter').flag;
+    let triggerDrag = false;
+    if (!(triggerInput || triggerCheckbox || triggerSort || triggerFilter)) {
+      if (columnOpts.drag && trigger === 'cell' && !(disabledMethod && disabledMethod(params))) {
+        triggerDrag = true;
+        $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
+      }
+    }
+    if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
+      $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({
+        cell,
+        triggerSort,
+        triggerFilter
+      }, params));
+    }
+    $xeTable.focus();
+    if ($xeTable.closeMenu) {
+      $xeTable.closeMenu();
+    }
+  },
+  /**
+   * 单元格按下事件
+   */
+  triggerCellMousedownEvent(evnt, params) {
+    const $xeTable = this;
+    const {
+      column
+    } = params;
+    const {
+      type,
+      treeNode
+    } = column;
+    const isRadioType = type === 'radio';
+    const isCheckboxType = type === 'checkbox';
+    const isExpandType = type === 'expand';
+    const rowOpts = $xeTable.computeRowOpts;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
+    const {
+      trigger,
+      disabledMethod
+    } = rowDragOpts;
+    const cell = evnt.currentTarget;
+    params.cell = cell;
+    const triggerInput = cell && cell.tagName && cell.tagName.toLowerCase() === 'input';
+    const triggerRadio = isRadioType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--radio').flag;
+    const triggerCheckbox = isCheckboxType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--checkbox').flag;
+    const triggerTreeNode = treeNode && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-tree--btn-wrapper').flag;
+    const triggerExpandNode = isExpandType && (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-table--expanded').flag;
+    let isColDragCell = false;
+    if (rowOpts.drag) {
+      isColDragCell = trigger === 'row' || column.dragSort && trigger === 'cell';
+    }
+    let triggerDrag = false;
+    if (!(triggerInput || triggerRadio || triggerCheckbox || triggerTreeNode || triggerExpandNode)) {
+      if (isColDragCell && !(disabledMethod && disabledMethod(params))) {
+        triggerDrag = true;
+        $xeTable.handleCellDragMousedownEvent(evnt, params);
+      }
+    }
+    if (!triggerDrag && $xeTable.handleCellMousedownEvent) {
+      $xeTable.handleCellMousedownEvent(evnt, params);
+    }
+    $xeTable.focus();
+    $xeTable.closeFilter();
+    if ($xeTable.closeMenu) {
+      $xeTable.closeMenu();
+    }
+  },
   /**
    * 行拖拽
    */
@@ -6335,18 +6423,20 @@ const Methods = {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
+    evnt.stopPropagation();
     const {
       dragConfig
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
+      trigger,
       dragStartMethod
     } = rowDragOpts;
     const {
       row
     } = params;
     const dragEl = evnt.currentTarget;
-    const tdEl = (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
+    const tdEl = trigger === 'cell' || trigger === 'row' ? dragEl : (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
     const trEl = tdEl.parentElement;
     const dStartMethod = dragStartMethod || (dragConfig ? dragConfig.dragStartMethod : null);
     reactData.isDragRowMove = false;
@@ -6607,15 +6697,17 @@ const Methods = {
     var _a;
     const $xeTable = this;
     const reactData = $xeTable;
+    evnt.stopPropagation();
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const {
+      trigger,
       dragStartMethod
     } = columnDragOpts;
     const {
       column
     } = params;
     const dragEl = evnt.currentTarget;
-    const thEl = (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
+    const thEl = trigger === 'cell' ? dragEl : (_a = dragEl.parentElement) === null || _a === void 0 ? void 0 : _a.parentElement;
     reactData.isDragColMove = false;
     clearColDropOrigin($xeTable);
     if (dragStartMethod && !dragStartMethod(params)) {