vxe-table 3.5.9-beta.4 → 3.5.9-beta.7

package/lib/table/src/body.js

@@ -294,7 +294,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
 
 
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
-    isDirty = $xetable.isUpdateByRow(row, column.property);
+    isDirty = $xetable.isUpdateByRow(row, column.field);
   }
 
   var tdVNs = [];

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"));function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var l=new WeakMap,t=new WeakMap;return(_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){if(e){if("string"==typeof e)return _arrayLikeToArray(e,l);var t=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(t="Object"===t&&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,d=n.treeNode,u=s[(0,_util.getRowid)(t,o)],n=0,s=0,o=[];return u&&(n=u.level,s=u._index,o=u.items),c&&c.line?t.callSlot(c.line,r,e):a&&d&&i.line?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:"".concat((0,_util.calcTreeLine)(r,o,s),"px"),left:"".concat(n*i.indent+(n?2-(0,_util.getOffsetSize)(t):0)+16,"px")}})])]:[]}function renderColumn(e,l,t,r,o,n,i,a,s,c,d,u,p,f,y){var h,g=t.$listeners,v=t.afterFullData,m=t.tableData,w=t.height,b=t.columnKey,x=t.overflowX,_=t.sYOpts,T=t.scrollXLoad,S=t.scrollYLoad,O=t.highlightCurrentRow,C=t.showOverflow,L=t.isAllOverflow,$=t.align,R=t.currentColumn,k=t.cellClassName,I=t.cellStyle,H=t.mergeList,E=t.spanMethod,A=t.radioOpts,Y=t.checkboxOpts,P=t.expandOpts,W=t.treeOpts,D=t.tooltipOpts,M=t.mouseConfig,q=t.editConfig,B=t.editOpts,j=t.editRules,U=t.validOpts,X=t.editStore,N=t.validStore,z=t.tooltipConfig,F=t.rowOpts,K=t.columnOpts,V=u.type,G=u.cellRender,J=u.editRender,Q=u.align,Z=u.showOverflow,ee=u.className,le=u.treeNode,te=X.actived,re=_.rHeight,oe=F.height,ne=D.showAll||D.enabled,ie=t.getColumnIndex(u),ae=t.getVTColumnIndex(u),X=(0,_utils.isEnableConf)(J),_=n?u.fixed!==n:u.fixed&&x,D=_xeUtils.default.isUndefined(Z)||_xeUtils.default.isNull(Z)?C:Z,x="ellipsis"===D,se="title"===D,ce=!0===D||"tooltip"===D,Z=se||ce||x,D={},Q=Q||$,$=N.row===a&&N.column===u,j=j&&U.showMessage&&("default"===U.message?w||1<m.length:"inline"===U.message),w={colid:u.id},de=g["cell-mouseenter"],ue=g["cell-mouseleave"],U=J&&q&&"dblclick"===B.trigger,pe={$table:t,seq:r,rowid:o,row:a,rowIndex:s,$rowIndex:c,_rowIndex:d,column:u,columnIndex:ie,$columnIndex:p,_columnIndex:ae,fixed:n,type:renderType,isHidden:_,level:i,visibleData:v,data:m,items:y};if(!T&&!S||Z||(x=Z=!0),(se||ce||ne||de||z)&&(D.mouseenter=function(e){isOperateMouse(t)||(se?_dom.default.updateCellTitle(e.currentTarget,u):(ce||ne)&&t.triggerBodyTooltipEvent(e,pe),de&&t.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},pe),e))}),(ce||ne||ue||z)&&(D.mouseleave=function(e){isOperateMouse(t)||((ce||ne)&&t.handleTargetLeaveEvent(e),ue&&t.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},pe),e))}),(Y.range||M)&&(D.mousedown=function(e){t.triggerCellMousedownEvent(e,pe)}),(F.isCurrent||O||g["cell-click"]||J&&q||"row"===P.trigger||"cell"===P.trigger||"row"===A.trigger||"radio"===u.type&&"cell"===A.trigger||"row"===Y.trigger||"checkbox"===u.type&&"cell"===Y.trigger||"row"===W.trigger||u.treeNode&&"cell"===W.trigger)&&(D.click=function(e){t.triggerCellClickEvent(e,pe)}),(U||g["cell-dblclick"])&&(D.dblclick=function(e){t.triggerCellDblclickEvent(e,pe)}),H.length){d=(0,_util.mergeBodyMethod)(H,d,ae);if(d){var ae=d.rowspan,fe=d.colspan;if(!ae||!fe)return null;1<ae&&(w.rowspan=ae),1<fe&&(w.colspan=fe)}}else if(E){fe=E(pe)||{},E=fe.rowspan,E=void 0===E?1:E,fe=fe.colspan,fe=void 0===fe?1:fe;if(!E||!fe)return null;1<E&&(w.rowspan=E),1<fe&&(w.colspan=fe)}!(_=_&&H&&(1<w.colspan||1<w.rowspan)?!1:_)&&q&&(J||G)&&(B.showStatus||B.showUpdateStatus)&&(h=t.isUpdateByRow(a,u.property));G=[];return _&&C&&L?G.push(e("div",{class:["vxe-cell",{"c--title":se,"c--tooltip":ce,"c--ellipsis":x}],style:{maxHeight:Z&&(re||oe)?"".concat(re||oe,"px"):""}})):(G.push.apply(G,_toConsumableArray(renderLine(e,l,t,pe)).concat([e("div",{class:["vxe-cell",{"c--title":se,"c--tooltip":ce,"c--ellipsis":x}],style:{maxHeight:Z&&(re||oe)?"".concat(re||oe,"px"):""},attrs:{title:se?t.getCellLabel(a,u):null}},u.renderCell(e,pe))])),j&&$&&G.push(e("div",{class:"vxe-cell--valid",style:N.rule&&N.rule.maxWidth?{width:"".concat(N.rule.maxWidth,"px")}:null},[e("span",{class:"vxe-cell--valid-msg"},N.content)]))),e("td",{class:["vxe-body--column",u.id,(_defineProperty(e={},"col--".concat(Q),Q),_defineProperty(e,"col--".concat(V),V),_defineProperty(e,"col--last",p===f.length-1),_defineProperty(e,"col--tree-node",le),_defineProperty(e,"col--edit",X),_defineProperty(e,"col--ellipsis",Z),_defineProperty(e,"fixed--hidden",_),_defineProperty(e,"col--dirty",h),_defineProperty(e,"col--actived",q&&X&&te.row===a&&(te.column===u||"row"===B.mode)),_defineProperty(e,"col--valid-error",$),_defineProperty(e,"col--current",R===u),e),_utils.default.getClass(ee,pe),_utils.default.getClass(k,pe)],key:b||K.useKey?u.id:p,attrs:w,style:Object.assign({height:Z&&(re||oe)?"".concat(re||oe,"px"):""},I?_xeUtils.default.isFunction(I)?I(pe):I:null),on:D},G)}function renderRows(y,h,g,v,m,w){var b=g.stripe,x=g.rowKey,_=g.highlightHoverRow,T=g.rowClassName,S=g.rowStyle,O=g.editConfig,C=g.showOverflow,L=g.treeConfig,$=g.treeOpts,R=g.editOpts,k=g.treeExpandeds,I=g.scrollYLoad,H=g.editStore,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={},o=g.getVTRowIndex(t),n=g.getRowIndex(t);(M.isHover||_)&&(e.mouseenter=function(e){isOperateMouse(g)||g.triggerHoverEvent(e,{row:t,rowIndex:n})},e.mouseleave=function(){isOperateMouse(g)||g.clearHoverRow()});var l,i=(0,_util.getRowid)(g,t),a=D[i],s=a?a.level:0,c=a?a.seq:-1,d={$table:g,seq:c,rowid:i,fixed:v,type:renderType,level:s,row:t,rowIndex:n,$rowIndex:r},u=P&&E.length&&-1<E.indexOf(t),p=!1,f=[],a=!1;O&&(a=-1<H.insertList.indexOf(t)),L&&!I&&!$.transform&&k.length&&(p=(f=t[$.children])&&f.length&&-1<k.indexOf(t)),q.push(y("tr",{class:["vxe-body--row",L?"row--level-".concat(s):"",{"row--stripe":b&&(g.getVTRowIndex(t)+1)%2==0,"is--new":a,"is--expand-row":u,"is--expand-tree":p,"row--new":a&&(R.showStatus||R.showInsertStatus),"row--radio":A.highlight&&g.selectRow===t,"row--checked":Y.highlight&&g.isCheckedByCheckboxRow(t)},T?_xeUtils.default.isFunction(T)?T(d):T:""],attrs:{rowid:i},style:S?_xeUtils.default.isFunction(S)?S(d):S:null,key:x||M.useKey||L?i:r,on:e},w.map(function(e,l){return renderColumn(y,h,g,c,i,v,s,t,n,r,o,e,l,w,m)}))),u&&(L&&(l={paddingLeft:"".concat(s*$.indent+30,"px")}),d=P.showOverflow,u=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?C:d,d={$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(d):S:null,on:e},[y("td",{class:["vxe-body--expanded-column",{"fixed--hidden":v&&!W,"col--ellipsis":u}],attrs:{colspan:w.length}},[y("div",{class:"vxe-body--expanded-cell",style:l},[P.renderData(y,d)])])]))),p&&q.push.apply(q,_toConsumableArray(renderRows(y,h,g,v,f,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.showOverflow,u=l.keyboardConfig,p=l.keyboardOpts,f=l.mergeList,y=l.spanMethod,h=l.scrollXLoad,g=l.scrollYLoad,v=l.isAllOverflow,m=l.emptyOpts,w=l.mouseConfig,b=l.mouseOpts,x=l.sYOpts;return o&&(s=!(h||g||d&&v)||f.length||y||u&&p.isMerge?c:r),m=n.empty?n.empty.call(this,{$table:l},t):(n=(n=m.name?_vXETable.default.renderer.get(m.name):null)?n.renderEmpty:null)?n.call(this,t,m,{$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:g&&"wheel"===x.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"}),w&&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"},m)])])},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,v=o.validTip,m=p?p.$el:null,o=g?g.$el:null,p=f.$el,g=y?y.$el:null,f=h?h.$el:null,y=n["main-body-ySpace"],h=n["main-body-xSpace"],n=(s&&y?y:p).clientHeight,y=(a&&h?h:p).clientWidth,h=l.scrollTop,l=p.scrollLeft,d=l!==d,c=h!==c;t.lastScrollTop=h,t.lastScrollLeft=l,t.lastScrollTime=Date.now(),(u.isHover||i)&&t.clearHoverRow(),g&&"left"===r?syncBodyScroll(t,r,h=g.scrollTop,p,f):f&&"right"===r?syncBodyScroll(t,r,h=f.scrollTop,p,g):(d&&(m&&(m.scrollLeft=p.scrollLeft),o&&(o.scrollLeft=p.scrollLeft)),(g||f)&&(t.checkScrolling(),c&&syncBodyScroll(t,r,h,g,f))),a&&d&&t.triggerScrollXEvent(e),s&&c&&t.triggerScrollYEvent(e),d&&v&&v.visible&&v.updatePlacement(),t.emitEvent("scroll",{type:renderType,fixed:r,scrollTop:h,scrollLeft:l,scrollHeight:p.scrollHeight,scrollWidth:p.scrollWidth,bodyHeight:n,bodyWidth:y,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,i=this.isPrevWheelTop===s?Math.max(0,this.wheelYSize-this.wheelYTotal):0,l=t["main-body-ySpace"],t=t["main-body-xSpace"],g=(r&&l?l:f).clientHeight,v=(o&&t?t:f).clientWidth;this.isPrevWheelTop=s,this.wheelYSize=Math.abs(s?e-i:e+i),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),t=f.scrollTop,l=f.clientHeight,n=f.scrollHeight,f.scrollTop=t=t+i*(s?-1:1),y&&(y.scrollTop=t),h&&(h.scrollTop=t),(s?t<n-l:0<=t)&&(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,u=n.tableBody.$el,n=l,l=n<0;(l?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+n,c=(t=u.scrollLeft+t)!==c,(s=r!==s)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=t,o.lastScrollTime=Date.now(),(d.isHover||i)&&o.clearHoverRow(),this.handleWheel(e,l,n,c,s),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"));function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var l=new WeakMap,t=new WeakMap;return(_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){if(e){if("string"==typeof e)return _arrayLikeToArray(e,l);var t=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(t="Object"===t&&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,d=n.treeNode,u=s[(0,_util.getRowid)(t,o)],n=0,s=0,o=[];return u&&(n=u.level,s=u._index,o=u.items),c&&c.line?t.callSlot(c.line,r,e):a&&d&&i.line?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:"".concat((0,_util.calcTreeLine)(r,o,s),"px"),left:"".concat(n*i.indent+(n?2-(0,_util.getOffsetSize)(t):0)+16,"px")}})])]:[]}function renderColumn(e,l,t,r,o,n,i,a,s,c,d,u,p,f,y){var h,g=t.$listeners,v=t.afterFullData,m=t.tableData,w=t.height,b=t.columnKey,x=t.overflowX,_=t.sYOpts,T=t.scrollXLoad,S=t.scrollYLoad,O=t.highlightCurrentRow,C=t.showOverflow,L=t.isAllOverflow,$=t.align,R=t.currentColumn,k=t.cellClassName,I=t.cellStyle,H=t.mergeList,E=t.spanMethod,A=t.radioOpts,Y=t.checkboxOpts,P=t.expandOpts,W=t.treeOpts,D=t.tooltipOpts,M=t.mouseConfig,q=t.editConfig,B=t.editOpts,j=t.editRules,U=t.validOpts,X=t.editStore,N=t.validStore,z=t.tooltipConfig,F=t.rowOpts,K=t.columnOpts,V=u.type,G=u.cellRender,J=u.editRender,Q=u.align,Z=u.showOverflow,ee=u.className,le=u.treeNode,te=X.actived,re=_.rHeight,oe=F.height,ne=D.showAll||D.enabled,ie=t.getColumnIndex(u),ae=t.getVTColumnIndex(u),X=(0,_utils.isEnableConf)(J),_=n?u.fixed!==n:u.fixed&&x,D=_xeUtils.default.isUndefined(Z)||_xeUtils.default.isNull(Z)?C:Z,x="ellipsis"===D,se="title"===D,ce=!0===D||"tooltip"===D,Z=se||ce||x,D={},Q=Q||$,$=N.row===a&&N.column===u,j=j&&U.showMessage&&("default"===U.message?w||1<m.length:"inline"===U.message),w={colid:u.id},de=g["cell-mouseenter"],ue=g["cell-mouseleave"],U=J&&q&&"dblclick"===B.trigger,pe={$table:t,seq:r,rowid:o,row:a,rowIndex:s,$rowIndex:c,_rowIndex:d,column:u,columnIndex:ie,$columnIndex:p,_columnIndex:ae,fixed:n,type:renderType,isHidden:_,level:i,visibleData:v,data:m,items:y};if(!T&&!S||Z||(x=Z=!0),(se||ce||ne||de||z)&&(D.mouseenter=function(e){isOperateMouse(t)||(se?_dom.default.updateCellTitle(e.currentTarget,u):(ce||ne)&&t.triggerBodyTooltipEvent(e,pe),de&&t.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},pe),e))}),(ce||ne||ue||z)&&(D.mouseleave=function(e){isOperateMouse(t)||((ce||ne)&&t.handleTargetLeaveEvent(e),ue&&t.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},pe),e))}),(Y.range||M)&&(D.mousedown=function(e){t.triggerCellMousedownEvent(e,pe)}),(F.isCurrent||O||g["cell-click"]||J&&q||"row"===P.trigger||"cell"===P.trigger||"row"===A.trigger||"radio"===u.type&&"cell"===A.trigger||"row"===Y.trigger||"checkbox"===u.type&&"cell"===Y.trigger||"row"===W.trigger||u.treeNode&&"cell"===W.trigger)&&(D.click=function(e){t.triggerCellClickEvent(e,pe)}),(U||g["cell-dblclick"])&&(D.dblclick=function(e){t.triggerCellDblclickEvent(e,pe)}),H.length){d=(0,_util.mergeBodyMethod)(H,d,ae);if(d){var ae=d.rowspan,fe=d.colspan;if(!ae||!fe)return null;1<ae&&(w.rowspan=ae),1<fe&&(w.colspan=fe)}}else if(E){fe=E(pe)||{},E=fe.rowspan,E=void 0===E?1:E,fe=fe.colspan,fe=void 0===fe?1:fe;if(!E||!fe)return null;1<E&&(w.rowspan=E),1<fe&&(w.colspan=fe)}!(_=_&&H&&(1<w.colspan||1<w.rowspan)?!1:_)&&q&&(J||G)&&(B.showStatus||B.showUpdateStatus)&&(h=t.isUpdateByRow(a,u.field));G=[];return _&&C&&L?G.push(e("div",{class:["vxe-cell",{"c--title":se,"c--tooltip":ce,"c--ellipsis":x}],style:{maxHeight:Z&&(re||oe)?"".concat(re||oe,"px"):""}})):(G.push.apply(G,_toConsumableArray(renderLine(e,l,t,pe)).concat([e("div",{class:["vxe-cell",{"c--title":se,"c--tooltip":ce,"c--ellipsis":x}],style:{maxHeight:Z&&(re||oe)?"".concat(re||oe,"px"):""},attrs:{title:se?t.getCellLabel(a,u):null}},u.renderCell(e,pe))])),j&&$&&G.push(e("div",{class:"vxe-cell--valid",style:N.rule&&N.rule.maxWidth?{width:"".concat(N.rule.maxWidth,"px")}:null},[e("span",{class:"vxe-cell--valid-msg"},N.content)]))),e("td",{class:["vxe-body--column",u.id,(_defineProperty(e={},"col--".concat(Q),Q),_defineProperty(e,"col--".concat(V),V),_defineProperty(e,"col--last",p===f.length-1),_defineProperty(e,"col--tree-node",le),_defineProperty(e,"col--edit",X),_defineProperty(e,"col--ellipsis",Z),_defineProperty(e,"fixed--hidden",_),_defineProperty(e,"col--dirty",h),_defineProperty(e,"col--actived",q&&X&&te.row===a&&(te.column===u||"row"===B.mode)),_defineProperty(e,"col--valid-error",$),_defineProperty(e,"col--current",R===u),e),_utils.default.getClass(ee,pe),_utils.default.getClass(k,pe)],key:b||K.useKey?u.id:p,attrs:w,style:Object.assign({height:Z&&(re||oe)?"".concat(re||oe,"px"):""},I?_xeUtils.default.isFunction(I)?I(pe):I:null),on:D},G)}function renderRows(y,h,g,v,m,w){var b=g.stripe,x=g.rowKey,_=g.highlightHoverRow,T=g.rowClassName,S=g.rowStyle,O=g.editConfig,C=g.showOverflow,L=g.treeConfig,$=g.treeOpts,R=g.editOpts,k=g.treeExpandeds,I=g.scrollYLoad,H=g.editStore,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={},o=g.getVTRowIndex(t),n=g.getRowIndex(t);(M.isHover||_)&&(e.mouseenter=function(e){isOperateMouse(g)||g.triggerHoverEvent(e,{row:t,rowIndex:n})},e.mouseleave=function(){isOperateMouse(g)||g.clearHoverRow()});var l,i=(0,_util.getRowid)(g,t),a=D[i],s=a?a.level:0,c=a?a.seq:-1,d={$table:g,seq:c,rowid:i,fixed:v,type:renderType,level:s,row:t,rowIndex:n,$rowIndex:r},u=P&&E.length&&-1<E.indexOf(t),p=!1,f=[],a=!1;O&&(a=-1<H.insertList.indexOf(t)),L&&!I&&!$.transform&&k.length&&(p=(f=t[$.children])&&f.length&&-1<k.indexOf(t)),q.push(y("tr",{class:["vxe-body--row",L?"row--level-".concat(s):"",{"row--stripe":b&&(g.getVTRowIndex(t)+1)%2==0,"is--new":a,"is--expand-row":u,"is--expand-tree":p,"row--new":a&&(R.showStatus||R.showInsertStatus),"row--radio":A.highlight&&g.selectRow===t,"row--checked":Y.highlight&&g.isCheckedByCheckboxRow(t)},T?_xeUtils.default.isFunction(T)?T(d):T:""],attrs:{rowid:i},style:S?_xeUtils.default.isFunction(S)?S(d):S:null,key:x||M.useKey||L?i:r,on:e},w.map(function(e,l){return renderColumn(y,h,g,c,i,v,s,t,n,r,o,e,l,w,m)}))),u&&(L&&(l={paddingLeft:"".concat(s*$.indent+30,"px")}),d=P.showOverflow,u=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?C:d,d={$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(d):S:null,on:e},[y("td",{class:["vxe-body--expanded-column",{"fixed--hidden":v&&!W,"col--ellipsis":u}],attrs:{colspan:w.length}},[y("div",{class:"vxe-body--expanded-cell",style:l},[P.renderData(y,d)])])]))),p&&q.push.apply(q,_toConsumableArray(renderRows(y,h,g,v,f,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.showOverflow,u=l.keyboardConfig,p=l.keyboardOpts,f=l.mergeList,y=l.spanMethod,h=l.scrollXLoad,g=l.scrollYLoad,v=l.isAllOverflow,m=l.emptyOpts,w=l.mouseConfig,b=l.mouseOpts,x=l.sYOpts;return o&&(s=!(h||g||d&&v)||f.length||y||u&&p.isMerge?c:r),m=n.empty?n.empty.call(this,{$table:l},t):(n=(n=m.name?_vXETable.default.renderer.get(m.name):null)?n.renderEmpty:null)?n.call(this,t,m,{$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:g&&"wheel"===x.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"}),w&&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"},m)])])},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,v=o.validTip,m=p?p.$el:null,o=g?g.$el:null,p=f.$el,g=y?y.$el:null,f=h?h.$el:null,y=n["main-body-ySpace"],h=n["main-body-xSpace"],n=(s&&y?y:p).clientHeight,y=(a&&h?h:p).clientWidth,h=l.scrollTop,l=p.scrollLeft,d=l!==d,c=h!==c;t.lastScrollTop=h,t.lastScrollLeft=l,t.lastScrollTime=Date.now(),(u.isHover||i)&&t.clearHoverRow(),g&&"left"===r?syncBodyScroll(t,r,h=g.scrollTop,p,f):f&&"right"===r?syncBodyScroll(t,r,h=f.scrollTop,p,g):(d&&(m&&(m.scrollLeft=p.scrollLeft),o&&(o.scrollLeft=p.scrollLeft)),(g||f)&&(t.checkScrolling(),c&&syncBodyScroll(t,r,h,g,f))),a&&d&&t.triggerScrollXEvent(e),s&&c&&t.triggerScrollYEvent(e),d&&v&&v.visible&&v.updatePlacement(),t.emitEvent("scroll",{type:renderType,fixed:r,scrollTop:h,scrollLeft:l,scrollHeight:p.scrollHeight,scrollWidth:p.scrollWidth,bodyHeight:n,bodyWidth:y,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,i=this.isPrevWheelTop===s?Math.max(0,this.wheelYSize-this.wheelYTotal):0,l=t["main-body-ySpace"],t=t["main-body-xSpace"],g=(r&&l?l:f).clientHeight,v=(o&&t?t:f).clientWidth;this.isPrevWheelTop=s,this.wheelYSize=Math.abs(s?e-i:e+i),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),t=f.scrollTop,l=f.clientHeight,n=f.scrollHeight,f.scrollTop=t=t+i*(s?-1:1),y&&(y.scrollTop=t),h&&(h.scrollTop=t),(s?t<n-l:0<=t)&&(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,u=n.tableBody.$el,n=l,l=n<0;(l?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+n,c=(t=u.scrollLeft+t)!==c,(s=r!==s)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=t,o.lastScrollTime=Date.now(),(d.isHover||i)&&o.clearHoverRow(),this.handleWheel(e,l,n,c,s),a&&o.triggerScrollYEvent(e)))}}};exports.default=_default;

