vxe-table 4.2.6-beta.3 → 4.2.6

package/lib/table/src/body.js

@@ -383,7 +383,7 @@ var _default = (0, _vue.defineComponent)({
 
 
       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";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},__spreadArray=function(e,l){for(var t=0,o=l.length,r=e.length;t<o;t++,r++)e[r]=l[t];return e},renderType="body",lineOffsetSizes={mini:3,small:2,medium:1},_default=(0,_vue.defineComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(_){function u(){if(l){var e=l.value;if(e)return lineOffsetSizes[e]||0}return 0}function c(e,l){var t=1;if(!e)return t;var o=e[d.value.children];if(ne.isTreeExpandByRow(e))for(var r=0;r<o.length;r++)t+=c(o[r],l);return t}function re(e){var l=e.row,t=e.column,o=ae.treeConfig,r=d.value,n=t.slots,a=t.treeNode,i=se.fullAllDataRowIdData[(0,_util.getRowid)(ne,l)],s=0,t=0,l=[];return i&&(s=i.level,t=i._index,l=i.items),n&&n.line?ne.callSlot(n.line,e):o&&a&&r.line?[(0,_vue.h)("div",{class:"vxe-tree--line-wrapper"},[(0,_vue.h)("div",{class:"vxe-tree--line",style:{height:(a=e,e=l,l=1,(t=t)&&(l=c(e[t-1],a)),ie.rowHeight*l-(t?1:12-u())+"px"),left:s*r.indent+(s?2-u():0)+16+"px"}})])]:[]}function A(f,h,x){var g=ae.stripe,_=ae.rowKey,m=ae.highlightHoverRow,y=ae.rowClassName,w=ae.rowStyle,b=ae.showOverflow,T=ae.editConfig,S=ae.treeConfig,C=ie.hasFixedColumn,L=ie.treeExpandeds,O=ie.scrollYLoad,R=ie.editStore,H=ie.rowExpandeds,E=ie.expandColumn,I=ie.selectRow,D=se.fullAllDataRowIdData,M=ve.value,$=t.value,k=d.value,U=ue.value,q=fe.value,B=k.transform,Y=[];return h.forEach(function(t,o){var e={},r=ne.getRowIndex(t);(q.isHover||m)&&(e.onMouseenter=function(e){xe()||ne.triggerHoverEvent(e,{row:t,rowIndex:r})},e.onMouseleave=function(){xe()||ne.clearHoverRow()});var n=(0,_util.getRowid)(ne,t),l=D[n],a=0,i=-1,s=0;l&&(a=l.level,i=l.seq,s=l._index);var u,c,d={$table:ne,seq:i,rowid:n,fixed:f,type:renderType,level:a,row:t,rowIndex:r,$rowIndex:o,_rowIndex:s},v=E&&H.length&&-1<ne.findRowIndexOf(H,t),p=!1,l=!1;T&&(l=-1<ne.findRowIndexOf(R.insertList,t)),S&&!O&&!B&&L.length&&(p=(u=t[k.children])&&u.length&&-1<ne.findRowIndexOf(L,t)),Y.push((0,_vue.h)("tr",__assign({class:["vxe-body--row",S?"row--level-"+a:"",{"row--stripe":g&&(ne.getVTRowIndex(t)+1)%2==0,"is--new":l,"is--expand-row":v,"is--expand-tree":p,"row--new":l&&(U.showStatus||U.showInsertStatus),"row--radio":$.highlight&&I===t,"row--checked":M.highlight&&ne.isCheckedByCheckboxRow(t)},y?_xeUtils.default.isFunction(y)?y(d):y:""],rowid:n,style:w?_xeUtils.default.isFunction(w)?w(d):w:null,key:_||q.useKey||S?n:o},e),x.map(function(e,l){return W(i,n,f,a,t,r,o,s,e,l,x,h)}))),v&&(d=void 0,S&&(d={paddingLeft:a*k.indent+30+"px"}),c=E.showOverflow,v=_xeUtils.default.isUndefined(c)||_xeUtils.default.isNull(c)?b:c,c={$table:ne,seq:i,column:E,fixed:f,type:renderType,level:a,row:t,rowIndex:r,$rowIndex:o,_rowIndex:s},Y.push((0,_vue.h)("tr",__assign({class:"vxe-body--expanded-row",key:"expand_"+n,style:w?_xeUtils.default.isFunction(w)?w(c):w:null},e),[(0,_vue.h)("td",{class:["vxe-body--expanded-column",{"fixed--hidden":f&&!C,"col--ellipsis":v}],colspan:x.length},[(0,_vue.h)("div",{class:"vxe-body--expanded-cell",style:d},[E.renderData(c)])])]))),!S||O||B||!L.length||(c=t[k.children])&&c.length&&-1<ne.findRowIndexOf(L,t)&&Y.push.apply(Y,A(f,c,x))}),Y}function m(e,l,t,o){(t||o)&&(t&&((0,_util.removeScrollListener)(t),t.scrollTop=l),o&&((0,_util.removeScrollListener)(o),o.scrollTop=l),clearTimeout(r),r=setTimeout(function(){(0,_util.restoreScrollListener)(t),(0,_util.restoreScrollListener)(o)},300))}function o(e){var l=_.fixedType,t=ae.highlightHoverRow,o=ie.scrollXLoad,r=ie.scrollYLoad,n=se.elemStore,a=se.lastScrollTop,i=se.lastScrollLeft,s=fe.value,u=b.value,c=T.value,d=S.value,v=C.value,p=L.value,f=O.value,h=I.value,x=u?u.$el:null,g=d?d.$el:null,u=c.$el,d=v?v.$el:null,c=p?p.$el:null,p=(v=n["main-body-ySpace"])?v.value:null,n=(v=n["main-body-xSpace"])?v.value:null,v=(r&&p?p:u).clientHeight,p=(o&&n?n:u).clientWidth,n=h.scrollTop,i=(h=u.scrollLeft)!==i,a=n!==a;se.lastScrollTop=n,se.lastScrollLeft=h,se.lastScrollTime=Date.now(),(s.isHover||t)&&ne.clearHoverRow(),d&&"left"===l?(n=d.scrollTop,m(0,n,u,c)):c&&"right"===l?(n=c.scrollTop,m(0,n,u,d)):(i&&(x&&(x.scrollLeft=u.scrollLeft),g&&(g.scrollLeft=u.scrollLeft)),(d||c)&&(ne.checkScrolling(),a&&m(0,n,d,c))),o&&i&&ne.triggerScrollXEvent(e),r&&a&&ne.triggerScrollYEvent(e),i&&f&&f.reactData.visible&&f.updatePlacement(),ne.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:n,scrollLeft:h,scrollHeight:u.scrollHeight,scrollWidth:u.scrollWidth,bodyHeight:v,bodyWidth:p,isX:i,isY:a},e)}function g(e){var l=e.deltaY,t=e.deltaX,o=ae.highlightHoverRow,r=ie.scrollYLoad,n=se.lastScrollTop,a=se.lastScrollLeft,i=fe.value,s=T.value,u=I.value,c=s.$el;((l=(s=l)<0)?u.scrollTop<=0:u.scrollTop>=u.scrollHeight-u.clientHeight)||(u=u.scrollTop+s,a=(t=c.scrollLeft+t)!==a,(n=u!==n)&&(e.preventDefault(),se.lastScrollTop=u,se.lastScrollLeft=t,se.lastScrollTime=Date.now(),(i.isHover||o)&&ne.clearHoverRow(),v(e,l,s,a,n),r&&ne.triggerScrollYEvent(e)))}var r,x,ne=(0,_vue.inject)("$xetable",{}),l=(0,_vue.inject)("xesize",null),y=ne.xID,ae=ne.props,w=ne.context,ie=ne.reactData,se=ne.internalData,e=ne.getRefMaps(),b=e.refTableHeader,T=e.refTableBody,S=e.refTableFooter,C=e.refTableLeftBody,L=e.refTableRightBody,O=e.refValidTooltip,e=ne.getComputeMaps(),ue=e.computeEditOpts,R=e.computeMouseOpts,ce=e.computeSYOpts,H=e.computeEmptyOpts,E=e.computeKeyboardOpts,de=e.computeTooltipOpts,t=e.computeRadioOpts,d=e.computeTreeOpts,ve=e.computeCheckboxOpts,pe=e.computeValidOpts,fe=e.computeRowOpts,he=e.computeColumnOpts,I=(0,_vue.ref)(),D=(0,_vue.ref)(),M=(0,_vue.ref)(),$=(0,_vue.ref)(),k=(0,_vue.ref)(),U=(0,_vue.ref)(),q=(0,_vue.ref)(),xe=function(){var e=ae.delayHover,l=se.lastScrollTime;return se._isResize||l&&Date.now()<l+e},W=function(e,l,t,o,r,n,a,i,s,u,c,d){var v,p=ae.columnKey,f=ae.height,h=ae.showOverflow,x=ae.cellClassName,g=ae.cellStyle,_=ae.align,m=ae.spanMethod,y=ae.mouseConfig,w=ae.editConfig,b=ae.editRules,T=ae.tooltipConfig,S=ie.tableData,C=ie.overflowX,L=ie.scrollYLoad,O=ie.currentColumn,R=ie.mergeList,H=ie.editStore,E=ie.validStore,I=ie.isAllOverflow,D=se.afterFullData,M=pe.value,$=ve.value,k=ue.value,U=de.value,q=fe.value,B=ce.value,Y=he.value,A=s.type,W=s.cellRender,X=s.editRender,j=s.align,N=s.showOverflow,F=s.className,V=s.treeNode,K=H.actived,P=B.rHeight,z=q.height,G=U.showAll,J=ne.getColumnIndex(s),H=ne.getVTColumnIndex(s),B=(0,_utils.isEnableConf)(X),q=t?s.fixed!==t:s.fixed&&C,U=_xeUtils.default.isUndefined(N)||_xeUtils.default.isNull(N)?h:N,C="ellipsis"===U,Q="title"===U,Z=!0===U||"tooltip"===U,N=Q||Z||C,U={},j=j||_,_=E.row===r&&E.column===s,f=b&&M.showMessage&&("default"===M.message?f||1<S.length:"inline"===M.message),M={colid:s.id},ee={$table:ne,seq:e,rowid:l,row:r,rowIndex:n,$rowIndex:a,_rowIndex:i,column:s,columnIndex:J,$columnIndex:u,_columnIndex:H,fixed:t,type:renderType,isHidden:q,level:o,visibleData:D,data:S,items:d};if(L&&!N&&(C=N=!0),(Q||Z||G||T)&&(U.onMouseenter=function(e){xe()||(Q?(0,_dom.updateCellTitle)(e.currentTarget,s):(Z||G)&&ne.triggerBodyTooltipEvent(e,ee),ne.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},ee),e))}),(Z||G||T)&&(U.onMouseleave=function(e){xe()||((Z||G)&&ne.handleTargetLeaveEvent(e),ne.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},ee),e))}),($.range||y)&&(U.onMousedown=function(e){ne.triggerCellMousedownEvent(e,ee)}),U.onClick=function(e){ne.triggerCellClickEvent(e,ee)},U.onDblclick=function(e){ne.triggerCellDblclickEvent(e,ee)},R.length){var le=(0,_util.mergeBodyMethod)(R,i,H);if(le){var te=le.rowspan,oe=le.colspan;if(!te||!oe)return null;1<te&&(M.rowspan=te),1<oe&&(M.colspan=oe)}}else if(m){le=m(ee)||{},m=le.rowspan,te=void 0===m?1:m,le=le.colspan,oe=void 0===le?1:le;if(!te||!oe)return null;1<te&&(M.rowspan=te),1<oe&&(M.colspan=oe)}!(q=q&&R&&(1<M.colspan||1<M.rowspan)?!1:q)&&w&&(X||W)&&(k.showStatus||k.showUpdateStatus)&&(v=ne.isUpdateByRow(r,s.property));W=[];return q&&h&&I?W.push((0,_vue.h)("div",{class:["vxe-cell",{"c--title":Q,"c--tooltip":Z,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""}})):(W.push.apply(W,__spreadArray(__spreadArray([],re(ee)),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":Q,"c--tooltip":Z,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""},title:Q?ne.getCellLabel(r,s):null},s.renderCell(ee))])),f&&_&&W.push((0,_vue.h)("div",{class:"vxe-cell--valid",style:E.rule&&E.rule.maxWidth?{width:E.rule.maxWidth+"px"}:null},[(0,_vue.h)("span",{class:"vxe-cell--valid-msg"},E.content)]))),(0,_vue.h)("td",__assign(__assign(__assign({class:["vxe-body--column",s.id,((E={})["col--"+j]=j,E["col--"+A]=A,E["col--last"]=u===c.length-1,E["col--tree-node"]=V,E["col--edit"]=B,E["col--ellipsis"]=N,E["fixed--hidden"]=q,E["col--dirty"]=v,E["col--actived"]=w&&B&&K.row===r&&(K.column===s||"row"===k.mode),E["col--valid-error"]=_,E["col--current"]=O===s,E),(0,_util.getPropClass)(F,ee),(0,_util.getPropClass)(x,ee)],key:p||Y.useKey?s.id:u},M),{style:Object.assign({height:N&&(P||z)?(P||z)+"px":""},g?_xeUtils.default.isFunction(g)?g(ee):g:null)}),U),W)},B=0,Y=0,X=0,j=!1,v=function(n,a,e,i,s){var l=se.elemStore,t=ie.scrollXLoad,o=ie.scrollYLoad,r=T.value,u=C.value,c=L.value,d=u?u.$el:null,v=c?c.$el:null,p=r.$el,r=l["main-body-ySpace"],r=r?r.value:null,l=l["main-body-xSpace"],l=l?l.value:null,f=(o&&r?r:p).clientHeight,h=(t&&l?l:p).clientWidth,l=j===a?Math.max(0,B-X):0;j=a,B=Math.abs(a?e-l:e+l),X=Y=0,clearTimeout(x),function e(){var l,t,o,r;X<B&&(l=_.fixedType,Y=Math.max(5,Math.floor(1.5*Y)),B<(X+=Y)&&(Y-=X-B),r=p.scrollTop,t=p.clientHeight,o=p.scrollHeight,r=r+Y*(a?-1:1),p.scrollTop=r,d&&(d.scrollTop=r),v&&(v.scrollTop=r),(a?r<o-t:0<=r)&&(x=setTimeout(e,10)),ne.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:p.scrollTop,scrollLeft:p.scrollLeft,scrollHeight:p.scrollHeight,scrollWidth:p.scrollWidth,bodyHeight:f,bodyWidth:h,isX:i,isY:s},n))}()};(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=_.fixedType,l=se.elemStore,t=(e||"main")+"-body-",e=I.value;l[t+"wrapper"]=I,l[t+"table"]=D,l[t+"colgroup"]=M,l[t+"list"]=$,l[t+"xSpace"]=k,l[t+"ySpace"]=U,l[t+"emptyBlock"]=q,e.onscroll=o,e._onscroll=o})}),(0,_vue.onBeforeUnmount)(function(){var e=I.value;clearTimeout(x),e._onscroll=null,e.onscroll=null}),(0,_vue.onUnmounted)(function(){var e=_.fixedType,l=se.elemStore,e=(e||"main")+"-body-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null});return function(){var e=_.fixedColumn,l=_.fixedType,t=_.tableColumn,o=ae.keyboardConfig,r=ae.showOverflow,n=ae.spanMethod,a=ae.mouseConfig,i=ie.tableData,s=ie.mergeList,u=ie.scrollYLoad,c=ie.isAllOverflow,d=se.visibleColumn,v=w.slots,p=ce.value,f=H.value,h=E.value,x=R.value;return l&&(t=!(u||r&&c)||s.length||n||o&&h.isMerge?d:e),f=v.empty?ne.callSlot(v.empty,{$table:ne}):(v=(v=f.name?_vXETable.VXETable.renderer.get(f.name):null)?v.renderEmpty:null)?v(f,{$table:ne}):ae.emptyText||_conf.default.i18n("vxe.table.emptyText"),(0,_vue.h)("div",__assign({ref:I,class:["vxe-table--body-wrapper",l?"fixed-"+l+"--wrapper":"body--wrapper"],xid:y},"wheel"===p.mode?{onWheel:g}:{}),[l?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:k,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:U,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:D,class:"vxe-table--body",xid:y,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:M},t.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})})),(0,_vue.h)("tbody",{ref:$},A(l,i,t))]),(0,_vue.h)("div",{class:"vxe-table--checkbox-range"}),a&&x.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"},x.extension?[(0,_vue.h)("span",{class:"vxe-table--cell-main-area-btn",onMousedown:function(e){ne.triggerCellExtendMousedownEvent(e,{$table:ne,fixed:l,type:renderType})}})]:[]),(0,_vue.h)("span",{class:"vxe-table--cell-copy-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"})]):null,l?null:(0,_vue.h)("div",{class:"vxe-table--empty-block",ref:q},[(0,_vue.h)("div",{class:"vxe-table--empty-content"},f)])])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},__spreadArray=function(e,l){for(var t=0,o=l.length,r=e.length;t<o;t++,r++)e[r]=l[t];return e},renderType="body",lineOffsetSizes={mini:3,small:2,medium:1},_default=(0,_vue.defineComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(_){function u(){if(l){var e=l.value;if(e)return lineOffsetSizes[e]||0}return 0}function c(e,l){var t=1;if(!e)return t;var o=e[d.value.children];if(ne.isTreeExpandByRow(e))for(var r=0;r<o.length;r++)t+=c(o[r],l);return t}function re(e){var l=e.row,t=e.column,o=ae.treeConfig,r=d.value,n=t.slots,a=t.treeNode,i=se.fullAllDataRowIdData[(0,_util.getRowid)(ne,l)],s=0,t=0,l=[];return i&&(s=i.level,t=i._index,l=i.items),n&&n.line?ne.callSlot(n.line,e):o&&a&&r.line?[(0,_vue.h)("div",{class:"vxe-tree--line-wrapper"},[(0,_vue.h)("div",{class:"vxe-tree--line",style:{height:(a=e,e=l,l=1,(t=t)&&(l=c(e[t-1],a)),ie.rowHeight*l-(t?1:12-u())+"px"),left:s*r.indent+(s?2-u():0)+16+"px"}})])]:[]}function A(f,h,x){var g=ae.stripe,_=ae.rowKey,m=ae.highlightHoverRow,y=ae.rowClassName,w=ae.rowStyle,b=ae.showOverflow,T=ae.editConfig,S=ae.treeConfig,C=ie.hasFixedColumn,L=ie.treeExpandeds,O=ie.scrollYLoad,R=ie.editStore,H=ie.rowExpandeds,E=ie.expandColumn,I=ie.selectRow,D=se.fullAllDataRowIdData,M=ve.value,$=t.value,k=d.value,U=ue.value,q=fe.value,B=k.transform,Y=[];return h.forEach(function(t,o){var e={},r=ne.getRowIndex(t);(q.isHover||m)&&(e.onMouseenter=function(e){xe()||ne.triggerHoverEvent(e,{row:t,rowIndex:r})},e.onMouseleave=function(){xe()||ne.clearHoverRow()});var n=(0,_util.getRowid)(ne,t),l=D[n],a=0,i=-1,s=0;l&&(a=l.level,i=l.seq,s=l._index);var u,c,d={$table:ne,seq:i,rowid:n,fixed:f,type:renderType,level:a,row:t,rowIndex:r,$rowIndex:o,_rowIndex:s},v=E&&H.length&&-1<ne.findRowIndexOf(H,t),p=!1,l=!1;T&&(l=-1<ne.findRowIndexOf(R.insertList,t)),S&&!O&&!B&&L.length&&(p=(u=t[k.children])&&u.length&&-1<ne.findRowIndexOf(L,t)),Y.push((0,_vue.h)("tr",__assign({class:["vxe-body--row",S?"row--level-"+a:"",{"row--stripe":g&&(ne.getVTRowIndex(t)+1)%2==0,"is--new":l,"is--expand-row":v,"is--expand-tree":p,"row--new":l&&(U.showStatus||U.showInsertStatus),"row--radio":$.highlight&&I===t,"row--checked":M.highlight&&ne.isCheckedByCheckboxRow(t)},y?_xeUtils.default.isFunction(y)?y(d):y:""],rowid:n,style:w?_xeUtils.default.isFunction(w)?w(d):w:null,key:_||q.useKey||S?n:o},e),x.map(function(e,l){return W(i,n,f,a,t,r,o,s,e,l,x,h)}))),v&&(d=void 0,S&&(d={paddingLeft:a*k.indent+30+"px"}),c=E.showOverflow,v=_xeUtils.default.isUndefined(c)||_xeUtils.default.isNull(c)?b:c,c={$table:ne,seq:i,column:E,fixed:f,type:renderType,level:a,row:t,rowIndex:r,$rowIndex:o,_rowIndex:s},Y.push((0,_vue.h)("tr",__assign({class:"vxe-body--expanded-row",key:"expand_"+n,style:w?_xeUtils.default.isFunction(w)?w(c):w:null},e),[(0,_vue.h)("td",{class:["vxe-body--expanded-column",{"fixed--hidden":f&&!C,"col--ellipsis":v}],colspan:x.length},[(0,_vue.h)("div",{class:"vxe-body--expanded-cell",style:d},[E.renderData(c)])])]))),!S||O||B||!L.length||(c=t[k.children])&&c.length&&-1<ne.findRowIndexOf(L,t)&&Y.push.apply(Y,A(f,c,x))}),Y}function m(e,l,t,o){(t||o)&&(t&&((0,_util.removeScrollListener)(t),t.scrollTop=l),o&&((0,_util.removeScrollListener)(o),o.scrollTop=l),clearTimeout(r),r=setTimeout(function(){(0,_util.restoreScrollListener)(t),(0,_util.restoreScrollListener)(o)},300))}function o(e){var l=_.fixedType,t=ae.highlightHoverRow,o=ie.scrollXLoad,r=ie.scrollYLoad,n=se.elemStore,a=se.lastScrollTop,i=se.lastScrollLeft,s=fe.value,u=b.value,c=T.value,d=S.value,v=C.value,p=L.value,f=O.value,h=I.value,x=u?u.$el:null,g=d?d.$el:null,u=c.$el,d=v?v.$el:null,c=p?p.$el:null,p=(v=n["main-body-ySpace"])?v.value:null,n=(v=n["main-body-xSpace"])?v.value:null,v=(r&&p?p:u).clientHeight,p=(o&&n?n:u).clientWidth,n=h.scrollTop,i=(h=u.scrollLeft)!==i,a=n!==a;se.lastScrollTop=n,se.lastScrollLeft=h,se.lastScrollTime=Date.now(),(s.isHover||t)&&ne.clearHoverRow(),d&&"left"===l?(n=d.scrollTop,m(0,n,u,c)):c&&"right"===l?(n=c.scrollTop,m(0,n,u,d)):(i&&(x&&(x.scrollLeft=u.scrollLeft),g&&(g.scrollLeft=u.scrollLeft)),(d||c)&&(ne.checkScrolling(),a&&m(0,n,d,c))),o&&i&&ne.triggerScrollXEvent(e),r&&a&&ne.triggerScrollYEvent(e),i&&f&&f.reactData.visible&&f.updatePlacement(),ne.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:n,scrollLeft:h,scrollHeight:u.scrollHeight,scrollWidth:u.scrollWidth,bodyHeight:v,bodyWidth:p,isX:i,isY:a},e)}function g(e){var l=e.deltaY,t=e.deltaX,o=ae.highlightHoverRow,r=ie.scrollYLoad,n=se.lastScrollTop,a=se.lastScrollLeft,i=fe.value,s=T.value,u=I.value,c=s.$el;((l=(s=l)<0)?u.scrollTop<=0:u.scrollTop>=u.scrollHeight-u.clientHeight)||(u=u.scrollTop+s,a=(t=c.scrollLeft+t)!==a,(n=u!==n)&&(e.preventDefault(),se.lastScrollTop=u,se.lastScrollLeft=t,se.lastScrollTime=Date.now(),(i.isHover||o)&&ne.clearHoverRow(),v(e,l,s,a,n),r&&ne.triggerScrollYEvent(e)))}var r,x,ne=(0,_vue.inject)("$xetable",{}),l=(0,_vue.inject)("xesize",null),y=ne.xID,ae=ne.props,w=ne.context,ie=ne.reactData,se=ne.internalData,e=ne.getRefMaps(),b=e.refTableHeader,T=e.refTableBody,S=e.refTableFooter,C=e.refTableLeftBody,L=e.refTableRightBody,O=e.refValidTooltip,e=ne.getComputeMaps(),ue=e.computeEditOpts,R=e.computeMouseOpts,ce=e.computeSYOpts,H=e.computeEmptyOpts,E=e.computeKeyboardOpts,de=e.computeTooltipOpts,t=e.computeRadioOpts,d=e.computeTreeOpts,ve=e.computeCheckboxOpts,pe=e.computeValidOpts,fe=e.computeRowOpts,he=e.computeColumnOpts,I=(0,_vue.ref)(),D=(0,_vue.ref)(),M=(0,_vue.ref)(),$=(0,_vue.ref)(),k=(0,_vue.ref)(),U=(0,_vue.ref)(),q=(0,_vue.ref)(),xe=function(){var e=ae.delayHover,l=se.lastScrollTime;return se._isResize||l&&Date.now()<l+e},W=function(e,l,t,o,r,n,a,i,s,u,c,d){var v,p=ae.columnKey,f=ae.height,h=ae.showOverflow,x=ae.cellClassName,g=ae.cellStyle,_=ae.align,m=ae.spanMethod,y=ae.mouseConfig,w=ae.editConfig,b=ae.editRules,T=ae.tooltipConfig,S=ie.tableData,C=ie.overflowX,L=ie.scrollYLoad,O=ie.currentColumn,R=ie.mergeList,H=ie.editStore,E=ie.validStore,I=ie.isAllOverflow,D=se.afterFullData,M=pe.value,$=ve.value,k=ue.value,U=de.value,q=fe.value,B=ce.value,Y=he.value,A=s.type,W=s.cellRender,X=s.editRender,j=s.align,N=s.showOverflow,F=s.className,V=s.treeNode,K=H.actived,P=B.rHeight,z=q.height,G=U.showAll,J=ne.getColumnIndex(s),H=ne.getVTColumnIndex(s),B=(0,_utils.isEnableConf)(X),q=t?s.fixed!==t:s.fixed&&C,U=_xeUtils.default.isUndefined(N)||_xeUtils.default.isNull(N)?h:N,C="ellipsis"===U,Q="title"===U,Z=!0===U||"tooltip"===U,N=Q||Z||C,U={},j=j||_,_=E.row===r&&E.column===s,f=b&&M.showMessage&&("default"===M.message?f||1<S.length:"inline"===M.message),M={colid:s.id},ee={$table:ne,seq:e,rowid:l,row:r,rowIndex:n,$rowIndex:a,_rowIndex:i,column:s,columnIndex:J,$columnIndex:u,_columnIndex:H,fixed:t,type:renderType,isHidden:q,level:o,visibleData:D,data:S,items:d};if(L&&!N&&(C=N=!0),(Q||Z||G||T)&&(U.onMouseenter=function(e){xe()||(Q?(0,_dom.updateCellTitle)(e.currentTarget,s):(Z||G)&&ne.triggerBodyTooltipEvent(e,ee),ne.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},ee),e))}),(Z||G||T)&&(U.onMouseleave=function(e){xe()||((Z||G)&&ne.handleTargetLeaveEvent(e),ne.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},ee),e))}),($.range||y)&&(U.onMousedown=function(e){ne.triggerCellMousedownEvent(e,ee)}),U.onClick=function(e){ne.triggerCellClickEvent(e,ee)},U.onDblclick=function(e){ne.triggerCellDblclickEvent(e,ee)},R.length){var le=(0,_util.mergeBodyMethod)(R,i,H);if(le){var te=le.rowspan,oe=le.colspan;if(!te||!oe)return null;1<te&&(M.rowspan=te),1<oe&&(M.colspan=oe)}}else if(m){le=m(ee)||{},m=le.rowspan,te=void 0===m?1:m,le=le.colspan,oe=void 0===le?1:le;if(!te||!oe)return null;1<te&&(M.rowspan=te),1<oe&&(M.colspan=oe)}!(q=q&&R&&(1<M.colspan||1<M.rowspan)?!1:q)&&w&&(X||W)&&(k.showStatus||k.showUpdateStatus)&&(v=ne.isUpdateByRow(r,s.field));W=[];return q&&h&&I?W.push((0,_vue.h)("div",{class:["vxe-cell",{"c--title":Q,"c--tooltip":Z,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""}})):(W.push.apply(W,__spreadArray(__spreadArray([],re(ee)),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":Q,"c--tooltip":Z,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""},title:Q?ne.getCellLabel(r,s):null},s.renderCell(ee))])),f&&_&&W.push((0,_vue.h)("div",{class:"vxe-cell--valid",style:E.rule&&E.rule.maxWidth?{width:E.rule.maxWidth+"px"}:null},[(0,_vue.h)("span",{class:"vxe-cell--valid-msg"},E.content)]))),(0,_vue.h)("td",__assign(__assign(__assign({class:["vxe-body--column",s.id,((E={})["col--"+j]=j,E["col--"+A]=A,E["col--last"]=u===c.length-1,E["col--tree-node"]=V,E["col--edit"]=B,E["col--ellipsis"]=N,E["fixed--hidden"]=q,E["col--dirty"]=v,E["col--actived"]=w&&B&&K.row===r&&(K.column===s||"row"===k.mode),E["col--valid-error"]=_,E["col--current"]=O===s,E),(0,_util.getPropClass)(F,ee),(0,_util.getPropClass)(x,ee)],key:p||Y.useKey?s.id:u},M),{style:Object.assign({height:N&&(P||z)?(P||z)+"px":""},g?_xeUtils.default.isFunction(g)?g(ee):g:null)}),U),W)},B=0,Y=0,X=0,j=!1,v=function(n,a,e,i,s){var l=se.elemStore,t=ie.scrollXLoad,o=ie.scrollYLoad,r=T.value,u=C.value,c=L.value,d=u?u.$el:null,v=c?c.$el:null,p=r.$el,r=l["main-body-ySpace"],r=r?r.value:null,l=l["main-body-xSpace"],l=l?l.value:null,f=(o&&r?r:p).clientHeight,h=(t&&l?l:p).clientWidth,l=j===a?Math.max(0,B-X):0;j=a,B=Math.abs(a?e-l:e+l),X=Y=0,clearTimeout(x),function e(){var l,t,o,r;X<B&&(l=_.fixedType,Y=Math.max(5,Math.floor(1.5*Y)),B<(X+=Y)&&(Y-=X-B),r=p.scrollTop,t=p.clientHeight,o=p.scrollHeight,r=r+Y*(a?-1:1),p.scrollTop=r,d&&(d.scrollTop=r),v&&(v.scrollTop=r),(a?r<o-t:0<=r)&&(x=setTimeout(e,10)),ne.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:p.scrollTop,scrollLeft:p.scrollLeft,scrollHeight:p.scrollHeight,scrollWidth:p.scrollWidth,bodyHeight:f,bodyWidth:h,isX:i,isY:s},n))}()};(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=_.fixedType,l=se.elemStore,t=(e||"main")+"-body-",e=I.value;l[t+"wrapper"]=I,l[t+"table"]=D,l[t+"colgroup"]=M,l[t+"list"]=$,l[t+"xSpace"]=k,l[t+"ySpace"]=U,l[t+"emptyBlock"]=q,e.onscroll=o,e._onscroll=o})}),(0,_vue.onBeforeUnmount)(function(){var e=I.value;clearTimeout(x),e._onscroll=null,e.onscroll=null}),(0,_vue.onUnmounted)(function(){var e=_.fixedType,l=se.elemStore,e=(e||"main")+"-body-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null});return function(){var e=_.fixedColumn,l=_.fixedType,t=_.tableColumn,o=ae.keyboardConfig,r=ae.showOverflow,n=ae.spanMethod,a=ae.mouseConfig,i=ie.tableData,s=ie.mergeList,u=ie.scrollYLoad,c=ie.isAllOverflow,d=se.visibleColumn,v=w.slots,p=ce.value,f=H.value,h=E.value,x=R.value;return l&&(t=!(u||r&&c)||s.length||n||o&&h.isMerge?d:e),f=v.empty?ne.callSlot(v.empty,{$table:ne}):(v=(v=f.name?_vXETable.VXETable.renderer.get(f.name):null)?v.renderEmpty:null)?v(f,{$table:ne}):ae.emptyText||_conf.default.i18n("vxe.table.emptyText"),(0,_vue.h)("div",__assign({ref:I,class:["vxe-table--body-wrapper",l?"fixed-"+l+"--wrapper":"body--wrapper"],xid:y},"wheel"===p.mode?{onWheel:g}:{}),[l?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:k,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:U,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:D,class:"vxe-table--body",xid:y,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:M},t.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})})),(0,_vue.h)("tbody",{ref:$},A(l,i,t))]),(0,_vue.h)("div",{class:"vxe-table--checkbox-range"}),a&&x.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"},x.extension?[(0,_vue.h)("span",{class:"vxe-table--cell-main-area-btn",onMousedown:function(e){ne.triggerCellExtendMousedownEvent(e,{$table:ne,fixed:l,type:renderType})}})]:[]),(0,_vue.h)("span",{class:"vxe-table--cell-copy-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"})]):null,l?null:(0,_vue.h)("div",{class:"vxe-table--empty-block",ref:q},[(0,_vue.h)("div",{class:"vxe-table--empty-content"},f)])])}}});exports.default=_default;

