vxe-table 3.11.21 → 3.11.23

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderer,formats,renderEmptyElement}=_ui.VxeUI;function renderTitlePrefixIcon(e,l){let{$table:r,column:t}=l,n=t.titlePrefix||t.titleHelp;return n?e("i",{class:["vxe-cell-title-prefix-icon",n.icon||getIcon().TABLE_TITLE_PREFIX],on:{mouseenter(e){r.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){r.handleTargetLeaveEvent(e)}}}):renderEmptyElement(r)}function renderTitleSuffixIcon(e,l){let{$table:r,column:t}=l,n=t.titleSuffix;return n?e("i",{class:["vxe-cell-title-suffix-icon",n.icon||getIcon().TABLE_TITLE_SUFFIX],on:{mouseenter(e){r.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){r.handleTargetLeaveEvent(e)}}}):renderEmptyElement(r)}function renderCellDragIcon(e,l){let r=l.$table;var t=r.dragConfig,{icon:n,disabledMethod:a}=r.computeRowDragOpts,a=a||(t?t.rowDisabledMethod:null);let d=a&&a(l);return e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":d}],on:{mousedown(e){d||r.handleCellDragMousedownEvent(e,l)},mouseup:r.handleCellDragMouseupEvent}},[e("i",{class:n||(t?t.rowIcon:"")||getIcon().TABLE_DRAG_ROW})])}function renderCellBaseVNs(e,l,r){var{$table:t,column:n,level:a}=l,n=n.dragSort,{treeConfig:d,dragConfig:o}=t,s=t.computeRowOpts,{showIcon:t,visibleMethod:i}=t.computeRowDragOpts,i=i||(o?o.rowVisibleMethod:null),r=_xeUtils.default.isArray(r)?r:[r];return!(n&&s.drag&&(t||o&&o.showRowIcon))||i&&!i(l)||d&&a||r.unshift(renderCellDragIcon(e,l)),r}function renderHeaderCellDragIcon(e,l){let{$table:r,column:t}=l;var n=r.computeColumnOpts,{showIcon:a,icon:d,visibleMethod:o,disabledMethod:s}=r.computeColumnDragOpts;let i=s&&s(l);return!n.drag||!a||o&&!o(l)||t.fixed||t.parentId?renderEmptyElement(r):e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":i}],on:{mousedown(e){i||r.handleHeaderCellDragMousedownEvent(e,l)},mouseup:r.handleHeaderCellDragMouseupEvent}},[e("i",{class:d||getIcon().TABLE_DRAG_COLUMN})])}function renderHeaderCellBaseVNs(e,l,r){return[renderTitlePrefixIcon(e,l),renderHeaderCellDragIcon(e,l),..._xeUtils.default.isArray(r)?r:[r],renderTitleSuffixIcon(e,l)]}function renderTitleContent(e,l,r){let{$table:t,column:n}=l;var{type:a,showHeaderOverflow:d}=n,{showHeaderOverflow:o,tooltipOpts:s}=t;let i=s.showAll||s.enabled;s=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?o:d;let c="title"===s,u=!0===s||"tooltip"===s;o={};return(c||u||i)&&(o.mouseenter=e=>{t._isResize||(c?(0,_dom.updateCellTitle)(e.currentTarget,n):(u||i)&&t.triggerHeaderTooltipEvent(e,l))}),(u||i)&&(o.mouseleave=e=>{t._isResize||(u||i)&&t.handleTargetLeaveEvent(e)}),["html"===a&&_xeUtils.default.isString(r)?e("span",{class:"vxe-cell--title",domProps:{innerHTML:r},on:o}):e("span",{class:"vxe-cell--title",on:o},(0,_vn.getSlotVNs)(r))]}function formatFooterLabel(e,l){var r,t;return _xeUtils.default.isFunction(e)?e(l):(t=(t=(r=_xeUtils.default.isArray(e))?formats.get(e[0]):formats.get(e))?t.tableFooterCellFormatMethod:null)?r?t(l,...e.slice(1)):t(l):""}function getFooterContent(e,l){var{$table:r,column:t,_columnIndex:n,row:a,items:d}=l,{slots:o,editRender:s,cellRender:i,footerFormatter:c}=t,s=s||i;if(o&&o.footer)return r.callSlot(o.footer,l,e);if(s){i=renderer.get(s.name),o=i?i.renderTableFooter||i.renderFooter:null;if(o)return(0,_vn.getSlotVNs)(o.call(r,e,s,l))}let u="";return _xeUtils.default.isArray(d)?u=d[n]:u=_xeUtils.default.get(a,t.field),[c?formatFooterLabel(c,{itemValue:u,column:t,row:a,items:d,_columnIndex:n}):(0,_utils.formatText)(u,1)]}function getDefaultCellLabel(e){var{$table:e,row:l,column:r}=e;return(0,_utils.formatText)(e.getCellLabel(l,r),1)}let Cell=exports.Cell={createColumn(e,l){var{type:r,sortable:t,remoteSort:n,filters:a,editRender:d,treeNode:o}=l,{editConfig:s,editOpts:i,checkboxOpts:c}=e,u={renderHeader:this.renderDefaultHeader,renderCell:o?this.renderTreeCell:this.renderDefaultCell,renderFooter:this.renderDefaultFooter};switch(r){case"seq":u.renderHeader=this.renderSeqHeader,u.renderCell=o?this.renderTreeIndexCell:this.renderSeqCell;break;case"radio":u.renderHeader=this.renderRadioHeader,u.renderCell=o?this.renderTreeRadioCell:this.renderRadioCell;break;case"checkbox":u.renderHeader=this.renderCheckboxHeader,u.renderCell=c.checkField?o?this.renderTreeSelectionCellByProp:this.renderCheckboxCellByProp:o?this.renderTreeSelectionCell:this.renderCheckboxCell;break;case"expand":u.renderCell=this.renderExpandCell,u.renderData=this.renderExpandData;break;case"html":u.renderCell=o?this.renderTreeHTMLCell:this.renderHTMLCell,a&&(t||n)?u.renderHeader=this.renderSortAndFilterHeader:t||n?u.renderHeader=this.renderSortHeader:a&&(u.renderHeader=this.renderFilterHeader);break;default:s&&d?(u.renderHeader=this.renderEditHeader,u.renderCell="cell"===i.mode?o?this.renderTreeCellEdit:this.renderCellEdit:o?this.renderTreeRowEdit:this.renderRowEdit):a&&(t||n)?u.renderHeader=this.renderSortAndFilterHeader:t||n?u.renderHeader=this.renderSortHeader:a&&(u.renderHeader=this.renderFilterHeader)}return(0,_util.createColumn)(e,l,u)},renderHeaderTitle(e,l){var{$table:r,column:t}=l,{slots:n,editRender:a,cellRender:d}=t,a=a||d;if(n&&n.header)return renderTitleContent(e,l,r.callSlot(n.header,l,e));if(a){d=renderer.get(a.name),n=d?d.renderTableHeader||d.renderHeader:null;if(n)return(0,_vn.getSlotVNs)(renderTitleContent(e,l,n.call(r,e,a,l)))}return renderTitleContent(e,l,(0,_utils.formatText)(t.getTitle(),1))},renderDefaultHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l))},renderDefaultCell(e,l){var{$table:r,row:t,column:n}=l,{slots:a,editRender:d,cellRender:o}=n,o=d||o;if(a&&a.default)return renderCellBaseVNs(e,l,r.callSlot(a.default,l,e));if(o){var a=renderer.get(o.name),s=a?a.renderTableDefault||a.renderDefault:null,a=a?a.renderTableCell||a.renderCell:null,a=d?a:s;if(a)return renderCellBaseVNs(e,l,(0,_vn.getSlotVNs)(a.call(r,e,o,Object.assign({$type:d?"edit":"cell"},l))))}s=r.getCellLabel(t,n),a=d?d.placeholder:"";return renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[d&&(0,_utils.eqEmptyValue)(s)?e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(a),1)):e("span",(0,_utils.formatText)(s,1))])])},renderTreeCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderDefaultCell.call(this,e,l))},renderDefaultFooter(e,l){return[e("span",{class:"vxe-cell--item"},getFooterContent(e,l))]},renderTreeIcon(e,l,r){let{$table:t,isHidden:n}=l;var{treeOpts:a,treeExpandedMaps:d,treeExpandLazyLoadedMaps:o,fullAllDataRowIdData:s}=t,{row:i,column:c,level:u}=l,c=c.slots,{indent:C,lazy:E,trigger:h,iconLoaded:g,showIcon:b,iconOpen:v,iconClose:x}=a,p=a.children||a.childrenField,a=a.hasChild||a.hasChildField,p=i[p],p=p&&p.length;let f=!1,T=!1,m=!1,_=!1;var H={};return c&&c.icon?t.callSlot(c.icon,l,e,r):(n||(c=(0,_util.getRowid)(t,i),T=!!d[c],E&&(d=s[c],m=!!o[c],f=i[a],_=!!d.treeLoaded)),h&&"default"!==h||(H.click=e=>{t.triggerTreeExpandEvent(e,l)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":T}],style:{paddingLeft:u*C+"px"}},[b&&(!E||_?p:f)?[e("div",{class:"vxe-tree--btn-wrapper",on:H},[e("i",{class:["vxe-tree--node-btn",m?g||getIcon().TABLE_TREE_LOADED:T?v||getIcon().TABLE_TREE_OPEN:x||getIcon().TABLE_TREE_CLOSE]})])]:null,e("div",{class:"vxe-tree-cell"},r)])])},renderSeqHeader(e,l){var{$table:r,column:t}=l,n=t.slots;return renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,n&&n.header?r.callSlot(n.header,l,e):(0,_utils.formatText)(t.getTitle(),1)))},renderSeqCell(e,l){var{$table:r,column:t}=l,{treeConfig:n,seqOpts:a}=r,t=t.slots;return t&&t.default?renderCellBaseVNs(e,l,r.callSlot(t.default,l,e)):(r=l.seq,t=a.seqMethod,renderCellBaseVNs(e,l,[e("span",""+(0,_utils.formatText)(t?t(l):n?r:(a.startIndex||0)+r,1))]))},renderTreeIndexCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderSeqCell(e,l))},renderRadioHeader(e,l){var{$table:r,column:t}=l,n=t.slots,a=n?n.header:null,n=n?n.title:null;return renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,a?r.callSlot(a,l,e):[e("span",{class:"vxe-radio--label"},n?r.callSlot(n,l,e):(0,_utils.formatText)(t.getTitle(),1))]))},renderRadioCell(e,l){let{$table:r,column:t,isHidden:n}=l;var{radioOpts:a,selectRadioRow:d}=r,o=t.slots,{labelField:a,checkMethod:s,visibleMethod:i}=a,c=l.row,u=o?o.default:null,o=o?o.radio:null,d=c===d;let C=!i||i({row:c}),E=!!s,h;n||(h={click(e){!E&&C&&r.triggerRadioRowEvent(e,l)}},s&&(E=!s({row:c})));i=Object.assign(Object.assign({},l),{checked:d,disabled:E,visible:C});return o?renderCellBaseVNs(e,l,r.callSlot(o,i,e)):(s=[],C&&s.push(e("span",{class:["vxe-radio--icon",d?getIcon().TABLE_RADIO_CHECKED:getIcon().TABLE_RADIO_UNCHECKED]})),(u||a)&&s.push(e("span",{class:"vxe-radio--label"},u?r.callSlot(u,i,e):_xeUtils.default.get(c,a))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--radio",{"is--checked":d,"is--disabled":E}],on:h},s)]))},renderTreeRadioCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRadioCell(e,l))},renderCheckboxHeader(e,l){let{$table:r,column:t,isHidden:n}=l,{isAllSelected:a,isIndeterminate:d,isAllCheckboxDisabled:o}=r;var s=t.slots,i=s?s.header:null,s=s?s.title:null,c=r.checkboxOpts,u=t.getTitle();let C;n||(C={click(e){o||r.triggerCheckAllEvent(e,!a)}});var E=Object.assign(Object.assign({},l),{checked:a,disabled:o,indeterminate:d});return i?renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,r.callSlot(i,E,e))):(c.checkStrictly?c.showHeader:!1!==c.showHeader)?renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,[e("span",{class:["vxe-cell--checkbox",{"is--checked":a,"is--disabled":o,"is--indeterminate":d}],attrs:{title:getI18n("vxe.table.allTitle")},on:C},[e("span",{class:["vxe-checkbox--icon",d?getIcon().TABLE_CHECKBOX_INDETERMINATE:a?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})].concat(s||u?[e("span",{class:"vxe-checkbox--label"},s?r.callSlot(s,E,e):u)]:[]))])):renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,[e("span",{class:"vxe-checkbox--label"},s?r.callSlot(s,E,e):u)]))},renderCheckboxCell(e,l){let{$table:r,row:t,column:n,isHidden:a}=l;var{treeConfig:d,treeIndeterminateMaps:o,selectCheckboxMaps:s}=r,{labelField:i,checkMethod:c,visibleMethod:u}=r.checkboxOpts,C=n.slots,E=C?C.default:null,C=C?C.checkbox:null;let h=!1,g=!1,b=!u||u({row:t}),v=!!c,x;a||(u=(0,_util.getRowid)(r,t),g=!!s[u],x={click(e){!v&&b&&r.triggerCheckRowEvent(e,l,!g)}},c&&(v=!c({row:t})),d&&(h=!!o[u]));s=Object.assign(Object.assign({},l),{checked:g,disabled:v,visible:b,indeterminate:h});return C?renderCellBaseVNs(e,l,r.callSlot(C,s,e)):(c=[],b&&c.push(e("span",{class:["vxe-checkbox--icon",h?getIcon().TABLE_CHECKBOX_INDETERMINATE:g?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(E||i)&&c.push(e("span",{class:"vxe-checkbox--label"},E?r.callSlot(E,s,e):_xeUtils.default.get(t,i))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":g,"is--disabled":v,"is--indeterminate":h,"is--hidden":!b}],on:x},c)]))},renderTreeSelectionCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCheckboxCell(e,l))},renderCheckboxCellByProp(e,l){let{$table:r,row:t,column:n,isHidden:a}=l;var{treeConfig:d,treeIndeterminateMaps:o,checkboxOpts:s}=r,{labelField:i,checkField:c,checkMethod:u,visibleMethod:C}=s,s=s.indeterminateField||s.halfField,E=n.slots,h=E?E.default:null,E=E?E.checkbox:null;let g=!1,b=!1,v=!C||C({row:t}),x=!!u,p;a||(C=(0,_util.getRowid)(r,t),b=_xeUtils.default.get(t,c),p={click(e){!x&&v&&r.triggerCheckRowEvent(e,l,!b)}},u&&(x=!u({row:t})),d&&(g=!!o[C]));c=Object.assign(Object.assign({},l),{checked:b,disabled:x,visible:v,indeterminate:g});return E?renderCellBaseVNs(e,l,r.callSlot(E,c,e)):(u=[],v&&u.push(e("span",{class:["vxe-checkbox--icon",g?getIcon().TABLE_CHECKBOX_INDETERMINATE:b?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(h||i)&&u.push(e("span",{class:"vxe-checkbox--label"},h?r.callSlot(h,c,e):_xeUtils.default.get(t,i))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":b,"is--disabled":x,"is--indeterminate":s&&!b?t[s]:g,"is--hidden":!v}],on:p},u)]))},renderTreeSelectionCellByProp(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCheckboxCellByProp(e,l))},renderExpandCell(e,l){let{$table:r,isHidden:t,row:n,column:a}=l;var{expandOpts:d,rowExpandedMaps:o,rowExpandLazyLoadedMaps:s}=r,{lazy:d,labelField:i,iconLoaded:c,showIcon:u,iconOpen:C,iconClose:E,visibleMethod:h}=d,g=a.slots,b=g?g.default:null;let v=!1,x=!1;return g&&g.icon?renderCellBaseVNs(e,l,r.callSlot(g.icon,l,e)):(t||(g=(0,_util.getRowid)(r,n),v=!!o[g],d&&(x=!!s[g])),renderCellBaseVNs(e,l,[!u||h&&!h(l)?renderEmptyElement(r):e("span",{class:["vxe-table--expanded",{"is--active":v}],on:{click(e){r.triggerRowExpandEvent(e,l)}}},[e("i",{class:["vxe-table--expand-btn",x?c||getIcon().TABLE_EXPAND_LOADED:v?C||getIcon().TABLE_EXPAND_OPEN:E||getIcon().TABLE_EXPAND_CLOSE]})]),b||i?e("span",{class:"vxe-table--expand-label"},b?r.callSlot(b,l,e):_xeUtils.default.get(n,i)):renderEmptyElement(r)]))},renderExpandData(e,l){var{$table:r,column:t}=l,{slots:t,contentRender:n}=t;if(t&&t.content)return r.callSlot(t.content,l,e);if(n){t=renderer.get(n.name),t=t?t.renderTableExpand||t.renderExpand:null;if(t)return(0,_vn.getSlotVNs)(t.call(r,e,n,l))}return[]},renderHTMLCell(e,l){var{$table:r,column:t}=l,t=t.slots;return t&&t.default?renderCellBaseVNs(e,l,r.callSlot(t.default,l,e)):renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--html",domProps:{innerHTML:getDefaultCellLabel(l)}})])},renderTreeHTMLCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderHTMLCell(e,l))},renderSortAndFilterHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderSortIcon(e,l).concat(Cell.renderFilterIcon(e,l))))},renderSortHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderSortIcon(e,l)))},renderSortIcon(e,l){let{$table:r,column:t}=l;var{showIcon:l,iconLayout:n,iconAsc:a,iconDesc:d}=r.sortOpts;return l?[e("span",{class:["vxe-cell--sort",`vxe-cell--sort-${n}-layout`]},[e("i",{class:["vxe-sort--asc-btn",a||getIcon().TABLE_SORT_ASC,{"sort--active":"asc"===t.order}],attrs:{title:getI18n("vxe.table.sortAsc")},on:{click(e){e.stopPropagation(),r.triggerSortEvent(e,t,"asc")}}}),e("i",{class:["vxe-sort--desc-btn",d||getIcon().TABLE_SORT_DESC,{"sort--active":"desc"===t.order}],attrs:{title:getI18n("vxe.table.sortDesc")},on:{click(e){e.stopPropagation(),r.triggerSortEvent(e,t,"desc")}}})])]:[]},renderFilterHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderFilterIcon(e,l)))},renderFilterIcon(e,l){let{$table:r,column:t,hasFilter:n}=l;var{filterStore:a,filterOpts:d}=r,{showIcon:d,iconNone:o,iconMatch:s}=d;return d?[e("span",{class:["vxe-cell--filter",{"is--active":a.visible&&a.column===t}]},[e("i",{class:["vxe-filter--btn",n?s||getIcon().TABLE_FILTER_MATCH:o||getIcon().TABLE_FILTER_NONE],attrs:{title:getI18n("vxe.table.filter")},on:{click(e){r.triggerFilterEvent&&r.triggerFilterEvent(e,l.column,l)}}})])]:[]},renderEditHeader(e,l){var{$table:r,column:t}=l,{editConfig:n,editRules:a,editOpts:d}=r,{sortable:o,remoteSort:s,filters:i,editRender:c}=t;let u=!1,C=(a&&(a=_xeUtils.default.get(a,t.field))&&(u=a.some(e=>e.required)),[]);return(0,_utils.isEnableConf)(n)&&(C=[u&&d.showAsterisk?e("i",{class:"vxe-cell--required-icon"}):renderEmptyElement(r),(0,_utils.isEnableConf)(c)&&d.showIcon?e("i",{class:["vxe-cell--edit-icon",d.icon||getIcon().TABLE_EDIT]}):renderEmptyElement(r)]),renderHeaderCellBaseVNs(e,l,C.concat(Cell.renderHeaderTitle(e,l)).concat(o||s?Cell.renderSortIcon(e,l):[]).concat(i?Cell.renderFilterIcon(e,l):[]))},renderRowEdit(e,l){var{$table:r,column:t}=l,t=t.editRender,r=r.editStore.actived;return Cell.runRenderer(e,l,this,(0,_utils.isEnableConf)(t)&&r&&r.row===l.row)},renderTreeRowEdit(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRowEdit(e,l))},renderCellEdit(e,l){var{$table:r,column:t}=l,t=t.editRender,r=r.editStore.actived;return Cell.runRenderer(e,l,this,(0,_utils.isEnableConf)(t)&&r&&r.row===l.row&&r.column===l.column)},renderTreeCellEdit(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCellEdit(e,l))},runRenderer(e,l,r,t){var{$table:n,column:a}=l,{slots:a,editRender:d,formatter:o}=a,s=renderer.get(d.name),s=s?s.renderTableEdit||s.renderEdit:null,i=Object.assign({$type:"",isEdit:t},l);return t?a&&a.edit?n.callSlot(a.edit,i,e):s?(0,_vn.getSlotVNs)(s.call(n,e,d,i)):[]:a&&a.default?renderCellBaseVNs(e,l,n.callSlot(a.default,i,e)):o?renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[getDefaultCellLabel(i)])]):Cell.renderDefaultCell.call(r,e,i)}};var _default=exports.default=Cell;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderer,formats,renderEmptyElement}=_ui.VxeUI;function renderTitlePrefixIcon(e,l){let{$table:r,column:t}=l,n=t.titlePrefix||t.titleHelp;return n?e("i",{class:["vxe-cell-title-prefix-icon",n.icon||getIcon().TABLE_TITLE_PREFIX],on:{mouseenter(e){r.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){r.handleTargetLeaveEvent(e)}}}):renderEmptyElement(r)}function renderTitleSuffixIcon(e,l){let{$table:r,column:t}=l,n=t.titleSuffix;return n?e("i",{class:["vxe-cell-title-suffix-icon",n.icon||getIcon().TABLE_TITLE_SUFFIX],on:{mouseenter(e){r.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){r.handleTargetLeaveEvent(e)}}}):renderEmptyElement(r)}function renderCellDragIcon(e,l){let r=l.$table;var t=r.dragConfig,{icon:n,disabledMethod:a}=r.computeRowDragOpts,a=a||(t?t.rowDisabledMethod:null);let d=a&&a(l);return e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":d}],on:{mousedown(e){d||r.handleCellDragMousedownEvent(e,l)},mouseup:r.handleCellDragMouseupEvent}},[e("i",{class:n||(t?t.rowIcon:"")||getIcon().TABLE_DRAG_ROW})])}function renderCellBaseVNs(e,l,r){var{$table:t,column:n,level:a}=l,n=n.dragSort,{treeConfig:d,dragConfig:o}=t,s=t.computeRowOpts,{showIcon:t,isCrossDrag:i,visibleMethod:c}=t.computeRowDragOpts,c=c||(o?o.rowVisibleMethod:null),r=_xeUtils.default.isArray(r)?r:[r];return!(n&&s.drag&&(t||o&&o.showRowIcon))||c&&!c(l)||d&&!i&&a||r.unshift(renderCellDragIcon(e,l)),r}function renderHeaderCellDragIcon(e,l){let{$table:r,column:t}=l;var n=r.computeColumnOpts,{showIcon:a,icon:d,visibleMethod:o,disabledMethod:s}=r.computeColumnDragOpts;let i=s&&s(l);return!n.drag||!a||o&&!o(l)||t.fixed||t.parentId?renderEmptyElement(r):e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":i}],on:{mousedown(e){i||r.handleHeaderCellDragMousedownEvent(e,l)},mouseup:r.handleHeaderCellDragMouseupEvent}},[e("i",{class:d||getIcon().TABLE_DRAG_COLUMN})])}function renderHeaderCellBaseVNs(e,l,r){return[renderTitlePrefixIcon(e,l),renderHeaderCellDragIcon(e,l),..._xeUtils.default.isArray(r)?r:[r],renderTitleSuffixIcon(e,l)]}function renderTitleContent(e,l,r){let{$table:t,column:n}=l;var{type:a,showHeaderOverflow:d}=n,{showHeaderOverflow:o,tooltipOpts:s}=t;let i=s.showAll||s.enabled;s=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?o:d;let c="title"===s,u=!0===s||"tooltip"===s;o={};return(c||u||i)&&(o.mouseenter=e=>{t._isResize||(c?(0,_dom.updateCellTitle)(e.currentTarget,n):(u||i)&&t.triggerHeaderTooltipEvent(e,l))}),(u||i)&&(o.mouseleave=e=>{t._isResize||(u||i)&&t.handleTargetLeaveEvent(e)}),["html"===a&&_xeUtils.default.isString(r)?e("span",{class:"vxe-cell--title",domProps:{innerHTML:r},on:o}):e("span",{class:"vxe-cell--title",on:o},(0,_vn.getSlotVNs)(r))]}function formatFooterLabel(e,l){var r,t;return _xeUtils.default.isFunction(e)?e(l):(t=(t=(r=_xeUtils.default.isArray(e))?formats.get(e[0]):formats.get(e))?t.tableFooterCellFormatMethod:null)?r?t(l,...e.slice(1)):t(l):""}function getFooterContent(e,l){var{$table:r,column:t,_columnIndex:n,row:a,items:d}=l,{slots:o,editRender:s,cellRender:i,footerFormatter:c}=t,s=s||i;if(o&&o.footer)return r.callSlot(o.footer,l,e);if(s){i=renderer.get(s.name),o=i?i.renderTableFooter||i.renderFooter:null;if(o)return(0,_vn.getSlotVNs)(o.call(r,e,s,l))}let u="";return _xeUtils.default.isArray(d)?u=d[n]:u=_xeUtils.default.get(a,t.field),[c?formatFooterLabel(c,{itemValue:u,column:t,row:a,items:d,_columnIndex:n}):(0,_utils.formatText)(u,1)]}function getDefaultCellLabel(e){var{$table:e,row:l,column:r}=e;return(0,_utils.formatText)(e.getCellLabel(l,r),1)}let Cell=exports.Cell={createColumn(e,l){var{type:r,sortable:t,remoteSort:n,filters:a,editRender:d,treeNode:o}=l,{editConfig:s,editOpts:i,checkboxOpts:c}=e,u={renderHeader:this.renderDefaultHeader,renderCell:o?this.renderTreeCell:this.renderDefaultCell,renderFooter:this.renderDefaultFooter};switch(r){case"seq":u.renderHeader=this.renderSeqHeader,u.renderCell=o?this.renderTreeIndexCell:this.renderSeqCell;break;case"radio":u.renderHeader=this.renderRadioHeader,u.renderCell=o?this.renderTreeRadioCell:this.renderRadioCell;break;case"checkbox":u.renderHeader=this.renderCheckboxHeader,u.renderCell=c.checkField?o?this.renderTreeSelectionCellByProp:this.renderCheckboxCellByProp:o?this.renderTreeSelectionCell:this.renderCheckboxCell;break;case"expand":u.renderCell=this.renderExpandCell,u.renderData=this.renderExpandData;break;case"html":u.renderCell=o?this.renderTreeHTMLCell:this.renderHTMLCell,a&&(t||n)?u.renderHeader=this.renderSortAndFilterHeader:t||n?u.renderHeader=this.renderSortHeader:a&&(u.renderHeader=this.renderFilterHeader);break;default:s&&d?(u.renderHeader=this.renderEditHeader,u.renderCell="cell"===i.mode?o?this.renderTreeCellEdit:this.renderCellEdit:o?this.renderTreeRowEdit:this.renderRowEdit):a&&(t||n)?u.renderHeader=this.renderSortAndFilterHeader:t||n?u.renderHeader=this.renderSortHeader:a&&(u.renderHeader=this.renderFilterHeader)}return(0,_util.createColumn)(e,l,u)},renderHeaderTitle(e,l){var{$table:r,column:t}=l,{slots:n,editRender:a,cellRender:d}=t,a=a||d;if(n&&n.header)return renderTitleContent(e,l,r.callSlot(n.header,l,e));if(a){d=renderer.get(a.name),n=d?d.renderTableHeader||d.renderHeader:null;if(n)return(0,_vn.getSlotVNs)(renderTitleContent(e,l,n.call(r,e,a,l)))}return renderTitleContent(e,l,(0,_utils.formatText)(t.getTitle(),1))},renderDefaultHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l))},renderDefaultCell(e,l){var{$table:r,row:t,column:n}=l,{slots:a,editRender:d,cellRender:o}=n,o=d||o;if(a&&a.default)return renderCellBaseVNs(e,l,r.callSlot(a.default,l,e));if(o){var a=renderer.get(o.name),s=a?a.renderTableDefault||a.renderDefault:null,a=a?a.renderTableCell||a.renderCell:null,a=d?a:s;if(a)return renderCellBaseVNs(e,l,(0,_vn.getSlotVNs)(a.call(r,e,o,Object.assign({$type:d?"edit":"cell"},l))))}s=r.getCellLabel(t,n),a=d?d.placeholder:"";return renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[d&&(0,_utils.eqEmptyValue)(s)?e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(a),1)):e("span",(0,_utils.formatText)(s,1))])])},renderTreeCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderDefaultCell.call(this,e,l))},renderDefaultFooter(e,l){return[e("span",{class:"vxe-cell--item"},getFooterContent(e,l))]},renderTreeIcon(e,l,r){let{$table:t,isHidden:n}=l;var{treeOpts:a,treeExpandedMaps:d,treeExpandLazyLoadedMaps:o,fullAllDataRowIdData:s}=t,{row:i,column:c,level:u}=l,c=c.slots,{indent:C,lazy:E,trigger:h,iconLoaded:g,showIcon:b,iconOpen:v,iconClose:x}=a,p=a.children||a.childrenField,a=a.hasChild||a.hasChildField,p=i[p],p=p&&p.length;let f=!1,T=!1,m=!1,_=!1;var H={};return c&&c.icon?t.callSlot(c.icon,l,e,r):(n||(c=(0,_util.getRowid)(t,i),T=!!d[c],E&&(d=s[c],m=!!o[c],f=i[a],_=!!d.treeLoaded)),h&&"default"!==h||(H.click=e=>{t.triggerTreeExpandEvent(e,l)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":T}],style:{paddingLeft:u*C+"px"}},[b&&(!E||_?p:f)?[e("div",{class:"vxe-tree--btn-wrapper",on:H},[e("i",{class:["vxe-tree--node-btn",m?g||getIcon().TABLE_TREE_LOADED:T?v||getIcon().TABLE_TREE_OPEN:x||getIcon().TABLE_TREE_CLOSE]})])]:null,e("div",{class:"vxe-tree-cell"},r)])])},renderSeqHeader(e,l){var{$table:r,column:t}=l,n=t.slots;return renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,n&&n.header?r.callSlot(n.header,l,e):(0,_utils.formatText)(t.getTitle(),1)))},renderSeqCell(e,l){var{$table:r,column:t}=l,{treeConfig:n,seqOpts:a}=r,t=t.slots;return t&&t.default?renderCellBaseVNs(e,l,r.callSlot(t.default,l,e)):(r=l.seq,t=a.seqMethod,renderCellBaseVNs(e,l,[e("span",""+(0,_utils.formatText)(t?t(l):n?r:(a.startIndex||0)+r,1))]))},renderTreeIndexCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderSeqCell(e,l))},renderRadioHeader(e,l){var{$table:r,column:t}=l,n=t.slots,a=n?n.header:null,n=n?n.title:null;return renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,a?r.callSlot(a,l,e):[e("span",{class:"vxe-radio--label"},n?r.callSlot(n,l,e):(0,_utils.formatText)(t.getTitle(),1))]))},renderRadioCell(e,l){let{$table:r,column:t,isHidden:n}=l;var{radioOpts:a,selectRadioRow:d}=r,o=t.slots,{labelField:a,checkMethod:s,visibleMethod:i}=a,c=l.row,u=o?o.default:null,o=o?o.radio:null,d=c===d;let C=!i||i({row:c}),E=!!s,h;n||(h={click(e){!E&&C&&r.triggerRadioRowEvent(e,l)}},s&&(E=!s({row:c})));i=Object.assign(Object.assign({},l),{checked:d,disabled:E,visible:C});return o?renderCellBaseVNs(e,l,r.callSlot(o,i,e)):(s=[],C&&s.push(e("span",{class:["vxe-radio--icon",d?getIcon().TABLE_RADIO_CHECKED:getIcon().TABLE_RADIO_UNCHECKED]})),(u||a)&&s.push(e("span",{class:"vxe-radio--label"},u?r.callSlot(u,i,e):_xeUtils.default.get(c,a))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--radio",{"is--checked":d,"is--disabled":E}],on:h},s)]))},renderTreeRadioCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRadioCell(e,l))},renderCheckboxHeader(e,l){let{$table:r,column:t,isHidden:n}=l,{isAllSelected:a,isIndeterminate:d,isAllCheckboxDisabled:o}=r;var s=t.slots,i=s?s.header:null,s=s?s.title:null,c=r.checkboxOpts,u=t.getTitle();let C;n||(C={click(e){o||r.triggerCheckAllEvent(e,!a)}});var E=Object.assign(Object.assign({},l),{checked:a,disabled:o,indeterminate:d});return i?renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,r.callSlot(i,E,e))):(c.checkStrictly?c.showHeader:!1!==c.showHeader)?renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,[e("span",{class:["vxe-cell--checkbox",{"is--checked":a,"is--disabled":o,"is--indeterminate":d}],attrs:{title:getI18n("vxe.table.allTitle")},on:C},[e("span",{class:["vxe-checkbox--icon",d?getIcon().TABLE_CHECKBOX_INDETERMINATE:a?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})].concat(s||u?[e("span",{class:"vxe-checkbox--label"},s?r.callSlot(s,E,e):u)]:[]))])):renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,[e("span",{class:"vxe-checkbox--label"},s?r.callSlot(s,E,e):u)]))},renderCheckboxCell(e,l){let{$table:r,row:t,column:n,isHidden:a}=l;var{treeConfig:d,treeIndeterminateMaps:o,selectCheckboxMaps:s}=r,{labelField:i,checkMethod:c,visibleMethod:u}=r.checkboxOpts,C=n.slots,E=C?C.default:null,C=C?C.checkbox:null;let h=!1,g=!1,b=!u||u({row:t}),v=!!c,x;a||(u=(0,_util.getRowid)(r,t),g=!!s[u],x={click(e){!v&&b&&r.triggerCheckRowEvent(e,l,!g)}},c&&(v=!c({row:t})),d&&(h=!!o[u]));s=Object.assign(Object.assign({},l),{checked:g,disabled:v,visible:b,indeterminate:h});return C?renderCellBaseVNs(e,l,r.callSlot(C,s,e)):(c=[],b&&c.push(e("span",{class:["vxe-checkbox--icon",h?getIcon().TABLE_CHECKBOX_INDETERMINATE:g?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(E||i)&&c.push(e("span",{class:"vxe-checkbox--label"},E?r.callSlot(E,s,e):_xeUtils.default.get(t,i))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":g,"is--disabled":v,"is--indeterminate":h,"is--hidden":!b}],on:x},c)]))},renderTreeSelectionCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCheckboxCell(e,l))},renderCheckboxCellByProp(e,l){let{$table:r,row:t,column:n,isHidden:a}=l;var{treeConfig:d,treeIndeterminateMaps:o,checkboxOpts:s}=r,{labelField:i,checkField:c,checkMethod:u,visibleMethod:C}=s,s=s.indeterminateField||s.halfField,E=n.slots,h=E?E.default:null,E=E?E.checkbox:null;let g=!1,b=!1,v=!C||C({row:t}),x=!!u,p;a||(C=(0,_util.getRowid)(r,t),b=_xeUtils.default.get(t,c),p={click(e){!x&&v&&r.triggerCheckRowEvent(e,l,!b)}},u&&(x=!u({row:t})),d&&(g=!!o[C]));c=Object.assign(Object.assign({},l),{checked:b,disabled:x,visible:v,indeterminate:g});return E?renderCellBaseVNs(e,l,r.callSlot(E,c,e)):(u=[],v&&u.push(e("span",{class:["vxe-checkbox--icon",g?getIcon().TABLE_CHECKBOX_INDETERMINATE:b?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(h||i)&&u.push(e("span",{class:"vxe-checkbox--label"},h?r.callSlot(h,c,e):_xeUtils.default.get(t,i))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":b,"is--disabled":x,"is--indeterminate":s&&!b?t[s]:g,"is--hidden":!v}],on:p},u)]))},renderTreeSelectionCellByProp(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCheckboxCellByProp(e,l))},renderExpandCell(e,l){let{$table:r,isHidden:t,row:n,column:a}=l;var{expandOpts:d,rowExpandedMaps:o,rowExpandLazyLoadedMaps:s}=r,{lazy:d,labelField:i,iconLoaded:c,showIcon:u,iconOpen:C,iconClose:E,visibleMethod:h}=d,g=a.slots,b=g?g.default:null;let v=!1,x=!1;return g&&g.icon?renderCellBaseVNs(e,l,r.callSlot(g.icon,l,e)):(t||(g=(0,_util.getRowid)(r,n),v=!!o[g],d&&(x=!!s[g])),renderCellBaseVNs(e,l,[!u||h&&!h(l)?renderEmptyElement(r):e("span",{class:["vxe-table--expanded",{"is--active":v}],on:{click(e){r.triggerRowExpandEvent(e,l)}}},[e("i",{class:["vxe-table--expand-btn",x?c||getIcon().TABLE_EXPAND_LOADED:v?C||getIcon().TABLE_EXPAND_OPEN:E||getIcon().TABLE_EXPAND_CLOSE]})]),b||i?e("span",{class:"vxe-table--expand-label"},b?r.callSlot(b,l,e):_xeUtils.default.get(n,i)):renderEmptyElement(r)]))},renderExpandData(e,l){var{$table:r,column:t}=l,{slots:t,contentRender:n}=t;if(t&&t.content)return r.callSlot(t.content,l,e);if(n){t=renderer.get(n.name),t=t?t.renderTableExpand||t.renderExpand:null;if(t)return(0,_vn.getSlotVNs)(t.call(r,e,n,l))}return[]},renderHTMLCell(e,l){var{$table:r,column:t}=l,t=t.slots;return t&&t.default?renderCellBaseVNs(e,l,r.callSlot(t.default,l,e)):renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--html",domProps:{innerHTML:getDefaultCellLabel(l)}})])},renderTreeHTMLCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderHTMLCell(e,l))},renderSortAndFilterHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderSortIcon(e,l).concat(Cell.renderFilterIcon(e,l))))},renderSortHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderSortIcon(e,l)))},renderSortIcon(e,l){let{$table:r,column:t}=l;var{showIcon:l,iconLayout:n,iconAsc:a,iconDesc:d}=r.sortOpts;return l?[e("span",{class:["vxe-cell--sort",`vxe-cell--sort-${n}-layout`]},[e("i",{class:["vxe-sort--asc-btn",a||getIcon().TABLE_SORT_ASC,{"sort--active":"asc"===t.order}],attrs:{title:getI18n("vxe.table.sortAsc")},on:{click(e){e.stopPropagation(),r.triggerSortEvent(e,t,"asc")}}}),e("i",{class:["vxe-sort--desc-btn",d||getIcon().TABLE_SORT_DESC,{"sort--active":"desc"===t.order}],attrs:{title:getI18n("vxe.table.sortDesc")},on:{click(e){e.stopPropagation(),r.triggerSortEvent(e,t,"desc")}}})])]:[]},renderFilterHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderFilterIcon(e,l)))},renderFilterIcon(e,l){let{$table:r,column:t,hasFilter:n}=l;var{filterStore:a,filterOpts:d}=r,{showIcon:d,iconNone:o,iconMatch:s}=d;return d?[e("span",{class:["vxe-cell--filter",{"is--active":a.visible&&a.column===t}]},[e("i",{class:["vxe-filter--btn",n?s||getIcon().TABLE_FILTER_MATCH:o||getIcon().TABLE_FILTER_NONE],attrs:{title:getI18n("vxe.table.filter")},on:{click(e){r.triggerFilterEvent&&r.triggerFilterEvent(e,l.column,l)}}})])]:[]},renderEditHeader(e,l){var{$table:r,column:t}=l,{editConfig:n,editRules:a,editOpts:d}=r,{sortable:o,remoteSort:s,filters:i,editRender:c}=t;let u=!1,C=(a&&(a=_xeUtils.default.get(a,t.field))&&(u=a.some(e=>e.required)),[]);return(0,_utils.isEnableConf)(n)&&(C=[u&&d.showAsterisk?e("i",{class:"vxe-cell--required-icon"}):renderEmptyElement(r),(0,_utils.isEnableConf)(c)&&d.showIcon?e("i",{class:["vxe-cell--edit-icon",d.icon||getIcon().TABLE_EDIT]}):renderEmptyElement(r)]),renderHeaderCellBaseVNs(e,l,C.concat(Cell.renderHeaderTitle(e,l)).concat(o||s?Cell.renderSortIcon(e,l):[]).concat(i?Cell.renderFilterIcon(e,l):[]))},renderRowEdit(e,l){var{$table:r,column:t}=l,t=t.editRender,r=r.editStore.actived;return Cell.runRenderer(e,l,this,(0,_utils.isEnableConf)(t)&&r&&r.row===l.row)},renderTreeRowEdit(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRowEdit(e,l))},renderCellEdit(e,l){var{$table:r,column:t}=l,t=t.editRender,r=r.editStore.actived;return Cell.runRenderer(e,l,this,(0,_utils.isEnableConf)(t)&&r&&r.row===l.row&&r.column===l.column)},renderTreeCellEdit(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCellEdit(e,l))},runRenderer(e,l,r,t){var{$table:n,column:a}=l,{slots:a,editRender:d,formatter:o}=a,s=renderer.get(d.name),s=s?s.renderTableEdit||s.renderEdit:null,i=Object.assign({$type:"",isEdit:t},l);return t?a&&a.edit?n.callSlot(a.edit,i,e):s?(0,_vn.getSlotVNs)(s.call(n,e,d,i)):[]:a&&a.default?renderCellBaseVNs(e,l,n.callSlot(a.default,i,e)):o?renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[getDefaultCellLabel(i)])]):Cell.renderDefaultCell.call(r,e,i)}};var _default=exports.default=Cell;

