vxe-table 3.7.0-beta.5 → 3.7.0-beta.7

package/lib/table/src/cell.js

@@ -447,7 +447,7 @@ var Cell = {
       isHidden = params.isHidden;
     var treeConfig = $table.treeConfig,
       treeIndeterminates = $table.treeIndeterminates,
-      selection = $table.selection;
+      selectCheckboxRows = $table.selectCheckboxRows;
     var _$table$checkboxOpts = $table.checkboxOpts,
       labelField = _$table$checkboxOpts.labelField,
       checkMethod = _$table$checkboxOpts.checkMethod,
@@ -463,7 +463,7 @@ var Cell = {
     var isDisabled = !!checkMethod;
     var on;
     if (!isHidden) {
-      isChecked = $table.findRowIndexOf(selection, row) > -1;
+      isChecked = $table.findRowIndexOf(selectCheckboxRows, row) > -1;
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
@@ -700,6 +700,7 @@ var Cell = {
       },
       on: {
         click: function click(evnt) {
+          evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'asc');
         }
       }
@@ -712,6 +713,7 @@ var Cell = {
       },
       on: {
         click: function click(evnt) {
+          evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'desc');
         }
       }

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

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

package/lib/table/src/columnInfo.js

@@ -54,14 +54,14 @@ var ColumnInfo = /*#__PURE__*/function () {
       }
       if (formatter) {
         if (_xeUtils["default"].isString(formatter)) {
-          var globalFunc = _formats.formats.get(formatter) || _xeUtils["default"][formatter];
-          if (!_xeUtils["default"].isFunction(globalFunc)) {
-            (0, _log.errLog)('vxe.error.notFunc', [formatter]);
+          var gFormatOpts = _formats.formats.get(formatter) || _xeUtils["default"][formatter];
+          if (!gFormatOpts || !_xeUtils["default"].isFunction(gFormatOpts.formatMethod)) {
+            (0, _log.errLog)('vxe.error.notFormats', [formatter]);
           }
         } else if (_xeUtils["default"].isArray(formatter)) {
-          var _globalFunc = _formats.formats.get(formatter[0]) || _xeUtils["default"][formatter[0]];
-          if (!_xeUtils["default"].isFunction(_globalFunc)) {
-            (0, _log.errLog)('vxe.error.notFunc', [formatter[0]]);
+          var _gFormatOpts = _formats.formats.get(formatter[0]) || _xeUtils["default"][formatter[0]];
+          if (!_gFormatOpts || !_xeUtils["default"].isFunction(_gFormatOpts.formatMethod)) {
+            (0, _log.errLog)('vxe.error.notFormats', [formatter[0]]);
           }
         }
       }

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

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

package/lib/table/src/methods.js

@@ -1357,16 +1357,16 @@ var Methods = {
         });
       }
     } else {
-      var selection = this.selection;
+      var selectCheckboxRows = this.selectCheckboxRows;
       if (treeConfig) {
         rowList = _xeUtils["default"].filterTree(currTableData, function (row) {
-          return _this17.findRowIndexOf(selection, row) > -1;
+          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
         }, {
           children: transform ? mapChildren : children
         });
       } else {
         rowList = currTableData.filter(function (row) {
-          return _this17.findRowIndexOf(selection, row) > -1;
+          return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
         });
       }
     }
