vxe-table 3.24.0-beta.0 → 3.24.0

package/lib/table/src/cell.js

@@ -277,7 +277,8 @@ function getFooterContent(h, params) {
   const renderOpts = editRenderOpts || cellRenderOpts;
   const itemValue = $table.getFooterCellLabel(row, column);
   if (renderOpts) {
-    const compConf = renderer.get(renderOpts.name);
+    const rendererOpts = $table.computeRendererOpts;
+    const compConf = renderOpts.name ? rendererOpts[renderOpts.name] || renderer.get(renderOpts.name) : null;
     const rtFooter = compConf ? compConf.renderTableFooter || compConf.renderFooter : null;
     if (rtFooter) {
       const footParams = Object.assign(params, {
@@ -443,7 +444,8 @@ const Cell = exports.Cell = {
       }
     }
     if (renderOpts) {
-      const compConf = renderer.get(renderOpts.name);
+      const rendererOpts = $table.computeRendererOpts;
+      const compConf = renderOpts.name ? rendererOpts[renderOpts.name] || renderer.get(renderOpts.name) : null;
       const rtHeader = compConf ? compConf.renderTableHeader || compConf.renderHeader : null;
       if (rtHeader) {
         return (0, _vn.getSlotVNs)(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params)));
@@ -572,9 +574,10 @@ const Cell = exports.Cell = {
       if (defaultSlot) {
         return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h));
       }
+      const rendererOpts = $table.computeRendererOpts;
       // 如果是编辑模式-查看：slot default > formatter > cellRender.renderTableDefault > editRender.renderTableCell > editRender.renderTableDefault > cellRender.tableCellFormatter > editRender.tableCellFormatter > field
       // 如果是查看表格：slot default > formatter > cellRender。renderTableDefault > cellRender.tableCellFormatter > field
-      const cellCompConf = cellRenderOpts ? renderer.get(cellRenderOpts.name) : null;
+      const cellCompConf = cellRenderOpts && cellRenderOpts.name ? rendererOpts[cellRenderOpts.name] || renderer.get(cellRenderOpts.name) : null;
       if (cellRenderOpts) {
         const cellDefaultRenderFn = cellCompConf ? cellCompConf.renderTableDefault || cellCompConf.renderDefault : null;
         if (cellDefaultRenderFn && cellRenderOpts) {
@@ -584,7 +587,7 @@ const Cell = exports.Cell = {
         }
       }
       if (editRenderOpts) {
-        const editCompConf = editRenderOpts ? renderer.get(editRenderOpts.name) : null;
+        const editCompConf = editRenderOpts && editRenderOpts.name ? rendererOpts[editRenderOpts.name] || renderer.get(editRenderOpts.name) : null;
         const editCellRenderFn = editCompConf ? editCompConf.renderTableCell || editCompConf.renderCell || editCompConf.renderTableDefault || editCompConf.renderDefault : null;
         if (editCellRenderFn) {
           return renderCellBaseVNs(h, params, (0, _vn.getSlotVNs)(editCellRenderFn(h, editRenderOpts, Object.assign({
@@ -1274,7 +1277,8 @@ const Cell = exports.Cell = {
       return $table.callSlot(slots.content, params, h);
     }
     if (contentRender) {
-      const compConf = renderer.get(contentRender.name);
+      const rendererOpts = $table.computeRendererOpts;
+      const compConf = contentRender.name ? rendererOpts[contentRender.name] || renderer.get(contentRender.name) : null;
       const rtExpand = compConf ? compConf.renderTableExpand || compConf.renderExpand : null;
       if (rtExpand) {
         return (0, _vn.getSlotVNs)(rtExpand.call($table, h, contentRender, params));
@@ -1549,7 +1553,8 @@ const Cell = exports.Cell = {
       if (slots && slots.edit) {
         return $table.callSlot(slots.edit, cellParams, h);
       }
-      const compConf = renderer.get(editRender.name);
+      const rendererOpts = $table.computeRendererOpts;
+      const compConf = editRenderOpts.name ? rendererOpts[editRenderOpts.name] || renderer.get(editRenderOpts.name) : null;
       const rtEdit = compConf ? compConf.renderTableEdit || compConf.renderEdit : null;
       if (rtEdit) {
         return (0, _vn.getSlotVNs)(rtEdit.call($table, h, editRender, cellParams));

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getI18n,getIcon,renderer,renderEmptyElement}=_ui.VxeUI;function renderTitlePrefixIcon(e,l){let{$table:t,column:r}=l,n=r.titlePrefix||r.titleHelp;return n?e("i",{class:["vxe-cell-title-prefix-icon",n.iconStatus?"theme--"+n.iconStatus:""],on:{mouseenter(e){t.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){t.handleTargetLeaveEvent(e)}}},[e("i",{class:n.icon||getIcon().TABLE_TITLE_PREFIX})]):renderEmptyElement(t)}function renderTitleSuffixIcon(e,l){let{$table:t,column:r}=l,n=r.titleSuffix;return n?e("i",{class:["vxe-cell-title-suffix-icon",n.iconStatus?"theme--"+n.iconStatus:""],on:{mouseenter(e){t.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){t.handleTargetLeaveEvent(e)}}},[e("i",{class:n.icon||getIcon().TABLE_TITLE_SUFFIX})]):renderEmptyElement(t)}function renderCellDragIcon(e,l){let t=l.$table;var r=t.$scopedSlots,n=t.dragConfig,{icon:o,trigger:a,disabledMethod:d}=t.computeRowDragOpts,d=d||(n?n.rowDisabledMethod:null);let i=d&&d(l);d=r.rowDragIcon||r["row-drag-icon"],r={};return"cell"!==a&&(r.mousedown=e=>{i||t.handleCellDragMousedownEvent(e,l)},r.mouseup=t.handleCellDragMouseupEvent),e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":i}],on:r},d?t.callSlot(d,l,e):[e("i",{class:o||(n?n.rowIcon:"")||getIcon().TABLE_DRAG_ROW})])}function renderCellBaseVNs(e,l,t){var{$table:r,column:n,level:o}=l,n=n.dragSort,{treeConfig:a,dragConfig:d}=r,i=r.computeRowOpts,s=r.computeTreeOpts,{showIcon:r,isPeerDrag:c,isCrossDrag:u,visibleMethod:C}=r.computeRowDragOpts,C=C||(d?d.rowVisibleMethod:null),g=[];return n&&i.drag&&(r||d&&d.showRowIcon)&&(!C||C(l))&&(!a||s.transform&&(c||u||!o))&&g.unshift(renderCellDragIcon(e,l)),g.concat(_xeUtils.default.isArray(t)?t:[t])}function renderHeaderCellDragIcon(e,t){let{$table:r,column:l}=t;var n=r.$scopedSlots,o=l.slots,a=r.computeColumnOpts,{showIcon:d,icon:i,trigger:s,isPeerDrag:c,isCrossDrag:u,visibleMethod:C,disabledMethod:g}=r.computeColumnDragOpts;if(!a.drag||!d||C&&!C(t)||l.fixed||!c&&!u&&l.parentId)return renderEmptyElement(r);{let l=g&&g(t);a=(o?o.columnDragIcon||o["column-drag-icon"]:null)||n.columnDragIcon||n["column-drag-icon"],d={};return"cell"!==s&&(d.mousedown=e=>{l||r.handleHeaderCellDragMousedownEvent(e,t)},d.mouseup=r.handleHeaderCellDragMouseupEvent),e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":l}],on:d},a?r.callSlot(a,t,e):[e("i",{class:i||getIcon().TABLE_DRAG_COLUMN})])}}function renderHeaderCellBaseVNs(e,l,t){return[renderTitlePrefixIcon(e,l),renderHeaderCellDragIcon(e,l),..._xeUtils.default.isArray(t)?t:[t],renderTitleSuffixIcon(e,l)]}function getRenderDefaultColumnTitle(e,l,t){return"html"===l.type&&_xeUtils.default.isString(t)?e("span",{key:"ch",domProps:{innerHTML:t}}):e("span",{key:"ct"},(0,_vn.getSlotVNs)(t))}function renderTitleContent(e,l,t){let{$table:r,column:n}=l;var o=r;let a=r;var o=o.showHeaderOverflow,d=a.isRowGroupStatus,{showHeaderOverflow:i,slots:s}=n,s=s?s.title:null,c=r.computeHeaderTooltipOpts;let u=c.showAll;o=_xeUtils.default.eqNull(i)?o:i;let C="title"===(!0===o?c.mode:o),g="tooltip"===(!0===o?c.mode:o);i={},(C||g||u)&&(i.mouseenter=e=>{a.isDragResize||(C?(0,_dom.updateCellTitle)(e.currentTarget,n):(g||u)&&r.triggerHeaderTooltipEvent(e,l))}),(g||u)&&(i.mouseleave=e=>{a.isDragResize||(g||u)&&r.handleTargetLeaveEvent(e)}),c=getRenderDefaultColumnTitle(e,n,t);return[e("span",{class:"vxe-cell--title",on:i},d&&n.aggFunc&&r.getPivotTableAggregateRenderColTitles?r.getPivotTableAggregateRenderColTitles(e,n,c):s?r.callSlot(s,l,e):[c])]}function getFooterContent(e,l){var{$table:t,column:r,row:n}=l,o=t.editConfig,{slots:a,editRender:d,cellRender:i}=r,a=a?a.footer:null;if(a)return t.callSlot(a,l,e);a=o&&(0,_utils.isEnableConf)(o)&&(0,_utils.isEnableConf)(d)?d:null,o=(0,_utils.isEnableConf)(i)?i:null,d=a||o,i=t.getFooterCellLabel(n,r);if(d){a=renderer.get(d.name),o=a?a.renderTableFooter||a.renderFooter:null;if(o)return n=Object.assign(l,{cellValue:i,itemValue:i}),(0,_vn.getSlotVNs)(o.call(t,e,d,n))}return[(0,_utils.formatText)(i,1)]}function getDefaultCellLabel(e){var{$table:e,row:l,column:t}=e;return(0,_utils.formatText)(e.getCellLabel(l,t),1)}function renderCellHandle(e,l){var{column:t,row:r,$table:n}=l,o=n.editConfig,a=n.isRowGroupStatus,{type:d,treeNode:i,rowGroupNode:s,editRender:c}=t,u=n.computeAggregateOpts.mode,C=n.computeCheckboxOpts,n=n.computeEditOpts,g=i||a&&("column"===u?t.field===r.groupField:s);switch(d){case"seq":return g?Cell.renderDeepIndexCell(e,l):Cell.renderSeqCell(e,l);case"radio":return g?Cell.renderDeepRadioCell(e,l):Cell.renderRadioCell(e,l);case"checkbox":return C.checkField?g?Cell.renderDeepSelectionCellByProp(e,l):Cell.renderCheckboxCellByProp(e,l):g?Cell.renderDeepSelectionCell(e,l):Cell.renderCheckboxCell(e,l);case"expand":return Cell.renderExpandCell(e,l);case"html":return g?Cell.renderDeepHTMLCell(e,l):Cell.renderHTMLCell(e,l)}return(o&&(0,_utils.isEnableConf)(o)&&(0,_utils.isEnableConf)(c)?c:null)?"cell"===n.mode?g?Cell.renderDeepCellEdit(e,l):Cell.renderCellEdit(e,l):g?Cell.renderDeepRowEdit(e,l):Cell.renderRowEdit(e,l):g?Cell.renderDeepCell(e,l):Cell.renderDefaultCell(e,l)}function renderHeaderHandle(e,l){var{column:t,$table:r}=l,n=r.editConfig,{type:t,filters:o,sortable:a,editRender:d,slots:i}=t;if("obsolete"!==getConfig().tableHeadeSlotToTitleSlot){i=i?i.header:null;if(i)return renderTitleContent(e,l,r.callSlot(i,l,e))}switch(t){case"seq":return Cell.renderSeqHeader(e,l);case"radio":return Cell.renderRadioHeader(e,l);case"checkbox":return Cell.renderCheckboxHeader(e,l);case"html":if(o&&a)return Cell.renderSortAndFilterHeader(e,l);if(a)return Cell.renderSortHeader(e,l);if(o)return Cell.renderFilterHeader(e,l)}return(n&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(d)?d:null)?Cell.renderEditHeader(e,l):o&&a?Cell.renderSortAndFilterHeader(e,l):a?Cell.renderSortHeader(e,l):o?Cell.renderFilterHeader(e,l):Cell.renderDefaultHeader(e,l)}function renderFooterHandle(e,l){return Cell.renderDefaultFooter(e,l)}let Cell=exports.Cell={createColumn(e,l){var t=l.type,r={renderHeader:renderHeaderHandle,renderCell:renderCellHandle,renderFooter:renderFooterHandle};return"expand"===t&&(r.renderData=Cell.renderExpandData),(0,_util.createColumn)(e,l,r)},renderHeaderTitle(e,l){var{$table:t,column:r}=l,n=t.editConfig,{slots:o,editRender:a,cellRender:d}=r,n=n&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(a)?a:null,a=(0,_utils.isEnableConf)(d)?d:null,d=n||a;if("obsolete"===getConfig().tableHeadeSlotToTitleSlot){n=o?o.header:null;if(n)return renderTitleContent(e,l,t.callSlot(n,l,e))}if(d){a=renderer.get(d.name),o=a?a.renderTableHeader||a.renderHeader:null;if(o)return(0,_vn.getSlotVNs)(renderTitleContent(e,l,o.call(t,e,d,l)))}return renderTitleContent(e,l,t.getHeaderCellLabel(r))},renderDefaultHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l))},renderDefaultCell(e,l){var{$table:t,row:r,column:n}=l,o=t,a=t.isRowGroupStatus,d=t.editConfig,{field:i,slots:s,editRender:c,cellRender:u,rowGroupNode:C,aggFunc:g}=n,d=d&&(0,_utils.isEnableConf)(d)&&(0,_utils.isEnableConf)(c)?c:null,c=(0,_utils.isEnableConf)(u)?u:null,u=s?s.default:null,p=s?s.groupContent||s["group-content"]:null,s=s?s.groupValues||s["group-values"]:null;let E="";if(a&&i&&r.isAggregate){var a=o.fullColumnFieldData,{mode:o,showTotal:b,totalMethod:f,countFields:v,contentMethod:m,formatValuesMethod:h,mapChildrenField:x}=t.computeAggregateOpts,_=r.aggData,_=_?_[i]:null,T=r.groupField,D=r.groupContent,x=x&&r[x]||[],S=r.childCount,a=a[T]||{},a={$table:t,groupField:T,groupColumn:a?a.column:null,column:n,groupValue:D,childList:x,childCount:S,aggValue:null,children:x,totalValue:S};if("column"===o?i===r.groupField:C){if(E=D,m&&(E=""+m(a)),b&&(E=getI18n("vxe.table.rowGroupContentTotal",[E,f?f(a):S,S])),p)return renderCellBaseVNs(e,l,t.callSlot(p,Object.assign({groupField:T,groupContent:D,childList:x,childCount:S},l),e))}else if(t.getPivotTableAggregateCellAggValue){if(E=t.getPivotTableAggregateCellAggValue(l),a.aggValue=E,s)return renderCellBaseVNs(e,l,t.callSlot(s,Object.assign({groupField:T,groupContent:D,childList:x,childCount:S},l,a),e))}else if((!0===g||v&&v.includes(i))&&(E=_?_.value:S,a.aggValue=E,h&&(E=h(a)),s))return renderCellBaseVNs(e,l,t.callSlot(s,Object.assign({groupField:T,groupContent:D,childList:x,childCount:S},l,a),e))}else{if(u)return renderCellBaseVNs(e,l,t.callSlot(u,l,e));o=c?renderer.get(c.name):null;if(c){C=o?o.renderTableDefault||o.renderDefault:null;if(C&&c)return renderCellBaseVNs(e,l,(0,_vn.getSlotVNs)(C(e,c,Object.assign({$type:d?"edit":"cell"},l))))}if(d){m=d?renderer.get(d.name):null,b=m?m.renderTableCell||m.renderCell||m.renderTableDefault||m.renderDefault:null;if(b)return renderCellBaseVNs(e,l,(0,_vn.getSlotVNs)(b(e,d,Object.assign({$type:d?"edit":"cell"},l))))}E=t.getCellLabel(r,n)}f=d?d.placeholder:"";return renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[d&&(0,_utils.eqEmptyValue)(E)?e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(f),1)):e("span",(0,_utils.formatText)(E,1))])])},renderDeepCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderDefaultCell(e,l))},renderDefaultFooter(e,l){return getFooterContent(e,l)},renderRowGroupBtn(e,l,t){let r=l.$table;var n=r,o=r,{row:a,level:d}=l,n=n.rowGroupExpandedFlag,o=o.rowGroupExpandedMaps,{mode:i,padding:s,indent:c,showIcon:u,iconOpen:C,iconClose:g}=r.computeAggregateOpts,p=(0,_util.getRowid)(r,a),n=!!n&&!!o[p];return e("div",{class:["vxe-row-group--tree-node",{"is--expanded":n}],style:"column"!==i&&s&&c?{paddingLeft:d*c+"px"}:void 0},[u&&a.isAggregate?e("span",{class:"vxe-row-group--node-btn",on:{click(e){r.triggerRowGroupExpandEvent(e,l)}}},[e("i",{class:n?C||getIcon().TABLE_ROW_GROUP_OPEN:g||getIcon().TABLE_ROW_GROUP_CLOSE})]):renderEmptyElement(r),e("div",{class:"vxe-row-group-cell"},t)])},renderTreeNodeBtn(e,l,t){let{$table:r,isHidden:n}=l;var o=r.treeExpandedFlag,{fullAllDataRowIdData:a,treeExpandedMaps:d,treeExpandLazyLoadedMaps:i}=r,s=r.computeTreeOpts,{row:c,column:u,level:C}=l,u=u.slots,{padding:g,indent:p,lazy:E,trigger:b,visibleMethod:f,iconLoaded:v,showIcon:m,iconOpen:h,iconClose:x}=s,_=s.children||s.childrenField,s=s.hasChild||s.hasChildField,_=c[_],_=_&&_.length,u=u?u.icon:null;let T=!1,D=!1,S=!1,H=!1;var B={};return u?r.callSlot(u,l,e):(n||(u=(0,_util.getRowid)(r,c),D=!!o&&!!d[u],E&&(o=a[u],S=!!i[u],T=c[s],H=!!o.treeLoaded)),b&&"default"!==b||(B.click=e=>{r.triggerTreeExpandEvent(e,l)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":D}],style:g&&p?{paddingLeft:C*p+"px"}:void 0},[m&&(!E||H?_:_||T)&&(!f||f(l))?[e("div",{class:"vxe-cell--tree-btn",on:B},[e("i",{class:S?v||getIcon().TABLE_TREE_LOADED:D?h||getIcon().TABLE_TREE_OPEN:x||getIcon().TABLE_TREE_CLOSE})])]:null,e("div",{class:"vxe-tree-cell"},t)])])},renderDeepNodeBtn(e,l,t){var{$table:r,row:n,column:o}=l,a=o.rowGroupNode,d=r.rowGroupList;if(d.length){d=r.computeAggregateOpts.mode;if("column"===d)return n.groupField&&o.field===n.groupField?[Cell.renderRowGroupBtn(e,l,t)]:t;if(a)return[Cell.renderRowGroupBtn(e,l,t)]}return[Cell.renderTreeNodeBtn(e,l,t)]},renderSeqHeader(e,l){var t,{$table:r,column:n}=l;return"obsolete"===getConfig().tableHeadeSlotToTitleSlot?(t=n.slots,renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,(t=t?t.header:null)?r.callSlot(t,l,e):r.getHeaderCellLabel(n)))):renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,r.getHeaderCellLabel(n)))},renderSeqCell(e,l){var{$table:t,column:r}=l,n=t.treeConfig,o=t.computeSeqOpts,r=r.slots;return r&&r.default?renderCellBaseVNs(e,l,t.callSlot(r.default,l,e)):(t=l.seq,r=o.seqMethod,renderCellBaseVNs(e,l,[e("span",""+(0,_utils.formatText)(r?r(l):n?t:(o.startIndex||0)+t,1))]))},renderDeepIndexCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderSeqCell(e,l))},renderRadioHeader(e,l){var{$table:t,column:r}=l,n=r.slots,o=n?n.title:null;return"obsolete"===getConfig().tableHeadeSlotToTitleSlot?renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,(n=n?n.header:null)?t.callSlot(n,l,e):[e("span",{class:"vxe-radio--label"},o?t.callSlot(o,l,e):t.getHeaderCellLabel(r))])):renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,[e("span",{class:"vxe-radio--label"},o?t.callSlot(o,l,e):t.getHeaderCellLabel(r))]))},renderRadioCell(e,l){let{$table:t,column:r,isHidden:n}=l;var o=t.selectRadioRow,a=r.slots,{labelField:d,checkMethod:i,visibleMethod:s}=t.computeRadioOpts,c=l.row,u=a?a.default:null,a=a?a.radio:null,o=c===o;let C=!s||s({$table:t,row:c}),g=!!i,p;n||(p={click(e){!g&&C&&t.triggerRadioRowEvent(e,l)}},i&&(g=!i({$table:t,row:c})));s=Object.assign(Object.assign({},l),{checked:o,disabled:g,visible:C});return a?renderCellBaseVNs(e,l,t.callSlot(a,s,e)):(i=[],C&&i.push(e("span",{class:["vxe-radio--icon",o?getIcon().TABLE_RADIO_CHECKED:g?getIcon().TABLE_RADIO_DISABLED_UNCHECKED:getIcon().TABLE_RADIO_UNCHECKED]})),(u||d)&&i.push(e("span",{class:"vxe-radio--label"},u?t.callSlot(u,s,e):_xeUtils.default.get(c,d))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--radio",{"is--checked":o,"is--disabled":g}],on:p},i)]))},renderDeepRadioCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderRadioCell(e,l))},renderCheckboxHeader(e,l){let{$table:t,column:r,isHidden:n}=l;let{isAllSelected:o,isIndeterminate:a}=t,d=t.computeIsAllCheckboxDisabled;var i=r.slots,s=i?i.title:null,{checkStrictly:c,showHeader:u,headerTitle:C}=t.computeCheckboxOpts,g=t.getHeaderCellLabel(r),p={},E=(n||(p.click=e=>{d||t.triggerCheckAllEvent(e,!o)}),Object.assign(Object.assign({},l),{checked:o,disabled:d,indeterminate:a}));if("obsolete"===getConfig().tableHeadeSlotToTitleSlot){i=i?i.header:null;if(i)return renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,t.callSlot(i,E,e)))}return renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,(c?u:!1!==u)?[e("span",{class:["vxe-cell--checkbox",{"is--checked":o,"is--disabled":d,"is--indeterminate":a}],attrs:{title:_xeUtils.default.eqNull(C)?getI18n("vxe.table.allTitle"):""+(C||"")},on:p},[e("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:o?getIcon().TABLE_CHECKBOX_CHECKED:d?getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})].concat(s||g?[e("span",{class:"vxe-checkbox--label"},s?t.callSlot(s,E,e):g)]:[]))]:[e("span",{class:"vxe-checkbox--label"},s?t.callSlot(s,E,e):g)]))},renderCheckboxCell(e,l){let{$table:t,row:r,column:n,isHidden:o}=l;var a=t.treeConfig,{updateCheckboxFlag:d,isRowGroupStatus:i}=t,{selectCheckboxMaps:s,treeIndeterminateRowMaps:c}=t,u=t.computeAggregateOpts.mapChildrenField;let{labelField:C,checkMethod:g,visibleMethod:p}=t.computeCheckboxOpts;var E=n.slots,b=E?E.default:null,E=E?E.checkbox:null;let f=!1,v=!1,m=!0,h=!1;var x,_={},s=(o||(x=(0,_util.getRowid)(t,r),v=!!d&&!!s[x],g&&i&&t.isAggregateRecord(r)?(d=r[u||""])&&d.length&&!d.every(e=>!g({$table:t,row:e}))||(h=!0):(m=!p||p({$table:t,row:r}),h=g?!g({$table:t,row:r}):!!g),(a||i)&&(f=!!c[x]),_.click=e=>{!h&&m&&t.triggerCheckRowEvent(e,l,!v)}),Object.assign(Object.assign({},l),{checked:v,disabled:h,visible:m,indeterminate:f}));return E?renderCellBaseVNs(e,l,t.callSlot(E,s,e)):(u=[],m&&u.push(e("span",{class:["vxe-checkbox--icon",f?getIcon().TABLE_CHECKBOX_INDETERMINATE:v?getIcon().TABLE_CHECKBOX_CHECKED:h?getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(b||C)&&u.push(e("span",{class:"vxe-checkbox--label"},b?t.callSlot(b,s,e):_xeUtils.default.get(r,C))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":v,"is--disabled":h,"is--indeterminate":f,"is--hidden":!m}],on:_},u)]))},renderDeepSelectionCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderCheckboxCell(e,l))},renderCheckboxCellByProp(e,l){let{$table:t,row:r,column:n,isHidden:o}=l;var a=t.treeConfig,{updateCheckboxFlag:d,isRowGroupStatus:i}=t,s=t.treeIndeterminateRowMaps,c=t.computeAggregateOpts.mapChildrenField,u=t.computeCheckboxOpts;let{labelField:C,checkField:g,checkMethod:p,visibleMethod:E}=u;var u=u.indeterminateField||u.halfField,b=n.slots,f=b?b.default:null,b=b?b.checkbox:null;let v=!1,m=!1,h=!0,x=!1;var _,T={},c=(o||(_=(0,_util.getRowid)(t,r),m=!!d&&_xeUtils.default.get(r,g),p&&i&&t.isAggregateRecord(r)?(d=r[c||""])&&d.length&&!d.every(e=>!p({$table:t,row:e}))||(x=!0):(h=!E||E({$table:t,row:r}),x=p?!p({$table:t,row:r}):!!p),(a||i)&&(v=!!s[_]),T.click=e=>{!x&&h&&t.triggerCheckRowEvent(e,l,!m)}),Object.assign(Object.assign({},l),{checked:m,disabled:x,visible:h,indeterminate:v}));return b?renderCellBaseVNs(e,l,t.callSlot(b,c,e)):(d=[],h&&d.push(e("span",{class:["vxe-checkbox--icon",v?getIcon().TABLE_CHECKBOX_INDETERMINATE:m?getIcon().TABLE_CHECKBOX_CHECKED:x?getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(f||C)&&d.push(e("span",{class:"vxe-checkbox--label"},f?t.callSlot(f,c,e):_xeUtils.default.get(r,C))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":m,"is--disabled":x,"is--indeterminate":u&&!m?r[u]:v,"is--hidden":!h}],on:T},d)]))},renderDeepSelectionCellByProp(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderCheckboxCellByProp(e,l))},renderExpandCell(e,l){let{$table:t,isHidden:r,row:n,column:o}=l;var a=t.isRowGroupStatus,{rowExpandedMaps:d,rowExpandLazyLoadedMaps:i}=t,{lazy:s,labelField:c,iconLoaded:u,showIcon:C,iconOpen:g,iconClose:p,visibleMethod:E}=t.computeExpandOpts,b=o.slots,f=b?b.default:null,b=b?b.icon:null;let v=!1,m=!1;return a&&n.isAggregate?renderCellBaseVNs(e,l,[]):b?renderCellBaseVNs(e,l,t.callSlot(b,l,e)):(r||(a=(0,_util.getRowid)(t,n),v=!!d[a],s&&(m=!!i[a])),renderCellBaseVNs(e,l,[!C||E&&!E(l)?renderEmptyElement(t):e("div",{class:["vxe-table--expanded",{"is--active":v}]},[e("span",{class:"vxe-table--expand-btn",on:{mousedown(e){e.stopPropagation()},click(e){t.triggerRowExpandEvent(e,l)}}},[e("i",{class:m?u||getIcon().TABLE_EXPAND_LOADED:v?g||getIcon().TABLE_EXPAND_OPEN:p||getIcon().TABLE_EXPAND_CLOSE})])]),f||c?e("span",{class:"vxe-table--expand-label"},f?t.callSlot(f,l,e):_xeUtils.default.get(n,c)):renderEmptyElement(t)]))},renderExpandData(e,l){var{$table:t,column:r}=l,{slots:r,contentRender:n}=r;if(r&&r.content)return t.callSlot(r.content,l,e);if(n){r=renderer.get(n.name),r=r?r.renderTableExpand||r.renderExpand:null;if(r)return(0,_vn.getSlotVNs)(r.call(t,e,n,l))}return[]},renderHTMLCell(e,l){var{$table:t,column:r}=l,r=r.slots;return r&&r.default?renderCellBaseVNs(e,l,t.callSlot(r.default,l,e)):renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--html",domProps:{innerHTML:getDefaultCellLabel(l)}})])},renderDeepHTMLCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderHTMLCell(e,l))},renderSortAndFilterHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderSortIcon(e,l).concat(Cell.renderFilterIcon(e,l))))},renderSortHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderSortIcon(e,l)))},renderSortIcon(e,l){let{$table:t,column:r}=l;var{showIcon:n,allowBtn:o,ascTitle:a,descTitle:d,iconLayout:i,iconAsc:s,iconDesc:c,iconVisibleMethod:u}=t.computeSortOpts,{order:C,slots:g}=r;return!n||u&&!u(l)?[]:(n=g?g.sort:null)?(0,_vn.getSlotVNs)(t.callSlot(n,l,e)):[e("span",{class:["vxe-cell--sort",`vxe-cell--sort-${i}-layout`]},[e("i",{class:["vxe-sort--asc-btn",s||getIcon().TABLE_SORT_ASC,{"sort--active":"asc"===C}],attrs:{title:_xeUtils.default.eqNull(a)?getI18n("vxe.table.sortAsc"):""+(a||"")},on:o?{click(e){e.stopPropagation(),t.triggerSortEvent(e,r,"asc")}}:void 0}),e("i",{class:["vxe-sort--desc-btn",c||getIcon().TABLE_SORT_DESC,{"sort--active":"desc"===C}],attrs:{title:_xeUtils.default.eqNull(d)?getI18n("vxe.table.sortDesc"):""+(d||"")},on:o?{click(e){e.stopPropagation(),t.triggerSortEvent(e,r,"desc")}}:void 0})])]},renderFilterHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderFilterIcon(e,l)))},renderFilterIcon(e,l){let{$table:t,column:r,hasFilter:n}=l;var o=t.filterStore,{showIcon:a,iconNone:d,iconMatch:i,iconVisibleMethod:s}=t.computeFilterOpts;return!a||s&&!s(l)?[]:[e("span",{class:["vxe-cell--filter",{"is--active":o.visible&&o.column===r}],on:{click(e){t.triggerFilterEvent&&t.triggerFilterEvent(e,l.column,l)}}},[e("i",{class:["vxe-filter--btn",n?i||getIcon().TABLE_FILTER_MATCH:d||getIcon().TABLE_FILTER_NONE],attrs:{title:getI18n("vxe.table.filter")}})])]},renderEditHeader(e,l){var{$table:t,column:r}=l,{editConfig:n,editRules:o}=t,a=t.computeEditOpts,{sortable:d,filters:i,editRender:s}=r,n=n&&(0,_utils.isEnableConf)(n),s=n&&(0,_utils.isEnableConf)(s)?s:null;let c=!1,u=(o&&(o=r.rules||_xeUtils.default.get(o,r.field))&&(c=o.some(e=>e.required)),[]);return n&&({showAsterisk:r,showIcon:o,icon:n}=a,u=[c&&r?e("i",{class:"vxe-cell--required-icon"},[e("i",{class:"vxe-cell--required-icon"})]):renderEmptyElement(t),s&&o?e("i",{class:"vxe-cell--edit-icon"},_xeUtils.default.isFunction(n)?(0,_vn.getSlotVNs)(n({})):[e("i",{class:n||getIcon().TABLE_EDIT})]):renderEmptyElement(t)]),renderHeaderCellBaseVNs(e,l,u.concat(Cell.renderHeaderTitle(e,l)).concat(d?Cell.renderSortIcon(e,l):[]).concat(i?Cell.renderFilterIcon(e,l):[]))},renderRowEdit(e,l){var{$table:t,column:r}=l,n=t.editConfig,t=t.editStore,t=t.actived,r=r.editRender,n=n&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(r)?r:null;return Cell.runRenderer(e,l,!(!n||!t||t.row!==l.row))},renderDeepRowEdit(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderRowEdit(e,l))},renderCellEdit(e,l){var{$table:t,column:r}=l,n=t.editConfig,t=t.editStore,t=t.actived,r=r.editRender,n=n&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(r)?r:null;return Cell.runRenderer(e,l,!(!n||!t||t.row!==l.row||t.column!==l.column))},renderDeepCellEdit(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderCellEdit(e,l))},runRenderer(e,l,t){var{$table:r,row:n,column:o}=l,a=r.editConfig,d=r.isRowGroupStatus,{slots:o,field:i,editRender:s,formatter:c}=o,a=a&&(0,_utils.isEnableConf)(a)&&(0,_utils.isEnableConf)(s)?s:null,u=o?o.default:null,C=o?o.groupContent||o["group-content"]:null,g=Object.assign({$type:"",isEdit:t},l);if(t&&a)return o&&o.edit?r.callSlot(o.edit,g,e):(a=(t=renderer.get(s.name))?t.renderTableEdit||t.renderEdit:null)?(0,_vn.getSlotVNs)(a.call(r,e,s,g)):[];if(d&&i&&n.isAggregate){o=r.computeAggregateOpts.mapChildrenField,t=n.groupField,a=o&&n[o]||[];if(C)return renderCellBaseVNs(e,l,r.callSlot(C,Object.assign({groupField:t,groupContent:n.groupContent,childList:a,childCount:n.childCount},l),e))}else if(u)return renderCellBaseVNs(e,l,r.callSlot(u,g,e));return c?renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[getDefaultCellLabel(g)])]):Cell.renderDefaultCell(e,g)}};var _default=exports.default=Cell;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getI18n,getIcon,renderer,renderEmptyElement}=_ui.VxeUI;function renderTitlePrefixIcon(e,l){let{$table:t,column:r}=l,n=r.titlePrefix||r.titleHelp;return n?e("i",{class:["vxe-cell-title-prefix-icon",n.iconStatus?"theme--"+n.iconStatus:""],on:{mouseenter(e){t.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){t.handleTargetLeaveEvent(e)}}},[e("i",{class:n.icon||getIcon().TABLE_TITLE_PREFIX})]):renderEmptyElement(t)}function renderTitleSuffixIcon(e,l){let{$table:t,column:r}=l,n=r.titleSuffix;return n?e("i",{class:["vxe-cell-title-suffix-icon",n.iconStatus?"theme--"+n.iconStatus:""],on:{mouseenter(e){t.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){t.handleTargetLeaveEvent(e)}}},[e("i",{class:n.icon||getIcon().TABLE_TITLE_SUFFIX})]):renderEmptyElement(t)}function renderCellDragIcon(e,l){let t=l.$table;var r=t.$scopedSlots,n=t.dragConfig,{icon:o,trigger:a,disabledMethod:d}=t.computeRowDragOpts,d=d||(n?n.rowDisabledMethod:null);let i=d&&d(l);d=r.rowDragIcon||r["row-drag-icon"],r={};return"cell"!==a&&(r.mousedown=e=>{i||t.handleCellDragMousedownEvent(e,l)},r.mouseup=t.handleCellDragMouseupEvent),e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":i}],on:r},d?t.callSlot(d,l,e):[e("i",{class:o||(n?n.rowIcon:"")||getIcon().TABLE_DRAG_ROW})])}function renderCellBaseVNs(e,l,t){var{$table:r,column:n,level:o}=l,n=n.dragSort,{treeConfig:a,dragConfig:d}=r,i=r.computeRowOpts,s=r.computeTreeOpts,{showIcon:r,isPeerDrag:c,isCrossDrag:u,visibleMethod:C}=r.computeRowDragOpts,C=C||(d?d.rowVisibleMethod:null),g=[];return n&&i.drag&&(r||d&&d.showRowIcon)&&(!C||C(l))&&(!a||s.transform&&(c||u||!o))&&g.unshift(renderCellDragIcon(e,l)),g.concat(_xeUtils.default.isArray(t)?t:[t])}function renderHeaderCellDragIcon(e,t){let{$table:r,column:l}=t;var n=r.$scopedSlots,o=l.slots,a=r.computeColumnOpts,{showIcon:d,icon:i,trigger:s,isPeerDrag:c,isCrossDrag:u,visibleMethod:C,disabledMethod:g}=r.computeColumnDragOpts;if(!a.drag||!d||C&&!C(t)||l.fixed||!c&&!u&&l.parentId)return renderEmptyElement(r);{let l=g&&g(t);a=(o?o.columnDragIcon||o["column-drag-icon"]:null)||n.columnDragIcon||n["column-drag-icon"],d={};return"cell"!==s&&(d.mousedown=e=>{l||r.handleHeaderCellDragMousedownEvent(e,t)},d.mouseup=r.handleHeaderCellDragMouseupEvent),e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":l}],on:d},a?r.callSlot(a,t,e):[e("i",{class:i||getIcon().TABLE_DRAG_COLUMN})])}}function renderHeaderCellBaseVNs(e,l,t){return[renderTitlePrefixIcon(e,l),renderHeaderCellDragIcon(e,l),..._xeUtils.default.isArray(t)?t:[t],renderTitleSuffixIcon(e,l)]}function getRenderDefaultColumnTitle(e,l,t){return"html"===l.type&&_xeUtils.default.isString(t)?e("span",{key:"ch",domProps:{innerHTML:t}}):e("span",{key:"ct"},(0,_vn.getSlotVNs)(t))}function renderTitleContent(e,l,t){let{$table:r,column:n}=l;var o=r;let a=r;var o=o.showHeaderOverflow,d=a.isRowGroupStatus,{showHeaderOverflow:i,slots:s}=n,s=s?s.title:null,c=r.computeHeaderTooltipOpts;let u=c.showAll;o=_xeUtils.default.eqNull(i)?o:i;let C="title"===(!0===o?c.mode:o),g="tooltip"===(!0===o?c.mode:o);i={},(C||g||u)&&(i.mouseenter=e=>{a.isDragResize||(C?(0,_dom.updateCellTitle)(e.currentTarget,n):(g||u)&&r.triggerHeaderTooltipEvent(e,l))}),(g||u)&&(i.mouseleave=e=>{a.isDragResize||(g||u)&&r.handleTargetLeaveEvent(e)}),c=getRenderDefaultColumnTitle(e,n,t);return[e("span",{class:"vxe-cell--title",on:i},d&&n.aggFunc&&r.getPivotTableAggregateRenderColTitles?r.getPivotTableAggregateRenderColTitles(e,n,c):s?r.callSlot(s,l,e):[c])]}function getFooterContent(e,l){var{$table:t,column:r,row:n}=l,o=t.editConfig,{slots:a,editRender:d,cellRender:i}=r,a=a?a.footer:null;if(a)return t.callSlot(a,l,e);a=o&&(0,_utils.isEnableConf)(o)&&(0,_utils.isEnableConf)(d)?d:null,o=(0,_utils.isEnableConf)(i)?i:null,d=a||o,i=t.getFooterCellLabel(n,r);if(d){a=t.computeRendererOpts,o=d.name?a[d.name]||renderer.get(d.name):null,n=o?o.renderTableFooter||o.renderFooter:null;if(n)return r=Object.assign(l,{cellValue:i,itemValue:i}),(0,_vn.getSlotVNs)(n.call(t,e,d,r))}return[(0,_utils.formatText)(i,1)]}function getDefaultCellLabel(e){var{$table:e,row:l,column:t}=e;return(0,_utils.formatText)(e.getCellLabel(l,t),1)}function renderCellHandle(e,l){var{column:t,row:r,$table:n}=l,o=n.editConfig,a=n.isRowGroupStatus,{type:d,treeNode:i,rowGroupNode:s,editRender:c}=t,u=n.computeAggregateOpts.mode,C=n.computeCheckboxOpts,n=n.computeEditOpts,g=i||a&&("column"===u?t.field===r.groupField:s);switch(d){case"seq":return g?Cell.renderDeepIndexCell(e,l):Cell.renderSeqCell(e,l);case"radio":return g?Cell.renderDeepRadioCell(e,l):Cell.renderRadioCell(e,l);case"checkbox":return C.checkField?g?Cell.renderDeepSelectionCellByProp(e,l):Cell.renderCheckboxCellByProp(e,l):g?Cell.renderDeepSelectionCell(e,l):Cell.renderCheckboxCell(e,l);case"expand":return Cell.renderExpandCell(e,l);case"html":return g?Cell.renderDeepHTMLCell(e,l):Cell.renderHTMLCell(e,l)}return(o&&(0,_utils.isEnableConf)(o)&&(0,_utils.isEnableConf)(c)?c:null)?"cell"===n.mode?g?Cell.renderDeepCellEdit(e,l):Cell.renderCellEdit(e,l):g?Cell.renderDeepRowEdit(e,l):Cell.renderRowEdit(e,l):g?Cell.renderDeepCell(e,l):Cell.renderDefaultCell(e,l)}function renderHeaderHandle(e,l){var{column:t,$table:r}=l,n=r.editConfig,{type:t,filters:o,sortable:a,editRender:d,slots:i}=t;if("obsolete"!==getConfig().tableHeadeSlotToTitleSlot){i=i?i.header:null;if(i)return renderTitleContent(e,l,r.callSlot(i,l,e))}switch(t){case"seq":return Cell.renderSeqHeader(e,l);case"radio":return Cell.renderRadioHeader(e,l);case"checkbox":return Cell.renderCheckboxHeader(e,l);case"html":if(o&&a)return Cell.renderSortAndFilterHeader(e,l);if(a)return Cell.renderSortHeader(e,l);if(o)return Cell.renderFilterHeader(e,l)}return(n&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(d)?d:null)?Cell.renderEditHeader(e,l):o&&a?Cell.renderSortAndFilterHeader(e,l):a?Cell.renderSortHeader(e,l):o?Cell.renderFilterHeader(e,l):Cell.renderDefaultHeader(e,l)}function renderFooterHandle(e,l){return Cell.renderDefaultFooter(e,l)}let Cell=exports.Cell={createColumn(e,l){var t=l.type,r={renderHeader:renderHeaderHandle,renderCell:renderCellHandle,renderFooter:renderFooterHandle};return"expand"===t&&(r.renderData=Cell.renderExpandData),(0,_util.createColumn)(e,l,r)},renderHeaderTitle(e,l){var{$table:t,column:r}=l,n=t.editConfig,{slots:o,editRender:a,cellRender:d}=r,n=n&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(a)?a:null,a=(0,_utils.isEnableConf)(d)?d:null,d=n||a;if("obsolete"===getConfig().tableHeadeSlotToTitleSlot){n=o?o.header:null;if(n)return renderTitleContent(e,l,t.callSlot(n,l,e))}if(d){a=t.computeRendererOpts,o=d.name?a[d.name]||renderer.get(d.name):null,n=o?o.renderTableHeader||o.renderHeader:null;if(n)return(0,_vn.getSlotVNs)(renderTitleContent(e,l,n.call(t,e,d,l)))}return renderTitleContent(e,l,t.getHeaderCellLabel(r))},renderDefaultHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l))},renderDefaultCell(e,l){var{$table:t,row:r,column:n}=l,o=t,a=t.isRowGroupStatus,d=t.editConfig,{field:i,slots:s,editRender:c,cellRender:u,rowGroupNode:C,aggFunc:g}=n,d=d&&(0,_utils.isEnableConf)(d)&&(0,_utils.isEnableConf)(c)?c:null,c=(0,_utils.isEnableConf)(u)?u:null,u=s?s.default:null,p=s?s.groupContent||s["group-content"]:null,s=s?s.groupValues||s["group-values"]:null;let E="";if(a&&i&&r.isAggregate){var a=o.fullColumnFieldData,{mode:o,showTotal:b,totalMethod:f,countFields:m,contentMethod:v,formatValuesMethod:h,mapChildrenField:x}=t.computeAggregateOpts,_=r.aggData,_=_?_[i]:null,T=r.groupField,D=r.groupContent,x=x&&r[x]||[],S=r.childCount,a=a[T]||{},a={$table:t,groupField:T,groupColumn:a?a.column:null,column:n,groupValue:D,childList:x,childCount:S,aggValue:null,children:x,totalValue:S};if("column"===o?i===r.groupField:C){if(E=D,v&&(E=""+v(a)),b&&(E=getI18n("vxe.table.rowGroupContentTotal",[E,f?f(a):S,S])),p)return renderCellBaseVNs(e,l,t.callSlot(p,Object.assign({groupField:T,groupContent:D,childList:x,childCount:S},l),e))}else if(t.getPivotTableAggregateCellAggValue){if(E=t.getPivotTableAggregateCellAggValue(l),a.aggValue=E,s)return renderCellBaseVNs(e,l,t.callSlot(s,Object.assign({groupField:T,groupContent:D,childList:x,childCount:S},l,a),e))}else if((!0===g||m&&m.includes(i))&&(E=_?_.value:S,a.aggValue=E,h&&(E=h(a)),s))return renderCellBaseVNs(e,l,t.callSlot(s,Object.assign({groupField:T,groupContent:D,childList:x,childCount:S},l,a),e))}else{if(u)return renderCellBaseVNs(e,l,t.callSlot(u,l,e));o=t.computeRendererOpts,C=c&&c.name?o[c.name]||renderer.get(c.name):null;if(c){v=C?C.renderTableDefault||C.renderDefault:null;if(v&&c)return renderCellBaseVNs(e,l,(0,_vn.getSlotVNs)(v(e,c,Object.assign({$type:d?"edit":"cell"},l))))}if(d){b=d&&d.name?o[d.name]||renderer.get(d.name):null,f=b?b.renderTableCell||b.renderCell||b.renderTableDefault||b.renderDefault:null;if(f)return renderCellBaseVNs(e,l,(0,_vn.getSlotVNs)(f(e,d,Object.assign({$type:d?"edit":"cell"},l))))}E=t.getCellLabel(r,n)}p=d?d.placeholder:"";return renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[d&&(0,_utils.eqEmptyValue)(E)?e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(p),1)):e("span",(0,_utils.formatText)(E,1))])])},renderDeepCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderDefaultCell(e,l))},renderDefaultFooter(e,l){return getFooterContent(e,l)},renderRowGroupBtn(e,l,t){let r=l.$table;var n=r,o=r,{row:a,level:d}=l,n=n.rowGroupExpandedFlag,o=o.rowGroupExpandedMaps,{mode:i,padding:s,indent:c,showIcon:u,iconOpen:C,iconClose:g}=r.computeAggregateOpts,p=(0,_util.getRowid)(r,a),n=!!n&&!!o[p];return e("div",{class:["vxe-row-group--tree-node",{"is--expanded":n}],style:"column"!==i&&s&&c?{paddingLeft:d*c+"px"}:void 0},[u&&a.isAggregate?e("span",{class:"vxe-row-group--node-btn",on:{click(e){r.triggerRowGroupExpandEvent(e,l)}}},[e("i",{class:n?C||getIcon().TABLE_ROW_GROUP_OPEN:g||getIcon().TABLE_ROW_GROUP_CLOSE})]):renderEmptyElement(r),e("div",{class:"vxe-row-group-cell"},t)])},renderTreeNodeBtn(e,l,t){let{$table:r,isHidden:n}=l;var o=r.treeExpandedFlag,{fullAllDataRowIdData:a,treeExpandedMaps:d,treeExpandLazyLoadedMaps:i}=r,s=r.computeTreeOpts,{row:c,column:u,level:C}=l,u=u.slots,{padding:g,indent:p,lazy:E,trigger:b,visibleMethod:f,iconLoaded:m,showIcon:v,iconOpen:h,iconClose:x}=s,_=s.children||s.childrenField,s=s.hasChild||s.hasChildField,_=c[_],_=_&&_.length,u=u?u.icon:null;let T=!1,D=!1,S=!1,H=!1;var B={};return u?r.callSlot(u,l,e):(n||(u=(0,_util.getRowid)(r,c),D=!!o&&!!d[u],E&&(o=a[u],S=!!i[u],T=c[s],H=!!o.treeLoaded)),b&&"default"!==b||(B.click=e=>{r.triggerTreeExpandEvent(e,l)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":D}],style:g&&p?{paddingLeft:C*p+"px"}:void 0},[v&&(!E||H?_:_||T)&&(!f||f(l))?[e("div",{class:"vxe-cell--tree-btn",on:B},[e("i",{class:S?m||getIcon().TABLE_TREE_LOADED:D?h||getIcon().TABLE_TREE_OPEN:x||getIcon().TABLE_TREE_CLOSE})])]:null,e("div",{class:"vxe-tree-cell"},t)])])},renderDeepNodeBtn(e,l,t){var{$table:r,row:n,column:o}=l,a=o.rowGroupNode,d=r.rowGroupList;if(d.length){d=r.computeAggregateOpts.mode;if("column"===d)return n.groupField&&o.field===n.groupField?[Cell.renderRowGroupBtn(e,l,t)]:t;if(a)return[Cell.renderRowGroupBtn(e,l,t)]}return[Cell.renderTreeNodeBtn(e,l,t)]},renderSeqHeader(e,l){var t,{$table:r,column:n}=l;return"obsolete"===getConfig().tableHeadeSlotToTitleSlot?(t=n.slots,renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,(t=t?t.header:null)?r.callSlot(t,l,e):r.getHeaderCellLabel(n)))):renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,r.getHeaderCellLabel(n)))},renderSeqCell(e,l){var{$table:t,column:r}=l,n=t.treeConfig,o=t.computeSeqOpts,r=r.slots;return r&&r.default?renderCellBaseVNs(e,l,t.callSlot(r.default,l,e)):(t=l.seq,r=o.seqMethod,renderCellBaseVNs(e,l,[e("span",""+(0,_utils.formatText)(r?r(l):n?t:(o.startIndex||0)+t,1))]))},renderDeepIndexCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderSeqCell(e,l))},renderRadioHeader(e,l){var{$table:t,column:r}=l,n=r.slots,o=n?n.title:null;return"obsolete"===getConfig().tableHeadeSlotToTitleSlot?renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,(n=n?n.header:null)?t.callSlot(n,l,e):[e("span",{class:"vxe-radio--label"},o?t.callSlot(o,l,e):t.getHeaderCellLabel(r))])):renderHeaderCellBaseVNs(e,l,renderTitleContent(e,l,[e("span",{class:"vxe-radio--label"},o?t.callSlot(o,l,e):t.getHeaderCellLabel(r))]))},renderRadioCell(e,l){let{$table:t,column:r,isHidden:n}=l;var o=t.selectRadioRow,a=r.slots,{labelField:d,checkMethod:i,visibleMethod:s}=t.computeRadioOpts,c=l.row,u=a?a.default:null,a=a?a.radio:null,o=c===o;let C=!s||s({$table:t,row:c}),g=!!i,p;n||(p={click(e){!g&&C&&t.triggerRadioRowEvent(e,l)}},i&&(g=!i({$table:t,row:c})));s=Object.assign(Object.assign({},l),{checked:o,disabled:g,visible:C});return a?renderCellBaseVNs(e,l,t.callSlot(a,s,e)):(i=[],C&&i.push(e("span",{class:["vxe-radio--icon",o?getIcon().TABLE_RADIO_CHECKED:g?getIcon().TABLE_RADIO_DISABLED_UNCHECKED:getIcon().TABLE_RADIO_UNCHECKED]})),(u||d)&&i.push(e("span",{class:"vxe-radio--label"},u?t.callSlot(u,s,e):_xeUtils.default.get(c,d))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--radio",{"is--checked":o,"is--disabled":g}],on:p},i)]))},renderDeepRadioCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderRadioCell(e,l))},renderCheckboxHeader(e,l){let{$table:t,column:r,isHidden:n}=l;let{isAllSelected:o,isIndeterminate:a}=t,d=t.computeIsAllCheckboxDisabled;var i=r.slots,s=i?i.title:null,{checkStrictly:c,showHeader:u,headerTitle:C}=t.computeCheckboxOpts,g=t.getHeaderCellLabel(r),p={},E=(n||(p.click=e=>{d||t.triggerCheckAllEvent(e,!o)}),Object.assign(Object.assign({},l),{checked:o,disabled:d,indeterminate:a}));if("obsolete"===getConfig().tableHeadeSlotToTitleSlot){i=i?i.header:null;if(i)return renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,t.callSlot(i,E,e)))}return renderHeaderCellBaseVNs(e,l,renderTitleContent(e,E,(c?u:!1!==u)?[e("span",{class:["vxe-cell--checkbox",{"is--checked":o,"is--disabled":d,"is--indeterminate":a}],attrs:{title:_xeUtils.default.eqNull(C)?getI18n("vxe.table.allTitle"):""+(C||"")},on:p},[e("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:o?getIcon().TABLE_CHECKBOX_CHECKED:d?getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})].concat(s||g?[e("span",{class:"vxe-checkbox--label"},s?t.callSlot(s,E,e):g)]:[]))]:[e("span",{class:"vxe-checkbox--label"},s?t.callSlot(s,E,e):g)]))},renderCheckboxCell(e,l){let{$table:t,row:r,column:n,isHidden:o}=l;var a=t.treeConfig,{updateCheckboxFlag:d,isRowGroupStatus:i}=t,{selectCheckboxMaps:s,treeIndeterminateRowMaps:c}=t,u=t.computeAggregateOpts.mapChildrenField;let{labelField:C,checkMethod:g,visibleMethod:p}=t.computeCheckboxOpts;var E=n.slots,b=E?E.default:null,E=E?E.checkbox:null;let f=!1,m=!1,v=!0,h=!1;var x,_={},s=(o||(x=(0,_util.getRowid)(t,r),m=!!d&&!!s[x],g&&i&&t.isAggregateRecord(r)?(d=r[u||""])&&d.length&&!d.every(e=>!g({$table:t,row:e}))||(h=!0):(v=!p||p({$table:t,row:r}),h=g?!g({$table:t,row:r}):!!g),(a||i)&&(f=!!c[x]),_.click=e=>{!h&&v&&t.triggerCheckRowEvent(e,l,!m)}),Object.assign(Object.assign({},l),{checked:m,disabled:h,visible:v,indeterminate:f}));return E?renderCellBaseVNs(e,l,t.callSlot(E,s,e)):(u=[],v&&u.push(e("span",{class:["vxe-checkbox--icon",f?getIcon().TABLE_CHECKBOX_INDETERMINATE:m?getIcon().TABLE_CHECKBOX_CHECKED:h?getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(b||C)&&u.push(e("span",{class:"vxe-checkbox--label"},b?t.callSlot(b,s,e):_xeUtils.default.get(r,C))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":m,"is--disabled":h,"is--indeterminate":f,"is--hidden":!v}],on:_},u)]))},renderDeepSelectionCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderCheckboxCell(e,l))},renderCheckboxCellByProp(e,l){let{$table:t,row:r,column:n,isHidden:o}=l;var a=t.treeConfig,{updateCheckboxFlag:d,isRowGroupStatus:i}=t,s=t.treeIndeterminateRowMaps,c=t.computeAggregateOpts.mapChildrenField,u=t.computeCheckboxOpts;let{labelField:C,checkField:g,checkMethod:p,visibleMethod:E}=u;var u=u.indeterminateField||u.halfField,b=n.slots,f=b?b.default:null,b=b?b.checkbox:null;let m=!1,v=!1,h=!0,x=!1;var _,T={},c=(o||(_=(0,_util.getRowid)(t,r),v=!!d&&_xeUtils.default.get(r,g),p&&i&&t.isAggregateRecord(r)?(d=r[c||""])&&d.length&&!d.every(e=>!p({$table:t,row:e}))||(x=!0):(h=!E||E({$table:t,row:r}),x=p?!p({$table:t,row:r}):!!p),(a||i)&&(m=!!s[_]),T.click=e=>{!x&&h&&t.triggerCheckRowEvent(e,l,!v)}),Object.assign(Object.assign({},l),{checked:v,disabled:x,visible:h,indeterminate:m}));return b?renderCellBaseVNs(e,l,t.callSlot(b,c,e)):(d=[],h&&d.push(e("span",{class:["vxe-checkbox--icon",m?getIcon().TABLE_CHECKBOX_INDETERMINATE:v?getIcon().TABLE_CHECKBOX_CHECKED:x?getIcon().TABLE_CHECKBOX_DISABLED_UNCHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(f||C)&&d.push(e("span",{class:"vxe-checkbox--label"},f?t.callSlot(f,c,e):_xeUtils.default.get(r,C))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":v,"is--disabled":x,"is--indeterminate":u&&!v?r[u]:m,"is--hidden":!h}],on:T},d)]))},renderDeepSelectionCellByProp(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderCheckboxCellByProp(e,l))},renderExpandCell(e,l){let{$table:t,isHidden:r,row:n,column:o}=l;var a=t.isRowGroupStatus,{rowExpandedMaps:d,rowExpandLazyLoadedMaps:i}=t,{lazy:s,labelField:c,iconLoaded:u,showIcon:C,iconOpen:g,iconClose:p,visibleMethod:E}=t.computeExpandOpts,b=o.slots,f=b?b.default:null,b=b?b.icon:null;let m=!1,v=!1;return a&&n.isAggregate?renderCellBaseVNs(e,l,[]):b?renderCellBaseVNs(e,l,t.callSlot(b,l,e)):(r||(a=(0,_util.getRowid)(t,n),m=!!d[a],s&&(v=!!i[a])),renderCellBaseVNs(e,l,[!C||E&&!E(l)?renderEmptyElement(t):e("div",{class:["vxe-table--expanded",{"is--active":m}]},[e("span",{class:"vxe-table--expand-btn",on:{mousedown(e){e.stopPropagation()},click(e){t.triggerRowExpandEvent(e,l)}}},[e("i",{class:v?u||getIcon().TABLE_EXPAND_LOADED:m?g||getIcon().TABLE_EXPAND_OPEN:p||getIcon().TABLE_EXPAND_CLOSE})])]),f||c?e("span",{class:"vxe-table--expand-label"},f?t.callSlot(f,l,e):_xeUtils.default.get(n,c)):renderEmptyElement(t)]))},renderExpandData(e,l){var{$table:t,column:r}=l,{slots:r,contentRender:n}=r;if(r&&r.content)return t.callSlot(r.content,l,e);if(n){r=t.computeRendererOpts,r=n.name?r[n.name]||renderer.get(n.name):null,r=r?r.renderTableExpand||r.renderExpand:null;if(r)return(0,_vn.getSlotVNs)(r.call(t,e,n,l))}return[]},renderHTMLCell(e,l){var{$table:t,column:r}=l,r=r.slots;return r&&r.default?renderCellBaseVNs(e,l,t.callSlot(r.default,l,e)):renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--html",domProps:{innerHTML:getDefaultCellLabel(l)}})])},renderDeepHTMLCell(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderHTMLCell(e,l))},renderSortAndFilterHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderSortIcon(e,l).concat(Cell.renderFilterIcon(e,l))))},renderSortHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderSortIcon(e,l)))},renderSortIcon(e,l){let{$table:t,column:r}=l;var{showIcon:n,allowBtn:o,ascTitle:a,descTitle:d,iconLayout:i,iconAsc:s,iconDesc:c,iconVisibleMethod:u}=t.computeSortOpts,{order:C,slots:g}=r;return!n||u&&!u(l)?[]:(n=g?g.sort:null)?(0,_vn.getSlotVNs)(t.callSlot(n,l,e)):[e("span",{class:["vxe-cell--sort",`vxe-cell--sort-${i}-layout`]},[e("i",{class:["vxe-sort--asc-btn",s||getIcon().TABLE_SORT_ASC,{"sort--active":"asc"===C}],attrs:{title:_xeUtils.default.eqNull(a)?getI18n("vxe.table.sortAsc"):""+(a||"")},on:o?{click(e){e.stopPropagation(),t.triggerSortEvent(e,r,"asc")}}:void 0}),e("i",{class:["vxe-sort--desc-btn",c||getIcon().TABLE_SORT_DESC,{"sort--active":"desc"===C}],attrs:{title:_xeUtils.default.eqNull(d)?getI18n("vxe.table.sortDesc"):""+(d||"")},on:o?{click(e){e.stopPropagation(),t.triggerSortEvent(e,r,"desc")}}:void 0})])]},renderFilterHeader(e,l){return renderHeaderCellBaseVNs(e,l,Cell.renderHeaderTitle(e,l).concat(Cell.renderFilterIcon(e,l)))},renderFilterIcon(e,l){let{$table:t,column:r,hasFilter:n}=l;var o=t.filterStore,{showIcon:a,iconNone:d,iconMatch:i,iconVisibleMethod:s}=t.computeFilterOpts;return!a||s&&!s(l)?[]:[e("span",{class:["vxe-cell--filter",{"is--active":o.visible&&o.column===r}],on:{click(e){t.triggerFilterEvent&&t.triggerFilterEvent(e,l.column,l)}}},[e("i",{class:["vxe-filter--btn",n?i||getIcon().TABLE_FILTER_MATCH:d||getIcon().TABLE_FILTER_NONE],attrs:{title:getI18n("vxe.table.filter")}})])]},renderEditHeader(e,l){var{$table:t,column:r}=l,{editConfig:n,editRules:o}=t,a=t.computeEditOpts,{sortable:d,filters:i,editRender:s}=r,n=n&&(0,_utils.isEnableConf)(n),s=n&&(0,_utils.isEnableConf)(s)?s:null;let c=!1,u=(o&&(o=r.rules||_xeUtils.default.get(o,r.field))&&(c=o.some(e=>e.required)),[]);return n&&({showAsterisk:r,showIcon:o,icon:n}=a,u=[c&&r?e("i",{class:"vxe-cell--required-icon"},[e("i",{class:"vxe-cell--required-icon"})]):renderEmptyElement(t),s&&o?e("i",{class:"vxe-cell--edit-icon"},_xeUtils.default.isFunction(n)?(0,_vn.getSlotVNs)(n({})):[e("i",{class:n||getIcon().TABLE_EDIT})]):renderEmptyElement(t)]),renderHeaderCellBaseVNs(e,l,u.concat(Cell.renderHeaderTitle(e,l)).concat(d?Cell.renderSortIcon(e,l):[]).concat(i?Cell.renderFilterIcon(e,l):[]))},renderRowEdit(e,l){var{$table:t,column:r}=l,n=t.editConfig,t=t.editStore,t=t.actived,r=r.editRender,n=n&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(r)?r:null;return Cell.runRenderer(e,l,!(!n||!t||t.row!==l.row))},renderDeepRowEdit(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderRowEdit(e,l))},renderCellEdit(e,l){var{$table:t,column:r}=l,n=t.editConfig,t=t.editStore,t=t.actived,r=r.editRender,n=n&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(r)?r:null;return Cell.runRenderer(e,l,!(!n||!t||t.row!==l.row||t.column!==l.column))},renderDeepCellEdit(e,l){return Cell.renderDeepNodeBtn(e,l,Cell.renderCellEdit(e,l))},runRenderer(e,l,t){var{$table:r,row:n,column:o}=l,a=r.editConfig,d=r.isRowGroupStatus,{slots:o,field:i,editRender:s,formatter:c}=o,a=a&&(0,_utils.isEnableConf)(a)&&(0,_utils.isEnableConf)(s)?s:null,u=o?o.default:null,C=o?o.groupContent||o["group-content"]:null,g=Object.assign({$type:"",isEdit:t},l);if(t&&a)return o&&o.edit?r.callSlot(o.edit,g,e):(t=r.computeRendererOpts,(t=(o=a.name?t[a.name]||renderer.get(a.name):null)?o.renderTableEdit||o.renderEdit:null)?(0,_vn.getSlotVNs)(t.call(r,e,s,g)):[]);if(d&&i&&n.isAggregate){a=r.computeAggregateOpts.mapChildrenField,o=n.groupField,t=a&&n[a]||[];if(C)return renderCellBaseVNs(e,l,r.callSlot(C,Object.assign({groupField:o,groupContent:n.groupContent,childList:t,childCount:n.childCount},l),e))}else if(u)return renderCellBaseVNs(e,l,r.callSlot(u,g,e));return c?renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[getDefaultCellLabel(g)])]):Cell.renderDefaultCell(e,g)}};var _default=exports.default=Cell;

