vxe-table 3.7.8 → 3.7.9-beta.1

package/lib/table/src/body.js

@@ -15,6 +15,8 @@ var _vn = require("../../tools/vn");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _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."); }
@@ -107,7 +109,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
     align = column.align,
     showOverflow = column.showOverflow,
     className = column.className,
-    treeNode = column.treeNode;
+    treeNode = column.treeNode,
+    slots = column.slots;
   var actived = editStore.actived;
   var scrollYRHeight = sYOpts.rHeight;
   var rowHeight = rowOpts.height;
@@ -285,12 +288,15 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       }
     }, column.renderCell(h, params))]));
     if (showValidTip && errorValidItem) {
+      var errRule = errorValidItem.rule;
+      var validSlot = slots ? slots.valid : null;
+      var validParams = _objectSpread(_objectSpread({}, params), errorValidItem);
       tdVNs.push(h('div', {
-        class: 'vxe-cell--valid-error-hint',
-        style: errorValidItem.rule && errorValidItem.rule.maxWidth ? {
-          width: "".concat(errorValidItem.rule.maxWidth, "px")
+        class: ['vxe-cell--valid-error-hint', _utils.default.getClass(validOpts.className, errorValidItem)],
+        style: errRule && errRule.maxWidth ? {
+          width: "".concat(errRule.maxWidth, "px")
         } : null
-      }, [h('span', {
+      }, validSlot ? $xetable.callSlot(validSlot, validParams, h) : [h('span', {
         class: 'vxe-cell--valid-error-msg'
       }, errorValidItem.content)]));
     }

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

package/lib/table/src/methods.js

@@ -807,6 +807,7 @@ var Methods = {
       }
       _xeUtils.default.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
         var rowid = (0, _util.getRowid)(_this12, childRow);
+        var parentRow = parent || row;
         var rest = {
           row: childRow,
           rowid: rowid,
@@ -815,7 +816,7 @@ var Methods = {
           _index: -1,
           $index: -1,
           items: items,
-          parent: parent,
+          parent: parentRow,
           level: parentLevel + nodes.length
         };
         fullDataRowIdData[rowid] = rest;
@@ -1710,7 +1711,8 @@ var Methods = {
         rowid = (0, _util.getRowid)(this, rowOrRowid);
       }
       if (rowid) {
-        return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null;
+        var rest = fullDataRowIdData[rowid];
+        return rest ? rest.parent : null;
       }
     }
     return null;
@@ -1738,12 +1740,14 @@ var Methods = {
    * 如果存在排序，继续处理
    */
   getTableData: function getTableData() {
-    var tableFullData = this.tableFullData,
+    var treeConfig = this.treeConfig,
+      tableFullData = this.tableFullData,
       afterFullData = this.afterFullData,
       tableData = this.tableData,
-      footerTableData = this.footerTableData;
+      footerTableData = this.footerTableData,
+      tableFullTreeData = this.tableFullTreeData;
     return {
-      fullData: tableFullData.slice(0),
+      fullData: treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0),
       visibleData: afterFullData.slice(0),
       tableData: tableData.slice(0),
       footerData: footerTableData.slice(0)
@@ -1791,9 +1795,22 @@ var Methods = {
    * 设置为固定列
    */
   setColumnFixed: function setColumnFixed(fieldOrColumn, fixed) {
+    var isMaxFixedColumn = this.isMaxFixedColumn,
+      columnOpts = this.columnOpts;
+    var maxFixedSize = columnOpts.maxFixedSize;
     var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
     var targetColumn = (0, _util.getRootColumn)(this, column);
     if (targetColumn && targetColumn.fixed !== fixed) {
+      // 是否超过最大固定列数量
+      if (!targetColumn.fixed && isMaxFixedColumn) {
+        if (_vXETable.default.modal) {
+          _vXETable.default.modal.message({
+            status: 'error',
+            content: _conf.default.i18n('vxe.table.maxFixedCol', [maxFixedSize])
+          });
+        }
+        return this.$nextTick();
+      }
       _xeUtils.default.eachTree([targetColumn], function (column) {
         column.fixed = fixed;
       });
@@ -2218,12 +2235,12 @@ var Methods = {
     });
     if (scrollXLoad) {
       if (process.env.NODE_ENV === 'development') {
-        if (this.showHeader && !this.showHeaderOverflow) {
-          (0, _log.warnLog)('vxe.error.reqProp', ['show-header-overflow']);
-        }
-        if (this.showFooter && !this.showFooterOverflow) {
-          (0, _log.warnLog)('vxe.error.reqProp', ['show-footer-overflow']);
-        }
+        // if (this.showHeader && !this.showHeaderOverflow) {
+        //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+        // }
+        // if (this.showFooter && !this.showFooterOverflow) {
+        //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+        // }
         if (this.spanMethod) {
           (0, _log.warnLog)('vxe.error.scrollErrProp', ['span-method']);
         }