package/lib/table/src/cell.js

@@ -605,7 +605,7 @@ var Cell = {
         treeIndeterminates = $table.treeIndeterminates;
     var _$table$checkboxOpts2 = $table.checkboxOpts,
         labelField = _$table$checkboxOpts2.labelField,
-        property = _$table$checkboxOpts2.checkField,
+        checkField = _$table$checkboxOpts2.checkField,
         halfField = _$table$checkboxOpts2.halfField,
         checkMethod = _$table$checkboxOpts2.checkMethod,
         visibleMethod = _$table$checkboxOpts2.visibleMethod;
@@ -621,7 +621,7 @@ var Cell = {
     var on;
 
     if (!isHidden) {
-      isChecked = _xeUtils.default.get(row, property);
+      isChecked = _xeUtils.default.get(row, checkField);
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
@@ -874,7 +874,7 @@ var Cell = {
     var isRequired = false;
 
     if (editRules) {
-      var columnRules = _xeUtils.default.get(editRules, params.column.property);
+      var columnRules = _xeUtils.default.get(editRules, column.field);
 
       if (columnRules) {
         isRequired = columnRules.some(function (rule) {

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

package/lib/table/src/columnInfo.js

@@ -179,7 +179,7 @@ var ColumnInfo = /*#__PURE__*/function () {
   }, {
     key: "getKey",
     value: function getKey() {
-      return this.property || (this.type ? "type=".concat(this.type) : null);
+      return this.field || (this.type ? "type=".concat(this.type) : null);
     }
   }, {
     key: "update",

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),e}var ColumnInfo=function(){function c(e,r){var t=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},o=t.renderHeader,l=t.renderCell,i=t.renderFooter,n=t.renderData;_classCallCheck(this,c);var s,d=e.$xegrid,a=d?d.proxyOpts:null,f=r.formatter,u=!_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"]),f&&(_xeUtils.default.isString(f)?(s=_formats.formats.get(f)||_xeUtils.default[f],_xeUtils.default.isFunction(s)||(0,_log.errLog)("vxe.error.notFunc",[f])):_xeUtils.default.isArray(f)&&(s=_formats.formats.get(f[0])||_xeUtils.default[f[0]],_xeUtils.default.isFunction(s)||(0,_log.errLog)("vxe.error.notFunc",[f[0]])))),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,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:f,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,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:u,halfVisible:!1,defaultVisible:u,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:o||r.renderHeader,renderCell:l||r.renderCell,renderFooter:i||r.renderFooter,renderData:n,slots:r.slots}),a&&a.beforeColumn&&a.beforeColumn({$grid:d,column:this})}return _createClass(c,[{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.property||(this.type?"type=".concat(this.type):null)}},{key:"update",value:function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}]),c}();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),e}var ColumnInfo=function(){function c(e,r){var t=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{},o=t.renderHeader,l=t.renderCell,i=t.renderFooter,n=t.renderData;_classCallCheck(this,c);var s,d=e.$xegrid,a=d?d.proxyOpts:null,f=r.formatter,u=!_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"]),f&&(_xeUtils.default.isString(f)?(s=_formats.formats.get(f)||_xeUtils.default[f],_xeUtils.default.isFunction(s)||(0,_log.errLog)("vxe.error.notFunc",[f])):_xeUtils.default.isArray(f)&&(s=_formats.formats.get(f[0])||_xeUtils.default[f[0]],_xeUtils.default.isFunction(s)||(0,_log.errLog)("vxe.error.notFunc",[f[0]])))),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,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:f,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,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:u,halfVisible:!1,defaultVisible:u,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:o||r.renderHeader,renderCell:l||r.renderCell,renderFooter:i||r.renderFooter,renderData:n,slots:r.slots}),a&&a.beforeColumn&&a.beforeColumn({$grid:d,column:this})}return _createClass(c,[{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)}}]),c}();exports.ColumnInfo=ColumnInfo;