package/lib/table/src/cell.js

@@ -634,7 +634,7 @@ var Cell = {
     var computeCheckboxOpts = $table.getComputeMaps().computeCheckboxOpts;
     var checkboxOpts = computeCheckboxOpts.value;
     var labelField = checkboxOpts.labelField,
-        property = checkboxOpts.checkField,
+        checkField = checkboxOpts.checkField,
         halfField = checkboxOpts.halfField,
         checkMethod = checkboxOpts.checkMethod,
         visibleMethod = checkboxOpts.visibleMethod;
@@ -650,7 +650,7 @@ var Cell = {
     var ons;
 
     if (!isHidden) {
-      isChecked = _xeUtils.default.get(row, property);
+      isChecked = _xeUtils.default.get(row, checkField);
       ons = {
         onClick: function onClick(evnt) {
           if (!isDisabled && isVisible) {
@@ -896,7 +896,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";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,r=1,n=arguments.length;r<n;r++)for(var t in l=arguments[r])Object.prototype.hasOwnProperty.call(l,t)&&(e[t]=l[t]);return e}).apply(this,arguments)};function renderHelpIcon(l){var r=l.$table,e=l.column,e=e.titlePrefix||e.titleHelp;return e?[(0,_vue.h)("i",{class:["vxe-cell-help-icon",e.icon||_conf.default.icon.TABLE_HELP],onMouseenter:function(e){r.triggerHeaderHelpEvent(e,l)},onMouseleave:function(e){r.handleTargetLeaveEvent(e)}})]:[]}function renderTitleContent(l,e){var r=l.$table,n=l.column,t=r.props,o=r.internalData,a=r.getComputeMaps().computeTooltipOpts,c=t.showHeaderOverflow,i=n.type,t=n.showHeaderOverflow,d=a.value.showAll,t=_xeUtils.default.isUndefined(t)||_xeUtils.default.isNull(t)?c:t,s="title"===t,u=!0===t||"tooltip"===t,t={};return(s||u||d)&&(t.onMouseenter=function(e){o._isResize||(s?(0,_dom.updateCellTitle)(e.currentTarget,n):(u||d)&&r.triggerHeaderTooltipEvent(e,l))}),(u||d)&&(t.onMouseleave=function(e){o._isResize||(u||d)&&r.handleTargetLeaveEvent(e)}),["html"===i&&_xeUtils.default.isString(e)?(0,_vue.h)("span",__assign({class:"vxe-cell--title",innerHTML:e},t)):(0,_vue.h)("span",__assign({class:"vxe-cell--title"},t),e)]}function getFooterContent(e){var l=e.$table,r=e.column,n=e._columnIndex,t=e.items,o=r.slots,a=r.editRender,r=r.cellRender,r=a||r,o=o?o.footer:null;if(o)return l.callSlot(o,e);if(r){o=_vXETable.VXETable.renderer.get(r.name);if(o&&o.renderFooter)return o.renderFooter(r,e)}return[(0,_utils.formatText)(t[n],1)]}function getDefaultCellLabel(e){var l=e.$table,r=e.row,e=e.column;return(0,_utils.formatText)(l.getCellLabel(r,e),1)}var Cell={createColumn:function(e,l){var r=l.type,n=l.sortable,t=l.filters,o=l.editRender,a=l.treeNode,c=e.props.editConfig,i=e.getComputeMaps(),d=i.computeEditOpts,s=i.computeCheckboxOpts.value,u=d.value,f={renderHeader:Cell.renderDefaultHeader,renderCell:a?Cell.renderTreeCell:Cell.renderDefaultCell,renderFooter:Cell.renderDefaultFooter};switch(r){case"seq":f.renderHeader=Cell.renderSeqHeader,f.renderCell=a?Cell.renderTreeIndexCell:Cell.renderSeqCell;break;case"radio":f.renderHeader=Cell.renderRadioHeader,f.renderCell=a?Cell.renderTreeRadioCell:Cell.renderRadioCell;break;case"checkbox":f.renderHeader=Cell.renderCheckboxHeader,f.renderCell=s.checkField?a?Cell.renderTreeSelectionCellByProp:Cell.renderCheckboxCellByProp:a?Cell.renderTreeSelectionCell:Cell.renderCheckboxCell;break;case"expand":f.renderCell=Cell.renderExpandCell,f.renderData=Cell.renderExpandData;break;case"html":f.renderCell=a?Cell.renderTreeHTMLCell:Cell.renderHTMLCell,t&&n?f.renderHeader=Cell.renderSortAndFilterHeader:n?f.renderHeader=Cell.renderSortHeader:t&&(f.renderHeader=Cell.renderFilterHeader);break;default:c&&o?(f.renderHeader=Cell.renderEditHeader,f.renderCell="cell"===u.mode?a?Cell.renderTreeCellEdit:Cell.renderCellEdit:a?Cell.renderTreeRowEdit:Cell.renderRowEdit):t&&n?f.renderHeader=Cell.renderSortAndFilterHeader:n?f.renderHeader=Cell.renderSortHeader:t&&(f.renderHeader=Cell.renderFilterHeader)}return(0,_util.createColumn)(e,l,f)},renderHeaderTitle:function(e){var l=e.$table,r=e.column,n=r.slots,t=r.editRender,o=r.cellRender,o=t||o,n=n?n.header:null;if(n)return renderTitleContent(e,l.callSlot(n,e));if(o){n=_vXETable.VXETable.renderer.get(o.name);if(n&&n.renderHeader)return renderTitleContent(e,n.renderHeader(o,e))}return renderTitleContent(e,(0,_utils.formatText)(r.getTitle(),1))},renderDefaultHeader:function(e){return renderHelpIcon(e).concat(Cell.renderHeaderTitle(e))},renderDefaultCell:function(e){var l=e.$table,r=e.row,n=e.column,t=n.slots,o=n.editRender,a=n.cellRender,c=o||a,a=t?t.default:null;if(a)return l.callSlot(a,e);if(c){t=o?"renderCell":"renderDefault",a=_vXETable.VXETable.renderer.get(c.name),t=a?a[t]:null;if(t)return t(c,Object.assign({$type:o?"edit":"cell"},e))}r=l.getCellLabel(r,n),n=o?o.placeholder:"";return[(0,_vue.h)("span",{class:"vxe-cell--label"},o&&(0,_utils.eqEmptyValue)(r)?[(0,_vue.h)("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(n),1))]:(0,_utils.formatText)(r,1))]},renderTreeCell:function(e){return Cell.renderTreeIcon(e,Cell.renderDefaultCell(e))},renderDefaultFooter:function(e){return[(0,_vue.h)("span",{class:"vxe-cell--item"},getFooterContent(e))]},renderTreeIcon:function(l,e){var r=l.$table,n=l.isHidden,t=r.reactData,o=r.getComputeMaps().computeTreeOpts,a=t.treeExpandeds,c=t.treeLazyLoadeds,i=o.value,d=l.row,s=l.column,u=l.level,f=s.slots,v=i.children,C=i.hasChild,_=i.indent,p=i.lazy,h=i.trigger,x=i.iconLoaded,b=i.showIcon,T=i.iconOpen,m=i.iconClose,t=d[v],o=f?f.icon:null,s=!1,i=!1,v=!1,f={};return o?r.callSlot(o,l):(n||(i=-1<r.findRowIndexOf(a,d),p&&(v=-1<r.findRowIndexOf(c,d),s=d[C])),h&&"default"!==h||(f.onClick=function(e){return r.triggerTreeExpandEvent(e,l)}),[(0,_vue.h)("div",{class:["vxe-cell--tree-node",{"is--active":i}],style:{paddingLeft:u*_+"px"}},[b&&(t&&t.length||s)?[(0,_vue.h)("div",__assign({class:"vxe-tree--btn-wrapper"},f),[(0,_vue.h)("i",{class:["vxe-tree--node-btn",v?x||_conf.default.icon.TABLE_TREE_LOADED:i?T||_conf.default.icon.TABLE_TREE_OPEN:m||_conf.default.icon.TABLE_TREE_CLOSE]})])]:null,(0,_vue.h)("div",{class:"vxe-tree-cell"},e)])])},renderSeqHeader:function(e){var l=e.$table,r=e.column,n=r.slots,n=n?n.header:null;return renderTitleContent(e,n?l.callSlot(n,e):(0,_utils.formatText)(r.getTitle(),1))},renderSeqCell:function(e){var l=e.$table,r=e.column,n=l.props.treeConfig,t=l.getComputeMaps().computeSeqOpts.value,r=r.slots,r=r?r.default:null;if(r)return l.callSlot(r,e);l=e.seq,r=t.seqMethod;return[(0,_utils.formatText)(r?r(e):n?l:(t.startIndex||0)+l,1)]},renderTreeIndexCell:function(e){return Cell.renderTreeIcon(e,Cell.renderSeqCell(e))},renderRadioHeader:function(e){var l=e.$table,r=e.column,n=r.slots,t=n?n.header:null,n=n?n.title:null;return renderTitleContent(e,t?l.callSlot(t,e):[(0,_vue.h)("span",{class:"vxe-radio--label"},n?l.callSlot(n,e):(0,_utils.formatText)(r.getTitle(),1))])},renderRadioCell:function(l){var e,r=l.$table,n=l.column,t=l.isHidden,o=r.reactData,a=r.getComputeMaps().computeRadioOpts,c=o.selectRow,i=a.value,d=n.slots,s=i.labelField,o=i.checkMethod,a=i.visibleMethod,n=l.row,i=d?d.default:null,d=d?d.radio:null,c=n===c,u=!a||a({row:n}),f=!!o;t||(e={onClick:function(e){!f&&u&&r.triggerRadioRowEvent(e,l)}},o&&(f=!o({row:n})));o=__assign(__assign({},l),{checked:c,disabled:f,visible:u});if(d)return r.callSlot(d,o);d=[];return u&&d.push((0,_vue.h)("span",{class:"vxe-radio--icon vxe-radio--checked-icon"}),(0,_vue.h)("span",{class:"vxe-radio--icon vxe-radio--unchecked-icon"})),(i||s)&&d.push((0,_vue.h)("span",{class:"vxe-radio--label"},i?r.callSlot(i,o):_xeUtils.default.get(n,s))),[(0,_vue.h)("span",__assign({class:["vxe-cell--radio",{"is--checked":c,"is--disabled":f}]},e),d)]},renderTreeRadioCell:function(e){return Cell.renderTreeIcon(e,Cell.renderRadioCell(e))},renderCheckboxHeader:function(e){var l,r=e.$table,n=e.column,t=e.isHidden,o=r.reactData,a=r.getComputeMaps(),c=a.computeIsAllCheckboxDisabled,i=a.computeCheckboxOpts,d=o.isAllSelected,a=o.isIndeterminate,s=c.value,o=n.slots,c=o?o.header:null,o=o?o.title:null,i=i.value,n=n.getTitle();t||(l={onClick:function(e){s||r.triggerCheckAllEvent(e,!d)}});e=__assign(__assign({},e),{checked:d,disabled:s,indeterminate:a});return c?renderTitleContent(e,r.callSlot(c,e)):(i.checkStrictly?i.showHeader:!1!==i.showHeader)?renderTitleContent(e,[(0,_vue.h)("span",__assign({class:["vxe-cell--checkbox",{"is--checked":d,"is--disabled":s,"is--indeterminate":a}],title:_conf.default.i18n("vxe.table.allTitle")},l),[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})].concat(o||n?[(0,_vue.h)("span",{class:"vxe-checkbox--label"},o?r.callSlot(o,e):n)]:[]))]):renderTitleContent(e,[(0,_vue.h)("span",{class:"vxe-checkbox--label"},o?r.callSlot(o,e):n)])},renderCheckboxCell:function(l){var e,r=l.$table,n=l.row,t=l.column,o=l.isHidden,a=r.props,c=r.reactData,i=a.treeConfig,d=c.selection,s=c.treeIndeterminates,u=r.getComputeMaps().computeCheckboxOpts.value,f=u.labelField,v=u.checkMethod,a=u.visibleMethod,c=t.slots,u=c?c.default:null,t=c?c.checkbox:null,c=!1,C=!1,_=!a||a({row:n}),p=!!v;o||(C=-1<r.findRowIndexOf(d,n),e={onClick:function(e){!p&&_&&r.triggerCheckRowEvent(e,l,!C)}},v&&(p=!v({row:n})),i&&(c=-1<r.findRowIndexOf(s,n)));s=__assign(__assign({},l),{checked:C,disabled:p,visible:_,indeterminate:c});if(t)return r.callSlot(t,s);t=[];return _&&t.push((0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})),(u||f)&&t.push((0,_vue.h)("span",{class:"vxe-checkbox--label"},u?r.callSlot(u,s):_xeUtils.default.get(n,f))),[(0,_vue.h)("span",__assign({class:["vxe-cell--checkbox",{"is--checked":C,"is--disabled":p,"is--indeterminate":c}]},e),t)]},renderTreeSelectionCell:function(e){return Cell.renderTreeIcon(e,Cell.renderCheckboxCell(e))},renderCheckboxCellByProp:function(l){var e,r=l.$table,n=l.row,t=l.column,o=l.isHidden,a=r.props,c=r.reactData,i=a.treeConfig,d=c.treeIndeterminates,s=r.getComputeMaps().computeCheckboxOpts.value,u=s.labelField,f=s.checkField,v=s.halfField,C=s.checkMethod,a=s.visibleMethod,c=t.slots,s=c?c.default:null,t=c?c.checkbox:null,c=!1,_=!1,p=!a||a({row:n}),h=!!C;o||(_=_xeUtils.default.get(n,f),e={onClick:function(e){!h&&p&&r.triggerCheckRowEvent(e,l,!_)}},C&&(h=!C({row:n})),i&&(c=-1<r.findRowIndexOf(d,n)));d=__assign(__assign({},l),{checked:_,disabled:h,visible:p,indeterminate:c});if(t)return r.callSlot(t,d);t=[];return p&&(t.push((0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})),(s||u)&&t.push((0,_vue.h)("span",{class:"vxe-checkbox--label"},s?r.callSlot(s,d):_xeUtils.default.get(n,u)))),[(0,_vue.h)("span",__assign({class:["vxe-cell--checkbox",{"is--checked":_,"is--disabled":h,"is--indeterminate":v&&!_?n[v]:c}]},e),t)]},renderTreeSelectionCellByProp:function(e){return Cell.renderTreeIcon(e,Cell.renderCheckboxCellByProp(e))},renderExpandCell:function(l){var r=l.$table,e=l.isHidden,n=l.row,t=l.column,o=r.reactData,a=o.rowExpandeds,c=o.expandLazyLoadeds,i=r.getComputeMaps().computeExpandOpts.value,d=i.lazy,s=i.labelField,u=i.iconLoaded,f=i.showIcon,v=i.iconOpen,C=i.iconClose,_=i.visibleMethod,p=t.slots,o=p?p.default:null,i=p?p.icon:null,t=!1,p=!1;return i?r.callSlot(i,l):(e||(t=-1<r.findRowIndexOf(a,l.row),d&&(p=-1<r.findRowIndexOf(c,n))),[!f||_&&!_(l)?null:(0,_vue.h)("span",{class:["vxe-table--expanded",{"is--active":t}],onClick:function(e){r.triggerRowExpandEvent(e,l)}},[(0,_vue.h)("i",{class:["vxe-table--expand-btn",p?u||_conf.default.icon.TABLE_EXPAND_LOADED:t?v||_conf.default.icon.TABLE_EXPAND_OPEN:C||_conf.default.icon.TABLE_EXPAND_CLOSE]})]),o||s?(0,_vue.h)("span",{class:"vxe-table--expand-label"},o?r.callSlot(o,l):_xeUtils.default.get(n,s)):null])},renderExpandData:function(e){var l=e.$table,r=e.column,n=r.slots,r=r.contentRender,n=n?n.content:null;if(n)return l.callSlot(n,e);if(r){n=_vXETable.VXETable.renderer.get(r.name);if(n&&n.renderExpand)return n.renderExpand(r,e)}return[]},renderHTMLCell:function(e){var l=e.$table,r=e.column.slots,r=r?r.default:null;return r?l.callSlot(r,e):[(0,_vue.h)("span",{class:"vxe-cell--html",innerHTML:getDefaultCellLabel(e)})]},renderTreeHTMLCell:function(e){return Cell.renderTreeIcon(e,Cell.renderHTMLCell(e))},renderSortAndFilterHeader:function(e){return Cell.renderDefaultHeader(e).concat(Cell.renderSortIcon(e)).concat(Cell.renderFilterIcon(e))},renderSortHeader:function(e){return Cell.renderDefaultHeader(e).concat(Cell.renderSortIcon(e))},renderSortIcon:function(e){var l=e.$table,r=e.column,n=l.getComputeMaps().computeSortOpts.value,t=n.showIcon,o=n.iconAsc,e=n.iconDesc,n=r.order;return t?[(0,_vue.h)("span",{class:"vxe-cell--sort"},[(0,_vue.h)("i",{class:["vxe-sort--asc-btn",o||_conf.default.icon.TABLE_SORT_ASC,{"sort--active":"asc"===n}],title:_conf.default.i18n("vxe.table.sortAsc"),onClick:function(e){l.triggerSortEvent(e,r,"asc")}}),(0,_vue.h)("i",{class:["vxe-sort--desc-btn",e||_conf.default.icon.TABLE_SORT_DESC,{"sort--active":"desc"===n}],title:_conf.default.i18n("vxe.table.sortDesc"),onClick:function(e){l.triggerSortEvent(e,r,"desc")}})])]:[]},renderFilterHeader:function(e){return Cell.renderDefaultHeader(e).concat(Cell.renderFilterIcon(e))},renderFilterIcon:function(l){var r=l.$table,e=l.column,n=l.hasFilter,t=r.reactData.filterStore,o=r.getComputeMaps().computeFilterOpts.value,a=o.showIcon,c=o.iconNone,o=o.iconMatch;return a?[(0,_vue.h)("span",{class:["vxe-cell--filter",{"is--active":t.visible&&t.column===e}]},[(0,_vue.h)("i",{class:["vxe-filter--btn",n?o||_conf.default.icon.TABLE_FILTER_MATCH:c||_conf.default.icon.TABLE_FILTER_NONE],title:_conf.default.i18n("vxe.table.filter"),onClick:function(e){r.triggerFilterEvent(e,l.column,l)}})])]:[]},renderEditHeader:function(e){var l=e.$table,r=e.column,n=l.props,t=l.getComputeMaps().computeEditOpts,o=n.editConfig,a=n.editRules,c=t.value,l=r.sortable,n=r.filters,t=r.editRender,r=!1;return!a||(a=_xeUtils.default.get(a,e.column.property))&&(r=a.some(function(e){return e.required})),((0,_utils.isEnableConf)(o)?[r&&c.showAsterisk?(0,_vue.h)("i",{class:"vxe-cell--required-icon"}):null,(0,_utils.isEnableConf)(t)&&c.showIcon?(0,_vue.h)("i",{class:["vxe-cell--edit-icon",c.icon||_conf.default.icon.TABLE_EDIT]}):null]:[]).concat(Cell.renderDefaultHeader(e)).concat(l?Cell.renderSortIcon(e):[]).concat(n?Cell.renderFilterIcon(e):[])},renderRowEdit:function(e){var l=e.$table,r=e.column,l=l.reactData.editStore.actived,r=r.editRender;return Cell.runRenderer(e,(0,_utils.isEnableConf)(r)&&l&&l.row===e.row)},renderTreeRowEdit:function(e){return Cell.renderTreeIcon(e,Cell.renderRowEdit(e))},renderCellEdit:function(e){var l=e.$table,r=e.column,l=l.reactData.editStore.actived,r=r.editRender;return Cell.runRenderer(e,(0,_utils.isEnableConf)(r)&&l&&l.row===e.row&&l.column===e.column)},renderTreeCellEdit:function(e){return Cell.renderTreeIcon(e,Cell.renderCellEdit(e))},runRenderer:function(e,l){var r=e.$table,n=e.column,t=n.slots,o=n.editRender,a=n.formatter,c=t?t.default:null,n=t?t.edit:null,t=_vXETable.VXETable.renderer.get(o.name);return l?n?r.callSlot(n,e):t&&t.renderEdit?t.renderEdit(o,Object.assign({$type:"edit"},e)):[]:c?r.callSlot(c,e):a?[(0,_vue.h)("span",{class:"vxe-cell--label"},getDefaultCellLabel(e))]:Cell.renderDefaultCell(e)}},_default=exports.Cell=Cell;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,r=1,n=arguments.length;r<n;r++)for(var t in l=arguments[r])Object.prototype.hasOwnProperty.call(l,t)&&(e[t]=l[t]);return e}).apply(this,arguments)};function renderHelpIcon(l){var r=l.$table,e=l.column,e=e.titlePrefix||e.titleHelp;return e?[(0,_vue.h)("i",{class:["vxe-cell-help-icon",e.icon||_conf.default.icon.TABLE_HELP],onMouseenter:function(e){r.triggerHeaderHelpEvent(e,l)},onMouseleave:function(e){r.handleTargetLeaveEvent(e)}})]:[]}function renderTitleContent(l,e){var r=l.$table,n=l.column,t=r.props,a=r.internalData,o=r.getComputeMaps().computeTooltipOpts,c=t.showHeaderOverflow,i=n.type,t=n.showHeaderOverflow,d=o.value.showAll,t=_xeUtils.default.isUndefined(t)||_xeUtils.default.isNull(t)?c:t,s="title"===t,u=!0===t||"tooltip"===t,t={};return(s||u||d)&&(t.onMouseenter=function(e){a._isResize||(s?(0,_dom.updateCellTitle)(e.currentTarget,n):(u||d)&&r.triggerHeaderTooltipEvent(e,l))}),(u||d)&&(t.onMouseleave=function(e){a._isResize||(u||d)&&r.handleTargetLeaveEvent(e)}),["html"===i&&_xeUtils.default.isString(e)?(0,_vue.h)("span",__assign({class:"vxe-cell--title",innerHTML:e},t)):(0,_vue.h)("span",__assign({class:"vxe-cell--title"},t),e)]}function getFooterContent(e){var l=e.$table,r=e.column,n=e._columnIndex,t=e.items,a=r.slots,o=r.editRender,r=r.cellRender,r=o||r,a=a?a.footer:null;if(a)return l.callSlot(a,e);if(r){a=_vXETable.VXETable.renderer.get(r.name);if(a&&a.renderFooter)return a.renderFooter(r,e)}return[(0,_utils.formatText)(t[n],1)]}function getDefaultCellLabel(e){var l=e.$table,r=e.row,e=e.column;return(0,_utils.formatText)(l.getCellLabel(r,e),1)}var Cell={createColumn:function(e,l){var r=l.type,n=l.sortable,t=l.filters,a=l.editRender,o=l.treeNode,c=e.props.editConfig,i=e.getComputeMaps(),d=i.computeEditOpts,s=i.computeCheckboxOpts.value,u=d.value,f={renderHeader:Cell.renderDefaultHeader,renderCell:o?Cell.renderTreeCell:Cell.renderDefaultCell,renderFooter:Cell.renderDefaultFooter};switch(r){case"seq":f.renderHeader=Cell.renderSeqHeader,f.renderCell=o?Cell.renderTreeIndexCell:Cell.renderSeqCell;break;case"radio":f.renderHeader=Cell.renderRadioHeader,f.renderCell=o?Cell.renderTreeRadioCell:Cell.renderRadioCell;break;case"checkbox":f.renderHeader=Cell.renderCheckboxHeader,f.renderCell=s.checkField?o?Cell.renderTreeSelectionCellByProp:Cell.renderCheckboxCellByProp:o?Cell.renderTreeSelectionCell:Cell.renderCheckboxCell;break;case"expand":f.renderCell=Cell.renderExpandCell,f.renderData=Cell.renderExpandData;break;case"html":f.renderCell=o?Cell.renderTreeHTMLCell:Cell.renderHTMLCell,t&&n?f.renderHeader=Cell.renderSortAndFilterHeader:n?f.renderHeader=Cell.renderSortHeader:t&&(f.renderHeader=Cell.renderFilterHeader);break;default:c&&a?(f.renderHeader=Cell.renderEditHeader,f.renderCell="cell"===u.mode?o?Cell.renderTreeCellEdit:Cell.renderCellEdit:o?Cell.renderTreeRowEdit:Cell.renderRowEdit):t&&n?f.renderHeader=Cell.renderSortAndFilterHeader:n?f.renderHeader=Cell.renderSortHeader:t&&(f.renderHeader=Cell.renderFilterHeader)}return(0,_util.createColumn)(e,l,f)},renderHeaderTitle:function(e){var l=e.$table,r=e.column,n=r.slots,t=r.editRender,a=r.cellRender,a=t||a,n=n?n.header:null;if(n)return renderTitleContent(e,l.callSlot(n,e));if(a){n=_vXETable.VXETable.renderer.get(a.name);if(n&&n.renderHeader)return renderTitleContent(e,n.renderHeader(a,e))}return renderTitleContent(e,(0,_utils.formatText)(r.getTitle(),1))},renderDefaultHeader:function(e){return renderHelpIcon(e).concat(Cell.renderHeaderTitle(e))},renderDefaultCell:function(e){var l=e.$table,r=e.row,n=e.column,t=n.slots,a=n.editRender,o=n.cellRender,c=a||o,o=t?t.default:null;if(o)return l.callSlot(o,e);if(c){t=a?"renderCell":"renderDefault",o=_vXETable.VXETable.renderer.get(c.name),t=o?o[t]:null;if(t)return t(c,Object.assign({$type:a?"edit":"cell"},e))}r=l.getCellLabel(r,n),n=a?a.placeholder:"";return[(0,_vue.h)("span",{class:"vxe-cell--label"},a&&(0,_utils.eqEmptyValue)(r)?[(0,_vue.h)("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(n),1))]:(0,_utils.formatText)(r,1))]},renderTreeCell:function(e){return Cell.renderTreeIcon(e,Cell.renderDefaultCell(e))},renderDefaultFooter:function(e){return[(0,_vue.h)("span",{class:"vxe-cell--item"},getFooterContent(e))]},renderTreeIcon:function(l,e){var r=l.$table,n=l.isHidden,t=r.reactData,a=r.getComputeMaps().computeTreeOpts,o=t.treeExpandeds,c=t.treeLazyLoadeds,i=a.value,d=l.row,s=l.column,u=l.level,f=s.slots,v=i.children,C=i.hasChild,_=i.indent,p=i.lazy,h=i.trigger,x=i.iconLoaded,b=i.showIcon,T=i.iconOpen,m=i.iconClose,t=d[v],a=f?f.icon:null,s=!1,i=!1,v=!1,f={};return a?r.callSlot(a,l):(n||(i=-1<r.findRowIndexOf(o,d),p&&(v=-1<r.findRowIndexOf(c,d),s=d[C])),h&&"default"!==h||(f.onClick=function(e){return r.triggerTreeExpandEvent(e,l)}),[(0,_vue.h)("div",{class:["vxe-cell--tree-node",{"is--active":i}],style:{paddingLeft:u*_+"px"}},[b&&(t&&t.length||s)?[(0,_vue.h)("div",__assign({class:"vxe-tree--btn-wrapper"},f),[(0,_vue.h)("i",{class:["vxe-tree--node-btn",v?x||_conf.default.icon.TABLE_TREE_LOADED:i?T||_conf.default.icon.TABLE_TREE_OPEN:m||_conf.default.icon.TABLE_TREE_CLOSE]})])]:null,(0,_vue.h)("div",{class:"vxe-tree-cell"},e)])])},renderSeqHeader:function(e){var l=e.$table,r=e.column,n=r.slots,n=n?n.header:null;return renderTitleContent(e,n?l.callSlot(n,e):(0,_utils.formatText)(r.getTitle(),1))},renderSeqCell:function(e){var l=e.$table,r=e.column,n=l.props.treeConfig,t=l.getComputeMaps().computeSeqOpts.value,r=r.slots,r=r?r.default:null;if(r)return l.callSlot(r,e);l=e.seq,r=t.seqMethod;return[(0,_utils.formatText)(r?r(e):n?l:(t.startIndex||0)+l,1)]},renderTreeIndexCell:function(e){return Cell.renderTreeIcon(e,Cell.renderSeqCell(e))},renderRadioHeader:function(e){var l=e.$table,r=e.column,n=r.slots,t=n?n.header:null,n=n?n.title:null;return renderTitleContent(e,t?l.callSlot(t,e):[(0,_vue.h)("span",{class:"vxe-radio--label"},n?l.callSlot(n,e):(0,_utils.formatText)(r.getTitle(),1))])},renderRadioCell:function(l){var e,r=l.$table,n=l.column,t=l.isHidden,a=r.reactData,o=r.getComputeMaps().computeRadioOpts,c=a.selectRow,i=o.value,d=n.slots,s=i.labelField,a=i.checkMethod,o=i.visibleMethod,n=l.row,i=d?d.default:null,d=d?d.radio:null,c=n===c,u=!o||o({row:n}),f=!!a;t||(e={onClick:function(e){!f&&u&&r.triggerRadioRowEvent(e,l)}},a&&(f=!a({row:n})));a=__assign(__assign({},l),{checked:c,disabled:f,visible:u});if(d)return r.callSlot(d,a);d=[];return u&&d.push((0,_vue.h)("span",{class:"vxe-radio--icon vxe-radio--checked-icon"}),(0,_vue.h)("span",{class:"vxe-radio--icon vxe-radio--unchecked-icon"})),(i||s)&&d.push((0,_vue.h)("span",{class:"vxe-radio--label"},i?r.callSlot(i,a):_xeUtils.default.get(n,s))),[(0,_vue.h)("span",__assign({class:["vxe-cell--radio",{"is--checked":c,"is--disabled":f}]},e),d)]},renderTreeRadioCell:function(e){return Cell.renderTreeIcon(e,Cell.renderRadioCell(e))},renderCheckboxHeader:function(e){var l,r=e.$table,n=e.column,t=e.isHidden,a=r.reactData,o=r.getComputeMaps(),c=o.computeIsAllCheckboxDisabled,i=o.computeCheckboxOpts,d=a.isAllSelected,o=a.isIndeterminate,s=c.value,a=n.slots,c=a?a.header:null,a=a?a.title:null,i=i.value,n=n.getTitle();t||(l={onClick:function(e){s||r.triggerCheckAllEvent(e,!d)}});e=__assign(__assign({},e),{checked:d,disabled:s,indeterminate:o});return c?renderTitleContent(e,r.callSlot(c,e)):(i.checkStrictly?i.showHeader:!1!==i.showHeader)?renderTitleContent(e,[(0,_vue.h)("span",__assign({class:["vxe-cell--checkbox",{"is--checked":d,"is--disabled":s,"is--indeterminate":o}],title:_conf.default.i18n("vxe.table.allTitle")},l),[(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})].concat(a||n?[(0,_vue.h)("span",{class:"vxe-checkbox--label"},a?r.callSlot(a,e):n)]:[]))]):renderTitleContent(e,[(0,_vue.h)("span",{class:"vxe-checkbox--label"},a?r.callSlot(a,e):n)])},renderCheckboxCell:function(l){var e,r=l.$table,n=l.row,t=l.column,a=l.isHidden,o=r.props,c=r.reactData,i=o.treeConfig,d=c.selection,s=c.treeIndeterminates,u=r.getComputeMaps().computeCheckboxOpts.value,f=u.labelField,v=u.checkMethod,o=u.visibleMethod,c=t.slots,u=c?c.default:null,t=c?c.checkbox:null,c=!1,C=!1,_=!o||o({row:n}),p=!!v;a||(C=-1<r.findRowIndexOf(d,n),e={onClick:function(e){!p&&_&&r.triggerCheckRowEvent(e,l,!C)}},v&&(p=!v({row:n})),i&&(c=-1<r.findRowIndexOf(s,n)));s=__assign(__assign({},l),{checked:C,disabled:p,visible:_,indeterminate:c});if(t)return r.callSlot(t,s);t=[];return _&&t.push((0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})),(u||f)&&t.push((0,_vue.h)("span",{class:"vxe-checkbox--label"},u?r.callSlot(u,s):_xeUtils.default.get(n,f))),[(0,_vue.h)("span",__assign({class:["vxe-cell--checkbox",{"is--checked":C,"is--disabled":p,"is--indeterminate":c}]},e),t)]},renderTreeSelectionCell:function(e){return Cell.renderTreeIcon(e,Cell.renderCheckboxCell(e))},renderCheckboxCellByProp:function(l){var e,r=l.$table,n=l.row,t=l.column,a=l.isHidden,o=r.props,c=r.reactData,i=o.treeConfig,d=c.treeIndeterminates,s=r.getComputeMaps().computeCheckboxOpts.value,u=s.labelField,f=s.checkField,v=s.halfField,C=s.checkMethod,o=s.visibleMethod,c=t.slots,s=c?c.default:null,t=c?c.checkbox:null,c=!1,_=!1,p=!o||o({row:n}),h=!!C;a||(_=_xeUtils.default.get(n,f),e={onClick:function(e){!h&&p&&r.triggerCheckRowEvent(e,l,!_)}},C&&(h=!C({row:n})),i&&(c=-1<r.findRowIndexOf(d,n)));d=__assign(__assign({},l),{checked:_,disabled:h,visible:p,indeterminate:c});if(t)return r.callSlot(t,d);t=[];return p&&(t.push((0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--checked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--unchecked-icon"}),(0,_vue.h)("span",{class:"vxe-checkbox--icon vxe-checkbox--indeterminate-icon"})),(s||u)&&t.push((0,_vue.h)("span",{class:"vxe-checkbox--label"},s?r.callSlot(s,d):_xeUtils.default.get(n,u)))),[(0,_vue.h)("span",__assign({class:["vxe-cell--checkbox",{"is--checked":_,"is--disabled":h,"is--indeterminate":v&&!_?n[v]:c}]},e),t)]},renderTreeSelectionCellByProp:function(e){return Cell.renderTreeIcon(e,Cell.renderCheckboxCellByProp(e))},renderExpandCell:function(l){var r=l.$table,e=l.isHidden,n=l.row,t=l.column,a=r.reactData,o=a.rowExpandeds,c=a.expandLazyLoadeds,i=r.getComputeMaps().computeExpandOpts.value,d=i.lazy,s=i.labelField,u=i.iconLoaded,f=i.showIcon,v=i.iconOpen,C=i.iconClose,_=i.visibleMethod,p=t.slots,a=p?p.default:null,i=p?p.icon:null,t=!1,p=!1;return i?r.callSlot(i,l):(e||(t=-1<r.findRowIndexOf(o,l.row),d&&(p=-1<r.findRowIndexOf(c,n))),[!f||_&&!_(l)?null:(0,_vue.h)("span",{class:["vxe-table--expanded",{"is--active":t}],onClick:function(e){r.triggerRowExpandEvent(e,l)}},[(0,_vue.h)("i",{class:["vxe-table--expand-btn",p?u||_conf.default.icon.TABLE_EXPAND_LOADED:t?v||_conf.default.icon.TABLE_EXPAND_OPEN:C||_conf.default.icon.TABLE_EXPAND_CLOSE]})]),a||s?(0,_vue.h)("span",{class:"vxe-table--expand-label"},a?r.callSlot(a,l):_xeUtils.default.get(n,s)):null])},renderExpandData:function(e){var l=e.$table,r=e.column,n=r.slots,r=r.contentRender,n=n?n.content:null;if(n)return l.callSlot(n,e);if(r){n=_vXETable.VXETable.renderer.get(r.name);if(n&&n.renderExpand)return n.renderExpand(r,e)}return[]},renderHTMLCell:function(e){var l=e.$table,r=e.column.slots,r=r?r.default:null;return r?l.callSlot(r,e):[(0,_vue.h)("span",{class:"vxe-cell--html",innerHTML:getDefaultCellLabel(e)})]},renderTreeHTMLCell:function(e){return Cell.renderTreeIcon(e,Cell.renderHTMLCell(e))},renderSortAndFilterHeader:function(e){return Cell.renderDefaultHeader(e).concat(Cell.renderSortIcon(e)).concat(Cell.renderFilterIcon(e))},renderSortHeader:function(e){return Cell.renderDefaultHeader(e).concat(Cell.renderSortIcon(e))},renderSortIcon:function(e){var l=e.$table,r=e.column,n=l.getComputeMaps().computeSortOpts.value,t=n.showIcon,a=n.iconAsc,e=n.iconDesc,n=r.order;return t?[(0,_vue.h)("span",{class:"vxe-cell--sort"},[(0,_vue.h)("i",{class:["vxe-sort--asc-btn",a||_conf.default.icon.TABLE_SORT_ASC,{"sort--active":"asc"===n}],title:_conf.default.i18n("vxe.table.sortAsc"),onClick:function(e){l.triggerSortEvent(e,r,"asc")}}),(0,_vue.h)("i",{class:["vxe-sort--desc-btn",e||_conf.default.icon.TABLE_SORT_DESC,{"sort--active":"desc"===n}],title:_conf.default.i18n("vxe.table.sortDesc"),onClick:function(e){l.triggerSortEvent(e,r,"desc")}})])]:[]},renderFilterHeader:function(e){return Cell.renderDefaultHeader(e).concat(Cell.renderFilterIcon(e))},renderFilterIcon:function(l){var r=l.$table,e=l.column,n=l.hasFilter,t=r.reactData.filterStore,a=r.getComputeMaps().computeFilterOpts.value,o=a.showIcon,c=a.iconNone,a=a.iconMatch;return o?[(0,_vue.h)("span",{class:["vxe-cell--filter",{"is--active":t.visible&&t.column===e}]},[(0,_vue.h)("i",{class:["vxe-filter--btn",n?a||_conf.default.icon.TABLE_FILTER_MATCH:c||_conf.default.icon.TABLE_FILTER_NONE],title:_conf.default.i18n("vxe.table.filter"),onClick:function(e){r.triggerFilterEvent(e,l.column,l)}})])]:[]},renderEditHeader:function(e){var l=e.$table,r=e.column,n=l.props,t=l.getComputeMaps().computeEditOpts,a=n.editConfig,o=n.editRules,c=t.value,i=r.sortable,l=r.filters,n=r.editRender,t=!1;return!o||(r=_xeUtils.default.get(o,r.field))&&(t=r.some(function(e){return e.required})),((0,_utils.isEnableConf)(a)?[t&&c.showAsterisk?(0,_vue.h)("i",{class:"vxe-cell--required-icon"}):null,(0,_utils.isEnableConf)(n)&&c.showIcon?(0,_vue.h)("i",{class:["vxe-cell--edit-icon",c.icon||_conf.default.icon.TABLE_EDIT]}):null]:[]).concat(Cell.renderDefaultHeader(e)).concat(i?Cell.renderSortIcon(e):[]).concat(l?Cell.renderFilterIcon(e):[])},renderRowEdit:function(e){var l=e.$table,r=e.column,l=l.reactData.editStore.actived,r=r.editRender;return Cell.runRenderer(e,(0,_utils.isEnableConf)(r)&&l&&l.row===e.row)},renderTreeRowEdit:function(e){return Cell.renderTreeIcon(e,Cell.renderRowEdit(e))},renderCellEdit:function(e){var l=e.$table,r=e.column,l=l.reactData.editStore.actived,r=r.editRender;return Cell.runRenderer(e,(0,_utils.isEnableConf)(r)&&l&&l.row===e.row&&l.column===e.column)},renderTreeCellEdit:function(e){return Cell.renderTreeIcon(e,Cell.renderCellEdit(e))},runRenderer:function(e,l){var r=e.$table,n=e.column,t=n.slots,a=n.editRender,o=n.formatter,c=t?t.default:null,n=t?t.edit:null,t=_vXETable.VXETable.renderer.get(a.name);return l?n?r.callSlot(n,e):t&&t.renderEdit?t.renderEdit(a,Object.assign({$type:"edit"},e)):[]:c?r.callSlot(c,e):o?[(0,_vue.h)("span",{class:"vxe-cell--label"},getDefaultCellLabel(e))]:Cell.renderDefaultCell(e)}},_default=exports.Cell=Cell;exports.default=_default;

