vxe-table 3.5.9-beta.7 → 3.5.9

package/lib/table/src/body.js

@@ -105,7 +105,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       isAllOverflow = $xetable.isAllOverflow,
       allAlign = $xetable.align,
       currentColumn = $xetable.currentColumn,
-      cellClassName = $xetable.cellClassName,
+      allCellClassName = $xetable.cellClassName,
       cellStyle = $xetable.cellStyle,
       mergeList = $xetable.mergeList,
       spanMethod = $xetable.spanMethod,
@@ -134,6 +134,9 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   var actived = editStore.actived;
   var scrollYRHeight = sYOpts.rHeight;
   var rowHeight = rowOpts.height;
+  var renderOpts = editRender || cellRender;
+  var compConf = renderOpts ? _vXETable.default.renderer.get(renderOpts.name) : null;
+  var cellClassName = compConf ? compConf.cellClassName : '';
   var showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
   var columnIndex = $xetable.getColumnIndex(column);
 
@@ -339,7 +342,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   }
 
   return h('td', {
-    class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), _utils.default.getClass(className, params), _utils.default.getClass(cellClassName, params)],
+    class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), _utils.default.getClass(cellClassName, params), _utils.default.getClass(className, params), _utils.default.getClass(allCellClassName, params)],
     key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs: attrs,
     style: Object.assign({

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.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;
+"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=J||G,ie=ne?_vXETable.default.renderer.get(ne.name):null,ae=ie?ie.cellClassName:"",se=D.showAll||D.enabled,X=t.getColumnIndex(u),_=t.getVTColumnIndex(u),ne=(0,_utils.isEnableConf)(J),ie=n?u.fixed!==n:u.fixed&&x,D=_xeUtils.default.isUndefined(Z)||_xeUtils.default.isNull(Z)?C:Z,x="ellipsis"===D,ce="title"===D,de=!0===D||"tooltip"===D,Z=ce||de||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},ue=g["cell-mouseenter"],pe=g["cell-mouseleave"],U=J&&q&&"dblclick"===B.trigger,fe={$table:t,seq:r,rowid:o,row:a,rowIndex:s,$rowIndex:c,_rowIndex:d,column:u,columnIndex:X,$columnIndex:p,_columnIndex:_,fixed:n,type:renderType,isHidden:ie,level:i,visibleData:v,data:m,items:y};if(!T&&!S||Z||(x=Z=!0),(ce||de||se||ue||z)&&(D.mouseenter=function(e){isOperateMouse(t)||(ce?_dom.default.updateCellTitle(e.currentTarget,u):(de||se)&&t.triggerBodyTooltipEvent(e,fe),ue&&t.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},fe),e))}),(de||se||pe||z)&&(D.mouseleave=function(e){isOperateMouse(t)||((de||se)&&t.handleTargetLeaveEvent(e),pe&&t.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},fe),e))}),(Y.range||M)&&(D.mousedown=function(e){t.triggerCellMousedownEvent(e,fe)}),(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,fe)}),(U||g["cell-dblclick"])&&(D.dblclick=function(e){t.triggerCellDblclickEvent(e,fe)}),H.length){d=(0,_util.mergeBodyMethod)(H,d,_);if(d){var _=d.rowspan,ye=d.colspan;if(!_||!ye)return null;1<_&&(w.rowspan=_),1<ye&&(w.colspan=ye)}}else if(E){ye=E(fe)||{},E=ye.rowspan,E=void 0===E?1:E,ye=ye.colspan,ye=void 0===ye?1:ye;if(!E||!ye)return null;1<E&&(w.rowspan=E),1<ye&&(w.colspan=ye)}!(ie=ie&&H&&(1<w.colspan||1<w.rowspan)?!1:ie)&&q&&(J||G)&&(B.showStatus||B.showUpdateStatus)&&(h=t.isUpdateByRow(a,u.field));G=[];return ie&&C&&L?G.push(e("div",{class:["vxe-cell",{"c--title":ce,"c--tooltip":de,"c--ellipsis":x}],style:{maxHeight:Z&&(re||oe)?"".concat(re||oe,"px"):""}})):(G.push.apply(G,_toConsumableArray(renderLine(e,l,t,fe)).concat([e("div",{class:["vxe-cell",{"c--title":ce,"c--tooltip":de,"c--ellipsis":x}],style:{maxHeight:Z&&(re||oe)?"".concat(re||oe,"px"):""},attrs:{title:ce?t.getCellLabel(a,u):null}},u.renderCell(e,fe))])),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",ne),_defineProperty(e,"col--ellipsis",Z),_defineProperty(e,"fixed--hidden",ie),_defineProperty(e,"col--dirty",h),_defineProperty(e,"col--actived",q&&ne&&te.row===a&&(te.column===u||"row"===B.mode)),_defineProperty(e,"col--valid-error",$),_defineProperty(e,"col--current",R===u),e),_utils.default.getClass(ae,fe),_utils.default.getClass(ee,fe),_utils.default.getClass(k,fe)],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(fe):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

@@ -19,6 +19,8 @@ var _utils = _interopRequireWildcard(require("../../tools/utils"));
 
 var _util = require("./util");
 
+var _vn = require("../../tools/vn");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -117,7 +119,7 @@ function getFooterContent(h, params) {
     var compConf = _vXETable.default.renderer.get(renderOpts.name);
 
     if (compConf && compConf.renderFooter) {
-      return compConf.renderFooter.call($table, h, renderOpts, params);
+      return (0, _vn.getSlotVNs)(compConf.renderFooter.call($table, h, renderOpts, params));
     }
   }
 