package/lib/table/src/header.js

@@ -92,7 +92,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
       thOns.mousedown = evnt => $xetable.triggerHeaderCellMousedownEvent(evnt, params);
     }
     // 拖拽行事件
-    if (columnOpts.drag && !column.parentId) {
+    if (columnOpts.drag) {
       thOns.dragstart = $xetable.handleHeaderCellDragDragstartEvent;
       thOns.dragend = $xetable.handleHeaderCellDragDragendEvent;
       thOns.dragover = $xetable.handleHeaderCellDragDragoverEvent;

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:I,columnOpts:A}=y;return C.map((e,l)=>{var{type:t,showHeaderOverflow:r,headerAlign:a,align:i,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,a=a||(s?s.tableHeaderCellAlign:"")||T||i||(s?s.tableCellAlign:"")||M;let c="ellipsis"===r;i="title"===r,s=!0===r||"tooltip"===r;let p=i||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),(A.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)),I&&(r.mousedown=e=>y.triggerHeaderCellMousedownEvent(e,g)),A.drag&&!e.parentId&&(r.dragstart=y.handleHeaderCellDragDragstartEvent,r.dragend=y.handleHeaderCellDragDragendEvent,r.dragover=y.handleHeaderCellDragDragoverEvent),x("th",{class:["vxe-header--column",d,{["col--"+a]:a,["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||A.useKey||A.drag||o?d:l},[x("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":s,"c--ellipsis":c}]},e.renderHeader(x,g)),u||o||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:A.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,a,e){let i=a.$parent;var l=i;let n=a.fixedType,{headerRowClassName:o,headerRowStyle:s}=l,d=i.isDragColMove,u=i.columnOpts;return e.map((e,l)=>{var t={$table:i,$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,a,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,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:n}=this,{tId:l,isGroup:o,visibleColumn:s,showHeaderOverflow:d,scrollXLoad:u,scrollbarWidth:c}=l;let p=a,h=i;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,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:n,clientX:g}=e,x=t.cell=n.parentNode,v=l.computeResizableOpts,C=0,b=i.$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,a=f.getBoundingClientRect(),i=h.clientWidth,n=m.clientWidth,o=m.clientHeight;let e=-n;t<n+i?e=n+i-t:r<t&&(e+=r-t),m.style.left=e+"px",m.style.top=Math.min(p.clientHeight-o,Math.max(0,l.clientY-a.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&&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")},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=(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()}}};

package/lib/table/src/methods.js

@@ -501,7 +501,7 @@ const updateColDropTipContent = ($xeTable, tdEl) => {
   }
   reactData.dragTipText = tipContent;
 };
-function showDropTip($xeTable, evnt, trEl, thEl, dragPos) {
+function showDropTip($xeTable, evnt, trEl, thEl, showLine, dragPos) {
   const reactData = $xeTable;
   const el = $xeTable.$refs.refElem;
   if (!el) {
@@ -515,26 +515,30 @@ function showDropTip($xeTable, evnt, trEl, thEl, dragPos) {
   if (trEl) {
     const rdLineEl = $xeTable.$refs.refDragRowLineElem;
     if (rdLineEl) {
-      const trRect = trEl.getBoundingClientRect();
-      let top = Math.max(1, trRect.y - wrapperRect.y);
-      if (dragPos === 'bottom') {
-        top = Math.min(wrapperRect.height - 1, trRect.y - wrapperRect.y + trRect.height);
+      if (showLine) {
+        const trRect = trEl.getBoundingClientRect();
+        rdLineEl.style.display = 'block';
+        rdLineEl.style.top = `${Math.max(1, trRect.y - wrapperRect.y)}px`;
+        rdLineEl.style.height = `${trRect.height}px`;
+        rdLineEl.style.width = `${wrapperRect.width - scrollbarWidth}px`;
+        rdLineEl.setAttribute('drag-pos', dragPos);
+      } else {
+        rdLineEl.style.display = '';
       }
-      rdLineEl.style.top = `${top}px`;
-      rdLineEl.style.width = `${wrapperRect.width - scrollbarWidth}px`;
-      rdLineEl.style.display = 'block';
     }
   } else if (thEl) {
     const cdLineEl = $xeTable.$refs.refDragColLineElem;
     if (cdLineEl) {
-      const thRect = thEl.getBoundingClientRect();
-      let left = Math.max(1, thRect.x - wrapperRect.x);
-      if (dragPos === 'right') {
-        left = Math.min(wrapperRect.width - 2, thRect.x - wrapperRect.x + thRect.width);
+      if (showLine) {
+        const thRect = thEl.getBoundingClientRect();
+        cdLineEl.style.display = 'block';
+        cdLineEl.style.left = `${Math.max(1, thRect.x - wrapperRect.x)}px`;
+        cdLineEl.style.width = `${thRect.width}px`;
+        cdLineEl.style.height = `${wrapperRect.height - scrollbarHeight}px`;
+        cdLineEl.setAttribute('drag-pos', dragPos);
+      } else {
+        cdLineEl.style.display = '';
       }
-      cdLineEl.style.left = `${left}px`;
-      cdLineEl.style.height = `${wrapperRect.height - scrollbarHeight}px`;
-      cdLineEl.style.display = 'block';
     }
   }
   const rdTipEl = $xeTable.$refs.refDragTipElem;
@@ -542,6 +546,7 @@ function showDropTip($xeTable, evnt, trEl, thEl, dragPos) {
     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.setAttribute('drag-status', showLine ? 'normal' : 'disabled');
   }
 }
 const hideDropTip = $xeTable => {
@@ -1091,6 +1096,7 @@ const Methods = {
         };
       }
       if (isSource) {
+        cacheItem.level = level;
         cacheItem.index = treeConfig && parent ? -1 : index;
         fullDataRowIdMaps[rowid] = cacheItem;
       }
@@ -1894,6 +1900,17 @@ const Methods = {
       tableColumn: this.tableColumn.slice(0)
     };
   },
+  /**
+   * 获取表格的全量列
+   */
+  getFullColumns() {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      collectColumn
+    } = internalData;
+    return collectColumn.slice(0);
+  },
   /**
    * 获取数据，和 data 的行为一致，也可以指定索引获取数据
    */
@@ -2424,6 +2441,38 @@ const Methods = {
       footerData: footerTableData.slice(0)
     };
   },
+  /**
+   * 获取表格的全量数据，如果是 tree-config 则返回带层级的树结构
+   */
+  getFullData() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      tableFullData,
+      tableFullTreeData
+    } = internalData;
+    if (treeConfig) {
+      const treeOpts = $xeTable.computeTreeOpts;
+      const {
+        transform,
+        mapChildrenField
+      } = treeOpts;
+      const childrenField = treeOpts.children || treeOpts.childrenField;
+      if (transform) {
+        return _xeUtils.default.toArrayTree(_xeUtils.default.toTreeArray(tableFullTreeData, {
+          children: mapChildrenField
+        }), {
+          children: childrenField
+        });
+      }
+      return tableFullTreeData.slice(0);
+    }
+    return tableFullData.slice(0);
+  },
   /**
    * 处理数据加载默认行为
    * 默认执行一次，除非被重置
@@ -2625,9 +2674,12 @@ const Methods = {
     return this.refreshColumn(true);
   },
   handleCustomRestore(storeData) {
+    const $xetable = this;
+    const reactData = $xetable;
+    const internalData = $xetable;
     let {
       collectColumn
-    } = this;
+    } = internalData;
     const {
       resizableData,
       sortData,
@@ -2659,9 +2711,12 @@ const Methods = {
       // 如果自定义了顺序
       if (hasCustomSort) {
         collectColumn = _xeUtils.default.orderBy(collectColumn, 'renderSortNumber');
-        this.collectColumn = collectColumn;
-        this.tableFullColumn = getColumnList(collectColumn);
+        internalData.collectColumn = collectColumn;
+        internalData.tableFullColumn = getColumnList(collectColumn);
       }
+      reactData.isCustomStatus = true;
+    } else {
+      reactData.isCustomStatus = false;
     }
   },
   /**
@@ -5507,20 +5562,45 @@ const Methods = {
       }, params), evnt);
     }
   },
+  triggerCurrentColumnEvent(evnt, params) {
+    const $xeTable = this;
+    const columnOpts = $xeTable.computeColumnOpts;
+    const {
+      currentMethod
+    } = columnOpts;
+    const {
+      column
+    } = params;
+    if (!currentMethod || currentMethod({
+      column
+    })) {
+      $xeTable.setCurrentColumn(column);
+    }
+  },
   triggerCurrentRowEvent(evnt, params) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       currentRow: oldValue
-    } = this;
+    } = reactData;
+    const rowOpts = $xeTable.computeRowOpts;
+    const {
+      currentMethod
+    } = rowOpts;
     const {
       row: newValue
     } = params;
     const isChange = oldValue !== newValue;
-    this.setCurrentRow(newValue);
-    if (isChange) {
-      this.emitEvent('current-change', Object.assign({
-        oldValue,
-        newValue
-      }, params), evnt);
+    if (!currentMethod || currentMethod({
+      row: newValue
+    })) {
+      $xeTable.setCurrentRow(newValue);
+      if (isChange) {
+        $xeTable.dispatchEvent('current-change', Object.assign({
+          oldValue,
+          newValue
+        }, params), evnt);
+      }
     }
   },
   /**
@@ -5667,7 +5747,7 @@ const Methods = {
       cell
     }, params), evnt);
     if (this.columnOpts.isCurrent || this.highlightCurrentColumn) {
-      return this.setCurrentColumn(column);
+      this.triggerCurrentColumnEvent(evnt, params);
     }
     return this.$nextTick();
   },
@@ -5928,20 +6008,26 @@ const Methods = {
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
+      fullAllDataRowIdData
+    } = internalData;
+    const {
+      isCrossDrag,
+      isSelfToChildDrag,
       dragEndMethod
     } = rowDragOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
-      transform
+      transform,
+      mapChildrenField,
+      parentField
     } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
     const {
       dragRow
     } = reactData;
     const {
       afterFullData,
-      afterTreeFullData,
       tableFullData,
-      tableFullTreeData,
       prevDragRow,
       prevDragPos
     } = internalData;
@@ -5961,26 +6047,102 @@ const Methods = {
           }
           let oafIndex = -1;
           let nafIndex = -1;
+          // 如果为树结构
           if (treeConfig) {
-            // 移出源位置
-            oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
-            const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
-            afterTreeFullData.splice(oafIndex, 1);
-            tableFullTreeData.splice(otfIndex, 1);
-            // 插新位置
-            const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
-            const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
-            nafIndex = pafIndex + dragOffsetIndex;
-            const ntfIndex = ptfIndex + dragOffsetIndex;
-            afterTreeFullData.splice(nafIndex, 0, dragRow);
-            tableFullTreeData.splice(ntfIndex, 0, dragRow);
+            if (transform) {
+              // 移出源位置
+              const oldRowid = (0, _util.getRowid)($xeTable, dragRow);
+              const oldRest = fullAllDataRowIdData[oldRowid];
+              const newRowid = (0, _util.getRowid)($xeTable, prevDragRow);
+              const newRest = fullAllDataRowIdData[newRowid];
+              if (oldRest && newRest) {
+                const {
+                  level: oldLevel
+                } = oldRest;
+                const {
+                  level: newLevel
+                } = newRest;
+                const oldAllMaps = {};
+                _xeUtils.default.eachTree([dragRow], item => {
+                  oldAllMaps[(0, _util.getRowid)($xeTable, item)] = item;
+                }, {
+                  children: mapChildrenField
+                });
+                let isSelfToChildStatus = false;
+                if (oldLevel && newLevel) {
+                  // 子到子
+                  if (!isCrossDrag) {
+                    return;
+                  }
+                  if (oldAllMaps[newRowid]) {
+                    if (!isSelfToChildDrag) {
+                      isSelfToChildStatus = true;
+                      if (_ui.VxeUI.modal) {
+                        _ui.VxeUI.modal.message({
+                          status: 'error',
+                          content: getI18n('vxe.error.treeDragChild')
+                        });
+                      }
+                      return;
+                    }
+                  }
+                } else if (oldLevel) {
+                  // 子到根
+                  if (!isCrossDrag) {
+                    return;
+                  }
+                } else if (newLevel) {
+                  // 根到子
+                  if (!isCrossDrag) {
+                    return;
+                  }
+                  if (oldAllMaps[newRowid]) {
+                    isSelfToChildStatus = true;
+                    if (!isSelfToChildDrag) {
+                      if (_ui.VxeUI.modal) {
+                        _ui.VxeUI.modal.message({
+                          status: 'error',
+                          content: getI18n('vxe.error.treeDragChild')
+                        });
+                      }
+                      return;
+                    }
+                  }
+                } else {
+                  // 根到根
+                }
+                const fullList = _xeUtils.default.toTreeArray(internalData.afterTreeFullData, {
+                  children: childrenField
+                });
+                // 移出
+                const otfIndex = $xeTable.findRowIndexOf(fullList, dragRow);
+                fullList.splice(otfIndex, 1);
+                // 插入
+                const ptfIndex = $xeTable.findRowIndexOf(fullList, prevDragRow);
+                const ntfIndex = ptfIndex + dragOffsetIndex;
+                fullList.splice(ntfIndex, 0, dragRow);
+                // 改变层级
+                if (isSelfToChildStatus && isSelfToChildDrag) {
+                  _xeUtils.default.each(dragRow[childrenField], childRow => {
+                    childRow[parentField] = dragRow[parentField];
+                  });
+                }
+                dragRow[parentField] = prevDragRow[parentField];
+                internalData.tableFullTreeData = _xeUtils.default.toArrayTree(fullList, {
+                  key: treeOpts.rowField,
+                  parentKey: treeOpts.parentField,
+                  children: childrenField,
+                  mapChildren: treeOpts.mapChildrenField
+                });
+              }
+            }
           } else {
-            // 移出源位置
+            // 移出
             oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
             const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
             afterFullData.splice(oafIndex, 1);
             tableFullData.splice(otfIndex, 1);
-            // 插新位置
+            // 插入
             const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
             const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
             nafIndex = pafIndex + dragOffsetIndex;
@@ -5989,9 +6151,9 @@ const Methods = {
             tableFullData.splice(ntfIndex, 0, dragRow);
           }
           reactData.isDragRowMove = true;
-          $xeTable.cacheRowMap();
-          $xeTable.updateScrollYStatus();
           $xeTable.handleTableData(treeConfig && transform);
+          $xeTable.cacheRowMap(true);
+          $xeTable.updateScrollYStatus();
           if (!(treeConfig && transform)) {
             $xeTable.updateAfterDataIndex();
           }
@@ -6026,29 +6188,44 @@ const Methods = {
   },
   handleRowDragDragoverEvent(evnt) {
     const $xeTable = this;
+    const props = $xeTable;
     const internalData = $xeTable;
     const reactData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
     const {
       dragRow
     } = reactData;
+    const rowDragOpts = $xeTable.computeRowDragOpts;
+    const {
+      isCrossDrag
+    } = rowDragOpts;
     if (!dragRow) {
       evnt.preventDefault();
       return;
     }
     const trEl = evnt.currentTarget;
-    const rowid = trEl.getAttribute('rowid');
-    const row = $xeTable.getRowById(rowid);
-    if (row) {
-      evnt.preventDefault();
+    const rowid = trEl.getAttribute('rowid') || '';
+    const rest = fullAllDataRowIdData[rowid];
+    if (rest) {
+      const row = rest.row;
       evnt.preventDefault();
       const {
         dragRow
       } = reactData;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
+      if ($xeTable.eqRow(dragRow, row) || !isCrossDrag && treeConfig && rest.level) {
+        showDropTip($xeTable, evnt, trEl, null, false, dragPos);
+        return;
+      }
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
-      showDropTip($xeTable, evnt, trEl, null, dragPos);
+      showDropTip($xeTable, evnt, trEl, null, true, dragPos);
       $xeTable.dispatchEvent('row-dragover', {
         oldRow: dragRow,
         targetRow: row,
@@ -6218,9 +6395,13 @@ const Methods = {
       } = reactData;
       const offsetX = evnt.clientX - thEl.getBoundingClientRect().x;
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
+      if (dragCol.id === column.id || column.parentId) {
+        showDropTip($xeTable, evnt, null, thEl, false, dragPos);
+        return;
+      }
       internalData.prevDragCol = column;
       internalData.prevDragPos = dragPos;
-      showDropTip($xeTable, evnt, null, thEl, dragPos);
+      showDropTip($xeTable, evnt, null, thEl, true, dragPos);
       $xeTable.dispatchEvent('column-dragover', {
         oldColumn: dragCol,
         targetColumn: column,