@@ -2457,6 +2457,7 @@ var Methods = {
   },
   updateHeight: function updateHeight() {
     this.customHeight = calcHeight(this, 'height');
+    this.customMinHeight = calcHeight(this, 'minHeight');
     this.customMaxHeight = calcHeight(this, 'maxHeight');
   },
   updateStyle: function updateStyle() {
@@ -2466,6 +2467,7 @@ var Methods = {
       fullColumnIdData = this.fullColumnIdData,
       tableColumn = this.tableColumn,
       customHeight = this.customHeight,
+      customMinHeight = this.customMinHeight,
       customMaxHeight = this.customMaxHeight,
       border = this.border,
       headerHeight = this.headerHeight,
@@ -2574,15 +2576,22 @@ var Methods = {
         } else if (layout === 'body') {
           var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
           if (isNodeElement(wrapperElem)) {
+            var bodyMinHeight = fixedType ? customMinHeight - headerHeight - footerHeight - (showFooter ? 0 : scrollbarHeight) : customMinHeight - headerHeight - footerHeight;
+            var bodyMaxHeight = 0;
             if (customMaxHeight) {
-              wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight, "px");
-            } else {
-              if (customHeight > 0) {
-                wrapperElem.style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight, "px");
-              } else {
-                wrapperElem.style.height = '';
+              bodyMaxHeight = Math.max(bodyMinHeight, fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight);
+              wrapperElem.style.maxHeight = "".concat(bodyMaxHeight, "px");
+            }
+            if (customHeight > 0) {
+              var bodyHeight = fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight;
+              if (bodyMaxHeight) {
+                bodyHeight = Math.min(bodyMaxHeight, bodyHeight);
               }
+              wrapperElem.style.height = "".concat(Math.max(bodyMinHeight, bodyHeight), "px");
+            } else {
+              wrapperElem.style.height = '';
             }
+            wrapperElem.style.minHeight = "".concat(bodyMinHeight, "px");
           }
 
           // 如果是固定列
@@ -3464,12 +3473,12 @@ var Methods = {
     return this.handleCheckedCheckboxRow(rows, value, true);
   },
   isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
-    var selection = this.selection;
+    var selectCheckboxRows = this.selectCheckboxRows;
     var checkField = this.checkboxOpts.checkField;
     if (checkField) {
       return _xeUtils["default"].get(row, checkField);
     }
-    return this.findRowIndexOf(selection, row) > -1;
+    return this.findRowIndexOf(selectCheckboxRows, row) > -1;
   },
   isIndeterminateByCheckboxRow: function isIndeterminateByCheckboxRow(row) {
     var treeIndeterminates = this.treeIndeterminates;
@@ -3482,7 +3491,7 @@ var Methods = {
   handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
     var _this33 = this;
     var row = _ref6.row;
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
@@ -3554,7 +3563,7 @@ var Methods = {
           if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
             treeIndeterminates.push(row);
           }
-          _xeUtils["default"].remove(selection, function (item) {
+          _xeUtils["default"].remove(selectCheckboxRows, function (item) {
             return _this33.eqRow(item, row);
           });
         } else {
@@ -3564,9 +3573,9 @@ var Methods = {
               row: item
             })) {
               if (value) {
-                selection.push(item);
+                selectCheckboxRows.push(item);
               } else {
-                _xeUtils["default"].remove(selection, function (select) {
+                _xeUtils["default"].remove(selectCheckboxRows, function (select) {
                   return _this33.eqRow(select, item);
                 });
               }
@@ -3595,7 +3604,7 @@ var Methods = {
             _parentStatus = -1;
           } else {
             var _selectItems = _matchObj.items.filter(function (item) {
-              return _this33.findRowIndexOf(selection, item) > -1;
+              return _this33.findRowIndexOf(selectCheckboxRows, item) > -1;
             });
             _parentStatus = _selectItems.filter(function (item) {
               return _this33.findRowIndexOf(_vItems, item) > -1;
@@ -3610,11 +3619,11 @@ var Methods = {
           row: row
         })) {
           if (value) {
-            if (this.findRowIndexOf(selection, row) === -1) {
-              selection.push(row);
+            if (this.findRowIndexOf(selectCheckboxRows, row) === -1) {
+              selectCheckboxRows.push(row);
             }
           } else {
-            _xeUtils["default"].remove(selection, function (item) {
+            _xeUtils["default"].remove(selectCheckboxRows, function (item) {
               return _this33.eqRow(item, row);
             });
           }
@@ -3625,11 +3634,11 @@ var Methods = {
     this.checkSelectionStatus();
   },
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
     var row = params.row;
-    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
+    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value);
     } else {
@@ -3654,10 +3663,10 @@ var Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow: function toggleCheckboxRow(row) {
-    var selection = this.selection,
+    var selectCheckboxRows = this.selectCheckboxRows,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField;
-    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
+    var value = checkField ? !_xeUtils["default"].get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
     this.handleSelectRow({
       row: row
     }, value, true);
@@ -3668,7 +3677,7 @@ var Methods = {
     var afterFullData = this.afterFullData,
       treeConfig = this.treeConfig,
       treeOpts = this.treeOpts,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       checkboxReserveRowMap = this.checkboxReserveRowMap,
       checkboxOpts = this.checkboxOpts;
     var checkField = checkboxOpts.checkField,
@@ -3676,7 +3685,7 @@ var Methods = {
       checkStrictly = checkboxOpts.checkStrictly,
       checkMethod = checkboxOpts.checkMethod;
     var selectRows = [];
-    var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
+    var beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(function (row) {
       return _this34.findRowIndexOf(afterFullData, row) === -1;
     });
     if (checkStrictly) {
@@ -3731,7 +3740,7 @@ var Methods = {
               _xeUtils["default"].eachTree(afterFullData, function (row) {
                 if (checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1) {
+                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1) {
                   selectRows.push(row);
                 }
               }, treeOpts);
@@ -3746,7 +3755,7 @@ var Methods = {
              */
             if (!isForce && checkMethod) {
               selectRows = afterFullData.filter(function (row) {
-                return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
+                return _this34.findRowIndexOf(selectCheckboxRows, row) > -1 || checkMethod({
                   row: row
                 });
               });
@@ -3763,7 +3772,7 @@ var Methods = {
               selectRows = afterFullData.filter(function (row) {
                 return checkMethod({
                   row: row
-                }) ? 0 : _this34.findRowIndexOf(selection, row) > -1;
+                }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1;
               });
             }
           }
@@ -3780,7 +3789,7 @@ var Methods = {
           });
         }
       }
-      this.selection = checkField ? [] : beforeSelection.concat(selectRows);
+      this.selectCheckboxRows = checkField ? [] : beforeSelection.concat(selectRows);
     }
     this.treeIndeterminates = [];
     this.checkSelectionStatus();
@@ -3796,7 +3805,7 @@ var Methods = {
   checkSelectionStatus: function checkSelectionStatus() {
     var _this35 = this;
     var afterFullData = this.afterFullData,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       treeIndeterminates = this.treeIndeterminates,
       checkboxOpts = this.checkboxOpts,
       treeConfig = this.treeConfig;
@@ -3856,22 +3865,22 @@ var Methods = {
             disableRows.push(row);
             return true;
           }
-          if (_this35.findRowIndexOf(selection, row) > -1) {
+          if (_this35.findRowIndexOf(selectCheckboxRows, row) > -1) {
             checkRows.push(row);
             return true;
           }
           return false;
         } : function (row) {
-          return _this35.findRowIndexOf(selection, row) > -1;
+          return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
         });
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selection, row) > -1;
+            return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
           });
         } else {
           isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
-            return _this35.findRowIndexOf(selection, row) > -1;
+            return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
           });
         }
       }
@@ -3891,7 +3900,7 @@ var Methods = {
       radioReserveRow = this.radioReserveRow,
       radioOpts = this.radioOpts,
       checkboxOpts = this.checkboxOpts,
-      selection = this.selection,
+      selectCheckboxRows = this.selectCheckboxRows,
       rowExpandeds = this.rowExpandeds,
       treeExpandeds = this.treeExpandeds,
       expandOpts = this.expandOpts;
@@ -3907,7 +3916,7 @@ var Methods = {
       }
     }
     // 复选框
-    this.selection = getRecoverRow(this, selection); // 刷新多选行状态
+    this.selectCheckboxRows = getRecoverRow(this, selectCheckboxRows); // 刷新多选行状态
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
       this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
@@ -4077,7 +4086,7 @@ var Methods = {
     }
     this.isAllSelected = false;
     this.isIndeterminate = false;
-    this.selection = [];
+    this.selectCheckboxRows = [];
     this.treeIndeterminates = [];
     return this.$nextTick();
   },
@@ -4498,12 +4507,18 @@ var Methods = {
         });
       }
       var params = {
+        $table: this,
+        $event: evnt,
         column: column,
         field: field,
         property: field,
         order: column.order,
-        sortList: this.getSortColumns()
+        sortList: this.getSortColumns(),
+        sortTime: column.sortTime
       };
+      if (this.mouseConfig && this.mouseOpts.area && this.handleSortEvent) {
+        return this.handleSortEvent(evnt, params);
+      }
       this.emitEvent('sort-change', params, evnt);
     }
   },