@@ -218,7 +220,7 @@ var Cell = {
       var compConf = _vXETable.default.renderer.get(renderOpts.name);
 
       if (compConf && compConf.renderHeader) {
-        return renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params));
+        return (0, _vn.getSlotVNs)(renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params)));
       }
     }
 
@@ -246,9 +248,9 @@ var Cell = {
       var compConf = _vXETable.default.renderer.get(renderOpts.name);
 
       if (compConf && compConf[funName]) {
-        return compConf[funName].call($table, h, renderOpts, Object.assign({
+        return (0, _vn.getSlotVNs)(compConf[funName].call($table, h, renderOpts, Object.assign({
           $type: editRender ? 'edit' : 'cell'
-        }, params));
+        }, params)));
       }
     }
 
@@ -747,7 +749,7 @@ var Cell = {
       var compConf = _vXETable.default.renderer.get(contentRender.name);
 
       if (compConf && compConf.renderExpand) {
-        return compConf.renderExpand.call($table, h, contentRender, params);
+        return (0, _vn.getSlotVNs)(compConf.renderExpand.call($table, h, contentRender, params));
       }
     }
 
@@ -925,9 +927,13 @@ var Cell = {
         return $table.callSlot(slots.edit, params, h);
       }
 
-      return compConf && compConf.renderEdit ? compConf.renderEdit.call($table, h, editRender, Object.assign({
-        $type: 'edit'
-      }, params)) : [];
+      if (compConf && compConf.renderEdit) {
+        return (0, _vn.getSlotVNs)(compConf.renderEdit.call($table, h, editRender, Object.assign({
+          $type: 'edit'
+        }, params)));
+      }
+
+      return [];
     }
 
     if (slots && slots.default) {

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

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_dom=_interopRequireDefault(require("../../tools/dom")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("./util");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;
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_dom=_interopRequireDefault(require("../../tools/dom")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("./util"),_vn=require("../../tools/vn");function _getRequireWildcardCache(e){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(0,_vn.getSlotVNs)(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(0,_vn.getSlotVNs)(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(0,_vn.getSlotVNs)(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(0,_vn.getSlotVNs)(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?(0,_vn.getSlotVNs)(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/methods.js

@@ -25,6 +25,8 @@ var _formats = require("../../v-x-e-table/src/formats");
 
 var _log = require("../../tools/log");
 
+var _vn = require("../../tools/vn");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -232,14 +234,14 @@ function setMerges(_vm, merges, mList, rowList) {
     var treeConfig = _vm.treeConfig,
         visibleColumn = _vm.visibleColumn;
 
-    if (treeConfig) {
-      throw new Error(_utils.default.getLog('vxe.error.noTree', ['merge-footer-items']));
-    }
-
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
 
+    if (treeConfig && merges.length) {
+      (0, _log.errLog)('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+    }
+
     merges.forEach(function (item) {
       var row = item.row,
           col = item.col,
@@ -297,14 +299,14 @@ function removeMerges(_vm, merges, mList, rowList) {
     var treeConfig = _vm.treeConfig,
         visibleColumn = _vm.visibleColumn;
 
-    if (treeConfig) {
-      throw new Error(_utils.default.getLog('vxe.error.noTree', ['merge-cells']));
-    }
-
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
 
+    if (treeConfig && merges.length) {
+      (0, _log.errLog)('vxe.error.noTree', ['merge-cells | merge-footer-items']);
+    }
+
     merges.forEach(function (item) {
       var row = item.row,
           col = item.col;
@@ -374,7 +376,7 @@ var Methods = {
       }
 
       if (_xeUtils.default.isFunction(slotFunc)) {
-        return slotFunc.call(this, params, h, vNodes);
+        return (0, _vn.getSlotVNs)(slotFunc.call(this, params, h, vNodes));
       }
     }
 
@@ -1368,7 +1370,7 @@ var Methods = {
           var rowIndex = _this15.getRowIndex(row);
 
           if (treeConfig && rowIndex === -1) {
-            throw new Error(_utils.default.getLog('vxe.error.noTree', ['revertData']));
+            (0, _log.errLog)('vxe.error.noTree', ['revertData']);
           }
 
           var oRow = tableSourceData[rowIndex];
@@ -3103,7 +3105,7 @@ var Methods = {
                 if (isClearActived || // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
-                    return _this26.clearActived(evnt);
+                    return _this26.clearEdit(evnt);
                   });
                 }
               });
@@ -3185,7 +3187,7 @@ var Methods = {
             if (actived.row) {
               var params = actived.args;
 
-              _this27.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this27.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
@@ -3305,7 +3307,7 @@ var Methods = {
             if (actived.row) {
               params = actived.args;
 
-              _this28.clearActived(evnt); // 如果配置了选中功能，则为选中状态
+              _this28.clearEdit(evnt); // 如果配置了选中功能，则为选中状态
 
 
               if (mouseConfig && mouseOpts.selected) {
@@ -6536,6 +6538,24 @@ var Methods = {
 
     return cellLabel;
   },
+  findRowIndexOf: function findRowIndexOf(list, row) {
+    var _this58 = this;
+
+    return row ? _xeUtils.default.findIndexOf(list, function (item) {
+      return _this58.eqRow(item, row);
+    }) : -1;
+  },
+  eqRow: function eqRow(row1, row2) {
+    if (row1 && row2) {
+      if (row1 === row2) {
+        return true;
+      }
+
+      return (0, _util.getRowid)(this, row1) === (0, _util.getRowid)(this, row2);
+    }
+
+    return false;
+  },
 
   /*************************
    * Publish methods