package/lib/table/src/columnInfo.js

@@ -52,7 +52,8 @@ class ColumnInfo {
     const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
     const defaultVisible = _xeUtils.default.isBoolean(visible) ? visible : true;
     const defaultRenderWidth = width && (0, _dom.isPx)(width) && width !== 'auto' ? Math.max(0, _xeUtils.default.toInteger(width)) : 0;
-    const flCompConf = filterRender && (0, _utils.isEnableConf)(filterRender) ? renderer.get(filterRender.name) : null;
+    const rendererOpts = $xeTable.computeRendererOpts;
+    const flCompConf = filterRender && (0, _utils.isEnableConf)(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || renderer.get(filterRender.name) : null;
     const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
     const filters = (0, _util.toFilters)(colConfs.filters, colId);
     const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{warnLog,errLog}=(0,_log.createComponentLog)("table"),{getI18n,formats,renderer}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,a=e.$xeGantt,s=n||a,{type:u,field:f,width:g,visible:h,fixed:c,align:m,headerAlign:p,footerAlign:x,aggFunc:F,formatter:_,filterMultiple:v,cellRender:M,editRender:b,filterRender:w}=r,y=r.colId||_xeUtils.default.uniqueId("col_"),C=n?n.computeProxyOpts:null,h=!_xeUtils.default.isBoolean(h)||h,g=g&&(0,_dom.isPx)(g)&&"auto"!==g?Math.max(0,_xeUtils.default.toInteger(g)):0,A=w&&(0,_utils.isEnableConf)(w)?renderer.get(w.name):null,A=A?A.createTableFilterOptions:null,R=(0,_util.toFilters)(r.filters,y),O=["seq","checkbox","radio","expand","html"];u&&-1===O.indexOf(u)&&warnLog("vxe.error.errProp",["type="+u,O.join(", ")]),(_xeUtils.default.isBoolean(M)||M&&!_xeUtils.default.isObject(M))&&warnLog("vxe.error.errProp",["column.cell-render="+M,"column.cell-render={}"]),(_xeUtils.default.isBoolean(b)||b&&!_xeUtils.default.isObject(b))&&warnLog("vxe.error.errProp",["column.edit-render="+b,"column.edit-render={}"]),"expand"===u&&(O=d.treeConfig,O)&&(e.treeOpts.showLine||e.treeOpts.line)&&errLog("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&warnLog("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&warnLog("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),_&&(_xeUtils.default.isString(_)?(M=formats.get(_)||_xeUtils.default[_])&&_xeUtils.default.isFunction(M.tableCellFormatMethod||M.cellFormatMethod)||errLog("vxe.error.notFormats",[_]):!_xeUtils.default.isArray(_)||(u=formats.get(_[0])||_xeUtils.default[_[0]])&&_xeUtils.default.isFunction(u.tableCellFormatMethod||u.cellFormatMethod)||errLog("vxe.error.notFormats",[_[0]])),F&&!e.handlePivotTableAggData&&!0!==F&&errLog("vxe.error.errProp",["column.agg-func="+F,"column.agg-func=true"]),f&&b&&(b.startField&&0<=(""+b.startField).indexOf(f)&&errLog("vxe.error.modelConflicts",["field="+f,"edit-render.startField="+b.startField]),b.endField)&&0<=(""+b.endField).indexOf(f)&&errLog("vxe.error.modelConflicts",["field="+f,"edit-render.endField="+b.endField]),Object.assign(this,{type:r.type,property:r.field,field:f,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:c,align:m,headerAlign:p,footerAlign:x,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:_,headerFormatter:r.headerFormatter,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:R,filterMultiple:!_xeUtils.default.isBoolean(v)||v,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:w,floatingFilters:r.floatingFilters,rules:r.rules,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:b,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:F,copyMethod:r.copyMethod,cutMethod:r.cutMethod,pasteMethod:r.pasteMethod,params:r.params,id:y,parentId:null,visible:h,defaultParentId:null,halfVisible:!1,defaultVisible:h,defaultFixed:c,defaultAlign:m,defaultHeaderAlign:p,defaultFooterAlign:x,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderAggDigits:null,renderAggFormat:null,renderAlign:"",renderHeaderAlign:"",renderFooterAlign:"",renderFixed:"",renderVisible:!1,renderWidth:g,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),!A||R&&R.length||(this.filters=(0,_util.toFilters)(A({$table:e,column:this}),y)),s&&C&&C.beforeColumn&&C.beforeColumn({$table:e,$grid:n,$gantt:a,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var{type:e,field:r}=this;return r||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_util=require("./util"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{warnLog,errLog}=(0,_log.createComponentLog)("table"),{getI18n,formats,renderer}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,a=e.$xeGantt,s=n||a,{type:u,field:f,width:g,visible:h,fixed:c,align:m,headerAlign:p,footerAlign:x,aggFunc:F,formatter:_,filterMultiple:v,cellRender:M,editRender:b,filterRender:w}=r,y=r.colId||_xeUtils.default.uniqueId("col_"),C=n?n.computeProxyOpts:null,h=!_xeUtils.default.isBoolean(h)||h,g=g&&(0,_dom.isPx)(g)&&"auto"!==g?Math.max(0,_xeUtils.default.toInteger(g)):0,A=e.computeRendererOpts,A=w&&(0,_utils.isEnableConf)(w)&&w.name?A[w.name]||renderer.get(w.name):null,A=A?A.createTableFilterOptions:null,R=(0,_util.toFilters)(r.filters,y),O=["seq","checkbox","radio","expand","html"];u&&-1===O.indexOf(u)&&warnLog("vxe.error.errProp",["type="+u,O.join(", ")]),(_xeUtils.default.isBoolean(M)||M&&!_xeUtils.default.isObject(M))&&warnLog("vxe.error.errProp",["column.cell-render="+M,"column.cell-render={}"]),(_xeUtils.default.isBoolean(b)||b&&!_xeUtils.default.isObject(b))&&warnLog("vxe.error.errProp",["column.edit-render="+b,"column.edit-render={}"]),"expand"===u&&(O=d.treeConfig,O)&&(e.treeOpts.showLine||e.treeOpts.line)&&errLog("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&warnLog("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&warnLog("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),_&&(_xeUtils.default.isString(_)?(M=formats.get(_)||_xeUtils.default[_])&&_xeUtils.default.isFunction(M.tableCellFormatMethod||M.cellFormatMethod)||errLog("vxe.error.notFormats",[_]):!_xeUtils.default.isArray(_)||(u=formats.get(_[0])||_xeUtils.default[_[0]])&&_xeUtils.default.isFunction(u.tableCellFormatMethod||u.cellFormatMethod)||errLog("vxe.error.notFormats",[_[0]])),F&&!e.handlePivotTableAggData&&!0!==F&&errLog("vxe.error.errProp",["column.agg-func="+F,"column.agg-func=true"]),f&&b&&(b.startField&&0<=(""+b.startField).indexOf(f)&&errLog("vxe.error.modelConflicts",["field="+f,"edit-render.startField="+b.startField]),b.endField)&&0<=(""+b.endField).indexOf(f)&&errLog("vxe.error.modelConflicts",["field="+f,"edit-render.endField="+b.endField]),Object.assign(this,{type:r.type,property:r.field,field:f,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:c,align:m,headerAlign:p,footerAlign:x,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:_,headerFormatter:r.headerFormatter,footerFormatter:r.footerFormatter,padding:r.padding,verticalAlign:r.verticalAlign,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,sortMethod:r.sortMethod,remoteSort:r.remoteSort,filters:R,filterMultiple:!_xeUtils.default.isBoolean(v)||v,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:w,floatingFilters:r.floatingFilters,rules:r.rules,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:b,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:F,copyMethod:r.copyMethod,cutMethod:r.cutMethod,pasteMethod:r.pasteMethod,params:r.params,id:y,parentId:null,visible:h,defaultParentId:null,halfVisible:!1,defaultVisible:h,defaultFixed:c,defaultAlign:m,defaultHeaderAlign:p,defaultFooterAlign:x,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderAggDigits:null,renderAggFormat:null,renderAlign:"",renderHeaderAlign:"",renderFooterAlign:"",renderFixed:"",renderVisible:!1,renderWidth:g,renderHeight:0,renderResizeWidth:0,renderAutoWidth:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:t||r.renderHeader,renderCell:o||r.renderCell,renderFooter:l||r.renderFooter,renderData:i,slots:r.slots}),!A||R&&R.length||(this.filters=(0,_util.toFilters)(A({$table:e,column:this}),y)),s&&C&&C.beforeColumn&&C.beforeColumn({$table:e,$grid:n,$gantt:a,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var{type:e,field:r}=this;return r||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;

package/lib/table/src/footer.js

@@ -64,6 +64,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
   const cellOpts = $xeTable.computeCellOpts;
   const footerCellOpts = $xeTable.computeFooterCellOpts;
   const currCellHeight = (0, _util.getCalcHeight)(footerCellOpts.height) || defaultRowHeight;
+  const rendererOpts = $xeTable.computeRendererOpts;
   return tableColumn.map((column, $columnIndex) => {
     const {
       type,
@@ -77,7 +78,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
     const colid = column.id;
     const colRest = fullColumnIdData[colid] || {};
     const renderOpts = editRender || cellRender;
-    const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
+    const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || renderer.get(renderOpts.name) : null;
     const showAllTip = footerTooltipOpts.showAll;
     const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
     const cellPadding = (0, _utils.getDefaultConfig)(footerCellOpts.padding, cellOpts.padding);

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let sourceType="table",renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(T,e,$,I,S,E,D,z){let R=e.$parent;var l=R,r=R,t=R;let O=R.$xeGrid,k=R.$xeGantt,A=e.fixedType,{resizable:q,border:X,footerCellClassName:L,footerCellStyle:U,footerAlign:H,footerSpanMethod:M,align:V,columnKey:G,showFooterOverflow:N}=l,{scrollXLoad:W,scrollYLoad:K,overflowX:j,mergeFootFlag:B,currColFlag:P}=r,{fullColumnIdData:Y,mergeFooterList:J,mergeFooterCellMaps:te,scrollXStore:Q,currentCol:oe}=t,ie=R.computeVirtualXOpts,Z=R.computeFooterTooltipOpts,ae=R.resizableOpts.isAllColumnDrag,ee=R.computeColumnOpts;e=R.computeDefaultRowHeight;let ne=R.computeCellOpts,le=R.computeFooterCellOpts,re=(0,_util.getCalcHeight)(le.height)||e;return I.map((l,e)=>{var{type:r,showFooterOverflow:t,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=Y[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=Z.showAll;var n=j&&(A?l.fixed!==A:!!l.fixed),c=(0,_utils.getDefaultConfig)(le.padding,ne.padding),f=!0===c,m=!!c&&(f||!1!==c.top),x=!!c&&(f||!1!==c.bottom),g=!!c&&(f||!1!==c.left),f=!!c&&(f||!1!==c.right),c=(0,_utils.getDefaultConfig)(t,N),t=o||(s?s.tableFooterCellAlign:"")||H||i||(s?s.tableCellAlign:"")||V,o="ellipsis"===(!0===c?Z.mode:c);let v="title"===(!0===c?Z.mode:c),b="tooltip"===(!0===c?Z.mode:c);var i=v||b||o,s=_xeUtils.default.isBoolean(l.resizable)?l.resizable:ee.resizable||q,c={colid:d},y={},w=u.index,u=u._index,C=u;let h={source:sourceType,$table:R,$grid:O,$gantt:k,row:E,rowIndex:z,_rowIndex:z,$rowIndex:D,column:l,columnIndex:w,$columnIndex:e,_columnIndex:u,itemIndex:C,items:E,fixed:A,type:renderType,data:S},F=((v||b||p)&&(y.mouseenter=e=>{v?(0,_dom.updateCellTitle)(e.currentTarget,l):(b||p)&&R.triggerFooterTooltipEvent(e,h)}),(b||p)&&(y.mouseleave=e=>{(b||p)&&R.handleTargetLeaveEvent(e)}),y.click=e=>{R.triggerFooterCellClickEvent(e,h)},!(y.dblclick=e=>{R.triggerFooterCellDblclickEvent(e,h)}));if(B&&J.length){w=te[z+":"+u];if(w){var{rowspan:C,colspan:w}=w;if(!C||!w)return null;1<C&&(F=!0,c.rowspan=C),1<w&&(F=!0,c.colspan=w)}}else if(M){var{rowspan:C=1,colspan:w=1}=M(h)||{};if(!C||!w)return null;1<C&&(c.rowspan=C),1<w&&(c.colspan=w)}C=e===I.length-1,w=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let _=!1;$&&j&&!F&&W&&10<I.length&&!l.fixed&&!ie.immediate&&(u<Q.visibleStartIndex-Q.preloadSize||u>Q.visibleEndIndex+Q.preloadSize)&&(_=!0);u={};return i?u.height=re+"px":u.minHeight=re+"px",T("td",{class:["vxe-table--column vxe-footer--column",l.id,{["col--"+t]:t,["col--"+r]:r,"col--last":C,"fixed--width":!w,"fixed--hidden":n,"is--pg-top":m,"is--pg-bottom":x,"is--pg-left":g,"is--pg-right":f,"col--ellipsis":i,"col--current":P&&oe===l},(0,_utils.getClass)(a,h),(0,_utils.getClass)(L,h)],attrs:c,style:U?_xeUtils.default.isFunction(U)?U(h):U:void 0,on:y,key:G||W||K||ee.useKey||ee.drag?l.id:e},[T("div",{class:["vxe-cell",{"c--title":v,"c--tooltip":b,"c--ellipsis":o}],style:u},_?[]:[T("div",{attrs:{colid:d},class:"vxe-cell--wrapper vxe-footer-cell--wrapper"},l.renderFooter(T,h))]),!n&&s&&ae?T("div",{class:["vxe-cell--col-resizable",{"is--line":!X||"none"===X}],on:{mousedown:e=>R.handleColResizeMousedownEvent(e,A,h),dblclick:e=>R.handleColResizeDblclickEvent(e,h)}}):renderEmptyElement(R)])})}function renderHeads(t,o,i,a){let n=o.$parent;var e=n;let{fixedType:s,footerTableData:d}=o,{footerRowClassName:u,footerRowStyle:p}=e;return d.map((e,l)=>{var r=l,r={$table:n,row:e,rowIndex:l,_rowIndex:l,$rowIndex:r,fixed:s,type:renderType};return t("tr",{key:l,class:["vxe-footer--row",u?_xeUtils.default.isFunction(u)?u(r):u:""],style:p?_xeUtils.default.isFunction(p)?p(r):p:void 0},renderRows(t,o,i,a,d,e,l,l))})}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-footer-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refFooterScroll,r[l+"table"]=e.$refs.refFooterTable,r[l+"colgroup"]=e.$refs.refFooterColgroup,r[l+"list"]=e.$refs.refFooterTFoot,r[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(r){let l=this.$parent;var e=l,t=l,o=l.xID;let{fixedType:i,fixedColumn:a,tableColumn:n}=this;var{visibleColumn:t,fullColumnIdData:s}=t,{isGroup:e,isColLoading:d,overflowX:u,scrollXLoad:p,dragCol:c}=e;let f=n;var m=l.computeIsFooterRenderOptimize;return m&&(d||!i&&u)||(f=t),i&&m&&(f=a||[]),i||e||p&&c&&2<f.length&&(d=s[c.id])&&(u=d._index,t=f[0],e=f[f.length-1],p=s[t.id],d=s[e.id],p)&&d&&(t=p._index,s=d._index,u<t?f=[c].concat(f):s<u&&(f=f.concat([c]))),r("div",{ref:"refElem",class:["vxe-table--footer-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:o}},[r("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:o,cellspacing:0,cellpadding:0,border:0,xvm:m?"1":null}},[r("colgroup",{ref:"refFooterColgroup"},f.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("tfoot",{ref:"refFooterTFoot"},renderHeads(r,this,m,f))])])])}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let sourceType="table",renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(T,e,$,I,S,E,D,R){let z=e.$parent;var l=z,r=z,t=z;let O=z.$xeGrid,k=z.$xeGantt,A=e.fixedType,{resizable:q,border:X,footerCellClassName:L,footerCellStyle:U,footerAlign:H,footerSpanMethod:M,align:V,columnKey:G,showFooterOverflow:N}=l,{scrollXLoad:W,scrollYLoad:K,overflowX:j,mergeFootFlag:B,currColFlag:P}=r,{fullColumnIdData:Y,mergeFooterList:J,mergeFooterCellMaps:te,scrollXStore:Q,currentCol:oe}=t,ie=z.computeVirtualXOpts,Z=z.computeFooterTooltipOpts,ae=z.resizableOpts.isAllColumnDrag,ee=z.computeColumnOpts;e=z.computeDefaultRowHeight;let ne=z.computeCellOpts,le=z.computeFooterCellOpts,re=(0,_util.getCalcHeight)(le.height)||e,se=z.computeRendererOpts;return I.map((l,e)=>{var{type:r,showFooterOverflow:t,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=Y[d]||{},n=n||s,s=n&&n.name?se[n.name]||renderer.get(n.name):null;let p=Z.showAll;var n=j&&(A?l.fixed!==A:!!l.fixed),c=(0,_utils.getDefaultConfig)(le.padding,ne.padding),f=!0===c,m=!!c&&(f||!1!==c.top),x=!!c&&(f||!1!==c.bottom),g=!!c&&(f||!1!==c.left),f=!!c&&(f||!1!==c.right),c=(0,_utils.getDefaultConfig)(t,N),t=o||(s?s.tableFooterCellAlign:"")||H||i||(s?s.tableCellAlign:"")||V,o="ellipsis"===(!0===c?Z.mode:c);let v="title"===(!0===c?Z.mode:c),b="tooltip"===(!0===c?Z.mode:c);var i=v||b||o,s=_xeUtils.default.isBoolean(l.resizable)?l.resizable:ee.resizable||q,c={colid:d},y={},w=u.index,u=u._index,C=u;let h={source:sourceType,$table:z,$grid:O,$gantt:k,row:E,rowIndex:R,_rowIndex:R,$rowIndex:D,column:l,columnIndex:w,$columnIndex:e,_columnIndex:u,itemIndex:C,items:E,fixed:A,type:renderType,data:S},F=((v||b||p)&&(y.mouseenter=e=>{v?(0,_dom.updateCellTitle)(e.currentTarget,l):(b||p)&&z.triggerFooterTooltipEvent(e,h)}),(b||p)&&(y.mouseleave=e=>{(b||p)&&z.handleTargetLeaveEvent(e)}),y.click=e=>{z.triggerFooterCellClickEvent(e,h)},!(y.dblclick=e=>{z.triggerFooterCellDblclickEvent(e,h)}));if(B&&J.length){w=te[R+":"+u];if(w){var{rowspan:C,colspan:w}=w;if(!C||!w)return null;1<C&&(F=!0,c.rowspan=C),1<w&&(F=!0,c.colspan=w)}}else if(M){var{rowspan:C=1,colspan:w=1}=M(h)||{};if(!C||!w)return null;1<C&&(c.rowspan=C),1<w&&(c.colspan=w)}C=e===I.length-1,w=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let _=!1;$&&j&&!F&&W&&10<I.length&&!l.fixed&&!ie.immediate&&(u<Q.visibleStartIndex-Q.preloadSize||u>Q.visibleEndIndex+Q.preloadSize)&&(_=!0);u={};return i?u.height=re+"px":u.minHeight=re+"px",T("td",{class:["vxe-table--column vxe-footer--column",l.id,{["col--"+t]:t,["col--"+r]:r,"col--last":C,"fixed--width":!w,"fixed--hidden":n,"is--pg-top":m,"is--pg-bottom":x,"is--pg-left":g,"is--pg-right":f,"col--ellipsis":i,"col--current":P&&oe===l},(0,_utils.getClass)(a,h),(0,_utils.getClass)(L,h)],attrs:c,style:U?_xeUtils.default.isFunction(U)?U(h):U:void 0,on:y,key:G||W||K||ee.useKey||ee.drag?l.id:e},[T("div",{class:["vxe-cell",{"c--title":v,"c--tooltip":b,"c--ellipsis":o}],style:u},_?[]:[T("div",{attrs:{colid:d},class:"vxe-cell--wrapper vxe-footer-cell--wrapper"},l.renderFooter(T,h))]),!n&&s&&ae?T("div",{class:["vxe-cell--col-resizable",{"is--line":!X||"none"===X}],on:{mousedown:e=>z.handleColResizeMousedownEvent(e,A,h),dblclick:e=>z.handleColResizeDblclickEvent(e,h)}}):renderEmptyElement(z)])})}function renderHeads(t,o,i,a){let n=o.$parent;var e=n;let{fixedType:s,footerTableData:d}=o,{footerRowClassName:u,footerRowStyle:p}=e;return d.map((e,l)=>{var r=l,r={$table:n,row:e,rowIndex:l,_rowIndex:l,$rowIndex:r,fixed:s,type:renderType};return t("tr",{key:l,class:["vxe-footer--row",u?_xeUtils.default.isFunction(u)?u(r):u:""],style:p?_xeUtils.default.isFunction(p)?p(r):p:void 0},renderRows(t,o,i,a,d,e,l,l))})}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-footer-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refFooterScroll,r[l+"table"]=e.$refs.refFooterTable,r[l+"colgroup"]=e.$refs.refFooterColgroup,r[l+"list"]=e.$refs.refFooterTFoot,r[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(r){let l=this.$parent;var e=l,t=l,o=l.xID;let{fixedType:i,fixedColumn:a,tableColumn:n}=this;var{visibleColumn:t,fullColumnIdData:s}=t,{isGroup:e,isColLoading:d,overflowX:u,scrollXLoad:p,dragCol:c}=e;let f=n;var m=l.computeIsFooterRenderOptimize;return m&&(d||!i&&u)||(f=t),i&&m&&(f=a||[]),i||e||p&&c&&2<f.length&&(d=s[c.id])&&(u=d._index,t=f[0],e=f[f.length-1],p=s[t.id],d=s[e.id],p)&&d&&(t=p._index,s=d._index,u<t?f=[c].concat(f):s<u&&(f=f.concat([c]))),r("div",{ref:"refElem",class:["vxe-table--footer-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:o}},[r("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:o,cellspacing:0,cellpadding:0,border:0,xvm:m?"1":null}},[r("colgroup",{ref:"refFooterColgroup"},f.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("tfoot",{ref:"refFooterTFoot"},renderHeads(r,this,m,f))])])])}});

package/lib/table/src/header.js

@@ -62,6 +62,7 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, co
   const cellOpts = $xeTable.computeCellOpts;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const headerCellOpts = $xeTable.computeHeaderCellOpts;
+  const rendererOpts = $xeTable.computeRendererOpts;
   const currCellHeight = (0, _util.getCalcHeight)(headerCellOpts.height) || defaultRowHeight;
   const {
     disabledMethod: dragDisabledMethod,
@@ -84,7 +85,7 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, co
     const colid = column.id;
     const colRest = fullColumnIdData[colid] || {};
     const renderOpts = editRender || cellRender;
-    const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
+    const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || renderer.get(renderOpts.name) : null;
     const isColGroup = column.children && column.children.length;
     const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
     const cellPadding = (0, _utils.getDefaultConfig)(headerCellOpts.padding, cellOpts.padding);
@@ -282,6 +283,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const headerCellOpts = $xeTable.computeHeaderCellOpts;
   const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
+  const rendererOpts = $xeTable.computeRendererOpts;
   const {
     cellClassName
   } = floatingFilterOpts;
@@ -302,8 +304,8 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
     const colid = column.id;
     const colRest = fullColumnIdData[colid] || {};
     const renderOpts = editRender || cellRender;
-    const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
-    const flCompConf = (0, _utils.isEnableConf)(filterRender) ? renderer.get(filterRender.name) : null;
+    const compConf = renderOpts && renderOpts.name ? rendererOpts[renderOpts.name] || renderer.get(renderOpts.name) : null;
+    const flCompConf = (0, _utils.isEnableConf)(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || renderer.get(filterRender.name) : null;
     const rtFloatingFilter = flCompConf ? flCompConf.renderTableFloatingFilter : null;
     const flSlot = slots ? slots.floatingFilter || slots['floating-filter'] : null;
     const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,sourceType="table",renderType="header";function renderRows(S,e,I,R,l,F,O){let k=e.$parent,z=k.$xeGrid,A=k.$xeGantt;var r=k,t=k,a=k;let q=e.fixedType,{resizable:G,columnKey:U,showCustomHeader:X,headerCellClassName:M,headerCellStyle:N,showHeaderOverflow:W,headerAlign:L,align:V,mouseConfig:B}=r,{dragCol:K,scrollXLoad:P,scrollYLoad:j,overflowX:Y,mergeHeadFlag:J,tableColumn:Q,currColFlag:de}=t,{fullColumnIdData:oe,scrollXStore:Z,mergeHeaderList:ne,mergeHeaderCellMaps:se,currentCol:ce}=a,ue=k.computeVirtualXOpts,ee=k.computeColumnOpts,le=k.computeColumnDragOpts,pe=k.computeHeaderTooltipOpts,ge=k.computeCellOpts;e=k.computeDefaultRowHeight;let re=k.computeHeaderCellOpts,te=(0,_util.getCalcHeight)(re.height)||e,{disabledMethod:ae,isCrossDrag:fe,isPeerDrag:me}=le,ie=F===l.length-1;return O.map((e,l)=>{var{type:r,showHeaderOverflow:t,headerAlign:a,align:i,filters:d,headerClassName:o,editRender:n,cellRender:s}=e,c=e.id,u=oe[c]||{},n=n||s,s=n?renderer.get(n.name):null,n=e.children&&e.children.length,p=Y&&!n&&(q?e.fixed!==q:!!e.fixed),g=(0,_utils.getDefaultConfig)(re.padding,ge.padding),f=!0===g,m=!!g&&(f||!1!==g.top),x=!!g&&(f||!1!==g.bottom),h=!!g&&(f||!1!==g.left),f=!!g&&(f||!1!==g.right),g=(0,_utils.getDefaultConfig)(t,W),t=a||(s?s.tableHeaderCellAlign:"")||L||i||(s?s.tableCellAlign:"")||V,a="ellipsis"===g,i="title"===g,s=!0===g?"tooltip"===pe.mode:"tooltip"===g,g=i||s||a;let v=!1,C=null;d&&(C=d[0],v=d.some(e=>e.checked));var b=u.index,u=X?l:u._index;let w={$table:k,$grid:z,$gantt:A,rowIndex:F,_rowIndex:F,$rowIndex:F,column:e,columnIndex:b,$columnIndex:l,_columnIndex:u,firstFilterOption:C,fixed:q,source:sourceType,type:renderType,isHidden:p,hasFilter:v};b={colid:c};let H=!1;if(X||(b.colspan=1<e.colSpan?e.colSpan:null,b.rowspan=1<e.rowSpan?e.rowSpan:null),J&&ne.length&&(X||ie)){var y=se[F+":"+(X?l:u)];if(y){var{rowspan:y,colspan:_}=y;if(!y||!_)return null;1<y&&(H=!0,b.rowspan=y),1<_&&(H=!0,b.colspan=_)}}y={click:e=>k.triggerHeaderCellClickEvent(e,w),dblclick:e=>k.triggerHeaderCellDblclickEvent(e,w)},_=ee.drag&&"cell"===le.trigger;let $=!1;_&&($=!(!ae||!ae(w))),(B||_)&&(y.mousedown=e=>k.triggerHeaderCellMousedownEvent(e,w)),ee.drag&&(y.dragstart=k.handleHeaderCellDragDragstartEvent,y.dragend=k.handleHeaderCellDragDragendEvent,y.dragover=k.handleHeaderCellDragDragoverEvent,_)&&(y.mouseup=k.handleHeaderCellDragMouseupEvent);var _=l===O.length-1,T=_xeUtils.default.isBoolean(e.resizable)?e.resizable:ee.resizable||G,D=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let E=!1;!R||!Y||I||H||K&&K.id===c||P&&10<Q.length&&!e.fixed&&!ue.immediate&&(u<Z.visibleStartIndex-Z.preloadSize||u>Z.visibleEndIndex+Z.preloadSize)&&(E=!0);u={};if(g?u.height=te+"px":u.minHeight=te+"px",!X&&n&&!ie){let l=0;_xeUtils.default.eachTree(e.children,e=>{!e.visible||e.children&&e.children.length||(l+=e.renderWidth)}),u.width=l+"px"}return S("th",{class:["vxe-table--column vxe-header--column",c,p?"fixed--hidden":"fixed--visible",{["col--"+t]:t,["col--"+r]:r,"col--last":_,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":g,"fixed--width":!D,"is--pg-top":m,"is--pg-bottom":x,"is--pg-left":h,"is--pg-right":f,"is--sortable":e.sortable,"col--filter":!!d,"is--filter-active":v,"is--drag-active":ee.drag&&!e.fixed&&!$&&(fe||me||!e.parentId),"is--drag-disabled":ee.drag&&$,"col--current":de&&ce===e},(0,_utils.getClass)(o,w),(0,_utils.getClass)(M,w)],attrs:b,style:N?_xeUtils.default.isFunction(N)?N(w):N:void 0,on:y,key:X?""+c+l:U||P||j||ee.useKey||ee.drag||n?c:l},[S("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":s,"c--ellipsis":a}],style:u},E||R&&p?[]:[S("div",{attrs:{colid:c},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader(S,w))]),p||!T||X&&!ie?renderEmptyElement(k):S("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>k.handleColResizeMousedownEvent(e,q,w),dblclick:e=>k.handleColResizeDblclickEvent(e,w)}})])})}function renderFilterRows(w,e,H,y){let _=e.$parent,$=_.$xeGrid,T=_.$xeGantt;var l=_,r=_,t=_;let D=e.fixedType,{showHeaderOverflow:E,headerAlign:S,align:I}=l,{overflowX:R,currColFlag:F}=r,{fullColumnIdData:O,currentCol:k}=t,z=_.computeHeaderTooltipOpts,A=_.computeCellOpts;e=_.computeDefaultRowHeight;let q=_.computeHeaderCellOpts,G=_.computeFloatingFilterOpts.cellClassName,U=(0,_util.getCalcHeight)(q.height)||e;return y.map((e,l)=>{var{type:r,showHeaderOverflow:t,headerAlign:a,align:i,filters:d,editRender:o,cellRender:n,floatingFilters:s,filterRender:c,slots:u}=e,p=e.id,g=O[p]||{},o=o||n,n=o?renderer.get(o.name):null,o=(0,_utils.isEnableConf)(c)?renderer.get(c.name):null,o=o?o.renderTableFloatingFilter:null,u=u?u.floatingFilter||u["floating-filter"]:null,f=R&&(D?e.fixed!==D:!!e.fixed),m=(_xeUtils.default.isBoolean(q.padding)?q:A).padding,t=_xeUtils.default.eqNull(t)?E:t,a=a||(n?n.tableHeaderCellAlign:"")||S||i||(n?n.tableCellAlign:"")||I,i="ellipsis"===(!0===t?z.mode:t),n="title"===(!0===t?z.mode:t),t="tooltip"===(!0===t?z.mode:t),x=n||t||i;let h=!1,v=null;d&&(v=d[0],h=d.some(e=>e.checked));var d=g.index,g=g._index,d={$table:_,$grid:$,$gantt:T,column:e,columnIndex:d,$columnIndex:l,_columnIndex:g,option:v,fixed:D,source:sourceType,type:renderType,isHidden:f,hasFilter:h},g={colid:p},l=l===y.length-1,C=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width),b={};return x?b.height=U+"px":b.minHeight=U+"px",w("th",{class:["vxe-table--column vxe-header--column is--floating-filters",p,f?"fixed--hidden":"fixed--visible",{["col--"+a]:a,["col--"+r]:r,"col--last":l,"col--fixed":e.fixed,"col--ellipsis":x,"fixed--width":!C,"is--padding":m,"is--sortable":e.sortable,"col--current":F&&k===e}],key:p,attrs:g},[w("div",{class:["vxe-cell",""+(G||""),{"c--title":n,"c--tooltip":t,"c--ellipsis":i}],style:b},H&&f&&!s?[]:[w("div",{attrs:{colid:p},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},u?_.callSlot(u,d,w):o&&v?(0,_vn.getSlotVNs)(o.call(_,w,c,d)):[])])])})}function renderHeads(t,a,i,d,o,e){let n=a.$parent;var l=n;let s=a.fixedType,{headerRowClassName:c,headerRowStyle:u}=l;var l=n.computeFloatingFilterOpts,r=o.map((e,l)=>{var r={$table:n,rowIndex:l,_rowIndex:l,$rowIndex:l,fixed:s,type:renderType};return t("tr",{key:l,class:["vxe-header--row",c?_xeUtils.default.isFunction(c)?c(r):c:""],style:u?_xeUtils.default.isFunction(u)?u(r):u:void 0},renderRows(t,a,i,d,o,l,e))});return l.enabled&&r.push(t("tr",{key:"ff",class:["vxe-header--row is--floating-filters",""+(l.rowClassName||"")]},renderFilterRows(t,a,d,e))),r}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null},render(r){let l=this.$parent;var e=l,t=l,a=l,i=l.xID;let{fixedType:d,fixedColumn:o,tableColumn:n}=this;var s=this.headerColumn,e=e.mouseConfig,{isGroup:t,isColLoading:c,overflowX:u,scrollXLoad:p,dragCol:g}=t,{visibleColumn:a,fullColumnIdData:f}=a,m=l.computeMouseOpts;let x=s,h=n;s=l.computeIsHeaderRenderOptimize;return t?h=a:(s&&(c||!d&&u)||(h=a),d&&s&&(h=o||[]),x=[h]),d||t||p&&g&&2<h.length&&(c=f[g.id])&&(u=c._index,a=h[0],p=h[h.length-1],c=f[a.id],a=f[p.id],c)&&a&&(f=c._index,p=a._index,u<f?(h=[g].concat(h),x=[[g].concat(x[0])].concat(x.slice(1))):p<u&&(h=h.concat([g]),x=[x[0].concat([g])].concat(x.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",d?`fixed-${d}--wrapper`:"body--wrapper"],attrs:{xid:i}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,d)}}},[d?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0,xvm:s?"1":null}},[r("colgroup",{ref:"refHeaderColgroup"},h.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,t,s,x,h))]),e&&m.area?r("div",{class:"vxe-table--cell-area",attrs:{xid:i}},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-clip-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])},methods:{uploadColumn(){let e=this.$parent;var l=e,r=e,l=l.showCustomHeader;let{collectColumn:t,visibleColumn:a}=e;var i=this.tableGroupColumn,r=r.isGroup;let d=r?(0,_util.convertHeaderColumnToRows)(i):[],o=[];l&&1<d.length&&(o=(0,_util.convertHeaderToGridRows)(d),d=o),this.headerColumn=d,e.$nextTick(()=>{e.dispatchEvent("columns-change",{visibleColgroups:o,collectColumn:t,visibleColumn:a},null)})}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,sourceType="table",renderType="header";function renderRows(R,e,S,I,l,O,F){let k=e.$parent,z=k.$xeGrid,A=k.$xeGantt;var r=k,t=k,a=k;let q=e.fixedType,{resizable:G,columnKey:U,showCustomHeader:X,headerCellClassName:M,headerCellStyle:N,showHeaderOverflow:W,headerAlign:L,align:V,mouseConfig:B}=r,{dragCol:K,scrollXLoad:P,scrollYLoad:j,overflowX:Y,mergeHeadFlag:J,tableColumn:Q,currColFlag:de}=t,{fullColumnIdData:ne,scrollXStore:Z,mergeHeaderList:oe,mergeHeaderCellMaps:se,currentCol:ce}=a,ue=k.computeVirtualXOpts,ee=k.computeColumnOpts,le=k.computeColumnDragOpts,pe=k.computeHeaderTooltipOpts,me=k.computeCellOpts;e=k.computeDefaultRowHeight;let re=k.computeHeaderCellOpts,ge=k.computeRendererOpts,te=(0,_util.getCalcHeight)(re.height)||e,{disabledMethod:ae,isCrossDrag:fe,isPeerDrag:xe}=le,ie=O===l.length-1;return F.map((e,l)=>{var{type:r,showHeaderOverflow:t,headerAlign:a,align:i,filters:d,headerClassName:n,editRender:o,cellRender:s}=e,c=e.id,u=ne[c]||{},o=o||s,s=o&&o.name?ge[o.name]||renderer.get(o.name):null,o=e.children&&e.children.length,p=Y&&!o&&(q?e.fixed!==q:!!e.fixed),m=(0,_utils.getDefaultConfig)(re.padding,me.padding),g=!0===m,f=!!m&&(g||!1!==m.top),x=!!m&&(g||!1!==m.bottom),h=!!m&&(g||!1!==m.left),g=!!m&&(g||!1!==m.right),m=(0,_utils.getDefaultConfig)(t,W),t=a||(s?s.tableHeaderCellAlign:"")||L||i||(s?s.tableCellAlign:"")||V,a="ellipsis"===m,i="title"===m,s=!0===m?"tooltip"===pe.mode:"tooltip"===m,m=i||s||a;let v=!1,C=null;d&&(C=d[0],v=d.some(e=>e.checked));var b=u.index,u=X?l:u._index;let w={$table:k,$grid:z,$gantt:A,rowIndex:O,_rowIndex:O,$rowIndex:O,column:e,columnIndex:b,$columnIndex:l,_columnIndex:u,firstFilterOption:C,fixed:q,source:sourceType,type:renderType,isHidden:p,hasFilter:v};b={colid:c};let H=!1;if(X||(b.colspan=1<e.colSpan?e.colSpan:null,b.rowspan=1<e.rowSpan?e.rowSpan:null),J&&oe.length&&(X||ie)){var y=se[O+":"+(X?l:u)];if(y){var{rowspan:y,colspan:_}=y;if(!y||!_)return null;1<y&&(H=!0,b.rowspan=y),1<_&&(H=!0,b.colspan=_)}}y={click:e=>k.triggerHeaderCellClickEvent(e,w),dblclick:e=>k.triggerHeaderCellDblclickEvent(e,w)},_=ee.drag&&"cell"===le.trigger;let $=!1;_&&($=!(!ae||!ae(w))),(B||_)&&(y.mousedown=e=>k.triggerHeaderCellMousedownEvent(e,w)),ee.drag&&(y.dragstart=k.handleHeaderCellDragDragstartEvent,y.dragend=k.handleHeaderCellDragDragendEvent,y.dragover=k.handleHeaderCellDragDragoverEvent,_)&&(y.mouseup=k.handleHeaderCellDragMouseupEvent);var _=l===F.length-1,T=_xeUtils.default.isBoolean(e.resizable)?e.resizable:ee.resizable||G,D=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let E=!1;!I||!Y||S||H||K&&K.id===c||P&&10<Q.length&&!e.fixed&&!ue.immediate&&(u<Z.visibleStartIndex-Z.preloadSize||u>Z.visibleEndIndex+Z.preloadSize)&&(E=!0);u={};if(m?u.height=te+"px":u.minHeight=te+"px",!X&&o&&!ie){let l=0;_xeUtils.default.eachTree(e.children,e=>{!e.visible||e.children&&e.children.length||(l+=e.renderWidth)}),u.width=l+"px"}return R("th",{class:["vxe-table--column vxe-header--column",c,p?"fixed--hidden":"fixed--visible",{["col--"+t]:t,["col--"+r]:r,"col--last":_,"col--fixed":e.fixed,"col--group":o,"col--ellipsis":m,"fixed--width":!D,"is--pg-top":f,"is--pg-bottom":x,"is--pg-left":h,"is--pg-right":g,"is--sortable":e.sortable,"col--filter":!!d,"is--filter-active":v,"is--drag-active":ee.drag&&!e.fixed&&!$&&(fe||xe||!e.parentId),"is--drag-disabled":ee.drag&&$,"col--current":de&&ce===e},(0,_utils.getClass)(n,w),(0,_utils.getClass)(M,w)],attrs:b,style:N?_xeUtils.default.isFunction(N)?N(w):N:void 0,on:y,key:X?""+c+l:U||P||j||ee.useKey||ee.drag||o?c:l},[R("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":s,"c--ellipsis":a}],style:u},E||I&&p?[]:[R("div",{attrs:{colid:c},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader(R,w))]),p||!T||X&&!ie?renderEmptyElement(k):R("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>k.handleColResizeMousedownEvent(e,q,w),dblclick:e=>k.handleColResizeDblclickEvent(e,w)}})])})}function renderFilterRows(w,e,H,y){let _=e.$parent,$=_.$xeGrid,T=_.$xeGantt;var l=_,r=_,t=_;let D=e.fixedType,{showHeaderOverflow:E,headerAlign:R,align:S}=l,{overflowX:I,currColFlag:O}=r,{fullColumnIdData:F,currentCol:k}=t,z=_.computeHeaderTooltipOpts,A=_.computeCellOpts;e=_.computeDefaultRowHeight;let q=_.computeHeaderCellOpts;l=_.computeFloatingFilterOpts;let G=_.computeRendererOpts,U=l.cellClassName,X=(0,_util.getCalcHeight)(q.height)||e;return y.map((e,l)=>{var{type:r,showHeaderOverflow:t,headerAlign:a,align:i,filters:d,editRender:n,cellRender:o,floatingFilters:s,filterRender:c,slots:u}=e,p=e.id,m=F[p]||{},n=n||o,o=n&&n.name?G[n.name]||renderer.get(n.name):null,n=(0,_utils.isEnableConf)(c)&&c.name?G[c.name]||renderer.get(c.name):null,n=n?n.renderTableFloatingFilter:null,u=u?u.floatingFilter||u["floating-filter"]:null,g=I&&(D?e.fixed!==D:!!e.fixed),f=(_xeUtils.default.isBoolean(q.padding)?q:A).padding,t=_xeUtils.default.eqNull(t)?E:t,a=a||(o?o.tableHeaderCellAlign:"")||R||i||(o?o.tableCellAlign:"")||S,i="ellipsis"===(!0===t?z.mode:t),o="title"===(!0===t?z.mode:t),t="tooltip"===(!0===t?z.mode:t),x=o||t||i;let h=!1,v=null;d&&(v=d[0],h=d.some(e=>e.checked));var d=m.index,m=m._index,d={$table:_,$grid:$,$gantt:T,column:e,columnIndex:d,$columnIndex:l,_columnIndex:m,option:v,fixed:D,source:sourceType,type:renderType,isHidden:g,hasFilter:h},m={colid:p},l=l===y.length-1,C=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width),b={};return x?b.height=X+"px":b.minHeight=X+"px",w("th",{class:["vxe-table--column vxe-header--column is--floating-filters",p,g?"fixed--hidden":"fixed--visible",{["col--"+a]:a,["col--"+r]:r,"col--last":l,"col--fixed":e.fixed,"col--ellipsis":x,"fixed--width":!C,"is--padding":f,"is--sortable":e.sortable,"col--current":O&&k===e}],key:p,attrs:m},[w("div",{class:["vxe-cell",""+(U||""),{"c--title":o,"c--tooltip":t,"c--ellipsis":i}],style:b},H&&g&&!s?[]:[w("div",{attrs:{colid:p},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},u?_.callSlot(u,d,w):n&&v?(0,_vn.getSlotVNs)(n.call(_,w,c,d)):[])])])})}function renderHeads(t,a,i,d,n,e){let o=a.$parent;var l=o;let s=a.fixedType,{headerRowClassName:c,headerRowStyle:u}=l;var l=o.computeFloatingFilterOpts,r=n.map((e,l)=>{var r={$table:o,rowIndex:l,_rowIndex:l,$rowIndex:l,fixed:s,type:renderType};return t("tr",{key:l,class:["vxe-header--row",c?_xeUtils.default.isFunction(c)?c(r):c:""],style:u?_xeUtils.default.isFunction(u)?u(r):u:void 0},renderRows(t,a,i,d,n,l,e))});return l.enabled&&r.push(t("tr",{key:"ff",class:["vxe-header--row is--floating-filters",""+(l.rowClassName||"")]},renderFilterRows(t,a,d,e))),r}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null},render(r){let l=this.$parent;var e=l,t=l,a=l,i=l.xID;let{fixedType:d,fixedColumn:n,tableColumn:o}=this;var s=this.headerColumn,e=e.mouseConfig,{isGroup:t,isColLoading:c,overflowX:u,scrollXLoad:p,dragCol:m}=t,{visibleColumn:a,fullColumnIdData:g}=a,f=l.computeMouseOpts;let x=s,h=o;s=l.computeIsHeaderRenderOptimize;return t?h=a:(s&&(c||!d&&u)||(h=a),d&&s&&(h=n||[]),x=[h]),d||t||p&&m&&2<h.length&&(c=g[m.id])&&(u=c._index,a=h[0],p=h[h.length-1],c=g[a.id],a=g[p.id],c)&&a&&(g=c._index,p=a._index,u<g?(h=[m].concat(h),x=[[m].concat(x[0])].concat(x.slice(1))):p<u&&(h=h.concat([m]),x=[x[0].concat([m])].concat(x.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",d?`fixed-${d}--wrapper`:"body--wrapper"],attrs:{xid:i}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,d)}}},[d?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0,xvm:s?"1":null}},[r("colgroup",{ref:"refHeaderColgroup"},h.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,t,s,x,h))]),e&&f.area?r("div",{class:"vxe-table--cell-area",attrs:{xid:i}},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-clip-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])},methods:{uploadColumn(){let e=this.$parent;var l=e,r=e,l=l.showCustomHeader;let{collectColumn:t,visibleColumn:a}=e;var i=this.tableGroupColumn,r=r.isGroup;let d=r?(0,_util.convertHeaderColumnToRows)(i):[],n=[];l&&1<d.length&&(n=(0,_util.convertHeaderToGridRows)(d),d=n),this.headerColumn=d,e.$nextTick(()=>{e.dispatchEvent("columns-change",{visibleColgroups:n,collectColumn:t,visibleColumn:a},null)})}}});

package/lib/table/src/methods.js

@@ -46,10 +46,10 @@ const matchObj=_xeUtils.default.findTree(tableFullGroupData,item=>(0,_util.getRo
  */function handleVirtualTreeToList($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{isRowGroupStatus}=reactData;const{fullAllDataRowIdData,treeExpandedMaps,rowGroupExpandedMaps}=internalData;const aggregateOpts=$xeTable.computeAggregateOpts;const treeOpts=$xeTable.computeTreeOpts;const{handleGetRowId}=(0,_util.createHandleGetRowId)($xeTable);const fullData=[];const expandMaps={};if(treeConfig&&treeOpts.transform){const childrenField=treeOpts.children||treeOpts.childrenField;_xeUtils.default.eachTree(internalData.afterTreeFullData,(row,index,items,path,parentRow)=>{const rowid=handleGetRowId(row);const parentRowid=handleGetRowId(parentRow);if(!parentRow||expandMaps[parentRowid]&&treeExpandedMaps[parentRowid]){const rowRest=fullAllDataRowIdData[rowid];if(rowRest){rowRest._index=fullData.length;}expandMaps[rowid]=1;fullData.push(row);}},{children:childrenField});internalData.afterFullData=fullData;updateScrollYStatus($xeTable,fullData);return fullData;}else if(isRowGroupStatus){const{childrenField}=aggregateOpts;_xeUtils.default.eachTree(internalData.afterGroupFullData,(row,index,items,path,parentRow)=>{const rowid=handleGetRowId(row);const parentRowid=handleGetRowId(parentRow);if(!parentRow||expandMaps[parentRowid]&&rowGroupExpandedMaps[parentRowid]){const rowRest=fullAllDataRowIdData[rowid];if(rowRest){rowRest._index=fullData.length;}expandMaps[rowid]=1;fullData.push(row);}},{children:childrenField});internalData.afterFullData=fullData;updateScrollYStatus($xeTable,fullData);return fullData;}return internalData.afterFullData;}/**
  * 编译处理后全量的表格数据
  * 如果存在筛选条件，继续处理
- */function updateAfterFullData($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{isRowGroupStatus}=reactData;const{tableFullColumn,tableFullData,tableFullTreeData,tableFullGroupData}=internalData;const filterOpts=$xeTable.computeFilterOpts;const sortOpts=$xeTable.computeSortOpts;const aggregateOpts=$xeTable.computeAggregateOpts;const treeOpts=$xeTable.computeTreeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;const{transform,rowField,parentField,mapChildrenField}=treeOpts;const{isEvery,remote:allRemoteFilter,filterMethod:allFilterMethod,isDeep:isFilterDeep}=filterOpts;const{remote:allRemoteSort,sortMethod:allSortMethod,multiple:sortMultiple,chronological,isDeep:isSortDeep}=sortOpts;let tableData=[];let tableTree=[];// 处理数据
+ */function updateAfterFullData($xeTable){const props=$xeTable;const reactData=$xeTable;const internalData=$xeTable;const{treeConfig}=props;const{isRowGroupStatus}=reactData;const{tableFullColumn,tableFullData,tableFullTreeData,tableFullGroupData}=internalData;const filterOpts=$xeTable.computeFilterOpts;const sortOpts=$xeTable.computeSortOpts;const aggregateOpts=$xeTable.computeAggregateOpts;const rendererOpts=$xeTable.computeRendererOpts;const treeOpts=$xeTable.computeTreeOpts;const childrenField=treeOpts.children||treeOpts.childrenField;const{transform,rowField,parentField,mapChildrenField}=treeOpts;const{isEvery,remote:allRemoteFilter,filterMethod:allFilterMethod,isDeep:isFilterDeep}=filterOpts;const{remote:allRemoteSort,sortMethod:allSortMethod,multiple:sortMultiple,chronological,isDeep:isSortDeep}=sortOpts;let tableData=[];let tableTree=[];// 处理数据
 if(!allRemoteFilter||!allRemoteSort){const filterColumns=[];let orderColumns=[];tableFullColumn.forEach(column=>{const{field,sortable,order,filters}=column;if(!allRemoteFilter&&filters&&filters.length){const valueList=[];const itemList=[];filters.forEach(item=>{if(item.checked){itemList.push(item);valueList.push(item.value);}});if(itemList.length){filterColumns.push({column,valueList,itemList});}}if(!allRemoteSort&&sortable&&order){orderColumns.push({column,field,property:field,order:order,sortTime:column.sortTime});}});if(sortMultiple&&chronological&&orderColumns.length>1){orderColumns=_xeUtils.default.orderBy(orderColumns,'sortTime');}// 处理筛选
 // 支持单列、多列、组合筛选
-if(!allRemoteFilter&&filterColumns.length){const handleFilter=row=>{return filterColumns.every(({column,valueList,itemList})=>{const{filterMethod,filterRender}=column;const compConf=(0,_utils.isEnableConf)(filterRender)?renderer.get(filterRender.name):null;const compFilterMethod=compConf?compConf.tableFilterMethod||compConf.filterMethod:null;const tdFilterMethod=compConf?compConf.tableFilterDefaultMethod||compConf.defaultTableFilterMethod||compConf.defaultFilterMethod:null;const cellValue=(0,_util.getCellValue)(row,column);if(filterMethod){return itemList.some(item=>filterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}else if(compFilterMethod){return itemList.some(item=>compFilterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}else if(allFilterMethod){return allFilterMethod({$table:$xeTable,options:itemList,values:valueList,cellValue,row,column});}else if(tdFilterMethod){return itemList.some(item=>tdFilterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}return valueList.indexOf(_xeUtils.default.get(row,column.field))>-1;});};if(isRowGroupStatus){// 行分组
+if(!allRemoteFilter&&filterColumns.length){const handleFilter=row=>{return filterColumns.every(({column,valueList,itemList})=>{const{filterMethod,filterRender}=column;const compConf=(0,_utils.isEnableConf)(filterRender)&&filterRender.name?rendererOpts[filterRender.name]||renderer.get(filterRender.name):null;const compFilterMethod=compConf?compConf.tableFilterMethod||compConf.filterMethod:null;const tdFilterMethod=compConf?compConf.tableFilterDefaultMethod||compConf.defaultTableFilterMethod||compConf.defaultFilterMethod:null;const cellValue=(0,_util.getCellValue)(row,column);if(filterMethod){return itemList.some(item=>filterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}else if(compFilterMethod){return itemList.some(item=>compFilterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}else if(allFilterMethod){return allFilterMethod({$table:$xeTable,options:itemList,values:valueList,cellValue,row,column});}else if(tdFilterMethod){return itemList.some(item=>tdFilterMethod({value:item.value,option:item,cellValue,row,column,$table:$xeTable}));}return valueList.indexOf(_xeUtils.default.get(row,column.field))>-1;});};if(isRowGroupStatus){// 行分组
 tableTree=_xeUtils.default.searchTree(tableFullGroupData,handleFilter,{original:true,isEvery:true,children:aggregateOpts.mapChildrenField,mapChildren:aggregateOpts.childrenField});tableData=tableTree;}else if(treeConfig&&transform&&isFilterDeep!==false){// 筛选虚拟树
 tableTree=_xeUtils.default.searchTree(tableFullTreeData,handleFilter,{original:true,isEvery,children:mapChildrenField,mapChildren:childrenField});tableData=tableTree;}else{tableData=treeConfig?tableFullTreeData.filter(handleFilter):tableFullData.filter(handleFilter);tableTree=tableData;}}else{if(isRowGroupStatus){// 还原行分组
 tableTree=_xeUtils.default.searchTree(tableFullGroupData,()=>true,{original:true,isEvery:true,children:aggregateOpts.mapChildrenField,mapChildren:aggregateOpts.childrenField});tableData=tableTree;}else if(treeConfig&&transform&&isFilterDeep!==false){// 还原虚拟树
@@ -366,8 +366,8 @@ if((0,_utils.eqEmptyValue)(_xeUtils.default.get(record,rowkey))){_xeUtils.defaul
      * 如果还额外传了 field 则清空指定单元格内容
      * @param {Array/Row} rows 行数据
      * @param {String} field 字段名
-     */clearData(rows,field){const $xeTable=this;const internalData=$xeTable;const{tableFullData,visibleColumn}=internalData;if(!arguments.length){rows=tableFullData;}else if(rows&&!_xeUtils.default.isArray(rows)){rows=[rows];}if(field){rows.forEach(row=>_xeUtils.default.set(row,field,null));}else{rows.forEach(row=>{visibleColumn.forEach(column=>{if(column.field){(0,_util.setCellValue)(row,column,null);}});});}return $xeTable.$nextTick();},effectCellData(row,column,options){const $xeTable=this;const internalData=$xeTable;const{fullCellStoreMaps}=internalData;const editOpts=$xeTable.computeEditOpts;const{key,isChanged,setValue,getResult}=options;const rowid=(0,_util.getRowid)($xeTable,row);const colid=column.id;let rowStore=fullCellStoreMaps[rowid];const cellValue=_xeUtils.default.get(row,column.field);const restParams={$table:$xeTable,row,rowid,column,colid,cellValue,oldValue:null};if(editOpts.cache===false&&key==='render_table_cell'){const rest=restParams;rest.cellResult=getResult?getResult(restParams):cellValue;return rest;}if(!rowStore){rowStore={};fullCellStoreMaps[rowid]=rowStore;}let cellStore=rowStore[colid];if(!cellStore){cellStore={value:undefined,result:{}};rowStore[colid]=cellStore;}const restData=rowStore[colid];const oldValue=restData.value;restParams.oldValue=oldValue;if(isChanged?!isChanged(restParams):oldValue!==cellValue){restData.value=setValue?setValue(restParams):cellValue;restData.result={};}const storeData=restData.result;if(_xeUtils.default.isUndefined(storeData[key])){storeData[key]=getResult?getResult(restParams):cellValue;}const cellResult=storeData[key];const rest=restParams;rest.cellResult=cellResult;return rest;},getCellElement(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const{elemStore}=internalData;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const rowid=(0,_util.getRowid)($xeTable,row);const bodyScrollElem=(0,_util.getRefElem)(elemStore['main-body-scroll']);const leftScrollElem=(0,_util.getRefElem)(elemStore['left-body-scroll']);const rightScrollElem=(0,_util.getRefElem)(elemStore['right-body-scroll']);let bodyElem;if(column){if(column.fixed){if(column.fixed==='left'){if(leftScrollElem){bodyElem=leftScrollElem;}}else{if(rightScrollElem){bodyElem=rightScrollElem;}}}if(!bodyElem){bodyElem=bodyScrollElem;}if(bodyElem){return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);}}return null;},getCellLabel(row,fieldOrColumn){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{editConfig}=props;const{formatter,editRender,cellRender}=column;let etOpSize=null;let etOgSize=null;let clOpSize=null;let clOgSize=null;if(editRender){etOpSize=editRender.options?editRender.options.length:0;etOgSize=editRender.optionGroups?editRender.optionGroups.length:0;}if(cellRender){clOpSize=cellRender.options?cellRender.options.length:0;clOgSize=cellRender.optionGroups?cellRender.optionGroups.length:0;}const isEnableEdit=editConfig&&(0,_utils.isEnableConf)(editConfig);const editRenderOpts=formatter?null:isEnableEdit&&(0,_utils.isEnableConf)(editRender)?editRender:null;const cellRenderOpts=formatter?null:(0,_utils.isEnableConf)(cellRender)?cellRender:null;// formatter > cellRender.tableCellFormatter > editRender.tableCellFormatter
-const cellCompConf=cellRenderOpts?renderer.get(cellRenderOpts.name):null;const editCompConf=editRenderOpts?renderer.get(editRenderOpts.name):null;const cellDfFormatter=cellCompConf?cellCompConf.tableCellFormatter:null;const editDfFormatter=editCompConf?editCompConf.tableCellFormatter:null;const cellValue=(0,_util.getCellValue)(row,column);let cellLabel=cellValue;if(formatter||cellDfFormatter||editDfFormatter){let formatData;const{fullAllDataRowIdData}=internalData;const rowid=(0,_util.getRowid)($xeTable,row);const colid=column.id;const rowRest=fullAllDataRowIdData[rowid];if(rowRest){formatData=rowRest.formatData;if(!formatData){formatData=fullAllDataRowIdData[rowid].formatData={};}if(rowRest&&formatData[colid]){const ftValue=formatData[colid].value;if(ftValue&&ftValue[0]===cellValue&&ftValue[1]===etOpSize&&ftValue[2]===etOgSize&&ftValue[3]===clOpSize&&ftValue[4]===clOgSize){return formatData[colid].label;}}}const formatParams={$table:$xeTable,cellValue,row,rowIndex:$xeTable.getRowIndex(row),column,columnIndex:$xeTable.getColumnIndex(column)};if(formatter){if(_xeUtils.default.isString(formatter)){const gFormatOpts=formats.get(formatter);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams):'';}else if(_xeUtils.default.isArray(formatter)){const gFormatOpts=formats.get(formatter[0]);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams,...formatter.slice(1)):'';}else{cellLabel=formatter(formatParams);}}else if(cellRenderOpts&&cellDfFormatter){cellLabel=cellDfFormatter(cellRenderOpts,formatParams);}else if(editRenderOpts&&editDfFormatter){cellLabel=editDfFormatter(editRenderOpts,formatParams);}if(formatData){const ftValue=[cellValue,etOpSize,etOgSize,clOpSize,clOgSize];formatData[colid]={value:ftValue,label:cellLabel};}}return cellLabel;},updateCellLabel(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{fullAllDataRowIdData}=internalData;const rowid=(0,_util.getRowid)($xeTable,row);if(rowid){const colid=column.id;const rowid=(0,_util.getRowid)($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const formatData=rowRest.formatData;if(formatData){delete formatData[colid];}}}return $xeTable.getFooterCellLabel(row,column);},clearFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableData,tableColumn}=reactData;const{fullAllDataRowIdData}=internalData;_xeUtils.default.each(fullAllDataRowIdData,rowRest=>{if(rowRest.formatData){rowRest.formatData=undefined;}});if(isUpdate){tableData.forEach(row=>{tableColumn.forEach(column=>{$xeTable.getCellLabel(row,column);});});}return $xeTable.$nextTick();},getHeaderCellLabel(fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{headerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let cellLabel=column.getTitle();if(headerFormatter){let formatData;const{headerFullDataColData}=internalData;const colid=column.id;let colRest=headerFullDataColData[colid];if(!colRest){colRest=headerFullDataColData[colid]={};}const formatObj=colRest.formatObj;if(formatObj&&formatObj.value===cellLabel){return formatObj.label;}const headFormatParams={$table:$xeTable,cellTitle:cellLabel,cellValue:cellLabel,column,_columnIndex,columnIndex:$xeTable.getColumnIndex(column)};if(_xeUtils.default.isString(headerFormatter)){const gFormatOpts=formats.get(headerFormatter);const fcFormatMethod=gFormatOpts?gFormatOpts.tableHeaderCellFormatMethod:null;cellLabel=_xeUtils.default.toValueString(fcFormatMethod?fcFormatMethod(headFormatParams):'');}else if(_xeUtils.default.isArray(headerFormatter)){const gFormatOpts=formats.get(headerFormatter[0]);const fcFormatMethod=gFormatOpts?gFormatOpts.tableHeaderCellFormatMethod:null;cellLabel=_xeUtils.default.toValueString(fcFormatMethod?fcFormatMethod(headFormatParams,...headerFormatter.slice(1)):'');}else{cellLabel=_xeUtils.default.toValueString(headerFormatter(headFormatParams));}if(formatData){colRest.formatObj={value:cellLabel,label:cellLabel};}}return cellLabel;},updateHeaderCellLabel(fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return'';}const{headerFullDataColData}=internalData;const colid=column.id;const colRest=headerFullDataColData[colid];if(colRest){colRest.formatObj=undefined;}return $xeTable.getHeaderCellLabel(column);},clearHeaderFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableColumn}=reactData;const{headerFullDataColData}=internalData;_xeUtils.default.each(headerFullDataColData,colRest=>{if(colRest.formatObj){colRest.formatObj=undefined;}});if(isUpdate){tableColumn.forEach(column=>{$xeTable.getHeaderCellLabel(column);});}return $xeTable.$nextTick();},getFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{footerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let itemValue='';// 兼容老模式
+     */clearData(rows,field){const $xeTable=this;const internalData=$xeTable;const{tableFullData,visibleColumn}=internalData;if(!arguments.length){rows=tableFullData;}else if(rows&&!_xeUtils.default.isArray(rows)){rows=[rows];}if(field){rows.forEach(row=>_xeUtils.default.set(row,field,null));}else{rows.forEach(row=>{visibleColumn.forEach(column=>{if(column.field){(0,_util.setCellValue)(row,column,null);}});});}return $xeTable.$nextTick();},effectCellData(row,column,options){const $xeTable=this;const internalData=$xeTable;const{fullCellStoreMaps}=internalData;const editOpts=$xeTable.computeEditOpts;const{key,isChanged,setValue,getResult}=options;const rowid=(0,_util.getRowid)($xeTable,row);const colid=column.id;let rowStore=fullCellStoreMaps[rowid];const cellValue=_xeUtils.default.get(row,column.field);const restParams={$table:$xeTable,row,rowid,column,colid,cellValue,oldValue:null};if(editOpts.cache===false&&key==='render_table_cell'){const rest=restParams;rest.cellResult=getResult?getResult(restParams):cellValue;return rest;}if(!rowStore){rowStore={};fullCellStoreMaps[rowid]=rowStore;}let cellStore=rowStore[colid];if(!cellStore){cellStore={value:undefined,result:{}};rowStore[colid]=cellStore;}const restData=rowStore[colid];const oldValue=restData.value;restParams.oldValue=oldValue;if(isChanged?!isChanged(restParams):oldValue!==cellValue){restData.value=setValue?setValue(restParams):cellValue;restData.result={};}const storeData=restData.result;if(_xeUtils.default.isUndefined(storeData[key])){storeData[key]=getResult?getResult(restParams):cellValue;}const cellResult=storeData[key];const rest=restParams;rest.cellResult=cellResult;return rest;},getCellElement(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const{elemStore}=internalData;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const rowid=(0,_util.getRowid)($xeTable,row);const bodyScrollElem=(0,_util.getRefElem)(elemStore['main-body-scroll']);const leftScrollElem=(0,_util.getRefElem)(elemStore['left-body-scroll']);const rightScrollElem=(0,_util.getRefElem)(elemStore['right-body-scroll']);let bodyElem;if(column){if(column.fixed){if(column.fixed==='left'){if(leftScrollElem){bodyElem=leftScrollElem;}}else{if(rightScrollElem){bodyElem=rightScrollElem;}}}if(!bodyElem){bodyElem=bodyScrollElem;}if(bodyElem){return bodyElem.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`);}}return null;},getCellLabel(row,fieldOrColumn){const $xeTable=this;const props=$xeTable;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{editConfig}=props;const{formatter,editRender,cellRender}=column;const rendererOpts=$xeTable.computeRendererOpts;let etOpSize=null;let etOgSize=null;let clOpSize=null;let clOgSize=null;if(editRender){etOpSize=editRender.options?editRender.options.length:0;etOgSize=editRender.optionGroups?editRender.optionGroups.length:0;}if(cellRender){clOpSize=cellRender.options?cellRender.options.length:0;clOgSize=cellRender.optionGroups?cellRender.optionGroups.length:0;}const isEnableEdit=editConfig&&(0,_utils.isEnableConf)(editConfig);const editRenderOpts=formatter?null:isEnableEdit&&(0,_utils.isEnableConf)(editRender)?editRender:null;const cellRenderOpts=formatter?null:(0,_utils.isEnableConf)(cellRender)?cellRender:null;// formatter > cellRender.tableCellFormatter > editRender.tableCellFormatter
+const cellCompConf=cellRenderOpts&&cellRenderOpts.name?rendererOpts[cellRenderOpts.name]||renderer.get(cellRenderOpts.name):null;const editCompConf=editRenderOpts&&editRenderOpts.name?rendererOpts[editRenderOpts.name]||renderer.get(editRenderOpts.name):null;const cellDfFormatter=cellCompConf?cellCompConf.tableCellFormatter:null;const editDfFormatter=editCompConf?editCompConf.tableCellFormatter:null;const cellValue=(0,_util.getCellValue)(row,column);let cellLabel=cellValue;if(formatter||cellDfFormatter||editDfFormatter){let formatData;const{fullAllDataRowIdData}=internalData;const rowid=(0,_util.getRowid)($xeTable,row);const colid=column.id;const rowRest=fullAllDataRowIdData[rowid];if(rowRest){formatData=rowRest.formatData;if(!formatData){formatData=fullAllDataRowIdData[rowid].formatData={};}if(rowRest&&formatData[colid]){const ftValue=formatData[colid].value;if(ftValue&&ftValue[0]===cellValue&&ftValue[1]===etOpSize&&ftValue[2]===etOgSize&&ftValue[3]===clOpSize&&ftValue[4]===clOgSize){return formatData[colid].label;}}}const formatParams={$table:$xeTable,cellValue,row,rowIndex:$xeTable.getRowIndex(row),column,columnIndex:$xeTable.getColumnIndex(column)};if(formatter){if(_xeUtils.default.isString(formatter)){const gFormatOpts=formats.get(formatter);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams):'';}else if(_xeUtils.default.isArray(formatter)){const gFormatOpts=formats.get(formatter[0]);const tcFormatMethod=gFormatOpts?gFormatOpts.tableCellFormatMethod||gFormatOpts.cellFormatMethod:null;cellLabel=tcFormatMethod?tcFormatMethod(formatParams,...formatter.slice(1)):'';}else{cellLabel=formatter(formatParams);}}else if(cellRenderOpts&&cellDfFormatter){cellLabel=cellDfFormatter(cellRenderOpts,formatParams);}else if(editRenderOpts&&editDfFormatter){cellLabel=editDfFormatter(editRenderOpts,formatParams);}if(formatData){const ftValue=[cellValue,etOpSize,etOgSize,clOpSize,clOgSize];formatData[colid]={value:ftValue,label:cellLabel};}}return cellLabel;},updateCellLabel(row,fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{fullAllDataRowIdData}=internalData;const rowid=(0,_util.getRowid)($xeTable,row);if(rowid){const colid=column.id;const rowid=(0,_util.getRowid)($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){const formatData=rowRest.formatData;if(formatData){delete formatData[colid];}}}return $xeTable.getFooterCellLabel(row,column);},clearFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableData,tableColumn}=reactData;const{fullAllDataRowIdData}=internalData;_xeUtils.default.each(fullAllDataRowIdData,rowRest=>{if(rowRest.formatData){rowRest.formatData=undefined;}});if(isUpdate){tableData.forEach(row=>{tableColumn.forEach(column=>{$xeTable.getCellLabel(row,column);});});}return $xeTable.$nextTick();},getHeaderCellLabel(fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{headerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let cellLabel=column.getTitle();if(headerFormatter){let formatData;const{headerFullDataColData}=internalData;const colid=column.id;let colRest=headerFullDataColData[colid];if(!colRest){colRest=headerFullDataColData[colid]={};}const formatObj=colRest.formatObj;if(formatObj&&formatObj.value===cellLabel){return formatObj.label;}const headFormatParams={$table:$xeTable,cellTitle:cellLabel,cellValue:cellLabel,column,_columnIndex,columnIndex:$xeTable.getColumnIndex(column)};if(_xeUtils.default.isString(headerFormatter)){const gFormatOpts=formats.get(headerFormatter);const fcFormatMethod=gFormatOpts?gFormatOpts.tableHeaderCellFormatMethod:null;cellLabel=_xeUtils.default.toValueString(fcFormatMethod?fcFormatMethod(headFormatParams):'');}else if(_xeUtils.default.isArray(headerFormatter)){const gFormatOpts=formats.get(headerFormatter[0]);const fcFormatMethod=gFormatOpts?gFormatOpts.tableHeaderCellFormatMethod:null;cellLabel=_xeUtils.default.toValueString(fcFormatMethod?fcFormatMethod(headFormatParams,...headerFormatter.slice(1)):'');}else{cellLabel=_xeUtils.default.toValueString(headerFormatter(headFormatParams));}if(formatData){colRest.formatObj={value:cellLabel,label:cellLabel};}}return cellLabel;},updateHeaderCellLabel(fieldOrColumn){const $xeTable=this;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return'';}const{headerFullDataColData}=internalData;const colid=column.id;const colRest=headerFullDataColData[colid];if(colRest){colRest.formatObj=undefined;}return $xeTable.getHeaderCellLabel(column);},clearHeaderFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableColumn}=reactData;const{headerFullDataColData}=internalData;_xeUtils.default.each(headerFullDataColData,colRest=>{if(colRest.formatObj){colRest.formatObj=undefined;}});if(isUpdate){tableColumn.forEach(column=>{$xeTable.getHeaderCellLabel(column);});}return $xeTable.$nextTick();},getFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{footerFormatter}=column;const _columnIndex=$xeTable.getVTColumnIndex(column);let itemValue='';// 兼容老模式
 if(_xeUtils.default.isArray(row)){itemValue=row[_columnIndex];}else{itemValue=_xeUtils.default.get(row,column.field);}let cellLabel=itemValue;if(footerFormatter){let formatData;const{footerTableData}=reactData;const{footerFullDataRowData}=internalData;const colid=column.id;const $rowIndex=footerTableData.indexOf(row);let rowRest=null;if($rowIndex>-1){rowRest=footerFullDataRowData[$rowIndex];if(!rowRest){rowRest=footerFullDataRowData[$rowIndex]={};}formatData=rowRest.formatData;if(!formatData){formatData=footerFullDataRowData[$rowIndex].formatData={};}if(rowRest&&formatData[colid]){if(formatData[colid].value===itemValue){return formatData[colid].label;}}}const footerFormatParams={$table:$xeTable,cellValue:itemValue,itemValue,row,items:row,$rowIndex,column,_columnIndex,columnIndex:$xeTable.getColumnIndex(column)};if(_xeUtils.default.isString(footerFormatter)){const gFormatOpts=formats.get(footerFormatter);const fcFormatMethod=gFormatOpts?gFormatOpts.tableFooterCellFormatMethod:null;cellLabel=fcFormatMethod?fcFormatMethod(footerFormatParams):'';}else if(_xeUtils.default.isArray(footerFormatter)){const gFormatOpts=formats.get(footerFormatter[0]);const fcFormatMethod=gFormatOpts?gFormatOpts.tableFooterCellFormatMethod:null;cellLabel=fcFormatMethod?fcFormatMethod(footerFormatParams,...footerFormatter.slice(1)):'';}else{cellLabel=footerFormatter(footerFormatParams);}if(formatData){formatData[colid]={value:itemValue,label:cellLabel};}}return cellLabel;},updateFooterCellLabel(row,fieldOrColumn){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const column=(0,_util.handleFieldOrColumn)($xeTable,fieldOrColumn);if(!column){return null;}const{footerTableData}=reactData;const{footerFullDataRowData}=internalData;const colid=column.id;const $rowIndex=footerTableData.indexOf(row);const rowRest=footerFullDataRowData[$rowIndex];if(rowRest){const formatData=rowRest.formatData;if(formatData){delete formatData[colid];}}return $xeTable.getFooterCellLabel(row,column);},clearFooterFormatterCache(isUpdate){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const{tableData,tableColumn}=reactData;const{footerFullDataRowData}=internalData;_xeUtils.default.each(footerFullDataRowData,rowRest=>{if(rowRest.formatData){rowRest.formatData=undefined;}});if(isUpdate){tableData.forEach(row=>{tableColumn.forEach(column=>{$xeTable.getFooterCellLabel(row,column);});});}return $xeTable.$nextTick();},/**
      * 检查是否为临时行数据
      */isInsertByRow(row){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const rowid=(0,_util.getRowid)($xeTable,row);return!!reactData.insertRowFlag&&!!internalData.insertRowMaps[rowid];},isRemoveByRow(row){const $xeTable=this;const reactData=$xeTable;const internalData=$xeTable;const rowid=(0,_util.getRowid)($xeTable,row);return!!reactData.removeRowFlag&&!!internalData.removeRowMaps[rowid];},/**
@@ -464,7 +464,7 @@ const{isRowGroupStatus,rowGroupList}=reactData;if(isRowGroupStatus&&!!$xeTable.h
 if(isCustomFixed&&(column.fixed||'')!==(column.defaultFixed||'')){hasFixed=1;fixedData[colKey]=column.fixed;}}if(isCustomAlign&&column.align){hasAlign=1;alignData[colKey]=column.align;}if(isCustomHeaderAlign&&column.headerAlign){hasHeaderAlign=1;headerAlignData[colKey]=column.headerAlign;}if(isCustomFooterAlign&&column.footerAlign){hasFooterAlign=1;footerAlignData[colKey]=column.footerAlign;}if(isCustomResizable&&column.resizeWidth){hasResizable=1;resizableData[colKey]=column.renderWidth;}if(isCustomVisible&&(!checkMethod||checkMethod({$table:$xeTable,column}))){if(!column.visible&&column.defaultVisible){hasVisible=1;visibleData[colKey]=false;}else if(column.visible&&!column.defaultVisible){hasVisible=1;visibleData[colKey]=true;}}if(isCustomAggFunc&&(column.aggFunc||'')!==(column.defaultAggFunc||'')){hasAggFunc=1;aggFuncData[colKey]=column.aggFunc;}});if(hasAlign){storeData.alignData=alignData;}if(hasHeaderAlign){storeData.headerAlignData=headerAlignData;}if(hasFooterAlign){storeData.footerAlignData=footerAlignData;}if(hasResizable){storeData.resizableData=resizableData;}if(hasSort){storeData.sortData=sortData;}if(hasFixed){storeData.fixedData=fixedData;}if(hasVisible){storeData.visibleData=visibleData;}if(isCustomAggGroup&&isRowGroupStatus){rowGroupList.forEach(aggConf=>{const colRest=fullColumnFieldData[aggConf.field];if(colRest){aggGroupData[colRest.column.getKey()]=true;}});storeData.aggGroupData=aggGroupData;}if(hasAggFunc){storeData.aggFuncData=aggFuncData;}return storeData;},/**
      * @private
      */saveCustomStore(type){const $xeTable=this;const props=$xeTable;const reactData=$xeTable;const{customConfig}=props;const tableId=$xeTable.computeTableId;const customOpts=$xeTable.computeCustomOpts;const{updateStore,storage}=customOpts;const{isCustomAlign,isCustomHeaderAlign,isCustomFooterAlign,isCustomResizable,isCustomVisible,isCustomFixed,isCustomSort,isCustomAggGroup,isCustomAggFunc,isCustomPager}=(0,_util.handleCustomStoreConfig)($xeTable);if(type!=='reset'){// fix：修复拖动列宽，重置按钮无法点击的问题
-reactData.isCustomStatus=true;}if(storage&&(customConfig?(0,_utils.isEnableConf)(customOpts):customOpts.enabled)&&(isCustomAlign||isCustomHeaderAlign||isCustomFooterAlign||isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggGroup||isCustomAggFunc||isCustomPager)){if(!tableId){errLog('vxe.error.reqProp',['id']);return $xeTable.$nextTick();}const storeData=type==='reset'?{pagerData:{},alignData:{},headerAlignData:{},footerAlignData:{},resizableData:{},sortData:[],visibleData:{},fixedData:{},aggGroupData:{},aggFuncData:{}}:$xeTable.getCustomStoreData();if(updateStore){return updateStore({$table:$xeTable,id:tableId,type,storeData});}else{setCustomStorageMap(tableId,type==='reset'?null:storeData);}}return $xeTable.$nextTick();},handleUpdateDataQueue(){const $xeTable=this;const reactData=$xeTable;reactData.upDataFlag++;},handleRefreshColumnQueue(){const $xeTable=this;const reactData=$xeTable;reactData.reColumnFlag++;},handleFilterOptions(column){const $xeTable=this;const reactData=$xeTable;if(column){const{filterStore}=reactData;const{filterRender,filters}=column;const filterOptions=filters||[];const compConf=(0,_utils.isEnableConf)(filterRender)?renderer.get(filterRender.name):null;const frMethod=column.filterRecoverMethod||(compConf?compConf.tableFilterRecoverMethod||compConf.filterRecoverMethod:null);filterStore.column=column;// 复原状态
+reactData.isCustomStatus=true;}if(storage&&(customConfig?(0,_utils.isEnableConf)(customOpts):customOpts.enabled)&&(isCustomAlign||isCustomHeaderAlign||isCustomFooterAlign||isCustomResizable||isCustomVisible||isCustomFixed||isCustomSort||isCustomAggGroup||isCustomAggFunc||isCustomPager)){if(!tableId){errLog('vxe.error.reqProp',['id']);return $xeTable.$nextTick();}const storeData=type==='reset'?{pagerData:{},alignData:{},headerAlignData:{},footerAlignData:{},resizableData:{},sortData:[],visibleData:{},fixedData:{},aggGroupData:{},aggFuncData:{}}:$xeTable.getCustomStoreData();if(updateStore){return updateStore({$table:$xeTable,id:tableId,type,storeData});}else{setCustomStorageMap(tableId,type==='reset'?null:storeData);}}return $xeTable.$nextTick();},handleUpdateDataQueue(){const $xeTable=this;const reactData=$xeTable;reactData.upDataFlag++;},handleRefreshColumnQueue(){const $xeTable=this;const reactData=$xeTable;reactData.reColumnFlag++;},handleFilterOptions(column){const $xeTable=this;const reactData=$xeTable;if(column){const{filterStore}=reactData;const{filterRender,filters}=column;const rendererOpts=$xeTable.computeRendererOpts;const filterOptions=filters||[];const compConf=(0,_utils.isEnableConf)(filterRender)&&filterRender.name?rendererOpts[filterRender.name]||renderer.get(filterRender.name):null;const frMethod=column.filterRecoverMethod||(compConf?compConf.tableFilterRecoverMethod||compConf.filterRecoverMethod:null);filterStore.column=column;// 复原状态
 filterOptions.forEach(option=>{const{_checked,checked}=option;option._checked=checked;if(!checked&&_checked!==checked){if(frMethod){frMethod({option,column,$table:$xeTable});}}});$xeTable.checkFilterOptions();}},/**
      * 刷新列配置
      */refreshColumn(initSort){const $xeTable=this;if(initSort){handleUpdateColumn($xeTable);}return parseColumns($xeTable,true).then(()=>{return $xeTable.refreshScroll();}).then(()=>{return handleLazyRecalculate($xeTable,false,true,true);});},/**