@@ -4763,7 +4778,19 @@ var Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setAllRowExpand: function setAllRowExpand(expanded) {
-    return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
+    var treeConfig = this.treeConfig,
+      treeOpts = this.treeOpts,
+      tableFullData = this.tableFullData,
+      tableFullTreeData = this.tableFullTreeData;
+    var expandedRows = [];
+    if (treeConfig) {
+      _xeUtils["default"].eachTree(tableFullTreeData, function (row) {
+        expandedRows.push(row);
+      }, treeOpts);
+    } else {
+      expandedRows = tableFullData;
+    }
+    return this.setRowExpand(expandedRows, expanded);
   },
   handleAsyncRowExpand: function handleAsyncRowExpand(row) {
     var _this44 = this;
@@ -5646,16 +5673,16 @@ var Methods = {
    * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
    * 如果单元格配置了校验规则，则会进行校验
    */
-  updateStatus: function updateStatus(scope, cellValue) {
+  updateStatus: function updateStatus(slotParams, cellValue) {
     var _this57 = this;
     var customVal = !_xeUtils["default"].isUndefined(cellValue);
     return this.$nextTick().then(function () {
       var $refs = _this57.$refs,
         editRules = _this57.editRules,
         validStore = _this57.validStore;
-      if (scope && $refs.tableBody && editRules) {
-        var row = scope.row,
-          column = scope.column;
+      if (slotParams && $refs.tableBody && editRules) {
+        var row = slotParams.row,
+          column = slotParams.column;
         var type = 'change';
         if (_this57.hasCellRules(type, row, column)) {
           var cell = _this57.getCell(row, column);
@@ -5846,11 +5873,11 @@ var Methods = {
         columnIndex: this.getColumnIndex(column)
       };
       if (_xeUtils["default"].isString(formatter)) {
-        var globalFunc = _formats.formats.get(formatter);
-        cellLabel = globalFunc ? globalFunc(formatParams) : '';
+        var gFormatOpts = _formats.formats.get(formatter);
+        cellLabel = gFormatOpts && gFormatOpts.formatMethod ? gFormatOpts.formatMethod(formatParams) : '';
       } else if (_xeUtils["default"].isArray(formatter)) {
-        var _globalFunc = _formats.formats.get(formatter[0]);
-        cellLabel = _globalFunc ? _globalFunc.apply(void 0, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+        var _gFormatOpts = _formats.formats.get(formatter[0]);
+        cellLabel = _gFormatOpts && _gFormatOpts.formatMethod ? _gFormatOpts.formatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
       } else {
         cellLabel = formatter(formatParams);
       }