package/lib/table/src/methods.js

@@ -524,7 +524,9 @@ var Methods = {
         scrollXStore = this.scrollXStore,
         lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop,
-        oldScrollYLoad = this.scrollYLoad;
+        oldScrollYLoad = this.scrollYLoad,
+        sXOpts = this.sXOpts,
+        sYOpts = this.sYOpts;
     var treeData = [];
     var fullData = datas ? datas.slice(0) : [];
 
@@ -636,12 +638,23 @@ var Methods = {
         _this4.$nextTick().then(function () {
           return _this4.recalculate();
         }).then(function () {
-          // 是否变更虚拟滚动
+          var targetScrollLeft = lastScrollLeft;
+          var targetScrollTop = lastScrollTop; // 是否在更新数据之后自动滚动重置滚动条
+
+          if (sXOpts.scrollToLeftOnChange) {
+            targetScrollLeft = 0;
+          }
+
+          if (sYOpts.scrollToTopOnChange) {
+            targetScrollTop = 0;
+          } // 是否变更虚拟滚动
+
+
           if (oldScrollYLoad === sYLoad) {
-            (0, _util.restoreScrollLocation)(_this4, lastScrollLeft, lastScrollTop).then(resolve);
+            (0, _util.restoreScrollLocation)(_this4, targetScrollLeft, targetScrollTop).then(resolve);
           } else {
             setTimeout(function () {
-              return (0, _util.restoreScrollLocation)(_this4, lastScrollLeft, lastScrollTop).then(resolve);
+              return (0, _util.restoreScrollLocation)(_this4, targetScrollLeft, targetScrollTop).then(resolve);
             });
           }
         });
@@ -951,7 +964,7 @@ var Methods = {
 
     var handleFunc = function handleFunc(column, index, items, path, parent) {
       var colid = column.id,
-          property = column.property,
+          field = column.field,
           fixed = column.fixed,
           type = column.type,
           treeNode = column.treeNode;
@@ -963,14 +976,14 @@ var Methods = {
         parent: parent
       };
 
-      if (property) {
+      if (field) {
         if (process.env.NODE_ENV === 'development') {
-          if (fullColumnFieldData[property]) {
-            (0, _log.warnLog)('vxe.error.colRepet', ['field', property]);
+          if (fullColumnFieldData[field]) {
+            (0, _log.warnLog)('vxe.error.colRepet', ['field', field]);
           }
         }
 
-        fullColumnFieldData[property] = rest;
+        fullColumnFieldData[field] = rest;
       }
 
       if (!hasFixed && fixed) {
@@ -1235,10 +1248,10 @@ var Methods = {
         expandOpts = this.expandOpts;
     var rowkey = (0, _util.getRowkey)(this);
     this.tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           editRender = column.editRender;
 
-      if (property && !_xeUtils.default.has(record, property)) {
+      if (field && !_xeUtils.default.has(record, field)) {
         var cellValue = null;
 
         if (editRender) {
@@ -1253,7 +1266,7 @@ var Methods = {
           }
         }
 
-        _xeUtils.default.set(record, property, cellValue);
+        _xeUtils.default.set(record, field, cellValue);
       }
     });
     var otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField];
@@ -1404,7 +1417,7 @@ var Methods = {
     } else {
       rows.forEach(function (row) {
         visibleColumn.forEach(function (column) {
-          if (column.property) {
+          if (column.field) {
             setCellValue(row, column, null);
           }
         });
@@ -1476,7 +1489,7 @@ var Methods = {
         }
 
         for (var index = 0, len = visibleColumn.length; index < len; index++) {
-          property = visibleColumn[index].property;
+          property = visibleColumn[index].field;
 
           if (property && !eqCellValue(oRow, row, property)) {
             return true;
@@ -1550,20 +1563,20 @@ var Methods = {
     var transform = treeOpts.transform,
         children = treeOpts.children,
         mapChildren = treeOpts.mapChildren;
-    var property = checkboxOpts.checkField;
+    var checkField = checkboxOpts.checkField;
     var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
 
-    if (property) {
+    if (checkField) {
       if (treeConfig) {
         rowList = _xeUtils.default.filterTree(currTableData, function (row) {
-          return _xeUtils.default.get(row, property);
+          return _xeUtils.default.get(row, checkField);
         }, {
           children: transform ? mapChildren : children
         });
       } else {
         rowList = currTableData.filter(function (row) {
-          return _xeUtils.default.get(row, property);
+          return _xeUtils.default.get(row, checkField);
         });
       }
     } else {
@@ -1643,7 +1656,7 @@ var Methods = {
     var filterColumns = [];
     var orderColumns = [];
     tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           sortable = column.sortable,
           order = column.order,
           filters = column.filters;
@@ -1670,8 +1683,8 @@ var Methods = {
       if (!allRemoteSort && sortable && order) {
         orderColumns.push({
           column: column,
-          field: column.property,
-          property: property,
+          field: field,
+          property: field,
           order: order,
           sortTime: column.sortTime
         });
@@ -1691,7 +1704,8 @@ var Methods = {
 
           if (valueList.length && !allRemoteFilter) {
             var filterMethod = column.filterMethod,
-                filterRender = column.filterRender;
+                filterRender = column.filterRender,
+                field = column.field;
             var compConf = filterRender ? _vXETable.default.renderer.get(filterRender.name) : null;
             var compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null;
             var defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
@@ -1741,7 +1755,7 @@ var Methods = {
               });
             }
 
-            return valueList.indexOf(_xeUtils.default.get(row, column.property)) > -1;
+            return valueList.indexOf(_xeUtils.default.get(row, field)) > -1;
           }
 
           return true;
@@ -1799,7 +1813,8 @@ var Methods = {
           var _sortRests = allSortMethod({
             data: tableData,
             column: firstOrderColumn.column,
-            property: firstOrderColumn.property,
+            property: firstOrderColumn.field,
+            field: firstOrderColumn.field,
             order: firstOrderColumn.order,
             sortList: orderColumns,
             $table: this
@@ -1940,8 +1955,9 @@ var Methods = {
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键
    */
-  getRowById: function getRowById(rowid) {
+  getRowById: function getRowById(cellValue) {
     var fullDataRowIdData = this.fullDataRowIdData;
+    var rowid = _xeUtils.default.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
     return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
   },
 
@@ -3788,10 +3804,10 @@ var Methods = {
     return this.$nextTick();
   },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
-    var property = this.checkboxOpts.checkField;
+    var checkField = this.checkboxOpts.checkField;
 
-    if (property) {
-      return _xeUtils.default.get(row, property);
+    if (checkField) {
+      return _xeUtils.default.get(row, checkField);
     }
 
     return this.selection.indexOf(row) > -1;
@@ -3814,25 +3830,25 @@ var Methods = {
         treeOpts = this.treeOpts,
         treeIndeterminates = this.treeIndeterminates,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         checkStrictly = checkboxOpts.checkStrictly,
         checkMethod = checkboxOpts.checkMethod;
 
-    if (property) {
+    if (checkField) {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
           if (treeIndeterminates.indexOf(row) === -1) {
             treeIndeterminates.push(row);
           }
 
-          _xeUtils.default.set(row, property, false);
+          _xeUtils.default.set(row, checkField, false);
         } else {
           // 更新子节点状态
           _xeUtils.default.eachTree([row], function (item) {
             if (row === item || !checkMethod || checkMethod({
               row: item
             })) {
-              _xeUtils.default.set(item, property, value);
+              _xeUtils.default.set(item, checkField, value);
 
               _xeUtils.default.remove(treeIndeterminates, function (half) {
                 return half === item;
@@ -3864,7 +3880,7 @@ var Methods = {
             parentStatus = -1;
           } else {
             var selectItems = matchObj.items.filter(function (item) {
-              return _xeUtils.default.get(item, property);
+              return _xeUtils.default.get(item, checkField);
             });
             parentStatus = selectItems.filter(function (item) {
               return vItems.indexOf(item) > -1;
@@ -3879,7 +3895,7 @@ var Methods = {
         if (!checkMethod || checkMethod({
           row: row
         })) {
-          _xeUtils.default.set(row, property, value);
+          _xeUtils.default.set(row, checkField, value);
 
           this.handleCheckboxReserveRow(row, value);
         }
@@ -3975,9 +3991,9 @@ var Methods = {
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
     var selection = this.selection,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField;
+    var checkField = checkboxOpts.checkField;
     var row = params.row;
-    var value = property ? !_xeUtils.default.get(row, property) : selection.indexOf(row) === -1;
+    var value = checkField ? !_xeUtils.default.get(row, checkField) : selection.indexOf(row) === -1;
 
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
@@ -4024,7 +4040,7 @@ var Methods = {
         selection = this.selection,
         checkboxReserveRowMap = this.checkboxReserveRowMap,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         reserve = checkboxOpts.reserve,
         checkStrictly = checkboxOpts.checkStrictly,
         checkMethod = checkboxOpts.checkMethod;
@@ -4040,7 +4056,7 @@ var Methods = {
        * 绑定属性方式（高性能，有污染）
        * 必须在行数据存在对应的属性，否则将不响应
        */
-      if (property) {
+      if (checkField) {
         var checkValFn = function checkValFn(row) {
           if (!checkMethod || checkMethod({
             row: row
@@ -4049,7 +4065,7 @@ var Methods = {
               selectRows.push(row);
             }
 
-            _xeUtils.default.set(row, property, value);
+            _xeUtils.default.set(row, checkField, value);
           }
         }; // 如果存在选中方法
         // 如果方法成立，则更新值，否则忽略该数据
@@ -4138,7 +4154,7 @@ var Methods = {
         }
       }
 
-      this.selection = property ? [] : beforeSelection.concat(selectRows);
+      this.selection = checkField ? [] : beforeSelection.concat(selectRows);
     }
 
     this.treeIndeterminates = [];
@@ -4444,17 +4460,17 @@ var Methods = {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         checkboxOpts = this.checkboxOpts;
-    var property = checkboxOpts.checkField,
+    var checkField = checkboxOpts.checkField,
         reserve = checkboxOpts.reserve;
 
-    if (property) {
+    if (checkField) {
       if (treeConfig) {
         _xeUtils.default.eachTree(tableFullData, function (item) {
-          return _xeUtils.default.set(item, property, false);
+          return _xeUtils.default.set(item, checkField, false);
         }, treeOpts);
       } else {
         tableFullData.forEach(function (item) {
-          return _xeUtils.default.set(item, property, false);
+          return _xeUtils.default.set(item, checkField, false);
         });
       }
     }
@@ -4934,21 +4950,24 @@ var Methods = {
    */
   triggerSortEvent: function triggerSortEvent(evnt, column, order) {
     var sortOpts = this.sortOpts;
-    var property = column.property;
+    var field = column.field,
+        sortable = column.sortable,
+        remoteSort = column.remoteSort;
 
-    if (column.sortable || column.remoteSort) {
+    if (sortable || remoteSort) {
       if (!order || column.order === order) {
         this.clearSort(sortOpts.multiple ? column : null);
       } else {
         this.sort({
-          field: property,
+          field: field,
           order: order
         });
       }
 
       var params = {
         column: column,
-        property: property,
+        field: field,
+        property: field,
         order: column.order,
         sortList: this.getSortColumns()
       };
@@ -5067,14 +5086,14 @@ var Methods = {
         chronological = _this$sortOpts.chronological;
     var sortList = [];
     this.tableFullColumn.forEach(function (column) {
-      var property = column.property,
+      var field = column.field,
           order = column.order;
 
       if ((column.sortable || column.remoteSort) && order) {
         sortList.push({
           column: column,
-          field: column.property,
-          property: property,
+          field: field,
+          property: field,
           order: order,
           sortTime: column.sortTime
         });
@@ -5106,7 +5125,8 @@ var Methods = {
     if (visible) {
       this.emitEvent('filter-visible', {
         column: column,
-        property: column.property,
+        field: column.field,
+        property: column.field,
         filterList: this.getCheckedFilters(),
         visible: false
       }, null);