package/lib/table/src/columnInfo.js

@@ -168,7 +168,7 @@ function () {
   };
 
   ColumnInfo.prototype.getKey = function () {
-    return this.property || (this.type ? "type=" + this.type : null);
+    return this.field || (this.type ? "type=" + this.type : null);
   };
 
   ColumnInfo.prototype.update = function (name, value) {

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")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_utils=require("../../tools/utils"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var ColumnInfo=function(){function e(e,r,t){var l,o=void 0===t?{}:t,i=o.renderHeader,n=o.renderCell,d=o.renderFooter,s=o.renderData,a=e.xegrid,u=r.formatter,t=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(o=["seq","checkbox","radio","expand","html"],r.type&&-1===o.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,o.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+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="+r.editRender,"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&(o=e.props.treeConfig,e=e.getComputeMaps().computeTreeOpts.value,o&&e.line&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"])),u&&(_xeUtils.default.isString(u)?(l=_vXETable.VXETable.formats.get(u)||_xeUtils.default[u],_xeUtils.default.isFunction(l)||(0,_log.errLog)("vxe.error.notFunc",[u])):_xeUtils.default.isArray(u)&&(l=_vXETable.VXETable.formats.get(u[0])||_xeUtils.default[u[0]],_xeUtils.default.isFunction(l)||(0,_log.errLog)("vxe.error.notFunc",[u[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:u,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,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:t,halfVisible:!1,defaultVisible:t,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:i||r.renderHeader,renderCell:n||r.renderCell,renderFooter:d||r.renderFooter,renderData:s,slots:r.slots}),!a||(r=a.getComputeMaps().computeProxyOpts.value).beforeColumn&&r.beforeColumn({$grid:a,column:this})}return e.prototype.getTitle=function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))},e.prototype.getKey=function(){return this.property||(this.type?"type="+this.type:null)},e.prototype.update=function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)},e}();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")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_utils=require("../../tools/utils"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var ColumnInfo=function(){function e(e,r,t){var l,o=void 0===t?{}:t,i=o.renderHeader,n=o.renderCell,d=o.renderFooter,s=o.renderData,a=e.xegrid,u=r.formatter,t=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(o=["seq","checkbox","radio","expand","html"],r.type&&-1===o.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,o.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+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="+r.editRender,"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&(o=e.props.treeConfig,e=e.getComputeMaps().computeTreeOpts.value,o&&e.line&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"])),u&&(_xeUtils.default.isString(u)?(l=_vXETable.VXETable.formats.get(u)||_xeUtils.default[u],_xeUtils.default.isFunction(l)||(0,_log.errLog)("vxe.error.notFunc",[u])):_xeUtils.default.isArray(u)&&(l=_vXETable.VXETable.formats.get(u[0])||_xeUtils.default[u[0]],_xeUtils.default.isFunction(l)||(0,_log.errLog)("vxe.error.notFunc",[u[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:u,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,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:t,halfVisible:!1,defaultVisible:t,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:i||r.renderHeader,renderCell:n||r.renderCell,renderFooter:d||r.renderFooter,renderData:s,slots:r.slots}),!a||(r=a.getComputeMaps().computeProxyOpts.value).beforeColumn&&r.beforeColumn({$grid:a,column:this})}return e.prototype.getTitle=function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))},e.prototype.getKey=function(){return this.field||(this.type?"type="+this.type:null)},e.prototype.update=function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)},e}();exports.ColumnInfo=ColumnInfo;

