vxe-table 3.7.0-beta.8 → 3.7.0-beta.9

package/lib/table/src/body.js

@@ -49,7 +49,7 @@ function renderLine(h, _vm, $xetable, params) {
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h);
   }
-  if (treeConfig && treeNode && treeOpts.line) {
+  if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [h('div', {
       "class": 'vxe-tree--line-wrapper'
     }, [h('div', {
@@ -377,7 +377,7 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
       isNewRow = $xetable.isInsertByRow(row);
     }
     if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
-      rowChildren = row[treeOpts.children];
+      rowChildren = row[treeOpts.childrenField || treeOpts.children];
       isExpandTree = rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1;
     }
     rows.push(h('tr', {

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

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("./util"),_dom=_interopRequireDefault(require("../../tools/dom")),_vn=require("../../tools/vn");function _getRequireWildcardCache(e){var l,t;return"function"!=typeof WeakMap?null:(l=new WeakMap,t=new WeakMap,(_getRequireWildcardCache=function(e){return e?t:l})(e))}function _interopRequireWildcard(e,l){if(!l&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};l=_getRequireWildcardCache(l);if(l&&l.has(e))return l.get(e);var t,r,o={},n=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(t in e)"default"!==t&&Object.prototype.hasOwnProperty.call(e,t)&&((r=n?Object.getOwnPropertyDescriptor(e,t):null)&&(r.get||r.set)?Object.defineProperty(o,t,r):o[t]=e[t]);return o.default=e,l&&l.set(e,o),o}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,l,t){return l in e?Object.defineProperty(e,l,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[l]=t,e}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,l){var t;if(e)return"string"==typeof e?_arrayLikeToArray(e,l):"Map"===(t="Object"===(t=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:t)||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?_arrayLikeToArray(e,l):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,l){(null==l||l>e.length)&&(l=e.length);for(var t=0,r=new Array(l);t<l;t++)r[t]=e[t];return r}var scrollProcessTimeout,renderType="body";function isOperateMouse(e){return e._isResize||e.lastScrollTime&&Date.now()<e.lastScrollTime+e.delayHover}function renderLine(e,l,t,r){var o=r.row,n=r.column,i=t.treeOpts,a=t.treeConfig,s=t.fullAllDataRowIdData,c=n.slots,n=n.treeNode,s=s[(0,_util.getRowid)(t,o)],o=0,d=0,u=[];return s&&(o=s.level,d=s._index,u=s.items),c&&c.line?t.callSlot(c.line,r,e):a&&n&&i.line?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:"".concat((0,_util.calcTreeLine)(r,u,d),"px"),left:"".concat(o*i.indent+(o?2-(0,_util.getOffsetSize)(t):0)+16,"px")}})])]:[]}function renderColumn(e,P,l,t,r,o,n,i,a,s,W,c,d,D,u){var M,p=l.$listeners,f=l.afterFullData,y=l.tableData,h=l.height,q=l.columnKey,g=l.overflowX,v=l.sYOpts,B=l.scrollXLoad,U=l.scrollYLoad,j=l.highlightCurrentRow,X=l.showOverflow,N=l.isAllOverflow,m=l.align,F=l.currentColumn,z=l.cellClassName,w=l.cellStyle,x=l.mergeList,V=l.spanMethod,K=l.radioOpts,G=l.checkboxOpts,J=l.expandOpts,Q=l.treeOpts,b=l.tooltipOpts,Z=l.mouseConfig,_=l.editConfig,T=l.editOpts,ee=l.editRules,S=l.validOpts,le=l.editStore,O=l.validStore,te=l.tooltipConfig,re=l.rowOpts,oe=l.columnOpts,ne=c.type,ie=c.cellRender,C=c.editRender,ae=c.align,$=c.showOverflow,se=c.className,ce=c.treeNode,le=le.actived,v=v.rHeight,L=re.height,R=C||ie,R=R?_vXETable.default.renderer.get(R.name):null,de=R?R.cellClassName:"",R=R?R.cellStyle:"",k=b.showAll||b.enabled,b=l.getColumnIndex(c),ue=l.getVTColumnIndex(c),pe=(0,_utils.isEnableConf)(C),g=o?c.fixed!==o:c.fixed&&g,$=_xeUtils.default.isUndefined($)||_xeUtils.default.isNull($)?X:$,I="ellipsis"===$,H="title"===$,E=!0===$||"tooltip"===$,$=H||E||I,A={},ae=ae||m,m=O.row===i&&O.column===c,ee=ee&&S.showMessage&&("default"===S.message?h||1<y.length:"inline"===S.message),h={colid:c.id},fe=p["cell-mouseenter"],ye=p["cell-mouseleave"],S=C&&_&&"dblclick"===T.trigger,Y={$table:l,$grid:l.$xegrid,seq:t,rowid:r,row:i,rowIndex:a,$rowIndex:s,_rowIndex:W,column:c,columnIndex:b,$columnIndex:d,_columnIndex:ue,fixed:o,type:renderType,isHidden:g,level:n,visibleData:f,data:y,items:u};if(!B&&!U||$||(I=$=!0),(H||E||k||fe||te)&&(A.mouseenter=function(e){isOperateMouse(l)||(H?_dom.default.updateCellTitle(e.currentTarget,c):(E||k)&&l.triggerBodyTooltipEvent(e,Y),fe&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Y),e))}),(E||k||ye||te)&&(A.mouseleave=function(e){isOperateMouse(l)||((E||k)&&l.handleTargetLeaveEvent(e),ye&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Y),e))}),(G.range||Z)&&(A.mousedown=function(e){l.triggerCellMousedownEvent(e,Y)}),(re.isCurrent||j||p["cell-click"]||C&&_||"row"===J.trigger||"cell"===J.trigger||"row"===K.trigger||"radio"===c.type&&"cell"===K.trigger||"row"===G.trigger||"checkbox"===c.type&&"cell"===G.trigger||"row"===Q.trigger||c.treeNode&&"cell"===Q.trigger)&&(A.click=function(e){l.triggerCellClickEvent(e,Y)}),(S||p["cell-dblclick"])&&(A.dblclick=function(e){l.triggerCellDblclickEvent(e,Y)}),x.length){t=(0,_util.mergeBodyMethod)(x,W,ue);if(t){r=t.rowspan,a=t.colspan;if(!r||!a)return null;1<r&&(h.rowspan=r),1<a&&(h.colspan=a)}}else if(V){s=V(Y)||{},b=s.rowspan,o=void 0===b?1:b,n=s.colspan,f=void 0===n?1:n;if(!o||!f)return null;1<o&&(h.rowspan=o),1<f&&(h.colspan=f)}!(g=g&&x&&(1<h.colspan||1<h.rowspan)?!1:g)&&_&&(C||ie)&&(T.showStatus||T.showUpdateStatus)&&(M=l.isUpdateByRow(i,c.field));y=[];return g&&X&&N?y.push(e("div",{class:["vxe-cell",{"c--title":H,"c--tooltip":E,"c--ellipsis":I}],style:{maxHeight:$&&(v||L)?"".concat(v||L,"px"):""}})):(y.push.apply(y,_toConsumableArray(renderLine(e,P,l,Y)).concat([e("div",{class:["vxe-cell",{"c--title":H,"c--tooltip":E,"c--ellipsis":I}],style:{maxHeight:$&&(v||L)?"".concat(v||L,"px"):""},attrs:{title:H?l.getCellLabel(i,c):null}},c.renderCell(e,Y))])),ee&&m&&y.push(e("div",{class:"vxe-cell--valid",style:O.rule&&O.rule.maxWidth?{width:"".concat(O.rule.maxWidth,"px")}:null},[e("span",{class:"vxe-cell--valid-msg"},O.content)]))),e("td",{class:["vxe-body--column",c.id,(_defineProperty(u={},"col--".concat(ae),ae),_defineProperty(u,"col--".concat(ne),ne),_defineProperty(u,"col--last",d===D.length-1),_defineProperty(u,"col--tree-node",ce),_defineProperty(u,"col--edit",pe),_defineProperty(u,"col--ellipsis",$),_defineProperty(u,"fixed--hidden",g),_defineProperty(u,"col--dirty",M),_defineProperty(u,"col--actived",_&&pe&&le.row===i&&(le.column===c||"row"===T.mode)),_defineProperty(u,"col--valid-error",m),_defineProperty(u,"col--current",F===c),u),_utils.default.getClass(de,Y),_utils.default.getClass(se,Y),_utils.default.getClass(z,Y)],key:q||oe.useKey?c.id:d,attrs:h,style:Object.assign({height:$&&(v||L)?"".concat(v||L,"px"):""},_xeUtils.default.isFunction(R)?R(Y):R,_xeUtils.default.isFunction(w)?w(Y):w),on:A},y)}function renderRows(y,h,g,v,m,w){var x=g.stripe,b=g.rowKey,_=g.highlightHoverRow,T=g.rowClassName,S=g.rowStyle,O=g.editConfig,C=g.showOverflow,$=g.treeConfig,L=g.treeOpts,R=g.expandOpts,k=g.editOpts,I=g.treeExpandeds,H=g.scrollYLoad,E=g.rowExpandeds,A=g.radioOpts,Y=g.checkboxOpts,P=g.expandColumn,W=g.hasFixedColumn,D=g.fullAllDataRowIdData,M=g.rowOpts,q=[];return m.forEach(function(t,r){var e,l={},o=g.getVTRowIndex(t),n=g.getRowIndex(t),i=((M.isHover||_)&&(l.mouseenter=function(e){isOperateMouse(g)||g.triggerHoverEvent(e,{row:t,rowIndex:n})},l.mouseleave=function(){isOperateMouse(g)||g.clearHoverRow()}),(0,_util.getRowid)(g,t)),a=D[i],s=a?a.level:0,c=a?a.seq:-1,a={$table:g,seq:c,rowid:i,fixed:v,type:renderType,level:s,row:t,rowIndex:n,$rowIndex:r},d=P&&E.length&&-1<E.indexOf(t),u=!1,p=[],f=!1;O&&(f=g.isInsertByRow(t)),$&&!H&&!L.transform&&I.length&&(u=(p=t[L.children])&&p.length&&-1<I.indexOf(t)),q.push(y("tr",{class:["vxe-body--row",$?"row--level-".concat(s):"",{"row--stripe":x&&(g.getVTRowIndex(t)+1)%2==0,"is--new":f,"is--expand-row":d,"is--expand-tree":u,"row--new":f&&(k.showStatus||k.showInsertStatus),"row--radio":A.highlight&&g.selectRow===t,"row--checked":Y.highlight&&g.isCheckedByCheckboxRow(t)},T?_xeUtils.default.isFunction(T)?T(a):T:""],attrs:{rowid:i},style:S?_xeUtils.default.isFunction(S)?S(a):S:null,key:b||M.useKey||$?i:r,on:l},w.map(function(e,l){return renderColumn(y,h,g,c,i,v,s,t,n,r,o,e,l,w,m)}))),d&&(f={},(a=R.height)&&(f.height="".concat(a,"px")),$&&(f.paddingLeft="".concat(s*L.indent+30,"px")),d=P.showOverflow,d=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?C:d,e={$table:g,seq:c,column:P,fixed:v,type:renderType,level:s,row:t,rowIndex:n,$rowIndex:r},q.push(y("tr",{class:"vxe-body--expanded-row",key:"expand_".concat(i),style:S?_xeUtils.default.isFunction(S)?S(e):S:null,on:l},[y("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":v&&!W,"col--ellipsis":d},attrs:{colspan:w.length}},[y("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":a},style:f},[P.renderData(y,e)])])]))),u&&q.push.apply(q,_toConsumableArray(renderRows(y,h,g,v,p,w)))}),q}function syncBodyScroll(e,l,t,r,o){(r||o)&&(r&&((0,_util.removeScrollListener)(r),r.scrollTop=t),o&&((0,_util.removeScrollListener)(o),o.scrollTop=t),clearTimeout(scrollProcessTimeout),scrollProcessTimeout=setTimeout(function(){(0,_util.restoreScrollListener)(r),(0,_util.restoreScrollListener)(o)},300))}var _default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,size:String,fixedType:String},data:function(){return{wheelTime:null,wheelYSize:0,wheelYInterval:0,wheelYTotal:0}},mounted:function(){var e=this.$parent,l=this.$el,t=this.$refs,r=this.fixedType,e=e.elemStore,r="".concat(r||"main","-body-");e["".concat(r,"wrapper")]=l,e["".concat(r,"table")]=t.table,e["".concat(r,"colgroup")]=t.colgroup,e["".concat(r,"list")]=t.tbody,e["".concat(r,"xSpace")]=t.xSpace,e["".concat(r,"ySpace")]=t.ySpace,e["".concat(r,"emptyBlock")]=t.emptyBlock,this.$el.onscroll=this.scrollEvent,this.$el._onscroll=this.scrollEvent},beforeDestroy:function(){clearTimeout(this.wheelTime),this.$el._onscroll=null,this.$el.onscroll=null},destroyed:function(){var e=this.$parent,l=this.fixedType,e=e.elemStore,l="".concat(l||"main","-body-");e["".concat(l,"wrapper")]=null,e["".concat(l,"table")]=null,e["".concat(l,"colgroup")]=null,e["".concat(l,"list")]=null,e["".concat(l,"xSpace")]=null,e["".concat(l,"ySpace")]=null,e["".concat(l,"emptyBlock")]=null},render:function(t){var e=this._e,l=this.$parent,r=this.fixedColumn,o=this.fixedType,n=l.$scopedSlots,i=l.tId,a=l.tableData,s=l.tableColumn,c=l.visibleColumn,d=l.expandColumn,u=l.showOverflow,p=l.keyboardConfig,f=l.keyboardOpts,y=l.mergeList,h=l.spanMethod,g=l.scrollXLoad,v=l.scrollYLoad,m=l.isAllOverflow,w=l.emptyOpts,x=l.mouseConfig,b=l.mouseOpts,_=l.sYOpts;return o&&(s=d||!(g||v||u&&m)||y.length||h||p&&f.isMerge?c:r),u=n.empty?n.empty.call(this,{$table:l},t):(g=(d=w.name?_vXETable.default.renderer.get(w.name):null)?d.renderEmpty:null)?(0,_vn.getSlotVNs)(g.call(this,t,w,{$table:l})):l.emptyText||_conf.default.i18n("vxe.table.emptyText"),t("div",{class:["vxe-table--body-wrapper",o?"fixed-".concat(o,"--wrapper"):"body--wrapper"],attrs:{xid:i},on:v&&"wheel"===_.mode?{wheel:this.wheelEvent}:{}},[o?e():t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("div",{class:"vxe-body--y-space",ref:"ySpace"}),t("table",{class:"vxe-table--body",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},s.map(function(e,l){return t("col",{attrs:{name:e.id},key:l})})),t("tbody",{ref:"tbody"},renderRows(t,this,l,o,a,s))]),t("div",{class:"vxe-table--checkbox-range"}),x&&b.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},b.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown:function(e){l.triggerCellExtendMousedownEvent(e,{$table:l,fixed:o,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-copy-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"})]):null,o?null:t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},u)])])},methods:{scrollEvent:function(e){var l=this.$el,t=this.$parent,r=this.fixedType,o=t.$refs,n=t.elemStore,i=t.highlightHoverRow,a=t.scrollXLoad,s=t.scrollYLoad,c=t.lastScrollTop,d=t.lastScrollLeft,u=t.rowOpts,p=o.tableHeader,f=o.tableBody,y=o.leftBody,h=o.rightBody,g=o.tableFooter,o=o.validTip,p=p?p.$el:null,g=g?g.$el:null,f=f.$el,y=y?y.$el:null,h=h?h.$el:null,v=n["main-body-ySpace"],n=n["main-body-xSpace"],v=(s&&v?v:f).clientHeight,n=(a&&n?n:f).clientWidth,l=l.scrollTop,m=f.scrollLeft,d=m!==d,c=l!==c;t.lastScrollTop=l,t.lastScrollLeft=m,t.lastScrollTime=Date.now(),(u.isHover||i)&&t.clearHoverRow(),y&&"left"===r?syncBodyScroll(t,r,l=y.scrollTop,f,h):h&&"right"===r?syncBodyScroll(t,r,l=h.scrollTop,f,y):(d&&(p&&(p.scrollLeft=f.scrollLeft),g)&&(g.scrollLeft=f.scrollLeft),(y||h)&&(t.checkScrolling(),c)&&syncBodyScroll(t,r,l,y,h)),a&&d&&t.triggerScrollXEvent(e),s&&c&&t.triggerScrollYEvent(e),d&&o&&o.visible&&o.updatePlacement(),t.emitEvent("scroll",{type:renderType,fixed:r,scrollTop:l,scrollLeft:m,scrollHeight:f.scrollHeight,scrollWidth:f.scrollWidth,bodyHeight:v,bodyWidth:n,isX:d,isY:c},e)},handleWheel:function(a,s,e,c,d){var u=this,p=this.$parent,l=p.$refs,t=p.elemStore,r=p.scrollYLoad,o=p.scrollXLoad,n=l.tableBody,i=l.leftBody,l=l.rightBody,f=n.$el,y=i?i.$el:null,h=l?l.$el:null,n=this.isPrevWheelTop===s?Math.max(0,this.wheelYSize-this.wheelYTotal):0,i=t["main-body-ySpace"],l=t["main-body-xSpace"],g=(r&&i?i:f).clientHeight,v=(o&&l?l:f).clientWidth;this.isPrevWheelTop=s,this.wheelYSize=Math.abs(s?e-n:e+n),this.wheelYInterval=0,this.wheelYTotal=0,clearTimeout(this.wheelTime),function e(){var l,t,r=u.fixedType,o=u.wheelYTotal,n=u.wheelYSize,i=u.wheelYInterval;o<n&&(n<(o+=i=Math.max(5,Math.floor(1.5*i)))&&(i-=o-n),n=f.scrollTop,l=f.clientHeight,t=f.scrollHeight,f.scrollTop=n=n+i*(s?-1:1),y&&(y.scrollTop=n),h&&(h.scrollTop=n),(s?n<t-l:0<=n)&&(u.wheelTime=setTimeout(e,10)),u.wheelYTotal=o,u.wheelYInterval=i,p.emitEvent("scroll",{type:renderType,fixed:r,scrollTop:f.scrollTop,scrollLeft:f.scrollLeft,scrollHeight:f.scrollHeight,scrollWidth:f.scrollWidth,bodyHeight:g,bodyWidth:v,isX:c,isY:d},a))}()},wheelEvent:function(e){var l=e.deltaY,t=e.deltaX,r=this.$el,o=this.$parent,n=o.$refs,i=o.highlightHoverRow,a=o.scrollYLoad,s=o.lastScrollTop,c=o.lastScrollLeft,d=o.rowOpts,n=n.tableBody.$el,u=l<0;(u?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+l,t=(n=n.scrollLeft+t)!==c,(c=r!==s)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=n,o.lastScrollTime=Date.now(),(d.isHover||i)&&o.clearHoverRow(),this.handleWheel(e,u,l,t,c),a)&&o.triggerScrollYEvent(e))}}};exports.default=_default;
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("./util"),_dom=_interopRequireDefault(require("../../tools/dom")),_vn=require("../../tools/vn");function _getRequireWildcardCache(e){var l,t;return"function"!=typeof WeakMap?null:(l=new WeakMap,t=new WeakMap,(_getRequireWildcardCache=function(e){return e?t:l})(e))}function _interopRequireWildcard(e,l){if(!l&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};l=_getRequireWildcardCache(l);if(l&&l.has(e))return l.get(e);var t,r,o={},n=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(t in e)"default"!==t&&Object.prototype.hasOwnProperty.call(e,t)&&((r=n?Object.getOwnPropertyDescriptor(e,t):null)&&(r.get||r.set)?Object.defineProperty(o,t,r):o[t]=e[t]);return o.default=e,l&&l.set(e,o),o}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,l,t){return l in e?Object.defineProperty(e,l,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[l]=t,e}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,l){var t;if(e)return"string"==typeof e?_arrayLikeToArray(e,l):"Map"===(t="Object"===(t=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:t)||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?_arrayLikeToArray(e,l):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,l){(null==l||l>e.length)&&(l=e.length);for(var t=0,r=new Array(l);t<l;t++)r[t]=e[t];return r}var scrollProcessTimeout,renderType="body";function isOperateMouse(e){return e._isResize||e.lastScrollTime&&Date.now()<e.lastScrollTime+e.delayHover}function renderLine(e,l,t,r){var o=r.row,n=r.column,i=t.treeOpts,a=t.treeConfig,s=t.fullAllDataRowIdData,c=n.slots,n=n.treeNode,s=s[(0,_util.getRowid)(t,o)],o=0,d=0,u=[];return s&&(o=s.level,d=s._index,u=s.items),c&&c.line?t.callSlot(c.line,r,e):a&&n&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:"".concat((0,_util.calcTreeLine)(r,u,d),"px"),left:"".concat(o*i.indent+(o?2-(0,_util.getOffsetSize)(t):0)+16,"px")}})])]:[]}function renderColumn(e,P,l,t,r,o,n,i,a,s,W,c,d,D,u){var M,p=l.$listeners,f=l.afterFullData,y=l.tableData,h=l.height,q=l.columnKey,g=l.overflowX,v=l.sYOpts,B=l.scrollXLoad,U=l.scrollYLoad,j=l.highlightCurrentRow,X=l.showOverflow,N=l.isAllOverflow,m=l.align,F=l.currentColumn,z=l.cellClassName,w=l.cellStyle,x=l.mergeList,V=l.spanMethod,K=l.radioOpts,G=l.checkboxOpts,J=l.expandOpts,Q=l.treeOpts,b=l.tooltipOpts,Z=l.mouseConfig,_=l.editConfig,T=l.editOpts,ee=l.editRules,S=l.validOpts,le=l.editStore,O=l.validStore,te=l.tooltipConfig,re=l.rowOpts,oe=l.columnOpts,ne=c.type,ie=c.cellRender,C=c.editRender,ae=c.align,$=c.showOverflow,se=c.className,ce=c.treeNode,le=le.actived,v=v.rHeight,L=re.height,R=C||ie,R=R?_vXETable.default.renderer.get(R.name):null,de=R?R.cellClassName:"",R=R?R.cellStyle:"",k=b.showAll||b.enabled,b=l.getColumnIndex(c),ue=l.getVTColumnIndex(c),pe=(0,_utils.isEnableConf)(C),g=o?c.fixed!==o:c.fixed&&g,$=_xeUtils.default.isUndefined($)||_xeUtils.default.isNull($)?X:$,I="ellipsis"===$,H="title"===$,E=!0===$||"tooltip"===$,$=H||E||I,A={},ae=ae||m,m=O.row===i&&O.column===c,ee=ee&&S.showMessage&&("default"===S.message?h||1<y.length:"inline"===S.message),h={colid:c.id},fe=p["cell-mouseenter"],ye=p["cell-mouseleave"],S=C&&_&&"dblclick"===T.trigger,Y={$table:l,$grid:l.$xegrid,seq:t,rowid:r,row:i,rowIndex:a,$rowIndex:s,_rowIndex:W,column:c,columnIndex:b,$columnIndex:d,_columnIndex:ue,fixed:o,type:renderType,isHidden:g,level:n,visibleData:f,data:y,items:u};if(!B&&!U||$||(I=$=!0),(H||E||k||fe||te)&&(A.mouseenter=function(e){isOperateMouse(l)||(H?_dom.default.updateCellTitle(e.currentTarget,c):(E||k)&&l.triggerBodyTooltipEvent(e,Y),fe&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Y),e))}),(E||k||ye||te)&&(A.mouseleave=function(e){isOperateMouse(l)||((E||k)&&l.handleTargetLeaveEvent(e),ye&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Y),e))}),(G.range||Z)&&(A.mousedown=function(e){l.triggerCellMousedownEvent(e,Y)}),(re.isCurrent||j||p["cell-click"]||C&&_||"row"===J.trigger||"cell"===J.trigger||"row"===K.trigger||"radio"===c.type&&"cell"===K.trigger||"row"===G.trigger||"checkbox"===c.type&&"cell"===G.trigger||"row"===Q.trigger||c.treeNode&&"cell"===Q.trigger)&&(A.click=function(e){l.triggerCellClickEvent(e,Y)}),(S||p["cell-dblclick"])&&(A.dblclick=function(e){l.triggerCellDblclickEvent(e,Y)}),x.length){t=(0,_util.mergeBodyMethod)(x,W,ue);if(t){r=t.rowspan,a=t.colspan;if(!r||!a)return null;1<r&&(h.rowspan=r),1<a&&(h.colspan=a)}}else if(V){s=V(Y)||{},b=s.rowspan,o=void 0===b?1:b,n=s.colspan,f=void 0===n?1:n;if(!o||!f)return null;1<o&&(h.rowspan=o),1<f&&(h.colspan=f)}!(g=g&&x&&(1<h.colspan||1<h.rowspan)?!1:g)&&_&&(C||ie)&&(T.showStatus||T.showUpdateStatus)&&(M=l.isUpdateByRow(i,c.field));y=[];return g&&X&&N?y.push(e("div",{class:["vxe-cell",{"c--title":H,"c--tooltip":E,"c--ellipsis":I}],style:{maxHeight:$&&(v||L)?"".concat(v||L,"px"):""}})):(y.push.apply(y,_toConsumableArray(renderLine(e,P,l,Y)).concat([e("div",{class:["vxe-cell",{"c--title":H,"c--tooltip":E,"c--ellipsis":I}],style:{maxHeight:$&&(v||L)?"".concat(v||L,"px"):""},attrs:{title:H?l.getCellLabel(i,c):null}},c.renderCell(e,Y))])),ee&&m&&y.push(e("div",{class:"vxe-cell--valid",style:O.rule&&O.rule.maxWidth?{width:"".concat(O.rule.maxWidth,"px")}:null},[e("span",{class:"vxe-cell--valid-msg"},O.content)]))),e("td",{class:["vxe-body--column",c.id,(_defineProperty(u={},"col--".concat(ae),ae),_defineProperty(u,"col--".concat(ne),ne),_defineProperty(u,"col--last",d===D.length-1),_defineProperty(u,"col--tree-node",ce),_defineProperty(u,"col--edit",pe),_defineProperty(u,"col--ellipsis",$),_defineProperty(u,"fixed--hidden",g),_defineProperty(u,"col--dirty",M),_defineProperty(u,"col--actived",_&&pe&&le.row===i&&(le.column===c||"row"===T.mode)),_defineProperty(u,"col--valid-error",m),_defineProperty(u,"col--current",F===c),u),_utils.default.getClass(de,Y),_utils.default.getClass(se,Y),_utils.default.getClass(z,Y)],key:q||oe.useKey?c.id:d,attrs:h,style:Object.assign({height:$&&(v||L)?"".concat(v||L,"px"):""},_xeUtils.default.isFunction(R)?R(Y):R,_xeUtils.default.isFunction(w)?w(Y):w),on:A},y)}function renderRows(y,h,g,v,m,w){var x=g.stripe,b=g.rowKey,_=g.highlightHoverRow,T=g.rowClassName,S=g.rowStyle,O=g.editConfig,C=g.showOverflow,$=g.treeConfig,L=g.treeOpts,R=g.expandOpts,k=g.editOpts,I=g.treeExpandeds,H=g.scrollYLoad,E=g.rowExpandeds,A=g.radioOpts,Y=g.checkboxOpts,P=g.expandColumn,W=g.hasFixedColumn,D=g.fullAllDataRowIdData,M=g.rowOpts,q=[];return m.forEach(function(t,r){var e,l={},o=g.getVTRowIndex(t),n=g.getRowIndex(t),i=((M.isHover||_)&&(l.mouseenter=function(e){isOperateMouse(g)||g.triggerHoverEvent(e,{row:t,rowIndex:n})},l.mouseleave=function(){isOperateMouse(g)||g.clearHoverRow()}),(0,_util.getRowid)(g,t)),a=D[i],s=a?a.level:0,c=a?a.seq:-1,a={$table:g,seq:c,rowid:i,fixed:v,type:renderType,level:s,row:t,rowIndex:n,$rowIndex:r},d=P&&E.length&&-1<E.indexOf(t),u=!1,p=[],f=!1;O&&(f=g.isInsertByRow(t)),$&&!H&&!L.transform&&I.length&&(u=(p=t[L.childrenField||L.children])&&p.length&&-1<I.indexOf(t)),q.push(y("tr",{class:["vxe-body--row",$?"row--level-".concat(s):"",{"row--stripe":x&&(g.getVTRowIndex(t)+1)%2==0,"is--new":f,"is--expand-row":d,"is--expand-tree":u,"row--new":f&&(k.showStatus||k.showInsertStatus),"row--radio":A.highlight&&g.selectRow===t,"row--checked":Y.highlight&&g.isCheckedByCheckboxRow(t)},T?_xeUtils.default.isFunction(T)?T(a):T:""],attrs:{rowid:i},style:S?_xeUtils.default.isFunction(S)?S(a):S:null,key:b||M.useKey||$?i:r,on:l},w.map(function(e,l){return renderColumn(y,h,g,c,i,v,s,t,n,r,o,e,l,w,m)}))),d&&(f={},(a=R.height)&&(f.height="".concat(a,"px")),$&&(f.paddingLeft="".concat(s*L.indent+30,"px")),d=P.showOverflow,d=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?C:d,e={$table:g,seq:c,column:P,fixed:v,type:renderType,level:s,row:t,rowIndex:n,$rowIndex:r},q.push(y("tr",{class:"vxe-body--expanded-row",key:"expand_".concat(i),style:S?_xeUtils.default.isFunction(S)?S(e):S:null,on:l},[y("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":v&&!W,"col--ellipsis":d},attrs:{colspan:w.length}},[y("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":a},style:f},[P.renderData(y,e)])])]))),u&&q.push.apply(q,_toConsumableArray(renderRows(y,h,g,v,p,w)))}),q}function syncBodyScroll(e,l,t,r,o){(r||o)&&(r&&((0,_util.removeScrollListener)(r),r.scrollTop=t),o&&((0,_util.removeScrollListener)(o),o.scrollTop=t),clearTimeout(scrollProcessTimeout),scrollProcessTimeout=setTimeout(function(){(0,_util.restoreScrollListener)(r),(0,_util.restoreScrollListener)(o)},300))}var _default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,size:String,fixedType:String},data:function(){return{wheelTime:null,wheelYSize:0,wheelYInterval:0,wheelYTotal:0}},mounted:function(){var e=this.$parent,l=this.$el,t=this.$refs,r=this.fixedType,e=e.elemStore,r="".concat(r||"main","-body-");e["".concat(r,"wrapper")]=l,e["".concat(r,"table")]=t.table,e["".concat(r,"colgroup")]=t.colgroup,e["".concat(r,"list")]=t.tbody,e["".concat(r,"xSpace")]=t.xSpace,e["".concat(r,"ySpace")]=t.ySpace,e["".concat(r,"emptyBlock")]=t.emptyBlock,this.$el.onscroll=this.scrollEvent,this.$el._onscroll=this.scrollEvent},beforeDestroy:function(){clearTimeout(this.wheelTime),this.$el._onscroll=null,this.$el.onscroll=null},destroyed:function(){var e=this.$parent,l=this.fixedType,e=e.elemStore,l="".concat(l||"main","-body-");e["".concat(l,"wrapper")]=null,e["".concat(l,"table")]=null,e["".concat(l,"colgroup")]=null,e["".concat(l,"list")]=null,e["".concat(l,"xSpace")]=null,e["".concat(l,"ySpace")]=null,e["".concat(l,"emptyBlock")]=null},render:function(t){var e=this._e,l=this.$parent,r=this.fixedColumn,o=this.fixedType,n=l.$scopedSlots,i=l.tId,a=l.tableData,s=l.tableColumn,c=l.visibleColumn,d=l.expandColumn,u=l.showOverflow,p=l.keyboardConfig,f=l.keyboardOpts,y=l.mergeList,h=l.spanMethod,g=l.scrollXLoad,v=l.scrollYLoad,m=l.isAllOverflow,w=l.emptyOpts,x=l.mouseConfig,b=l.mouseOpts,_=l.sYOpts;return o&&(s=d||!(g||v||u&&m)||y.length||h||p&&f.isMerge?c:r),u=n.empty?n.empty.call(this,{$table:l},t):(g=(d=w.name?_vXETable.default.renderer.get(w.name):null)?d.renderEmpty:null)?(0,_vn.getSlotVNs)(g.call(this,t,w,{$table:l})):l.emptyText||_conf.default.i18n("vxe.table.emptyText"),t("div",{class:["vxe-table--body-wrapper",o?"fixed-".concat(o,"--wrapper"):"body--wrapper"],attrs:{xid:i},on:v&&"wheel"===_.mode?{wheel:this.wheelEvent}:{}},[o?e():t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("div",{class:"vxe-body--y-space",ref:"ySpace"}),t("table",{class:"vxe-table--body",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},s.map(function(e,l){return t("col",{attrs:{name:e.id},key:l})})),t("tbody",{ref:"tbody"},renderRows(t,this,l,o,a,s))]),t("div",{class:"vxe-table--checkbox-range"}),x&&b.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},b.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown:function(e){l.triggerCellExtendMousedownEvent(e,{$table:l,fixed:o,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-copy-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"})]):null,o?null:t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},u)])])},methods:{scrollEvent:function(e){var l=this.$el,t=this.$parent,r=this.fixedType,o=t.$refs,n=t.elemStore,i=t.highlightHoverRow,a=t.scrollXLoad,s=t.scrollYLoad,c=t.lastScrollTop,d=t.lastScrollLeft,u=t.rowOpts,p=o.tableHeader,f=o.tableBody,y=o.leftBody,h=o.rightBody,g=o.tableFooter,o=o.validTip,p=p?p.$el:null,g=g?g.$el:null,f=f.$el,y=y?y.$el:null,h=h?h.$el:null,v=n["main-body-ySpace"],n=n["main-body-xSpace"],v=(s&&v?v:f).clientHeight,n=(a&&n?n:f).clientWidth,l=l.scrollTop,m=f.scrollLeft,d=m!==d,c=l!==c;t.lastScrollTop=l,t.lastScrollLeft=m,t.lastScrollTime=Date.now(),(u.isHover||i)&&t.clearHoverRow(),y&&"left"===r?syncBodyScroll(t,r,l=y.scrollTop,f,h):h&&"right"===r?syncBodyScroll(t,r,l=h.scrollTop,f,y):(d&&(p&&(p.scrollLeft=f.scrollLeft),g)&&(g.scrollLeft=f.scrollLeft),(y||h)&&(t.checkScrolling(),c)&&syncBodyScroll(t,r,l,y,h)),a&&d&&t.triggerScrollXEvent(e),s&&c&&t.triggerScrollYEvent(e),d&&o&&o.visible&&o.updatePlacement(),t.emitEvent("scroll",{type:renderType,fixed:r,scrollTop:l,scrollLeft:m,scrollHeight:f.scrollHeight,scrollWidth:f.scrollWidth,bodyHeight:v,bodyWidth:n,isX:d,isY:c},e)},handleWheel:function(a,s,e,c,d){var u=this,p=this.$parent,l=p.$refs,t=p.elemStore,r=p.scrollYLoad,o=p.scrollXLoad,n=l.tableBody,i=l.leftBody,l=l.rightBody,f=n.$el,y=i?i.$el:null,h=l?l.$el:null,n=this.isPrevWheelTop===s?Math.max(0,this.wheelYSize-this.wheelYTotal):0,i=t["main-body-ySpace"],l=t["main-body-xSpace"],g=(r&&i?i:f).clientHeight,v=(o&&l?l:f).clientWidth;this.isPrevWheelTop=s,this.wheelYSize=Math.abs(s?e-n:e+n),this.wheelYInterval=0,this.wheelYTotal=0,clearTimeout(this.wheelTime),function e(){var l,t,r=u.fixedType,o=u.wheelYTotal,n=u.wheelYSize,i=u.wheelYInterval;o<n&&(n<(o+=i=Math.max(5,Math.floor(1.5*i)))&&(i-=o-n),n=f.scrollTop,l=f.clientHeight,t=f.scrollHeight,f.scrollTop=n=n+i*(s?-1:1),y&&(y.scrollTop=n),h&&(h.scrollTop=n),(s?n<t-l:0<=n)&&(u.wheelTime=setTimeout(e,10)),u.wheelYTotal=o,u.wheelYInterval=i,p.emitEvent("scroll",{type:renderType,fixed:r,scrollTop:f.scrollTop,scrollLeft:f.scrollLeft,scrollHeight:f.scrollHeight,scrollWidth:f.scrollWidth,bodyHeight:g,bodyWidth:v,isX:c,isY:d},a))}()},wheelEvent:function(e){var l=e.deltaY,t=e.deltaX,r=this.$el,o=this.$parent,n=o.$refs,i=o.highlightHoverRow,a=o.scrollYLoad,s=o.lastScrollTop,c=o.lastScrollLeft,d=o.rowOpts,n=n.tableBody.$el,u=l<0;(u?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+l,t=(n=n.scrollLeft+t)!==c,(c=r!==s)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=n,o.lastScrollTime=Date.now(),(d.isHover||i)&&o.clearHoverRow(),this.handleWheel(e,u,l,t,c),a)&&o.triggerScrollYEvent(e))}}};exports.default=_default;

package/lib/table/src/cell.js

@@ -237,7 +237,9 @@ var Cell = {
       column = params.column,
       level = params.level;
     var slots = column.slots;
-    var children = treeOpts.children,
+    var childrenField = treeOpts.childrenField,
+      children = treeOpts.children,
+      hasChildField = treeOpts.hasChildField,
       hasChild = treeOpts.hasChild,
       indent = treeOpts.indent,
       lazy = treeOpts.lazy,
@@ -246,7 +248,7 @@ var Cell = {
       showIcon = treeOpts.showIcon,
       iconOpen = treeOpts.iconOpen,
       iconClose = treeOpts.iconClose;
-    var rowChilds = row[children];
+    var rowChilds = row[childrenField || children];
     var hasLazyChilds = false;
     var isAceived = false;
     var isLazyLoaded = false;
@@ -258,7 +260,7 @@ var Cell = {
       isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1;
       if (lazy) {
         isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1;
-        hasLazyChilds = row[hasChild];
+        hasLazyChilds = row[hasChildField || hasChild];
       }
     }
     if (!trigger || trigger === 'default') {

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

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_dom=_interopRequireDefault(require("../../tools/dom")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("./util"),_vn=require("../../tools/vn");function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,l,n={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((l=o?Object.getOwnPropertyDescriptor(e,r):null)&&(l.get||l.set)?Object.defineProperty(n,r,l):n[r]=e[r]);return n.default=e,t&&t.set(e,n),n}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,l=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),l.push.apply(l,r)),l}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function renderHelpIcon(e,t){var r=t.$table,l=t.column,l=l.titlePrefix||l.titleHelp;return l?[e("i",{class:["vxe-cell-help-icon",l.icon||_conf.default.icon.TABLE_HELP],on:{mouseenter:function(e){r.triggerHeaderHelpEvent(e,t)},mouseleave:function(e){r.handleTargetLeaveEvent(e)}}})]:[]}function renderTitleContent(e,t,r){var l=t.$table,n=t.column,o=n.type,i=n.showHeaderOverflow,a=l.showHeaderOverflow,d=l.tooltipOpts,c=d.showAll||d.enabled,d=_xeUtils.default.isUndefined(i)||_xeUtils.default.isNull(i)?a:i,s="title"===d,u=!0===d||"tooltip"===d,a={};return(s||u||c)&&(a.mouseenter=function(e){l._isResize||(s?_dom.default.updateCellTitle(e.currentTarget,n):(u||c)&&l.triggerHeaderTooltipEvent(e,t))}),(u||c)&&(a.mouseleave=function(e){l._isResize||(u||c)&&l.handleTargetLeaveEvent(e)}),["html"===o&&_xeUtils.default.isString(r)?e("span",{class:"vxe-cell--title",domProps:{innerHTML:r},on:a}):e("span",{class:"vxe-cell--title",on:a},(0,_vn.getSlotVNs)(r))]}function getFooterContent(e,t){var r=t.$table,l=t.column,n=t._columnIndex,o=t.items,i=l.slots,a=l.editRender,l=l.cellRender,a=a||l;if(i&&i.footer)return r.callSlot(i.footer,t,e);if(a){l=_vXETable.default.renderer.get(a.name);if(l&&l.renderFooter)return(0,_vn.getSlotVNs)(l.renderFooter.call(r,e,a,t))}return[_utils.default.formatText(o[n],1)]}function getDefaultCellLabel(e){var t=e.$table,r=e.row,e=e.column;return _utils.default.formatText(t.getCellLabel(r,e),1)}var Cell={createColumn:function(e,t){var r=t.type,l=t.sortable,n=t.remoteSort,o=t.filters,i=t.editRender,a=t.treeNode,d=e.editConfig,c=e.editOpts,s=e.checkboxOpts,u={renderHeader:this.renderDefaultHeader,renderCell:a?this.renderTreeCell:this.renderDefaultCell,renderFooter:this.renderDefaultFooter};switch(r){case"seq":u.renderHeader=this.renderSeqHeader,u.renderCell=a?this.renderTreeIndexCell:this.renderSeqCell;break;case"radio":u.renderHeader=this.renderRadioHeader,u.renderCell=a?this.renderTreeRadioCell:this.renderRadioCell;break;case"checkbox":u.renderHeader=this.renderCheckboxHeader,u.renderCell=s.checkField?a?this.renderTreeSelectionCellByProp:this.renderCheckboxCellByProp:a?this.renderTreeSelectionCell:this.renderCheckboxCell;break;case"expand":u.renderCell=this.renderExpandCell,u.renderData=this.renderExpandData;break;case"html":u.renderCell=a?this.renderTreeHTMLCell:this.renderHTMLCell,o&&(l||n)?u.renderHeader=this.renderSortAndFilterHeader:l||n?u.renderHeader=this.renderSortHeader:o&&(u.renderHeader=this.renderFilterHeader);break;default:d&&i?(u.renderHeader=this.renderEditHeader,u.renderCell="cell"===c.mode?a?this.renderTreeCellEdit:this.renderCellEdit:a?this.renderTreeRowEdit:this.renderRowEdit):o&&(l||n)?u.renderHeader=this.renderSortAndFilterHeader:l||n?u.renderHeader=this.renderSortHeader:o&&(u.renderHeader=this.renderFilterHeader)}return(0,_util.getColumnConfig)(e,t,u)},renderHeaderTitle:function(e,t){var r=t.$table,l=t.column,n=l.slots,o=l.editRender,i=l.cellRender,o=o||i;if(n&&n.header)return renderTitleContent(e,t,r.callSlot(n.header,t,e));if(o){i=_vXETable.default.renderer.get(o.name);if(i&&i.renderHeader)return(0,_vn.getSlotVNs)(renderTitleContent(e,t,i.renderHeader.call(r,e,o,t)))}return renderTitleContent(e,t,_utils.default.formatText(l.getTitle(),1))},renderDefaultHeader:function(e,t){return renderHelpIcon(e,t).concat(Cell.renderHeaderTitle(e,t))},renderDefaultCell:function(e,t){var r=t.$table,l=t.row,n=t.column,o=n.slots,i=n.editRender,a=n.cellRender,a=i||a;if(o&&o.default)return r.callSlot(o.default,t,e);if(a){var o=i?"renderCell":"renderDefault",d=_vXETable.default.renderer.get(a.name);if(d&&d[o])return(0,_vn.getSlotVNs)(d[o].call(r,e,a,Object.assign({$type:i?"edit":"cell"},t)))}d=r.getCellLabel(l,n),o=i?i.placeholder:"";return[e("span",{class:"vxe-cell--label"},i&&(0,_utils.eqEmptyValue)(d)?[e("span",{class:"vxe-cell--placeholder"},_utils.default.formatText((0,_utils.getFuncText)(o),1))]:_utils.default.formatText(d,1))]},renderTreeCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderDefaultCell.call(this,e,t))},renderDefaultFooter:function(e,t){return[e("span",{class:"vxe-cell--item"},getFooterContent(e,t))]},renderTreeIcon:function(e,t,r){var l=t.$table,n=t.isHidden,o=l.treeOpts,i=l.treeExpandeds,a=l.treeLazyLoadeds,d=t.row,c=t.column,s=t.level,c=c.slots,u=o.children,f=o.hasChild,p=o.indent,C=o.lazy,b=o.trigger,_=o.iconLoaded,h=o.showIcon,v=o.iconOpen,o=o.iconClose,u=d[u],E=!1,x=!1,T=!1,g={};return c&&c.icon?l.callSlot(c.icon,t,e,r):(n||(x=-1<l.findRowIndexOf(i,d),C&&(T=-1<l.findRowIndexOf(a,d),E=d[f])),b&&"default"!==b||(g.click=function(e){e.stopPropagation(),l.triggerTreeExpandEvent(e,t)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":x}],style:{paddingLeft:"".concat(s*p,"px")}},[h&&(u&&u.length||E)?[e("div",{class:"vxe-tree--btn-wrapper",on:g},[e("i",{class:["vxe-tree--node-btn",T?_||_conf.default.icon.TABLE_TREE_LOADED:x?v||_conf.default.icon.TABLE_TREE_OPEN:o||_conf.default.icon.TABLE_TREE_CLOSE]})])]:null,e("div",{class:"vxe-tree-cell"},r)])])},renderSeqHeader:function(e,t){var r=t.$table,l=t.column,n=l.slots;return renderTitleContent(e,t,n&&n.header?r.callSlot(n.header,t,e):_utils.default.formatText(l.getTitle(),1))},renderSeqCell:function(e,t){var r=t.$table,l=t.column,n=r.treeConfig,o=r.seqOpts,l=l.slots;return l&&l.default?r.callSlot(l.default,t,e):(r=t.seq,l=o.seqMethod,[_utils.default.formatText(l?l(t):n?r:(o.startIndex||0)+r,1)])},renderTreeIndexCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderSeqCell(e,t))},renderRadioHeader:function(e,t){var r=t.$table,l=t.column,n=l.slots,o=n?n.header:null,n=n?n.title:null;return renderTitleContent(e,t,o?r.callSlot(o,t,e):[e("span",{class:"vxe-radio--label"},n?r.callSlot(n,t,e):_utils.default.formatText(l.getTitle(),1))])},renderRadioCell:function(e,t){var r,l=t.$table,n=t.column,o=t.isHidden,i=l.radioOpts,a=l.selectRow,n=n.slots,d=i.labelField,c=i.checkMethod,i=i.visibleMethod,s=t.row,u=n?n.default:null,n=n?n.radio:null,a=s===a,f=!i||i({row:s}),p=!!c,i=(o||(r={click:function(e){!p&&f&&(e.stopPropagation(),l.triggerRadioRowEvent(e,t))}},c&&(p=!c({row:s}))),_objectSpread(_objectSpread({},t),{},{checked:a,disabled:p,visible:f}));return n?l.callSlot(n,i,e):(o=[],f&&o.push(e("span",{class:["vxe-radio--icon",a?_conf.default.icon.TABLE_RADIO_CHECKED:_conf.default.icon.TABLE_RADIO_UNCHECKED]})),(u||d)&&o.push(e("span",{class:"vxe-radio--label"},u?l.callSlot(u,i,e):_xeUtils.default.get(s,d))),[e("span",{class:["vxe-cell--radio",{"is--checked":a,"is--disabled":p}],on:r},o)])},renderTreeRadioCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderRadioCell(e,t))},renderCheckboxHeader:function(e,t){var r,l=t.$table,n=t.column,o=t.isHidden,i=l.isAllSelected,a=l.isIndeterminate,d=l.isAllCheckboxDisabled,c=n.slots,s=c?c.header:null,c=c?c.title:null,u=l.checkboxOpts,n=n.getTitle(),o=(o||(r={click:function(e){d||(e.stopPropagation(),l.triggerCheckAllEvent(e,!i))}}),_objectSpread(_objectSpread({},t),{},{checked:i,disabled:d,indeterminate:a}));return s?renderTitleContent(e,o,l.callSlot(s,o,e)):(u.checkStrictly?u.showHeader:!1!==u.showHeader)?renderTitleContent(e,o,[e("span",{class:["vxe-cell--checkbox",{"is--checked":i,"is--disabled":d,"is--indeterminate":a}],attrs:{title:_conf.default.i18n("vxe.table.allTitle")},on:r},[e("span",{class:["vxe-checkbox--icon",a?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:i?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})].concat(c||n?[e("span",{class:"vxe-checkbox--label"},c?l.callSlot(c,o,e):n)]:[]))]):renderTitleContent(e,o,[e("span",{class:"vxe-checkbox--label"},c?l.callSlot(c,o,e):n)])},renderCheckboxCell:function(e,t){var r,l=t.$table,n=t.row,o=t.column,i=t.isHidden,a=l.treeConfig,d=l.treeIndeterminates,c=l.selectCheckboxRows,s=l.checkboxOpts,u=s.labelField,f=s.checkMethod,s=s.visibleMethod,o=o.slots,p=o?o.default:null,o=o?o.checkbox:null,C=!1,b=!1,_=!s||s({row:n}),h=!!f,s=(i||(b=-1<l.findRowIndexOf(c,n),r={click:function(e){!h&&_&&(e.stopPropagation(),l.triggerCheckRowEvent(e,t,!b))}},f&&(h=!f({row:n})),a&&(C=-1<l.findRowIndexOf(d,n))),_objectSpread(_objectSpread({},t),{},{checked:b,disabled:h,visible:_,indeterminate:C}));return o?l.callSlot(o,s,e):(i=[],_&&i.push(e("span",{class:["vxe-checkbox--icon",C?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:b?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})),(p||u)&&i.push(e("span",{class:"vxe-checkbox--label"},p?l.callSlot(p,s,e):_xeUtils.default.get(n,u))),[e("span",{class:["vxe-cell--checkbox",{"is--checked":b,"is--disabled":h,"is--indeterminate":C}],on:r},i)])},renderTreeSelectionCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderCheckboxCell(e,t))},renderCheckboxCellByProp:function(e,t){var r,l=t.$table,n=t.row,o=t.column,i=t.isHidden,a=l.treeConfig,d=l.treeIndeterminates,c=l.checkboxOpts,s=c.labelField,u=c.checkField,f=c.halfField,p=c.checkMethod,c=c.visibleMethod,o=o.slots,C=o?o.default:null,o=o?o.checkbox:null,b=!1,_=!1,h=!c||c({row:n}),v=!!p,c=(i||(_=_xeUtils.default.get(n,u),r={click:function(e){!v&&h&&(e.stopPropagation(),l.triggerCheckRowEvent(e,t,!_))}},p&&(v=!p({row:n})),a&&(b=-1<l.findRowIndexOf(d,n))),_objectSpread(_objectSpread({},t),{},{checked:_,disabled:v,visible:h,indeterminate:b}));return o?l.callSlot(o,c,e):(i=[],h&&i.push(e("span",{class:["vxe-checkbox--icon",b?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:_?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})),(C||s)&&i.push(e("span",{class:"vxe-checkbox--label"},C?l.callSlot(C,c,e):_xeUtils.default.get(n,s))),[e("span",{class:["vxe-cell--checkbox",{"is--checked":_,"is--disabled":v,"is--indeterminate":f&&!_?n[f]:b}],on:r},i)])},renderTreeSelectionCellByProp:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderCheckboxCellByProp(e,t))},renderExpandCell:function(e,t){var r=t.$table,l=t.isHidden,n=t.row,o=t.column,i=r.expandOpts,a=r.rowExpandeds,d=r.expandLazyLoadeds,c=i.lazy,s=i.labelField,u=i.iconLoaded,f=i.showIcon,p=i.iconOpen,C=i.iconClose,i=i.visibleMethod,o=o.slots,b=o?o.default:null,_=!1,h=!1;return o&&o.icon?r.callSlot(o.icon,t,e):(l||(_=-1<r.findRowIndexOf(a,t.row),c&&(h=-1<r.findRowIndexOf(d,n))),[!f||i&&!i(t)?null:e("span",{class:["vxe-table--expanded",{"is--active":_}],on:{click:function(e){e.stopPropagation(),r.triggerRowExpandEvent(e,t)}}},[e("i",{class:["vxe-table--expand-btn",h?u||_conf.default.icon.TABLE_EXPAND_LOADED:_?p||_conf.default.icon.TABLE_EXPAND_OPEN:C||_conf.default.icon.TABLE_EXPAND_CLOSE]})]),b||s?e("span",{class:"vxe-table--expand-label"},b?r.callSlot(b,t,e):_xeUtils.default.get(n,s)):null])},renderExpandData:function(e,t){var r=t.$table,l=t.column,n=l.slots,l=l.contentRender;if(n&&n.content)return r.callSlot(n.content,t,e);if(l){n=_vXETable.default.renderer.get(l.name);if(n&&n.renderExpand)return(0,_vn.getSlotVNs)(n.renderExpand.call(r,e,l,t))}return[]},renderHTMLCell:function(e,t){var r=t.$table,l=t.column.slots;return l&&l.default?r.callSlot(l.default,t,e):[e("span",{class:"vxe-cell--html",domProps:{innerHTML:getDefaultCellLabel(t)}})]},renderTreeHTMLCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderHTMLCell(e,t))},renderSortAndFilterHeader:function(e,t){return Cell.renderDefaultHeader(e,t).concat(Cell.renderSortIcon(e,t)).concat(Cell.renderFilterIcon(e,t))},renderSortHeader:function(e,t){return Cell.renderDefaultHeader(e,t).concat(Cell.renderSortIcon(e,t))},renderSortIcon:function(e,t){var r=t.$table,l=t.column,t=r.sortOpts,n=t.showIcon,o=t.iconAsc,t=t.iconDesc;return n?[e("span",{class:"vxe-cell--sort"},[e("i",{class:["vxe-sort--asc-btn",o||_conf.default.icon.TABLE_SORT_ASC,{"sort--active":"asc"===l.order}],attrs:{title:_conf.default.i18n("vxe.table.sortAsc")},on:{click:function(e){e.stopPropagation(),r.triggerSortEvent(e,l,"asc")}}}),e("i",{class:["vxe-sort--desc-btn",t||_conf.default.icon.TABLE_SORT_DESC,{"sort--active":"desc"===l.order}],attrs:{title:_conf.default.i18n("vxe.table.sortDesc")},on:{click:function(e){e.stopPropagation(),r.triggerSortEvent(e,l,"desc")}}})])]:[]},renderFilterHeader:function(e,t){return Cell.renderDefaultHeader(e,t).concat(Cell.renderFilterIcon(e,t))},renderFilterIcon:function(e,t){var r=t.$table,l=t.column,n=t.hasFilter,o=r.filterStore,i=r.filterOpts,a=i.showIcon,d=i.iconNone,i=i.iconMatch;return a?[e("span",{class:["vxe-cell--filter",{"is--active":o.visible&&o.column===l}]},[e("i",{class:["vxe-filter--btn",n?i||_conf.default.icon.TABLE_FILTER_MATCH:d||_conf.default.icon.TABLE_FILTER_NONE],attrs:{title:_conf.default.i18n("vxe.table.filter")},on:{click:function(e){r.triggerFilterEvent(e,t.column,t)}}})])]:[]},renderEditHeader:function(e,t){var r=t.$table,l=t.column,n=r.editConfig,o=r.editRules,r=r.editOpts,i=l.sortable,a=l.remoteSort,d=l.filters,c=l.editRender,s=!1;return o&&(o=_xeUtils.default.get(o,l.field))&&(s=o.some(function(e){return e.required})),((0,_utils.isEnableConf)(n)?[s&&r.showAsterisk?e("i",{class:"vxe-cell--required-icon"}):null,(0,_utils.isEnableConf)(c)&&r.showIcon?e("i",{class:["vxe-cell--edit-icon",r.icon||_conf.default.icon.TABLE_EDIT]}):null]:[]).concat(Cell.renderDefaultHeader(e,t)).concat(i||a?Cell.renderSortIcon(e,t):[]).concat(d?Cell.renderFilterIcon(e,t):[])},renderRowEdit:function(e,t){var r=t.$table,l=t.column.editRender,r=r.editStore.actived;return Cell.runRenderer(e,t,this,(0,_utils.isEnableConf)(l)&&r&&r.row===t.row)},renderTreeRowEdit:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderRowEdit(e,t))},renderCellEdit:function(e,t){var r=t.$table,l=t.column.editRender,r=r.editStore.actived;return Cell.runRenderer(e,t,this,(0,_utils.isEnableConf)(l)&&r&&r.row===t.row&&r.column===t.column)},renderTreeCellEdit:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderCellEdit(e,t))},runRenderer:function(e,t,r,l){var n=t.$table,o=t.column,i=o.slots,a=o.editRender,o=o.formatter,d=_vXETable.default.renderer.get(a.name);return l?i&&i.edit?n.callSlot(i.edit,t,e):d&&d.renderEdit?(0,_vn.getSlotVNs)(d.renderEdit.call(n,e,a,Object.assign({$type:"edit"},t))):[]:i&&i.default?n.callSlot(i.default,t,e):o?[e("span",{class:"vxe-cell--label"},[getDefaultCellLabel(t)])]:Cell.renderDefaultCell.call(r,e,t)}},_default=exports.Cell=Cell;exports.default=_default;
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_dom=_interopRequireDefault(require("../../tools/dom")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("./util"),_vn=require("../../tools/vn");function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,l,n={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((l=o?Object.getOwnPropertyDescriptor(e,r):null)&&(l.get||l.set)?Object.defineProperty(n,r,l):n[r]=e[r]);return n.default=e,t&&t.set(e,n),n}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,l=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),l.push.apply(l,r)),l}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function renderHelpIcon(e,t){var r=t.$table,l=t.column,l=l.titlePrefix||l.titleHelp;return l?[e("i",{class:["vxe-cell-help-icon",l.icon||_conf.default.icon.TABLE_HELP],on:{mouseenter:function(e){r.triggerHeaderHelpEvent(e,t)},mouseleave:function(e){r.handleTargetLeaveEvent(e)}}})]:[]}function renderTitleContent(e,t,r){var l=t.$table,n=t.column,o=n.type,i=n.showHeaderOverflow,a=l.showHeaderOverflow,d=l.tooltipOpts,c=d.showAll||d.enabled,d=_xeUtils.default.isUndefined(i)||_xeUtils.default.isNull(i)?a:i,s="title"===d,u=!0===d||"tooltip"===d,a={};return(s||u||c)&&(a.mouseenter=function(e){l._isResize||(s?_dom.default.updateCellTitle(e.currentTarget,n):(u||c)&&l.triggerHeaderTooltipEvent(e,t))}),(u||c)&&(a.mouseleave=function(e){l._isResize||(u||c)&&l.handleTargetLeaveEvent(e)}),["html"===o&&_xeUtils.default.isString(r)?e("span",{class:"vxe-cell--title",domProps:{innerHTML:r},on:a}):e("span",{class:"vxe-cell--title",on:a},(0,_vn.getSlotVNs)(r))]}function getFooterContent(e,t){var r=t.$table,l=t.column,n=t._columnIndex,o=t.items,i=l.slots,a=l.editRender,l=l.cellRender,a=a||l;if(i&&i.footer)return r.callSlot(i.footer,t,e);if(a){l=_vXETable.default.renderer.get(a.name);if(l&&l.renderFooter)return(0,_vn.getSlotVNs)(l.renderFooter.call(r,e,a,t))}return[_utils.default.formatText(o[n],1)]}function getDefaultCellLabel(e){var t=e.$table,r=e.row,e=e.column;return _utils.default.formatText(t.getCellLabel(r,e),1)}var Cell={createColumn:function(e,t){var r=t.type,l=t.sortable,n=t.remoteSort,o=t.filters,i=t.editRender,a=t.treeNode,d=e.editConfig,c=e.editOpts,s=e.checkboxOpts,u={renderHeader:this.renderDefaultHeader,renderCell:a?this.renderTreeCell:this.renderDefaultCell,renderFooter:this.renderDefaultFooter};switch(r){case"seq":u.renderHeader=this.renderSeqHeader,u.renderCell=a?this.renderTreeIndexCell:this.renderSeqCell;break;case"radio":u.renderHeader=this.renderRadioHeader,u.renderCell=a?this.renderTreeRadioCell:this.renderRadioCell;break;case"checkbox":u.renderHeader=this.renderCheckboxHeader,u.renderCell=s.checkField?a?this.renderTreeSelectionCellByProp:this.renderCheckboxCellByProp:a?this.renderTreeSelectionCell:this.renderCheckboxCell;break;case"expand":u.renderCell=this.renderExpandCell,u.renderData=this.renderExpandData;break;case"html":u.renderCell=a?this.renderTreeHTMLCell:this.renderHTMLCell,o&&(l||n)?u.renderHeader=this.renderSortAndFilterHeader:l||n?u.renderHeader=this.renderSortHeader:o&&(u.renderHeader=this.renderFilterHeader);break;default:d&&i?(u.renderHeader=this.renderEditHeader,u.renderCell="cell"===c.mode?a?this.renderTreeCellEdit:this.renderCellEdit:a?this.renderTreeRowEdit:this.renderRowEdit):o&&(l||n)?u.renderHeader=this.renderSortAndFilterHeader:l||n?u.renderHeader=this.renderSortHeader:o&&(u.renderHeader=this.renderFilterHeader)}return(0,_util.getColumnConfig)(e,t,u)},renderHeaderTitle:function(e,t){var r=t.$table,l=t.column,n=l.slots,o=l.editRender,i=l.cellRender,o=o||i;if(n&&n.header)return renderTitleContent(e,t,r.callSlot(n.header,t,e));if(o){i=_vXETable.default.renderer.get(o.name);if(i&&i.renderHeader)return(0,_vn.getSlotVNs)(renderTitleContent(e,t,i.renderHeader.call(r,e,o,t)))}return renderTitleContent(e,t,_utils.default.formatText(l.getTitle(),1))},renderDefaultHeader:function(e,t){return renderHelpIcon(e,t).concat(Cell.renderHeaderTitle(e,t))},renderDefaultCell:function(e,t){var r=t.$table,l=t.row,n=t.column,o=n.slots,i=n.editRender,a=n.cellRender,a=i||a;if(o&&o.default)return r.callSlot(o.default,t,e);if(a){var o=i?"renderCell":"renderDefault",d=_vXETable.default.renderer.get(a.name);if(d&&d[o])return(0,_vn.getSlotVNs)(d[o].call(r,e,a,Object.assign({$type:i?"edit":"cell"},t)))}d=r.getCellLabel(l,n),o=i?i.placeholder:"";return[e("span",{class:"vxe-cell--label"},i&&(0,_utils.eqEmptyValue)(d)?[e("span",{class:"vxe-cell--placeholder"},_utils.default.formatText((0,_utils.getFuncText)(o),1))]:_utils.default.formatText(d,1))]},renderTreeCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderDefaultCell.call(this,e,t))},renderDefaultFooter:function(e,t){return[e("span",{class:"vxe-cell--item"},getFooterContent(e,t))]},renderTreeIcon:function(e,t,r){var l=t.$table,n=t.isHidden,o=l.treeOpts,i=l.treeExpandeds,a=l.treeLazyLoadeds,d=t.row,c=t.column,s=t.level,c=c.slots,u=o.childrenField,f=o.children,p=o.hasChildField,C=o.hasChild,b=o.indent,_=o.lazy,h=o.trigger,v=o.iconLoaded,E=o.showIcon,x=o.iconOpen,o=o.iconClose,u=d[u||f],f=!1,T=!1,g=!1,m={};return c&&c.icon?l.callSlot(c.icon,t,e,r):(n||(T=-1<l.findRowIndexOf(i,d),_&&(g=-1<l.findRowIndexOf(a,d),f=d[p||C])),h&&"default"!==h||(m.click=function(e){e.stopPropagation(),l.triggerTreeExpandEvent(e,t)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":T}],style:{paddingLeft:"".concat(s*b,"px")}},[E&&(u&&u.length||f)?[e("div",{class:"vxe-tree--btn-wrapper",on:m},[e("i",{class:["vxe-tree--node-btn",g?v||_conf.default.icon.TABLE_TREE_LOADED:T?x||_conf.default.icon.TABLE_TREE_OPEN:o||_conf.default.icon.TABLE_TREE_CLOSE]})])]:null,e("div",{class:"vxe-tree-cell"},r)])])},renderSeqHeader:function(e,t){var r=t.$table,l=t.column,n=l.slots;return renderTitleContent(e,t,n&&n.header?r.callSlot(n.header,t,e):_utils.default.formatText(l.getTitle(),1))},renderSeqCell:function(e,t){var r=t.$table,l=t.column,n=r.treeConfig,o=r.seqOpts,l=l.slots;return l&&l.default?r.callSlot(l.default,t,e):(r=t.seq,l=o.seqMethod,[_utils.default.formatText(l?l(t):n?r:(o.startIndex||0)+r,1)])},renderTreeIndexCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderSeqCell(e,t))},renderRadioHeader:function(e,t){var r=t.$table,l=t.column,n=l.slots,o=n?n.header:null,n=n?n.title:null;return renderTitleContent(e,t,o?r.callSlot(o,t,e):[e("span",{class:"vxe-radio--label"},n?r.callSlot(n,t,e):_utils.default.formatText(l.getTitle(),1))])},renderRadioCell:function(e,t){var r,l=t.$table,n=t.column,o=t.isHidden,i=l.radioOpts,a=l.selectRow,n=n.slots,d=i.labelField,c=i.checkMethod,i=i.visibleMethod,s=t.row,u=n?n.default:null,n=n?n.radio:null,a=s===a,f=!i||i({row:s}),p=!!c,i=(o||(r={click:function(e){!p&&f&&(e.stopPropagation(),l.triggerRadioRowEvent(e,t))}},c&&(p=!c({row:s}))),_objectSpread(_objectSpread({},t),{},{checked:a,disabled:p,visible:f}));return n?l.callSlot(n,i,e):(o=[],f&&o.push(e("span",{class:["vxe-radio--icon",a?_conf.default.icon.TABLE_RADIO_CHECKED:_conf.default.icon.TABLE_RADIO_UNCHECKED]})),(u||d)&&o.push(e("span",{class:"vxe-radio--label"},u?l.callSlot(u,i,e):_xeUtils.default.get(s,d))),[e("span",{class:["vxe-cell--radio",{"is--checked":a,"is--disabled":p}],on:r},o)])},renderTreeRadioCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderRadioCell(e,t))},renderCheckboxHeader:function(e,t){var r,l=t.$table,n=t.column,o=t.isHidden,i=l.isAllSelected,a=l.isIndeterminate,d=l.isAllCheckboxDisabled,c=n.slots,s=c?c.header:null,c=c?c.title:null,u=l.checkboxOpts,n=n.getTitle(),o=(o||(r={click:function(e){d||(e.stopPropagation(),l.triggerCheckAllEvent(e,!i))}}),_objectSpread(_objectSpread({},t),{},{checked:i,disabled:d,indeterminate:a}));return s?renderTitleContent(e,o,l.callSlot(s,o,e)):(u.checkStrictly?u.showHeader:!1!==u.showHeader)?renderTitleContent(e,o,[e("span",{class:["vxe-cell--checkbox",{"is--checked":i,"is--disabled":d,"is--indeterminate":a}],attrs:{title:_conf.default.i18n("vxe.table.allTitle")},on:r},[e("span",{class:["vxe-checkbox--icon",a?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:i?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})].concat(c||n?[e("span",{class:"vxe-checkbox--label"},c?l.callSlot(c,o,e):n)]:[]))]):renderTitleContent(e,o,[e("span",{class:"vxe-checkbox--label"},c?l.callSlot(c,o,e):n)])},renderCheckboxCell:function(e,t){var r,l=t.$table,n=t.row,o=t.column,i=t.isHidden,a=l.treeConfig,d=l.treeIndeterminates,c=l.selectCheckboxRows,s=l.checkboxOpts,u=s.labelField,f=s.checkMethod,s=s.visibleMethod,o=o.slots,p=o?o.default:null,o=o?o.checkbox:null,C=!1,b=!1,_=!s||s({row:n}),h=!!f,s=(i||(b=-1<l.findRowIndexOf(c,n),r={click:function(e){!h&&_&&(e.stopPropagation(),l.triggerCheckRowEvent(e,t,!b))}},f&&(h=!f({row:n})),a&&(C=-1<l.findRowIndexOf(d,n))),_objectSpread(_objectSpread({},t),{},{checked:b,disabled:h,visible:_,indeterminate:C}));return o?l.callSlot(o,s,e):(i=[],_&&i.push(e("span",{class:["vxe-checkbox--icon",C?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:b?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})),(p||u)&&i.push(e("span",{class:"vxe-checkbox--label"},p?l.callSlot(p,s,e):_xeUtils.default.get(n,u))),[e("span",{class:["vxe-cell--checkbox",{"is--checked":b,"is--disabled":h,"is--indeterminate":C}],on:r},i)])},renderTreeSelectionCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderCheckboxCell(e,t))},renderCheckboxCellByProp:function(e,t){var r,l=t.$table,n=t.row,o=t.column,i=t.isHidden,a=l.treeConfig,d=l.treeIndeterminates,c=l.checkboxOpts,s=c.labelField,u=c.checkField,f=c.halfField,p=c.checkMethod,c=c.visibleMethod,o=o.slots,C=o?o.default:null,o=o?o.checkbox:null,b=!1,_=!1,h=!c||c({row:n}),v=!!p,c=(i||(_=_xeUtils.default.get(n,u),r={click:function(e){!v&&h&&(e.stopPropagation(),l.triggerCheckRowEvent(e,t,!_))}},p&&(v=!p({row:n})),a&&(b=-1<l.findRowIndexOf(d,n))),_objectSpread(_objectSpread({},t),{},{checked:_,disabled:v,visible:h,indeterminate:b}));return o?l.callSlot(o,c,e):(i=[],h&&i.push(e("span",{class:["vxe-checkbox--icon",b?_conf.default.icon.TABLE_CHECKBOX_INDETERMINATE:_?_conf.default.icon.TABLE_CHECKBOX_CHECKED:_conf.default.icon.TABLE_CHECKBOX_UNCHECKED]})),(C||s)&&i.push(e("span",{class:"vxe-checkbox--label"},C?l.callSlot(C,c,e):_xeUtils.default.get(n,s))),[e("span",{class:["vxe-cell--checkbox",{"is--checked":_,"is--disabled":v,"is--indeterminate":f&&!_?n[f]:b}],on:r},i)])},renderTreeSelectionCellByProp:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderCheckboxCellByProp(e,t))},renderExpandCell:function(e,t){var r=t.$table,l=t.isHidden,n=t.row,o=t.column,i=r.expandOpts,a=r.rowExpandeds,d=r.expandLazyLoadeds,c=i.lazy,s=i.labelField,u=i.iconLoaded,f=i.showIcon,p=i.iconOpen,C=i.iconClose,i=i.visibleMethod,o=o.slots,b=o?o.default:null,_=!1,h=!1;return o&&o.icon?r.callSlot(o.icon,t,e):(l||(_=-1<r.findRowIndexOf(a,t.row),c&&(h=-1<r.findRowIndexOf(d,n))),[!f||i&&!i(t)?null:e("span",{class:["vxe-table--expanded",{"is--active":_}],on:{click:function(e){e.stopPropagation(),r.triggerRowExpandEvent(e,t)}}},[e("i",{class:["vxe-table--expand-btn",h?u||_conf.default.icon.TABLE_EXPAND_LOADED:_?p||_conf.default.icon.TABLE_EXPAND_OPEN:C||_conf.default.icon.TABLE_EXPAND_CLOSE]})]),b||s?e("span",{class:"vxe-table--expand-label"},b?r.callSlot(b,t,e):_xeUtils.default.get(n,s)):null])},renderExpandData:function(e,t){var r=t.$table,l=t.column,n=l.slots,l=l.contentRender;if(n&&n.content)return r.callSlot(n.content,t,e);if(l){n=_vXETable.default.renderer.get(l.name);if(n&&n.renderExpand)return(0,_vn.getSlotVNs)(n.renderExpand.call(r,e,l,t))}return[]},renderHTMLCell:function(e,t){var r=t.$table,l=t.column.slots;return l&&l.default?r.callSlot(l.default,t,e):[e("span",{class:"vxe-cell--html",domProps:{innerHTML:getDefaultCellLabel(t)}})]},renderTreeHTMLCell:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderHTMLCell(e,t))},renderSortAndFilterHeader:function(e,t){return Cell.renderDefaultHeader(e,t).concat(Cell.renderSortIcon(e,t)).concat(Cell.renderFilterIcon(e,t))},renderSortHeader:function(e,t){return Cell.renderDefaultHeader(e,t).concat(Cell.renderSortIcon(e,t))},renderSortIcon:function(e,t){var r=t.$table,l=t.column,t=r.sortOpts,n=t.showIcon,o=t.iconAsc,t=t.iconDesc;return n?[e("span",{class:"vxe-cell--sort"},[e("i",{class:["vxe-sort--asc-btn",o||_conf.default.icon.TABLE_SORT_ASC,{"sort--active":"asc"===l.order}],attrs:{title:_conf.default.i18n("vxe.table.sortAsc")},on:{click:function(e){e.stopPropagation(),r.triggerSortEvent(e,l,"asc")}}}),e("i",{class:["vxe-sort--desc-btn",t||_conf.default.icon.TABLE_SORT_DESC,{"sort--active":"desc"===l.order}],attrs:{title:_conf.default.i18n("vxe.table.sortDesc")},on:{click:function(e){e.stopPropagation(),r.triggerSortEvent(e,l,"desc")}}})])]:[]},renderFilterHeader:function(e,t){return Cell.renderDefaultHeader(e,t).concat(Cell.renderFilterIcon(e,t))},renderFilterIcon:function(e,t){var r=t.$table,l=t.column,n=t.hasFilter,o=r.filterStore,i=r.filterOpts,a=i.showIcon,d=i.iconNone,i=i.iconMatch;return a?[e("span",{class:["vxe-cell--filter",{"is--active":o.visible&&o.column===l}]},[e("i",{class:["vxe-filter--btn",n?i||_conf.default.icon.TABLE_FILTER_MATCH:d||_conf.default.icon.TABLE_FILTER_NONE],attrs:{title:_conf.default.i18n("vxe.table.filter")},on:{click:function(e){r.triggerFilterEvent(e,t.column,t)}}})])]:[]},renderEditHeader:function(e,t){var r=t.$table,l=t.column,n=r.editConfig,o=r.editRules,r=r.editOpts,i=l.sortable,a=l.remoteSort,d=l.filters,c=l.editRender,s=!1;return o&&(o=_xeUtils.default.get(o,l.field))&&(s=o.some(function(e){return e.required})),((0,_utils.isEnableConf)(n)?[s&&r.showAsterisk?e("i",{class:"vxe-cell--required-icon"}):null,(0,_utils.isEnableConf)(c)&&r.showIcon?e("i",{class:["vxe-cell--edit-icon",r.icon||_conf.default.icon.TABLE_EDIT]}):null]:[]).concat(Cell.renderDefaultHeader(e,t)).concat(i||a?Cell.renderSortIcon(e,t):[]).concat(d?Cell.renderFilterIcon(e,t):[])},renderRowEdit:function(e,t){var r=t.$table,l=t.column.editRender,r=r.editStore.actived;return Cell.runRenderer(e,t,this,(0,_utils.isEnableConf)(l)&&r&&r.row===t.row)},renderTreeRowEdit:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderRowEdit(e,t))},renderCellEdit:function(e,t){var r=t.$table,l=t.column.editRender,r=r.editStore.actived;return Cell.runRenderer(e,t,this,(0,_utils.isEnableConf)(l)&&r&&r.row===t.row&&r.column===t.column)},renderTreeCellEdit:function(e,t){return Cell.renderTreeIcon(e,t,Cell.renderCellEdit(e,t))},runRenderer:function(e,t,r,l){var n=t.$table,o=t.column,i=o.slots,a=o.editRender,o=o.formatter,d=_vXETable.default.renderer.get(a.name);return l?i&&i.edit?n.callSlot(i.edit,t,e):d&&d.renderEdit?(0,_vn.getSlotVNs)(d.renderEdit.call(n,e,a,Object.assign({$type:"edit"},t))):[]:i&&i.default?n.callSlot(i.default,t,e):o?[e("span",{class:"vxe-cell--label"},[getDefaultCellLabel(t)])]:Cell.renderDefaultCell.call(r,e,t)}},_default=exports.Cell=Cell;exports.default=_default;

package/lib/table/src/columnInfo.js

@@ -42,7 +42,7 @@ var ColumnInfo = /*#__PURE__*/function () {
         (0, _log.warnLog)('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render']);
       }
       if (_vm.type === 'expand') {
-        if ($xetable.treeConfig && $xetable.treeOpts.line) {
+        if ($xetable.treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
           (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand']);
         }
       }
@@ -55,12 +55,12 @@ var ColumnInfo = /*#__PURE__*/function () {
       if (formatter) {
         if (_xeUtils["default"].isString(formatter)) {
           var gFormatOpts = _formats.formats.get(formatter) || _xeUtils["default"][formatter];
-          if (!gFormatOpts || !_xeUtils["default"].isFunction(gFormatOpts.formatMethod)) {
+          if (!gFormatOpts || !_xeUtils["default"].isFunction(gFormatOpts.cellFormatMethod)) {
             (0, _log.errLog)('vxe.error.notFormats', [formatter]);
           }
         } else if (_xeUtils["default"].isArray(formatter)) {
           var _gFormatOpts = _formats.formats.get(formatter[0]) || _xeUtils["default"][formatter[0]];
-          if (!_gFormatOpts || !_xeUtils["default"].isFunction(_gFormatOpts.formatMethod)) {
+          if (!_gFormatOpts || !_xeUtils["default"].isFunction(_gFormatOpts.cellFormatMethod)) {
             (0, _log.errLog)('vxe.error.notFormats', [formatter[0]]);
           }
         }

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_formats=require("../../v-x-e-table/src/formats"),_util=require("./util"),_utils=require("../../tools/utils"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,r){for(var t=0;t<r.length;t++){var o=r[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,r,t){return r&&_defineProperties(e.prototype,r),t&&_defineProperties(e,t),Object.defineProperty(e,"prototype",{writable:!1}),e}var ColumnInfo=function(){function u(e,r){var t,o=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},l=o.renderHeader,i=o.renderCell,n=o.renderFooter,o=o.renderData,d=(_classCallCheck(this,u),e.$xegrid),s=d?d.proxyOpts:null,a=r.formatter,f=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(t=["seq","checkbox","radio","expand","html"],r.type&&-1===t.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type=".concat(r.type),t.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render=".concat(r.cellRender),"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render=".concat(r.editRender),"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&e.treeConfig&&e.treeOpts.line&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),a)&&(_xeUtils.default.isString(a)?(t=_formats.formats.get(a)||_xeUtils.default[a])&&_xeUtils.default.isFunction(t.formatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a]):!_xeUtils.default.isArray(a)||(e=_formats.formats.get(a[0])||_xeUtils.default[a[0]])&&_xeUtils.default.isFunction(e.formatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:a,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:f,halfVisible:!1,defaultVisible:f,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,customOrder:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:l||r.renderHeader,renderCell:i||r.renderCell,renderFooter:n||r.renderFooter,renderData:o,slots:r.slots}),s&&s.beforeColumn&&s.beforeColumn({$grid:d,column:this})}return _createClass(u,[{key:"getTitle",value:function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))}},{key:"getKey",value:function(){return this.field||(this.type?"type=".concat(this.type):null)}},{key:"update",value:function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}]),u}();exports.ColumnInfo=ColumnInfo;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_formats=require("../../v-x-e-table/src/formats"),_util=require("./util"),_utils=require("../../tools/utils"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _classCallCheck(e,r){if(!(e instanceof r))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,r){for(var t=0;t<r.length;t++){var o=r[t];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function _createClass(e,r,t){return r&&_defineProperties(e.prototype,r),t&&_defineProperties(e,t),Object.defineProperty(e,"prototype",{writable:!1}),e}var ColumnInfo=function(){function u(e,r){var t,o=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},l=o.renderHeader,i=o.renderCell,n=o.renderFooter,o=o.renderData,d=(_classCallCheck(this,u),e.$xegrid),s=d?d.proxyOpts:null,a=r.formatter,f=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(t=["seq","checkbox","radio","expand","html"],r.type&&-1===t.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type=".concat(r.type),t.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render=".concat(r.cellRender),"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render=".concat(r.editRender),"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&e.treeConfig&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),a)&&(_xeUtils.default.isString(a)?(t=_formats.formats.get(a)||_xeUtils.default[a])&&_xeUtils.default.isFunction(t.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a]):!_xeUtils.default.isArray(a)||(e=_formats.formats.get(a[0])||_xeUtils.default[a[0]])&&_xeUtils.default.isFunction(e.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:a,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:f,halfVisible:!1,defaultVisible:f,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,customOrder:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:l||r.renderHeader,renderCell:i||r.renderCell,renderFooter:n||r.renderFooter,renderData:o,slots:r.slots}),s&&s.beforeColumn&&s.beforeColumn({$grid:d,column:this})}return _createClass(u,[{key:"getTitle",value:function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))}},{key:"getKey",value:function(){return this.field||(this.type?"type=".concat(this.type):null)}},{key:"update",value:function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}]),u}();exports.ColumnInfo=ColumnInfo;

package/lib/table/src/methods.js

@@ -446,26 +446,26 @@ var Methods = {
           if (!treeOpts.parentField) {
             (0, _log.errLog)('vxe.error.reqProp', ['table.tree-config.parentField']);
           }
-          if (!treeOpts.children) {
-            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.children']);
+          if (!(treeOpts.childrenField || treeOpts.children)) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
           }
-          if (!treeOpts.mapChildren) {
-            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildren']);
+          if (!treeOpts.mapChildrenField) {
+            (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
           }
-          if (treeOpts.children === treeOpts.mapChildren) {
-            (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
+          if ((treeOpts.treeOpts || treeOpts.children) === treeOpts.mapChildrenField) {
+            (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
           }
           fullData.forEach(function (row) {
-            if (row[treeOpts.children] && row[treeOpts.children].length) {
-              (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.children)]);
+            if (row[treeOpts.childrenField || treeOpts.children] && row[treeOpts.childrenField || treeOpts.children].length) {
+              (0, _log.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.childrenField || treeOpts.children)]);
             }
           });
         }
         treeData = _xeUtils["default"].toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
-          children: treeOpts.children,
-          mapChildren: treeOpts.mapChildren
+          children: treeOpts.childrenField || treeOpts.children,
+          mapChildren: treeOpts.mapChildrenField
         });
         fullData = treeData.slice(0);
       } else {
@@ -701,8 +701,8 @@ var Methods = {
         rowid = getRowUniqueId();
         _xeUtils["default"].set(row, rowkey, rowid);
       }
-      if (isLazy && row[treeOpts.hasChild] && _xeUtils["default"].isUndefined(row[treeOpts.children])) {
-        row[treeOpts.children] = null;
+      if (isLazy && row[treeOpts.hasChildField || treeOpts.hasChild] && _xeUtils["default"].isUndefined(row[treeOpts.childrenField || treeOpts.children])) {
+        row[treeOpts.childrenField || treeOpts.children] = null;
       }
       var rest = {
         row: row,
@@ -771,8 +771,9 @@ var Methods = {
       fullAllDataRowMap = this.fullAllDataRowMap,
       fullAllDataRowIdData = this.fullAllDataRowIdData;
     var transform = treeOpts.transform,
+      childrenField = treeOpts.childrenField,
       children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
     var rest = fullAllDataRowIdData[(0, _util.getRowid)(this, row)];
     var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
@@ -782,7 +783,7 @@ var Methods = {
           return rowid === (0, _util.getRowid)(_this12, item);
         }, treeOpts);
         if (matchObj) {
-          matchObj.item[children] = _xeUtils["default"].clone(rows, true);
+          matchObj.item[childrenField || children] = _xeUtils["default"].clone(rows, true);
         }
       }
       _xeUtils["default"].eachTree(rows, function (childRow, index, items, path, parent, nodes) {
@@ -803,9 +804,9 @@ var Methods = {
         fullAllDataRowIdData[rowid] = rest;
         fullAllDataRowMap.set(childRow, rest);
       }, treeOpts);
-      row[children] = rows;
+      row[childrenField || children] = rows;
       if (transform) {
-        row[mapChildren] = rows;
+        row[mapChildrenField] = rows;
       }
       _this12.updateAfterDataIndex();
       return rows;
@@ -1119,8 +1120,8 @@ var Methods = {
           _xeUtils["default"].set(record, key, null);
         }
       });
-      if (treeConfig && treeOpts.lazy && _xeUtils["default"].isUndefined(record[treeOpts.children])) {
-        record[treeOpts.children] = null;
+      if (treeConfig && treeOpts.lazy && _xeUtils["default"].isUndefined(record[treeOpts.childrenField || treeOpts.children])) {
+        record[treeOpts.childrenField || treeOpts.children] = null;
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if ((0, _utils.eqEmptyValue)(_xeUtils["default"].get(record, rowkey))) {
@@ -1339,8 +1340,9 @@ var Methods = {
       tableFullTreeData = this.tableFullTreeData,
       afterTreeFullData = this.afterTreeFullData;
     var transform = treeOpts.transform,
+      childrenField = treeOpts.childrenField,
       children = treeOpts.children,
-      mapChildren = treeOpts.mapChildren;
+      mapChildrenField = treeOpts.mapChildrenField;
     var checkField = checkboxOpts.checkField;
     var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
@@ -1349,7 +1351,7 @@ var Methods = {
         rowList = _xeUtils["default"].filterTree(currTableData, function (row) {
           return _xeUtils["default"].get(row, checkField);
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField || children
         });
       } else {
         rowList = currTableData.filter(function (row) {
@@ -1362,7 +1364,7 @@ var Methods = {
         rowList = _xeUtils["default"].filterTree(currTableData, function (row) {
           return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
         }, {
-          children: transform ? mapChildren : children
+          children: transform ? mapChildrenField : childrenField || children
         });
       } else {
         rowList = currTableData.filter(function (row) {
@@ -1391,7 +1393,7 @@ var Methods = {
           fullData.push(row);
         }
       }, {
-        children: treeOpts.mapChildren
+        children: treeOpts.mapChildrenField
       });
       this.afterFullData = fullData;
       this.updateScrollYStatus(fullData);
@@ -1642,7 +1644,7 @@ var Methods = {
           fullDataRowIdData[rowid] = rest;
         }
       }, {
-        children: treeOpts.transform ? treeOpts.mapChildren : treeOpts.children
+        children: treeOpts.transform ? treeOpts.mapChildrenField : treeOpts.childrenField || treeOpts.children
       });
     } else {
       afterFullData.forEach(function (row, index) {
@@ -4983,8 +4985,9 @@ var Methods = {
       treeLazyLoadeds = this.treeLazyLoadeds;
     var transform = treeOpts.transform,
       lazy = treeOpts.lazy,
+      hasChildField = treeOpts.hasChildField,
       hasChild = treeOpts.hasChild;
-    if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
+    if (lazy && row[hasChildField || hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
         return _this47.handleAsyncTreeExpandChilds(row);
       }).then(function () {
@@ -5125,10 +5128,11 @@ var Methods = {
     var tableFullData = this.tableFullData,
       treeOpts = this.treeOpts;
     var lazy = treeOpts.lazy,
+      childrenField = treeOpts.childrenField,
       children = treeOpts.children;
     var expandeds = [];
     _xeUtils["default"].eachTree(tableFullData, function (row) {
-      var rowChildren = row[children];
+      var rowChildren = row[childrenField || children];
       if (lazy || rowChildren && rowChildren.length) {
         expandeds.push(row);
       }
@@ -5151,7 +5155,9 @@ var Methods = {
       treeNodeColumn = this.treeNodeColumn;
     var reserve = treeOpts.reserve,
       lazy = treeOpts.lazy,
+      hasChildField = treeOpts.hasChildField,
       hasChild = treeOpts.hasChild,
+      childrenField = treeOpts.childrenField,
       children = treeOpts.children,
       accordion = treeOpts.accordion,
       toggleMethod = treeOpts.toggleMethod;
@@ -5183,12 +5189,12 @@ var Methods = {
       validRows.forEach(function (row) {
         if (treeExpandeds.indexOf(row) === -1) {
           var rest = fullAllDataRowMap.get(row);
-          var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
+          var isLoad = lazy && row[hasChildField || hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
           // 是否使用懒加载
           if (isLoad) {
             result.push(_this49.handleAsyncTreeExpandChilds(row));
           } else {
-            if (row[children] && row[children].length) {
+            if (row[childrenField || children] && row[childrenField || children].length) {
               treeExpandeds.push(row);
             }
           }
@@ -5874,10 +5880,10 @@ var Methods = {
       };
       if (_xeUtils["default"].isString(formatter)) {
         var gFormatOpts = _formats.formats.get(formatter);
-        cellLabel = gFormatOpts && gFormatOpts.formatMethod ? gFormatOpts.formatMethod(formatParams) : '';
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
       } else if (_xeUtils["default"].isArray(formatter)) {
         var _gFormatOpts = _formats.formats.get(formatter[0]);
-        cellLabel = _gFormatOpts && _gFormatOpts.formatMethod ? _gFormatOpts.formatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
       } else {
         cellLabel = formatter(formatParams);
       }