vxe-table 3.12.0-beta.9 → 3.12.0

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,trigger:a,disabledMethod:d}=r.computeRowDragOpts,d=d||(t?t.rowDisabledMethod:null);let o=d&&d(l);d={};return"cell"!==a&&(d.mousedown=e=>{o||r.handleCellDragMousedownEvent(e,l)},d.mouseup=r.handleCellDragMouseupEvent),e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":o}],on:d},[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,r){let{$table:t,column:l}=r;var n=t.computeColumnOpts,{showIcon:a,icon:d,trigger:o,isCrossDrag:s,visibleMethod:i,disabledMethod:c}=t.computeColumnDragOpts;if(!n.drag||!a||i&&!i(r)||l.fixed||!s&&l.parentId)return renderEmptyElement(t);{let l=c&&c(r);n={};return"cell"!==o&&(n.mousedown=e=>{l||t.handleHeaderCellDragMousedownEvent(e,r)},n.mouseup=t.handleHeaderCellDragMouseupEvent),e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":l}],on:n},[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:g,iconLoaded:h,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)),g&&"default"!==g||(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?h||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,g;n||(g={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:g},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 g=!1,h=!1,b=!u||u({row:t}),v=!!c,x;a||(u=(0,_util.getRowid)(r,t),h=!!s[u],x={click(e){!v&&b&&r.triggerCheckRowEvent(e,l,!h)}},c&&(v=!c({row:t})),d&&(g=!!o[u]));s=Object.assign(Object.assign({},l),{checked:h,disabled:v,visible:b,indeterminate:g});return C?renderCellBaseVNs(e,l,r.callSlot(C,s,e)):(c=[],b&&c.push(e("span",{class:["vxe-checkbox--icon",g?getIcon().TABLE_CHECKBOX_INDETERMINATE:h?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":h,"is--disabled":v,"is--indeterminate":g,"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,g=E?E.default:null,E=E?E.checkbox:null;let h=!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&&(h=!!o[C]));c=Object.assign(Object.assign({},l),{checked:b,disabled:x,visible:v,indeterminate:h});return E?renderCellBaseVNs(e,l,r.callSlot(E,c,e)):(u=[],v&&u.push(e("span",{class:["vxe-checkbox--icon",h?getIcon().TABLE_CHECKBOX_INDETERMINATE:b?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(g||i)&&u.push(e("span",{class:"vxe-checkbox--label"},g?r.callSlot(g,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]:h,"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:g}=d,h=a.slots,b=h?h.default:null;let v=!1,x=!1;return h&&h.icon?renderCellBaseVNs(e,l,r.callSlot(h.icon,l,e)):(t||(h=(0,_util.getRowid)(r,n),v=!!o[h],d&&(x=!!s[h])),renderCellBaseVNs(e,l,[!u||g&&!g(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,trigger:a,disabledMethod:d}=r.computeRowDragOpts,d=d||(t?t.rowDisabledMethod:null);let o=d&&d(l);d={};return"cell"!==a&&(d.mousedown=e=>{o||r.handleCellDragMousedownEvent(e,l)},d.mouseup=r.handleCellDragMouseupEvent),e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":o}],on:d},[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,isPeerDrag:i,isCrossDrag:c,visibleMethod:u}=t.computeRowDragOpts,u=u||(o?o.rowVisibleMethod:null),r=_xeUtils.default.isArray(r)?r:[r];return!(n&&s.drag&&(t||o&&o.showRowIcon))||u&&!u(l)||d&&!i&&!c&&a||r.unshift(renderCellDragIcon(e,l)),r}function renderHeaderCellDragIcon(e,r){let{$table:t,column:l}=r;var n=t.computeColumnOpts,{showIcon:a,icon:d,trigger:o,isPeerDrag:s,isCrossDrag:i,visibleMethod:c,disabledMethod:u}=t.computeColumnDragOpts;if(!n.drag||!a||c&&!c(r)||l.fixed||!s&&!i&&l.parentId)return renderEmptyElement(t);{let l=u&&u(r);n={};return"cell"!==o&&(n.mousedown=e=>{l||t.handleHeaderCellDragMousedownEvent(e,r)},n.mouseup=t.handleHeaderCellDragMouseupEvent),e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":l}],on:n},[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,o=t;let s=t;o=o.showHeaderOverflow;let i=t.computeTooltipOpts.showAll;o=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?o:d;let c="title"===o,u=!0===o||"tooltip"===o;d={};return(c||u||i)&&(d.mouseenter=e=>{s._isResize||(c?(0,_dom.updateCellTitle)(e.currentTarget,n):(u||i)&&t.triggerHeaderTooltipEvent(e,l))}),(u||i)&&(d.mouseleave=e=>{s._isResize||(u||i)&&t.handleTargetLeaveEvent(e)}),["html"===a&&_xeUtils.default.isString(r)?e("span",{class:"vxe-cell--title",domProps:{innerHTML:r},on:d}):e("span",{class:"vxe-cell--title",on:d},(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{treeExpandedMaps:a,treeExpandLazyLoadedMaps:d}=t,o=t.fullAllDataRowIdData,s=t.computeTreeOpts,{row:i,column:c,level:u}=l,c=c.slots,{indent:C,lazy:E,trigger:g,iconLoaded:h,showIcon:p,iconOpen:b,iconClose:v}=s,x=s.children||s.childrenField,s=s.hasChild||s.hasChildField,x=i[x],x=x&&x.length,c=c?c.icon:null;let f=!1,T=!1,m=!1,_=!1;var I={};return c?t.callSlot(c,l,e):(n||(c=(0,_util.getRowid)(t,i),T=!!a[c],E&&(a=o[c],m=!!d[c],f=i[s],_=!!a.treeLoaded)),g&&"default"!==g||(I.click=e=>{t.triggerTreeExpandEvent(e,l)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":T}],style:{paddingLeft:u*C+"px"}},[p&&(!E||_?x:f)?[e("div",{class:"vxe-tree--btn-wrapper",on:I},[e("i",{class:["vxe-tree--node-btn",m?h||getIcon().TABLE_TREE_LOADED:T?b||getIcon().TABLE_TREE_OPEN:v||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,n=r.treeConfig,a=r.computeSeqOpts,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 a=r.selectRadioRow,d=t.slots,{labelField:o,checkMethod:s,visibleMethod:i}=r.computeRadioOpts,c=l.row,u=d?d.default:null,d=d?d.radio:null,a=c===a;let C=!i||i({row:c}),E=!!s,g;n||(g={click(e){!E&&C&&r.triggerRadioRowEvent(e,l)}},s&&(E=!s({row:c})));i=Object.assign(Object.assign({},l),{checked:a,disabled:E,visible:C});return d?renderCellBaseVNs(e,l,r.callSlot(d,i,e)):(s=[],C&&s.push(e("span",{class:["vxe-radio--icon",a?getIcon().TABLE_RADIO_CHECKED:getIcon().TABLE_RADIO_UNCHECKED]})),(u||o)&&s.push(e("span",{class:"vxe-radio--label"},u?r.callSlot(u,i,e):_xeUtils.default.get(c,o))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--radio",{"is--checked":a,"is--disabled":E}],on:g},s)]))},renderTreeRadioCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRadioCell(e,l))},renderCheckboxHeader(e,l){let{$table:r,column:t,isHidden:n}=l;let{isAllSelected:a,isIndeterminate:d}=r,o=r.computeIsAllCheckboxDisabled;var s=t.slots,i=s?s.header:null,s=s?s.title:null,c=r.computeCheckboxOpts,u=t.getTitle(),C={},E=(n||(C.click=e=>{o||r.triggerCheckAllEvent(e,!a)}),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 d=r.treeConfig,{selectCheckboxMaps:o,treeIndeterminateMaps:s}=r,{labelField:i,checkMethod:c,visibleMethod:u}=r.computeCheckboxOpts,C=n.slots,E=C?C.default:null,C=C?C.checkbox:null;let g=!1,h=!1,p=!u||u({row:t}),b=!!c;var v,u={},o=(a||(v=(0,_util.getRowid)(r,t),h=!!o[v],u.click=e=>{!b&&p&&r.triggerCheckRowEvent(e,l,!h)},c&&(b=!c({row:t})),d&&(g=!!s[v])),Object.assign(Object.assign({},l),{checked:h,disabled:b,visible:p,indeterminate:g}));return C?renderCellBaseVNs(e,l,r.callSlot(C,o,e)):(c=[],p&&c.push(e("span",{class:["vxe-checkbox--icon",g?getIcon().TABLE_CHECKBOX_INDETERMINATE:h?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(E||i)&&c.push(e("span",{class:"vxe-checkbox--label"},E?r.callSlot(E,o,e):_xeUtils.default.get(t,i))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":h,"is--disabled":b,"is--indeterminate":g,"is--hidden":!p}],on:u},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 d=r.treeConfig,o=r.treeIndeterminateMaps,s=r.computeCheckboxOpts,{labelField:i,checkField:c,checkMethod:u,visibleMethod:C}=s,s=s.indeterminateField||s.halfField,E=n.slots,g=E?E.default:null,E=E?E.checkbox:null;let h=!1,p=!1,b=!C||C({row:t}),v=!!u;var x,C={},c=(a||(x=(0,_util.getRowid)(r,t),p=_xeUtils.default.get(t,c),C.click=e=>{!v&&b&&r.triggerCheckRowEvent(e,l,!p)},u&&(v=!u({row:t})),d&&(h=!!o[x])),Object.assign(Object.assign({},l),{checked:p,disabled:v,visible:b,indeterminate:h}));return E?renderCellBaseVNs(e,l,r.callSlot(E,c,e)):(u=[],b&&u.push(e("span",{class:["vxe-checkbox--icon",h?getIcon().TABLE_CHECKBOX_INDETERMINATE:p?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(g||i)&&u.push(e("span",{class:"vxe-checkbox--label"},g?r.callSlot(g,c,e):_xeUtils.default.get(t,i))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":p,"is--disabled":v,"is--indeterminate":s&&!p?t[s]:h,"is--hidden":!b}],on:C},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{rowExpandedMaps:d,rowExpandLazyLoadedMaps:o}=r,{lazy:s,labelField:i,iconLoaded:c,showIcon:u,iconOpen:C,iconClose:E,visibleMethod:g}=r.computeExpandOpts,h=a.slots,p=h?h.default:null,h=h?h.icon:null;let b=!1,v=!1;return h?renderCellBaseVNs(e,l,r.callSlot(h,l,e)):(t||(h=(0,_util.getRowid)(r,n),b=!!d[h],s&&(v=!!o[h])),renderCellBaseVNs(e,l,[!u||g&&!g(l)?renderEmptyElement(r):e("span",{class:["vxe-table--expanded",{"is--active":b}],on:{click(e){r.triggerRowExpandEvent(e,l)}}},[e("i",{class:["vxe-table--expand-btn",v?c||getIcon().TABLE_EXPAND_LOADED:b?C||getIcon().TABLE_EXPAND_OPEN:E||getIcon().TABLE_EXPAND_CLOSE]})]),p||i?e("span",{class:"vxe-table--expand-label"},p?r.callSlot(p,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 a=r.filterStore,{showIcon:d,iconNone:o,iconMatch:s}=r.computeFilterOpts;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}=r,d=r.computeEditOpts,{sortable:o,filters:s,editRender:i}=t;let c=!1,u=(a&&(a=_xeUtils.default.get(a,t.field))&&(c=a.some(e=>e.required)),[]);return(0,_utils.isEnableConf)(n)&&(u=[c&&d.showAsterisk?e("i",{class:"vxe-cell--required-icon"}):renderEmptyElement(r),(0,_utils.isEnableConf)(i)&&d.showIcon?e("i",{class:["vxe-cell--edit-icon",d.icon||getIcon().TABLE_EDIT]}):renderEmptyElement(r)]),renderHeaderCellBaseVNs(e,l,u.concat(Cell.renderHeaderTitle(e,l)).concat(o?Cell.renderSortIcon(e,l):[]).concat(s?Cell.renderFilterIcon(e,l):[]))},renderRowEdit(e,l){var{$table:r,column:t}=l,r=r.editStore,r=r.actived,t=t.editRender;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,r=r.editStore,r=r.actived,t=t.editRender;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/methods.js

@@ -125,33 +125,28 @@ function handleVirtualXVisible($xeTable) {
   };
 }
 const computeRowHeight = $xeTable => {
-  const props = $xeTable;
-  const {
-    showOverflow
-  } = props;
   const tableHeader = $xeTable.$refs.tableHeader;
   const tableBody = $xeTable.$refs.tableBody;
   const tableBodyElem = tableBody ? tableBody.$el : null;
   const vSize = $xeTable.computeSize;
   const rowHeightMaps = $xeTable.computeRowHeightMaps;
-  let rowHeight = 24;
-  if (showOverflow) {
-    if (tableBodyElem) {
-      const tableHeaderElem = tableHeader ? tableHeader.$el : null;
-      let firstTrElem;
-      firstTrElem = tableBodyElem.querySelector('tr');
-      if (!firstTrElem && tableHeaderElem) {
-        firstTrElem = tableHeaderElem.querySelector('tr');
-      }
-      if (firstTrElem) {
-        rowHeight = firstTrElem.clientHeight;
-      }
-      if (!rowHeight) {
-        rowHeight = rowHeightMaps[vSize || 'default'];
-      }
+  let rowHeight = 0;
+  if (tableBodyElem) {
+    const tableHeaderElem = tableHeader ? tableHeader.$el : null;
+    let firstTrElem;
+    firstTrElem = tableBodyElem.querySelector('tr');
+    if (!firstTrElem && tableHeaderElem) {
+      firstTrElem = tableHeaderElem.querySelector('tr');
     }
+    if (firstTrElem) {
+      rowHeight = firstTrElem.clientHeight;
+    }
+  }
+  if (!rowHeight) {
+    rowHeight = rowHeightMaps[vSize || 'default'];
   }
-  return rowHeight;
+  // 最低支持 18px 行高
+  return Math.max(18, rowHeight);
 };
 function handleVirtualYVisible($xeTable) {
   const internalData = $xeTable;
@@ -620,7 +615,9 @@ const handleScrollToRowColumn = ($xeTable, fieldOrColumn, row) => {
   return $xeTable.$nextTick();
 };
 function handleRecalculateLayout($xeTable, reFull) {
+  const internalData = $xeTable;
   const el = $xeTable.$refs.refElem;
+  internalData.reRunTime = Date.now();
   if (!el || !el.clientWidth) {
     return $xeTable.$nextTick();
   }
@@ -1107,7 +1104,7 @@ const Methods = {
     const isLazy = treeConfig && treeOpts.lazy;
     const fullAllDataRowIdMaps = {};
     const fullDataRowIdMaps = {};
-    const handleCache = (row, index, items, path, parent, nodes) => {
+    const handleCache = (row, index, items, path, parentRow, nodes) => {
       let rowid = (0, _util.getRowid)(this, row);
       const seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
       const level = nodes ? nodes.length - 1 : 0;
@@ -1128,16 +1125,16 @@ const Methods = {
           _index: -1,
           $index: -1,
           items,
-          parent,
+          parent: parentRow,
           level,
           height: 0
         };
       }
       cacheItem.row = row;
       cacheItem.items = items;
-      cacheItem.parent = parent;
+      cacheItem.parent = parentRow;
       cacheItem.level = level;
-      cacheItem.index = treeConfig && parent ? -1 : index;
+      cacheItem.index = treeConfig && parentRow ? -1 : index;
       if (isSource) {
         fullDataRowIdMaps[rowid] = cacheItem;
       }
@@ -1220,9 +1217,9 @@ const Methods = {
           sourceDataRowIdData[rowid] = _xeUtils.default.clone(childRow, true);
         });
       }
-      _xeUtils.default.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
+      _xeUtils.default.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
         const rowid = (0, _util.getRowid)($xeTable, childRow);
-        const parentRow = parent || parentRest.row;
+        const parentRow = parentItem || parentRest.row;
         const rest = {
           row: childRow,
           rowid,
@@ -1279,7 +1276,7 @@ const Methods = {
     let radioColumn;
     let htmlColumn;
     let hasFixed;
-    const handleFunc = (column, index, items, path, parent) => {
+    const handleFunc = (column, index, items, path, parentColumn) => {
       const {
         id: colid,
         field,
@@ -1294,7 +1291,7 @@ const Methods = {
         colid,
         index,
         items,
-        parent: parent || null,
+        parent: parentColumn || null,
         width: 0
       };
       if (field) {
@@ -1358,9 +1355,9 @@ const Methods = {
       fullColumnIdData[colid] = rest;
     };
     if (isGroup) {
-      _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent, nodes) => {
+      _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
         column.level = nodes.length;
-        handleFunc(column, index, items, path, parent);
+        handleFunc(column, index, items, path, parentColumn);
       });
     } else {
       tableFullColumn.forEach(handleFunc);
@@ -2030,10 +2027,10 @@ const Methods = {
     if (treeConfig && treeOpts.transform) {
       const fullData = [];
       const expandMaps = {};
-      _xeUtils.default.eachTree(afterTreeFullData, (row, index, items, path, parent) => {
+      _xeUtils.default.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
         const rowid = (0, _util.getRowid)(this, row);
-        const parentRowid = (0, _util.getRowid)(this, parent);
-        if (!parent || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
+        const parentRowid = (0, _util.getRowid)(this, parentRow);
+        if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
             rowRest._index = fullData.length;
@@ -2729,11 +2726,11 @@ const Methods = {
     let hasCustomSort = false;
     // 处理还原
     if (resizableData || sortData || visibleData || fixedData) {
-      _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
+      _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentRow) => {
         const colKey = column.getKey();
         // 支持一级
-        if (!parent) {
-          if (fixedData && fixedData[colKey]) {
+        if (!parentRow) {
+          if (fixedData && fixedData[colKey] !== undefined) {
             column.fixed = fixedData[colKey];
           }
           if (sortData && _xeUtils.default.isNumber(sortData[colKey])) {
@@ -2827,9 +2824,9 @@ const Methods = {
     let hasSort = 0;
     let hasFixedt = 0;
     let hasVisible = 0;
-    _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
+    _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       // 只支持一级
-      if (!parent) {
+      if (!parentColumn) {
         collectColumn.forEach(column => {
           const colKey = column.getKey();
           if (colKey) {
@@ -2837,7 +2834,7 @@ const Methods = {
             sortData[colKey] = column.renderSortNumber;
           }
         });
-        if (column.fixed && column.fixed !== column.defaultFixed) {
+        if (column.fixed !== column.defaultFixed) {
           const colKey = column.getKey();
           if (colKey) {
             hasFixedt = 1;
@@ -2973,13 +2970,13 @@ const Methods = {
       const leftGroupList = [];
       const centerGroupList = [];
       const rightGroupList = [];
-      _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
+      _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
         const isColGroup = (0, _utils.hasChildrenList)(column);
         // 如果是分组，必须按组设置固定列，不允许给子列设置固定
-        if (parent && parent.fixed) {
-          column.fixed = parent.fixed;
+        if (parentColumn && parentColumn.fixed) {
+          column.fixed = parentColumn.fixed;
         }
-        if (parent && column.fixed !== parent.fixed) {
+        if (parentColumn && column.fixed !== parentColumn.fixed) {
           (0, _log.errLog)('vxe.error.groupFixed');
         }
         if (isColGroup) {
@@ -3187,28 +3184,35 @@ const Methods = {
    * 刷新布局
    */
   recalculate(reFull) {
+    const $xeTable = this;
+    const internalData = $xeTable;
     return new Promise(resolve => {
-      const $xeTable = this;
-      const internalData = $xeTable;
       const {
-        rceTimeout
+        rceTimeout,
+        reRunTime
       } = internalData;
+      const resizeOpts = $xeTable.computeResizeOpts;
+      const refreshDelay = resizeOpts.refreshDelay || 20;
       const el = $xeTable.$refs.refElem;
       if (el && el.clientWidth) {
         $xeTable.autoCellWidth();
       }
       if (rceTimeout) {
         clearTimeout(rceTimeout);
-        $xeTable.$nextTick(() => {
-          resolve();
-        });
+        if (reRunTime && reRunTime + (refreshDelay - 5) < Date.now()) {
+          resolve(handleRecalculateLayout($xeTable, !!reFull));
+        } else {
+          $xeTable.$nextTick(() => {
+            resolve();
+          });
+        }
       } else {
         resolve(handleRecalculateLayout($xeTable, !!reFull));
       }
       internalData.rceTimeout = setTimeout(() => {
         internalData.rceTimeout = undefined;
-        resolve(handleRecalculateLayout($xeTable, !!reFull));
-      }, 15);
+        handleRecalculateLayout($xeTable, !!reFull);
+      }, refreshDelay);
     });
   },
   calcCellWidth() {
@@ -5964,7 +5968,9 @@ const Methods = {
       actived
     } = editStore;
     const cell = evnt.currentTarget;
-    params.cell = cell;
+    params = Object.assign({
+      cell
+    }, params);
     if ((0, _utils.isEnableConf)(editConfig) && editOpts.trigger === 'dblclick') {
       if (!actived.args || evnt.currentTarget !== actived.args.cell) {
         if (editOpts.mode === 'row') {
@@ -6179,6 +6185,7 @@ const Methods = {
       prevDragToChild
     } = internalData;
     const {
+      isPeerDrag,
       isCrossDrag,
       isSelfToChildDrag,
       dragEndMethod
@@ -6240,20 +6247,27 @@ const Methods = {
                 let isSelfToChildStatus = false;
                 if (oldLevel && 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')
-                        });
-                      }
+                  if (isPeerDrag) {
+                    if (oldRest.row[parentField] !== newRest.row[parentField]) {
+                      // 非同级
+                      return;
+                    }
+                  } else {
+                    if (!isCrossDrag) {
                       return;
                     }
+                    if (oldAllMaps[newRowid]) {
+                      isSelfToChildStatus = true;
+                      if (!(isCrossDrag && isSelfToChildDrag)) {
+                        if (_ui.VxeUI.modal) {
+                          _ui.VxeUI.modal.message({
+                            status: 'error',
+                            content: getI18n('vxe.error.treeDragChild')
+                          });
+                        }
+                        return;
+                      }
+                    }
                   }
                 } else if (oldLevel) {
                   // 子到根
@@ -6267,7 +6281,7 @@ const Methods = {
                   }
                   if (oldAllMaps[newRowid]) {
                     isSelfToChildStatus = true;
-                    if (!isSelfToChildDrag) {
+                    if (!(isCrossDrag && isSelfToChildDrag)) {
                       if (_ui.VxeUI.modal) {
                         _ui.VxeUI.modal.message({
                           status: 'error',
@@ -6291,7 +6305,7 @@ const Methods = {
                 const ntfIndex = ptfIndex + dragOffsetIndex;
                 fullList.splice(ntfIndex, 0, dragRow);
                 // 改变层级
-                if (isSelfToChildStatus && isSelfToChildDrag) {
+                if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
                   _xeUtils.default.each(dragRow[childrenField], childRow => {
                     childRow[parentField] = dragRow[parentField];
                   });
@@ -6372,10 +6386,12 @@ const Methods = {
     } = reactData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
-      transform
+      transform,
+      parentField
     } = treeOpts;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
+      isPeerDrag,
       isCrossDrag,
       isToChildDrag
     } = rowDragOpts;
@@ -6395,7 +6411,7 @@ const Methods = {
       } = 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) {
+      if ($xeTable.eqRow(dragRow, row) || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
         showDropTip($xeTable, evnt, trEl, null, false, dragPos);
         return;
       }
@@ -6477,6 +6493,7 @@ const Methods = {
     } = props;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const {
+      isPeerDrag,
       isCrossDrag,
       isSelfToChildDrag,
       isToChildDrag,
@@ -6509,20 +6526,27 @@ const Methods = {
           let isSelfToChildStatus = false;
           if (oldColumn.parentId && newColumn.parentId) {
             // 子到子
-            if (!isCrossDrag) {
-              return;
-            }
-            if (oldAllMaps[newColumn.id]) {
-              isSelfToChildStatus = true;
-              if (!isSelfToChildDrag) {
-                if (_ui.VxeUI.modal) {
-                  _ui.VxeUI.modal.message({
-                    status: 'error',
-                    content: getI18n('vxe.error.treeDragChild')
-                  });
-                }
+            if (isPeerDrag) {
+              if (oldColumn.parentId !== newColumn.parentId) {
+                // 非同级
+                return;
+              }
+            } else {
+              if (!isCrossDrag) {
                 return;
               }
+              if (oldAllMaps[newColumn.id]) {
+                isSelfToChildStatus = true;
+                if (!(isCrossDrag && isSelfToChildDrag)) {
+                  if (_ui.VxeUI.modal) {
+                    _ui.VxeUI.modal.message({
+                      status: 'error',
+                      content: getI18n('vxe.error.treeDragChild')
+                    });
+                  }
+                  return;
+                }
+              }
             }
           } else if (oldColumn.parentId) {
             // 子到根
@@ -6536,7 +6560,7 @@ const Methods = {
             }
             if (oldAllMaps[newColumn.id]) {
               isSelfToChildStatus = true;
-              if (!isSelfToChildDrag) {
+              if (!(isCrossDrag && isSelfToChildDrag)) {
                 if (_ui.VxeUI.modal) {
                   _ui.VxeUI.modal.message({
                     status: 'error',
@@ -6551,7 +6575,7 @@ const Methods = {
           }
           const oldewMatchRest = _xeUtils.default.findTree(collectColumn, item => item.id === oldColumn.id);
           // 改变层级
-          if (isSelfToChildStatus && isSelfToChildDrag) {
+          if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
             if (oldewMatchRest) {
               const {
                 items: oCols,
@@ -6585,7 +6609,7 @@ const Methods = {
               parent: nParent
             } = newMatchRest;
             // 转子级
-            if (isToChildDrag && prevDragToChild) {
+            if (isCrossDrag && isToChildDrag && prevDragToChild) {
               oldColumn.parentId = newColumn.id;
               newColumn.children = (newColumn.children || []).concat([oldColumn]);
             } else {
@@ -6596,8 +6620,8 @@ const Methods = {
               nafIndex = nIndex;
             }
           }
-          _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
-            if (!parent) {
+          _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+            if (!parentColumn) {
               const sortIndex = index + 1;
               column.renderSortNumber = sortIndex;
             }
@@ -6665,6 +6689,7 @@ const Methods = {
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const {
       isToChildDrag,
+      isPeerDrag,
       isCrossDrag
     } = columnDragOpts;
     if (!dragCol) {
@@ -6682,11 +6707,11 @@ const Methods = {
       } = evnt;
       const offsetX = clientX - thEl.getBoundingClientRect().x;
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
-      if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && column.parentId) {
+      if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId)) {
         showDropTip($xeTable, evnt, null, thEl, false, dragPos);
         return;
       }
-      internalData.prevDragToChild = !!(isToChildDrag && hasCtrlKey);
+      internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
       internalData.prevDragCol = column;
       internalData.prevDragPos = dragPos;
       showDropTip($xeTable, evnt, null, thEl, true, dragPos);