package/lib/table/src/table.js

@@ -1014,7 +1014,7 @@ var _default = (0, _vue.defineComponent)({
 
       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;
@@ -1026,14 +1026,14 @@ var _default = (0, _vue.defineComponent)({
           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) {
@@ -1435,7 +1435,7 @@ var _default = (0, _vue.defineComponent)({
         var filterColumns_1 = [];
         var orderColumns_1 = [];
         tableFullColumn.forEach(function (column) {
-          var property = column.property,
+          var field = column.field,
               sortable = column.sortable,
               order = column.order,
               filters = column.filters;
@@ -1462,8 +1462,8 @@ var _default = (0, _vue.defineComponent)({
           if (!allRemoteSort && sortable && order) {
             orderColumns_1.push({
               column: column,
-              field: property,
-              property: property,
+              field: field,
+              property: field,
               order: order,
               sortTime: column.sortTime
             });
@@ -1532,7 +1532,7 @@ var _default = (0, _vue.defineComponent)({
                 });
               }
 
-              return valueList.indexOf(_xeUtils.default.get(row, column.property)) > -1;
+              return valueList.indexOf(_xeUtils.default.get(row, column.field)) > -1;
             });
           };
 
@@ -2200,8 +2200,6 @@ var _default = (0, _vue.defineComponent)({
           loadMethod({
             $table: $xetable,
             row: row
-          }).catch(function () {
-            return [];
           }).then(function (childRecords) {
             rest.treeLoaded = true;
 
@@ -2497,12 +2495,25 @@ var _default = (0, _vue.defineComponent)({
           (0, _vue.nextTick)().then(function () {
             return tableMethods.recalculate();
           }).then(function () {
-            // 是否变更虚拟滚动
+            var targetScrollLeft = lastScrollLeft;
+            var targetScrollTop = lastScrollTop;
+            var sXOpts = computeSXOpts.value;
+            var sYOpts = computeSYOpts.value; // 是否在更新数据之后自动滚动重置滚动条
+
+            if (sXOpts.scrollToLeftOnChange) {
+              targetScrollLeft = 0;
+            }
+
+            if (sYOpts.scrollToTopOnChange) {
+              targetScrollTop = 0;
+            } // 是否变更虚拟滚动
+
+
             if (oldScrollYLoad === sYLoad) {
-              (0, _util.restoreScrollLocation)($xetable, lastScrollLeft, lastScrollTop).then(resolve);
+              (0, _util.restoreScrollLocation)($xetable, targetScrollLeft, targetScrollTop).then(resolve);
             } else {
               setTimeout(function () {
-                return (0, _util.restoreScrollLocation)($xetable, lastScrollLeft, lastScrollTop).then(resolve);
+                return (0, _util.restoreScrollLocation)($xetable, targetScrollLeft, targetScrollTop).then(resolve);
               });
             }
           });
@@ -3384,7 +3395,7 @@ var _default = (0, _vue.defineComponent)({
         } else {
           rows.forEach(function (row) {
             visibleColumn.forEach(function (column) {
-              if (column.property) {
+              if (column.field) {
                 (0, _util.setCellValue)(row, column, null);
               }
             });
@@ -3459,7 +3470,7 @@ var _default = (0, _vue.defineComponent)({
             }
 
             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;
@@ -3533,20 +3544,20 @@ var _default = (0, _vue.defineComponent)({
         var transform = treeOpts.transform,
             children = treeOpts.children,
             mapChildren = treeOpts.mapChildren;
-        var property = checkboxOpts.checkField;
+        var checkField = checkboxOpts.checkField;
         var rowList = [];
         var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
 
-        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 {
@@ -3596,8 +3607,9 @@ var _default = (0, _vue.defineComponent)({
        * 根据行的唯一主键获取行
        * @param {String/Number} rowid 行主键
        */
-      getRowById: function getRowById(rowid) {
+      getRowById: function getRowById(cellValue) {
         var fullDataRowIdData = internalData.fullDataRowIdData;
+        var rowid = _xeUtils.default.eqNull(cellValue) ? '' : encodeURIComponent(cellValue);
         return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].row : null;
       },
 
@@ -3836,10 +3848,10 @@ var _default = (0, _vue.defineComponent)({
       isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
         var selection = reactData.selection;
         var checkboxOpts = computeCheckboxOpts.value;
-        var property = checkboxOpts.checkField;
+        var checkField = checkboxOpts.checkField;
 
-        if (property) {
-          return _xeUtils.default.get(row, property);
+        if (checkField) {
+          return _xeUtils.default.get(row, checkField);
         }
 
         return $xetable.findRowIndexOf(selection, row) > -1;
@@ -3870,7 +3882,7 @@ var _default = (0, _vue.defineComponent)({
             checkboxReserveRowMap = internalData.checkboxReserveRowMap;
         var treeOpts = computeTreeOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
-        var property = checkboxOpts.checkField,
+        var checkField = checkboxOpts.checkField,
             reserve = checkboxOpts.reserve,
             checkStrictly = checkboxOpts.checkStrictly,
             checkMethod = checkboxOpts.checkMethod;
@@ -3886,7 +3898,7 @@ var _default = (0, _vue.defineComponent)({
            * 绑定属性方式（高性能，有污染）
            * 必须在行数据存在对应的属性，否则将不响应
            */
-          if (property) {
+          if (checkField) {
             var checkValFn = function checkValFn(row) {
               if (!checkMethod || checkMethod({
                 row: row
@@ -3895,7 +3907,7 @@ var _default = (0, _vue.defineComponent)({
                   selectRows.push(row);
                 }
 
-                _xeUtils.default.set(row, property, value);
+                _xeUtils.default.set(row, checkField, value);
               }
             }; // 如果存在选中方法
             // 如果方法成立，则更新值，否则忽略该数据
@@ -3984,7 +3996,7 @@ var _default = (0, _vue.defineComponent)({
             }
           }
 
-          reactData.selection = property ? [] : beforeSelection.concat(selectRows);
+          reactData.selection = checkField ? [] : beforeSelection.concat(selectRows);
         }
 
         reactData.treeIndeterminates = [];
@@ -4102,17 +4114,17 @@ var _default = (0, _vue.defineComponent)({
         var tableFullData = internalData.tableFullData;
         var treeOpts = computeTreeOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
-        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);
             });
           }
         }
@@ -4366,14 +4378,14 @@ var _default = (0, _vue.defineComponent)({
         var sortList = [];
         var tableFullColumn = internalData.tableFullColumn;
         tableFullColumn.forEach(function (column) {
-          var property = column.property,
+          var field = column.field,
               order = column.order;
 
           if (column.sortable && order) {
             sortList.push({
               column: column,
-              field: property,
-              property: property,
+              field: field,
+              property: field,
               order: order,
               sortTime: column.sortTime
             });
@@ -4405,7 +4417,8 @@ var _default = (0, _vue.defineComponent)({
         if (visible) {
           $xetable.dispatchEvent('filter-visible', {
             column: column,
-            property: column.property,
+            property: column.field,
+            field: column.field,
             filterList: $xetable.getCheckedFilters(),
             visible: false
           }, null);
@@ -5735,10 +5748,10 @@ var _default = (0, _vue.defineComponent)({
         var checkboxOpts = computeCheckboxOpts.value;
         var rowkey = (0, _util.getRowkey)($xetable);
         internalData.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) {
@@ -5753,7 +5766,7 @@ var _default = (0, _vue.defineComponent)({
               }
             }
 
-            _xeUtils.default.set(record, property, cellValue);
+            _xeUtils.default.set(record, field, cellValue);
           }
         });
         var otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField];
@@ -6122,25 +6135,25 @@ var _default = (0, _vue.defineComponent)({
         var afterFullData = internalData.afterFullData;
         var treeOpts = computeTreeOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
-        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 ($xetable.findRowIndexOf(treeIndeterminates, 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 ($xetable.eqRow(item, row) || !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;
@@ -6172,7 +6185,7 @@ var _default = (0, _vue.defineComponent)({
                 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 $xetable.findRowIndexOf(vItems_1, item) > -1;
@@ -6187,7 +6200,7 @@ var _default = (0, _vue.defineComponent)({
             if (!checkMethod || checkMethod({
               row: row
             })) {
-              _xeUtils.default.set(row, property, value);
+              _xeUtils.default.set(row, checkField, value);
 
               handleCheckboxReserveRow(row, value);
             }
@@ -6549,9 +6562,9 @@ var _default = (0, _vue.defineComponent)({
       handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
         var selection = reactData.selection;
         var checkboxOpts = computeCheckboxOpts.value;
-        var property = checkboxOpts.checkField;
+        var checkField = checkboxOpts.checkField;
         var row = params.row;
-        var value = property ? !_xeUtils.default.get(row, property) : $xetable.findRowIndexOf(selection, row) === -1;
+        var value = checkField ? !_xeUtils.default.get(row, checkField) : $xetable.findRowIndexOf(selection, row) === -1;
 
         if (evnt) {
           tablePrivateMethods.triggerCheckRowEvent(evnt, params, value);
@@ -6691,21 +6704,23 @@ var _default = (0, _vue.defineComponent)({
        */
       triggerSortEvent: function triggerSortEvent(evnt, column, order) {
         var sortOpts = computeSortOpts.value;
-        var property = column.property;
+        var field = column.field,
+            sortable = column.sortable;
 
-        if (column.sortable) {
+        if (sortable) {
           if (!order || column.order === order) {
             tableMethods.clearSort(sortOpts.multiple ? column : null);
           } else {
             tableMethods.sort({
-              field: property,
+              field: field,
               order: order
             });
           }
 
           var params = {
             column: column,
-            property: property,
+            field: field,
+            property: field,
             order: column.order,
             sortList: tableMethods.getSortColumns()
           };