vxe-table 3.15.46 → 3.15.47

package/lib/table/module/custom/mixin.js

@@ -81,7 +81,9 @@ var _default = exports.default = {
         allowVisible,
         allowSort,
         allowFixed,
-        allowResizable
+        allowResizable,
+        allowGroup,
+        allowValues
       } = customOpts;
       _xeUtils.default.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
         if (parentColumn) {
@@ -107,6 +109,9 @@ var _default = exports.default = {
         if (allowVisible) {
           column.visible = column.renderVisible;
         }
+        if (allowGroup && allowValues) {
+          column.aggFunc = column.renderAggFn;
+        }
       });
       reactData.isCustomStatus = true;
       reactData.isDragColMove = true;
@@ -114,14 +119,17 @@ var _default = exports.default = {
         reactData.isDragColMove = false;
       }, 1000);
       return $xeTable.saveCustomStore('confirm').then(() => {
-        if ($xeTable.handlePivotTableAggregateData) {
+        if (allowGroup && allowValues && $xeTable.handlePivotTableAggregateData) {
           if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
-            // 改动聚合分组
+            // 更新数据分组
             if (aggHandleFields.length) {
               $xeTable.setRowGroups(aggHandleFields);
             } else {
               $xeTable.clearRowGroups();
             }
+          } else {
+            // 更新聚合函数
+            $xeTable.handleUpdateAggData();
           }
         }
       });
@@ -186,7 +194,8 @@ var _default = exports.default = {
         visible: true,
         resizable: options === true,
         fixed: options === true,
-        sort: options === true
+        sort: options === true,
+        aggFunc: options === true
       }, options);
       _xeUtils.default.eachTree(collectColumn, column => {
         if (opts.resizable) {
@@ -204,12 +213,16 @@ var _default = exports.default = {
         })) {
           column.visible = column.defaultVisible;
         }
+        if (opts.aggFunc) {
+          column.aggFunc = column.defaultAggFunc;
+          column.renderAggFn = column.defaultAggFunc;
+        }
         column.renderResizeWidth = column.renderWidth;
       });
       reactData.isCustomStatus = false;
       $xeTable.saveCustomStore('reset');
       return $xeTable.handleCustom().then(() => {
-        if ($xeTable.handlePivotTableAggregateData) {
+        if (opts.aggFunc && $xeTable.handlePivotTableAggregateData) {
           const rowGroupFields = $xeTable.computeRowGroupFields;
           if (rowGroupFields ? rowGroupFields.length : rowGroupList.length) {
             if (rowGroupFields && rowGroupFields.length) {
@@ -217,6 +230,8 @@ var _default = exports.default = {
             } else {
               $xeTable.clearRowGroups();
             }
+          } else {
+            $xeTable.handleUpdateAggData();
           }
         }
       });

package/lib/table/module/custom/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function calcMaxHeight(e){var t=e.customStore,e=e.$refs.refElem;let s=0;e&&(s=e.clientHeight-28),t.maxHeight=Math.max(88,s)}function emitCustomEvent(e,t,s){(e.$xeGrid||e).dispatchEvent("custom",{type:t},s)}var _default=exports.default={methods:{_openCustom(){let e=this;var{initStore:t,customStore:s}=e;return s.visible=!0,t.custom=!0,e.handleUpdateCustomColumn(),e.checkCustomStatus(),calcMaxHeight(e),e.$nextTick().then(()=>calcMaxHeight(e))},_closeCustom(){var e=this,t=e.customStore,s=e.computeCustomOpts;return t.visible&&(t.visible=!1,s.immediate||e.handleCustom()),e.$nextTick()},_toggleCustom(){var e=this,t=e.customStore;return t.visible?e.closeCustom():e.openCustom()},_saveCustom(){let e=this,t=e,{customColumnList:s,aggHandleFields:i,rowGroupList:l}=t;let{allowVisible:o,allowSort:r,allowFixed:u,allowResizable:a}=e.computeCustomOpts;return _xeUtils.default.eachTree(s,(e,t,s,i,l)=>{l?e.fixed=l.fixed:(r&&(e.renderSortNumber=t+1),u&&(e.fixed=e.renderFixed)),a&&e.renderVisible&&(!e.children||e.children.length)&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth),o&&(e.visible=e.renderVisible)}),t.isCustomStatus=!0,t.isDragColMove=!0,setTimeout(()=>{t.isDragColMove=!1},1e3),e.saveCustomStore("confirm").then(()=>{!e.handlePivotTableAggregateData||l.length===i.length&&!l.some((e,t)=>e.field!==i[t])||(i.length?e.setRowGroups(i):e.clearRowGroups())})},_cancelCustom(){var e=this,{customColumnList:t,customStore:s}=e;let{oldSortMaps:l,oldFixedMaps:o,oldVisibleMaps:r}=s,{allowVisible:u,allowSort:a,allowFixed:n,allowResizable:m}=e.computeCustomOpts;return _xeUtils.default.eachTree(t,e=>{var t=e.getKey(),s=!!r[t],i=o[t]||"";u&&(e.renderVisible=s,e.visible=s),n&&(e.renderFixed=i,e.fixed=i),a&&(e.renderSortNumber=l[t]||0),m&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),e.$nextTick()},_resetCustom(e){let t=this;var s=t,i=t;let l=s.rowGroupList;i=i.collectColumn;let o=t.computeCustomOpts.checkMethod,r=Object.assign({visible:!0,resizable:!0===e,fixed:!0===e,sort:!0===e},e);return _xeUtils.default.eachTree(i,e=>{r.resizable&&(e.resizeWidth=0),r.fixed&&(e.fixed=e.defaultFixed),r.sort&&(e.renderSortNumber=e.sortNumber),o&&!o({$table:t,column:e})||(e.visible=e.defaultVisible),e.renderResizeWidth=e.renderWidth}),s.isCustomStatus=!1,t.saveCustomStore("reset"),t.handleCustom().then(()=>{var e;t.handlePivotTableAggregateData&&((e=t.computeRowGroupFields)||l).length&&(e&&e.length?t.setRowGroups(e):t.clearRowGroups())})},_toggleCustomAllCheckbox(){var e=this.customStore,e=!e.isAll;return this.setCustomAllCheckbox(e)},_setCustomAllCheckbox(e){let t=this;var s=t,i=s.customStore,l=s.customColumnList,o=t.computeCustomOpts;let{checkMethod:r,visibleMethod:u}=o,a=!!e;o.immediate?(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.visible=a,e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a,s.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:visible")):(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a),t.checkCustomStatus()},checkCustomStatus(){let t=this;var e=t.customStore,s=t.collectColumn;let i=t.computeCustomOpts.checkMethod;e.isAll=s.every(e=>!!i&&!i({$table:t,column:e})||e.renderVisible),e.isIndeterminate=!e.isAll&&s.some(e=>(!i||i({$table:t,column:e}))&&(e.renderVisible||e.halfVisible))},emitCustomEvent(e,t){(this.$xeGrid||this).dispatchEvent("custom",{type:e},t)},triggerCustomEvent(e){var t=this.customStore;t.visible?(this.closeCustom(),emitCustomEvent(this,"close",e)):(t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customOpenEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!0,t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customCloseEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!1,this.closeCustom(),emitCustomEvent(this,"close",e))},handleUpdateCustomColumn(){var e=this,t=e.customStore,o=this.collectColumn;if(t.visible){let s={},i={},l={};_xeUtils.default.eachTree(o,e=>{var t=e.getKey();e.renderFixed=e.fixed,e.renderVisible=e.visible,e.renderResizeWidth=e.renderWidth,s[t]=e.renderSortNumber,i[t]=e.fixed,l[t]=e.visible}),t.oldSortMaps=s,t.oldFixedMaps=i,t.oldVisibleMaps=l,e.customColumnList=o.slice(0)}}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function calcMaxHeight(e){var t=e.customStore,e=e.$refs.refElem;let s=0;e&&(s=e.clientHeight-28),t.maxHeight=Math.max(88,s)}function emitCustomEvent(e,t,s){(e.$xeGrid||e).dispatchEvent("custom",{type:t},s)}var _default=exports.default={methods:{_openCustom(){let e=this;var{initStore:t,customStore:s}=e;return s.visible=!0,t.custom=!0,e.handleUpdateCustomColumn(),e.checkCustomStatus(),calcMaxHeight(e),e.$nextTick().then(()=>calcMaxHeight(e))},_closeCustom(){var e=this,t=e.customStore,s=e.computeCustomOpts;return t.visible&&(t.visible=!1,s.immediate||e.handleCustom()),e.$nextTick()},_toggleCustom(){var e=this,t=e.customStore;return t.visible?e.closeCustom():e.openCustom()},_saveCustom(){let e=this,t=e,{customColumnList:s,aggHandleFields:i,rowGroupList:l}=t;let{allowVisible:o,allowSort:r,allowFixed:u,allowResizable:a,allowGroup:n,allowValues:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(s,(e,t,s,i,l)=>{l?e.fixed=l.fixed:(r&&(e.renderSortNumber=t+1),u&&(e.fixed=e.renderFixed)),a&&e.renderVisible&&(!e.children||e.children.length)&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth),o&&(e.visible=e.renderVisible),n&&d&&(e.aggFunc=e.renderAggFn)}),t.isCustomStatus=!0,t.isDragColMove=!0,setTimeout(()=>{t.isDragColMove=!1},1e3),e.saveCustomStore("confirm").then(()=>{n&&d&&e.handlePivotTableAggregateData&&(l.length!==i.length||l.some((e,t)=>e.field!==i[t])?i.length?e.setRowGroups(i):e.clearRowGroups():e.handleUpdateAggData())})},_cancelCustom(){var e=this,{customColumnList:t,customStore:s}=e;let{oldSortMaps:l,oldFixedMaps:o,oldVisibleMaps:r}=s,{allowVisible:u,allowSort:a,allowFixed:n,allowResizable:d}=e.computeCustomOpts;return _xeUtils.default.eachTree(t,e=>{var t=e.getKey(),s=!!r[t],i=o[t]||"";u&&(e.renderVisible=s,e.visible=s),n&&(e.renderFixed=i,e.fixed=i),a&&(e.renderSortNumber=l[t]||0),d&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),e.$nextTick()},_resetCustom(e){let t=this;var s=t,i=t;let l=s.rowGroupList;i=i.collectColumn;let o=t.computeCustomOpts.checkMethod,r=Object.assign({visible:!0,resizable:!0===e,fixed:!0===e,sort:!0===e,aggFunc:!0===e},e);return _xeUtils.default.eachTree(i,e=>{r.resizable&&(e.resizeWidth=0),r.fixed&&(e.fixed=e.defaultFixed),r.sort&&(e.renderSortNumber=e.sortNumber),o&&!o({$table:t,column:e})||(e.visible=e.defaultVisible),r.aggFunc&&(e.aggFunc=e.defaultAggFunc,e.renderAggFn=e.defaultAggFunc),e.renderResizeWidth=e.renderWidth}),s.isCustomStatus=!1,t.saveCustomStore("reset"),t.handleCustom().then(()=>{var e;r.aggFunc&&t.handlePivotTableAggregateData&&(((e=t.computeRowGroupFields)||l).length?e&&e.length?t.setRowGroups(e):t.clearRowGroups():t.handleUpdateAggData())})},_toggleCustomAllCheckbox(){var e=this.customStore,e=!e.isAll;return this.setCustomAllCheckbox(e)},_setCustomAllCheckbox(e){let t=this;var s=t,i=s.customStore,l=s.customColumnList,o=t.computeCustomOpts;let{checkMethod:r,visibleMethod:u}=o,a=!!e;o.immediate?(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.visible=a,e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a,s.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:visible")):(_xeUtils.default.eachTree(l,e=>{u&&!u({$table:t,column:e})||r&&!r({$table:t,column:e})||(e.renderVisible=a,e.halfVisible=!1)}),i.isAll=a),t.checkCustomStatus()},checkCustomStatus(){let t=this;var e=t.customStore,s=t.collectColumn;let i=t.computeCustomOpts.checkMethod;e.isAll=s.every(e=>!!i&&!i({$table:t,column:e})||e.renderVisible),e.isIndeterminate=!e.isAll&&s.some(e=>(!i||i({$table:t,column:e}))&&(e.renderVisible||e.halfVisible))},emitCustomEvent(e,t){(this.$xeGrid||this).dispatchEvent("custom",{type:e},t)},triggerCustomEvent(e){var t=this.customStore;t.visible?(this.closeCustom(),emitCustomEvent(this,"close",e)):(t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customOpenEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!0,t.btnEl=e.target,this.openCustom(),emitCustomEvent(this,"open",e))},customCloseEvent(e){var t=this.customStore;t.visible&&(t.activeBtn=!1,this.closeCustom(),emitCustomEvent(this,"close",e))},handleUpdateCustomColumn(){var e=this,t=e.customStore,o=this.collectColumn;if(t.visible){let s={},i={},l={};_xeUtils.default.eachTree(o,e=>{var t=e.getKey();e.renderFixed=e.fixed,e.renderVisible=e.visible,e.renderResizeWidth=e.renderWidth,s[t]=e.renderSortNumber,i[t]=e.fixed,l[t]=e.visible}),t.oldSortMaps=s,t.oldFixedMaps=i,t.oldVisibleMaps=l,e.customColumnList=o.slice(0)}}}};

package/lib/table/module/custom/panel.js

@@ -30,8 +30,8 @@ function showDropTip($xeTableCustomPanel, evnt, optEl, showLine, dragPos) {
   } = customPanelInternalData;
   const bodyWrapperRect = bodyWrapperElem.getBoundingClientRect();
   const customBodyRect = customBodyElem.getBoundingClientRect();
+  const dragLineEl = $xeTableCustomPanel.$refs.refDragLineElem;
   if (optEl) {
-    const dragLineEl = $xeTableCustomPanel.$refs.refDragLineElem;
     if (dragLineEl) {
       if (showLine) {
         const optRect = optEl.getBoundingClientRect();
@@ -46,6 +46,10 @@ function showDropTip($xeTableCustomPanel, evnt, optEl, showLine, dragPos) {
         dragLineEl.style.display = '';
       }
     }
+  } else {
+    if (dragLineEl) {
+      dragLineEl.style.display = 'node';
+    }
   }
   const dragTipEl = $xeTableCustomPanel.$refs.refDragTipElem;
   if (dragTipEl) {
@@ -282,7 +286,7 @@ const renderSimplePanel = (h, _vm) => {
     } : {}
   }, customStore.visible ? [h('div', {
     ref: 'refBodyWrapperElem',
-    class: 'vxe-table-custom-body-wrapper'
+    class: 'vxe-table-custom-simple--body-wrapper'
   }, [!treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel ? h($xeTable.getPivotTableAggregateSimplePanel(), {
     props: {
       customStore
@@ -747,12 +751,14 @@ var _default = exports.default = {
   data() {
     const reactData = {
       dragCol: null,
+      dragGroupField: null,
+      dragAggFnCol: null,
       dragTipText: ''
     };
     const internalData = {
       // prevDragCol: undefined,
-      // prevDragGroup: undefined,
-      // prevDragValues: undefined,
+      // prevDragGroupField: undefined,
+      // prevDragAggFnColid: undefined,
       // prevDragToChild: false,
       // prevDragPos: null
     };
@@ -1038,6 +1044,8 @@ var _default = exports.default = {
       const column = $xeTable.getColumnById(colid);
       trEl.draggable = true;
       customPanelReactData.dragCol = column;
+      customPanelReactData.dragGroupField = null;
+      customPanelReactData.dragAggFnCol = null;
       this.updateColDropTipContent();
       (0, _dom.addClass)(trEl, 'active--drag-origin');
     },
@@ -1051,6 +1059,8 @@ var _default = exports.default = {
       hideDropTip($xeTableCustomPanel);
       trEl.draggable = false;
       customPanelReactData.dragCol = null;
+      customPanelReactData.dragGroupField = null;
+      customPanelReactData.dragAggFnCol = null;
       (0, _dom.removeClass)(trEl, 'active--drag-origin');
     },
     sortDragstartEvent(evnt) {
@@ -1059,8 +1069,8 @@ var _default = exports.default = {
       if (evnt.dataTransfer) {
         evnt.dataTransfer.setDragImage((0, _dom.getTpImg)(), 0, 0);
       }
-      customPanelInternalData.prevDragGroup = null;
-      customPanelInternalData.prevDragValues = null;
+      customPanelInternalData.prevDragGroupField = null;
+      customPanelInternalData.prevDragAggFnColid = null;
     },
     sortDragendEvent(evnt) {
       const $xeTableCustomPanel = this;
@@ -1096,13 +1106,13 @@ var _default = exports.default = {
       } = customPanelReactData;
       const {
         prevDragCol,
-        prevDragGroup,
-        prevDragValues,
+        prevDragGroupField,
+        prevDragAggFnColid,
         prevDragPos,
         prevDragToChild
       } = customPanelInternalData;
       const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-      if (prevDragGroup || prevDragValues) {
+      if (prevDragGroupField || prevDragAggFnColid) {
         if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
           $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt);
         }
@@ -1262,8 +1272,10 @@ var _default = exports.default = {
       }
       hideDropTip($xeTableCustomPanel);
       customPanelReactData.dragCol = null;
-      customPanelInternalData.prevDragGroup = null;
-      customPanelInternalData.prevDragValues = null;
+      customPanelReactData.dragGroupField = null;
+      customPanelReactData.dragAggFnCol = null;
+      customPanelInternalData.prevDragGroupField = null;
+      customPanelInternalData.prevDragAggFnColid = null;
       trEl.draggable = false;
       trEl.removeAttribute('drag-pos');
       (0, _dom.removeClass)(trEl, 'active--drag-target');
@@ -1290,14 +1302,14 @@ var _default = exports.default = {
       const isControlKey = (0, _dom.hasControlKey)(evnt);
       const colid = optEl.getAttribute('colid');
       const column = $xeTable.getColumnById(colid);
-      customPanelInternalData.prevDragGroup = null;
-      customPanelInternalData.prevDragValues = null;
+      customPanelInternalData.prevDragGroupField = null;
+      customPanelInternalData.prevDragAggFnColid = null;
       // 是否移入有效列
       if (column && (isCrossDrag || column.level === 1)) {
         evnt.preventDefault();
         const offsetY = evnt.clientY - optEl.getBoundingClientRect().y;
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom';
-        if (dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1 || column.renderFixed) {
+        if (!dragCol || dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1 || column.renderFixed) {
           showDropTip($xeTableCustomPanel, evnt, optEl, false, dragPos);
           return;
         }

package/lib/table/module/custom/panel.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;function showDropTip(e,t,l,o,s){var a,r,i,n=e.internalData,c=e.$refs.refBodyWrapperElem;c&&(i=e.$refs.refCustomBodyElem)&&(n=n.prevDragToChild,a=c.getBoundingClientRect(),i=i.getBoundingClientRect(),l&&(r=e.$refs.refDragLineElem)&&(o?(l=l.getBoundingClientRect(),r.style.display="block",r.style.left=Math.max(0,i.x-a.x)+"px",r.style.top=Math.max(1,l.y+c.scrollTop-a.y)+"px",r.style.height=l.height+"px",r.style.width=l.width+"px",r.setAttribute("drag-pos",s),r.setAttribute("drag-to-child",n?"y":"n")):r.style.display=""),i=e.$refs.refDragTipElem)&&(i.style.display="block",i.style.top=Math.min(c.clientHeight+c.scrollTop-i.clientHeight,t.clientY+c.scrollTop-a.y)+"px",i.style.left=Math.min(c.clientWidth+c.scrollLeft-i.clientWidth,t.clientX+c.scrollLeft-a.x)+"px",i.setAttribute("drag-status",o?n?"sub":"normal":"disabled"))}function hideDropTip(e){var t=e.$refs.refDragTipElem,e=e.$refs.refDragLineElem;t&&(t.style.display=""),e&&(e.style.display="")}let renderDragTip=(e,t)=>{var l=t.$xeTable,t=t.reactData.dragTipText;return e("div",{},[e("div",{ref:"refDragLineElem",class:["vxe-table-custom-popup--drag-line",{"is--guides":l.computeColumnDragOpts.showGuidesStatus}]}),e("div",{ref:"refDragTipElem",class:"vxe-table-custom-popup--drag-tip"},[e("div",{class:"vxe-table-custom-popup--drag-tip-wrapper"},[e("div",{class:"vxe-table-custom-popup--drag-tip-status"},[e("span",{class:["vxe-table-custom-popup--drag-tip-normal-status",getIcon().TABLE_DRAG_STATUS_ROW]}),e("span",{class:["vxe-table-custom-popup--drag-tip-sub-status",getIcon().TABLE_DRAG_STATUS_SUB_ROW]}),e("span",{class:["vxe-table-custom-popup--drag-tip-group-status",getIcon().TABLE_DRAG_STATUS_AGG_GROUP]}),e("span",{class:["vxe-table-custom-popup--drag-tip-values-status",getIcon().TABLE_DRAG_STATUS_AGG_VALUES]}),e("span",{class:["vxe-table-custom-popup--drag-tip-disabled-status",getIcon().TABLE_DRAG_DISABLED]})]),e("div",{class:"vxe-table-custom-popup--drag-tip-content"},""+(t||""))])])])},renderSimplePanel=(d,u)=>{let m=_ui.VxeUI.getComponent("VxeButton");let p=u.$xeTable;var e=p,t=p,l=p.$xeGrid,o=u.customStore,{treeConfig:e,rowGroupConfig:s,aggregateConfig:a}=e,{isCustomStatus:t,customColumnList:r}=t,i=p.computeCustomOpts;let v=i.immediate;var n=p.computeColumnDragOpts,c=o.maxHeight;let{checkMethod:x,visibleMethod:g,allowVisible:h,allowSort:b,allowFixed:C,trigger:E,placement:T}=i,f=p.computeIsMaxFixedColumn,_=n.isCrossDrag;var n=i.slots||{},I=n.header,D=n.top,y=n.bottom,O=n.default,n=n.footer;let k=[];var A={},S=o.isAll,B=o.isIndeterminate,l=("hover"===E&&(A.mouseenter=u.handleWrapperMouseenterEvent,A.mouseleave=u.handleWrapperMouseleaveEvent),{$table:p,$grid:l,columns:r,isAllChecked:S,isAllIndeterminate:B,isCustomStatus:t});return _xeUtils.default.eachTree(r,(l,e,t,o,s)=>{if(!g||g({$table:p,column:l})){var a=l.renderVisible,r=l.halfVisible,i=l.children&&l.children.length,n=(0,_utils.formatText)(l.getTitle(),1);let t=!!x&&!x({$table:p,column:l});var c=!a;k.push(d("li",{key:l.id,attrs:{colid:l.id},class:["vxe-table-custom--option","level--"+l.level,{"is--hidden":t||c,"is--group":i}],on:{dragstart:u.sortDragstartEvent,dragend:u.sortDragendEvent,dragover:u.sortDragoverEvent}},[h?d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":a,"is--indeterminate":r,"is--disabled":t}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:e=>{t||u.changeCheckboxOption(l,e)}}},[d("span",{class:["vxe-checkbox--icon",r?getIcon().TABLE_CHECKBOX_INDETERMINATE:a?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):renderEmptyElement(p),d("div",{class:"vxe-table-custom--name-option"},[b&&(_&&v||1===l.level)?d("div",{class:"vxe-table-custom--sort-option"},[d("span",{class:["vxe-table-custom--sort-btn",{"is--disabled":t||c||l.renderFixed}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:t||c||l.renderFixed?{}:{mousedown:u.sortMousedownEvent,mouseup:u.sortMouseupEvent}},[d("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):renderEmptyElement(p),"html"===l.type?d("div",{key:"1",class:"vxe-table-custom--checkbox-label",domProps:{innerHTML:n}}):d("div",{key:"0",class:"vxe-table-custom--checkbox-label",attrs:{title:n}},n)]),!s&&C?d("div",{class:"vxe-table-custom--fixed-option"},[d(m,{props:{mode:"text",icon:"left"===l.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===l.renderFixed?"primary":"",disabled:t||c||f&&!l.renderFixed,title:getI18n("left"===l.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft")},on:{click:({$event:e})=>{u.changeFixedOption(l,"left",e)}}}),d(m,{props:{mode:"text",icon:"right"===l.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===l.renderFixed?"primary":"",disabled:t||c||f&&!l.renderFixed,title:getI18n("right"===l.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight")},on:{click:({$event:e})=>{u.changeFixedOption(l,"right",e)}}})]):renderEmptyElement(p)]))}}),d("div",{key:"simple",class:["vxe-table-custom-wrapper","placement--"+T,{"is--active":o.visible}],style:c&&!["left","right"].includes(T||"")?{maxHeight:c+"px"}:{}},o.visible?[d("div",{ref:"refBodyWrapperElem",class:"vxe-table-custom-body-wrapper"},[!e&&(a||s)&&p.getPivotTableAggregateSimplePanel?d(p.getPivotTableAggregateSimplePanel(),{props:{customStore:o}}):renderEmptyElement(p),d("div",{ref:"refCustomBodyElem",class:"vxe-table-custom--handle-wrapper"},[d("div",{class:"vxe-table-custom--header"},I?p.callSlot(I,l,d):[d("ul",{class:"vxe-table-custom--panel-list"},[d("li",{class:"vxe-table-custom--option"},[h?d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":S,"is--indeterminate":B}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:u.allOptionEvent}},[d("span",{class:["vxe-checkbox--icon",B?getIcon().TABLE_CHECKBOX_INDETERMINATE:S?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),d("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):d("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),d("div",{class:"vxe-table-custom--body"},[D?d("div",{class:"vxe-table-custom--panel-top"},p.callSlot(D,l,d)):renderEmptyElement(p),O?d("div",{class:"vxe-table-custom--panel-body"},p.callSlot(O,l,d)):d("transition-group",{class:"vxe-table-custom--panel-list",props:{name:"vxe-table-custom--list",tag:"ul"},on:A},k),y?d("div",{class:"vxe-table-custom--panel-bottom"},p.callSlot(y,l,d)):renderEmptyElement(p)]),i.showFooter?d("div",{class:"vxe-table-custom--footer"},n?p.callSlot(n,l,d):[d("div",{class:"vxe-table-custom--footer-buttons"},[d(m,{props:{mode:"text",content:i.resetButtonText||getI18n("vxe.table.customRestore"),disabled:!t},on:{click:u.resetCustomEvent}}),v?d(m,{props:{mode:"text",content:i.closeButtonText||getI18n("vxe.table.customClose")},on:{click:u.cancelCloseEvent}}):d(m,{props:{mode:"text",content:i.resetButtonText||getI18n("vxe.table.customCancel")},on:{click:u.cancelCustomEvent}}),v?renderEmptyElement(p):d(m,{props:{mode:"text",status:"primary",content:i.confirmButtonText||getI18n("vxe.table.customConfirm")},on:{click:u.confirmCustomEvent}})])]):null]),renderDragTip(d,u)])]:[])},renderPopupPanel=(d,u)=>{var e=_ui.VxeUI.getComponent("VxeModal"),t=_ui.VxeUI.getComponent("VxeDrawer");let l=_ui.VxeUI.getComponent("VxeButton"),m=_ui.VxeUI.getComponent("VxeInput"),p=u,v=u.$xeTable;var o=v,s=v,a=v.$xeGrid;let r=u.customStore,$=o.resizable,{isCustomStatus:i,customColumnList:n}=s,c=v.computeCustomOpts,x=c.immediate;o=v.computeColumnDragOpts;let{mode:F,modalOptions:M,drawerOptions:R,allowVisible:g,allowSort:H,allowFixed:h,allowResizable:b,checkMethod:C,visibleMethod:E}=c,T=v.computeColumnOpts,f=T.maxFixedSize,{minWidth:_,maxWidth:I}=v.computeResizableOpts;var s=Object.assign({},M),D=Object.assign({},R);let y=v.computeIsMaxFixedColumn,W=o.isCrossDrag;o=c.slots||{};let O=o.header,k=o.top,A=o.bottom,S=o.default,B=o.footer,w=[],V=r.isAll,U=r.isIndeterminate,L={$table:v,$grid:a,columns:n,isAllChecked:V,isAllIndeterminate:U,isCustomStatus:i};_xeUtils.default.eachTree(n,(o,s,e,t,a)=>{if(!E||E({$table:v,column:o})){let e=0,t=0;b&&(s={$table:v,column:o,columnIndex:s,$columnIndex:s,$rowIndex:-1},_&&(e=_xeUtils.default.toNumber(_xeUtils.default.isFunction(_)?_(s):_)),I)&&(t=_xeUtils.default.toNumber(_xeUtils.default.isFunction(I)?I(s):I));var s=o.renderVisible,r=o.halfVisible,i=(0,_utils.formatText)(o.getTitle(),1),n=o.children&&o.children.length;let l=!!C&&!C({$table:v,column:o});var c=!s;w.push(d("tr",{key:o.id,attrs:{colid:o.id},class:["vxe-table-custom-popup--row level--"+o.level,{"is--group":n}],on:{dragstart:p.sortDragstartEvent,dragend:p.sortDragendEvent,dragover:p.sortDragoverEvent}},[g?d("td",{class:"vxe-table-custom-popup--column-item col--visible"},[d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":r,"is--disabled":l}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:e=>{l||p.changeCheckboxOption(o,e)}}},[d("span",{class:["vxe-checkbox--icon",r?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):renderEmptyElement(v),d("td",{class:"vxe-table-custom-popup--column-item col--name"},[d("div",{class:"vxe-table-custom-popup--name"},[H?W&&x||1===o.level?d("div",{class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":l||c||o.renderFixed}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:l||c||o.renderFixed?{}:{mousedown:p.sortMousedownEvent,mouseup:p.sortMouseupEvent}},[d("i",{class:getIcon().TABLE_CUSTOM_SORT})]):d("div",{class:"vxe-table-custom-popup--column-sort-placeholder"}):renderEmptyElement(v),"html"===o.type?d("div",{key:"1",class:"vxe-table-custom-popup--title",domProps:{innerHTML:i}}):d("div",{key:"0",class:"vxe-table-custom-popup--title",attrs:{title:i}},i)])]),b?d("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[o.children&&o.children.length||!(_xeUtils.default.isBoolean(o.resizable)?o.resizable:T.resizable||$)?d("span","-"):m?d(m,{props:{type:"integer",immediate:!1,disabled:l||c,value:o.renderResizeWidth,min:e||void 0,max:t||void 0},on:{modelValue(e){o.renderResizeWidth=Math.max(0,Number(e))},change(){p.changeColumnWidth(o)}}}):renderEmptyElement(u)]):renderEmptyElement(v),h?d("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[a?d("span","-"):d("vxe-radio-group",{props:{value:o.renderFixed||"",type:"button",size:"mini",disabled:l||c,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:l||c||y},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:l||c},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:l||c||y}]},on:{change({label:e,$event:t}){p.changeFixedOption(o,e,t)}}})]):renderEmptyElement(v)]))}});o={default:()=>d("div",{ref:"refBodyWrapperElem",class:"vxe-table-custom-popup--body-wrapper"},S?v.callSlot(S,L,d):[d("div",{ref:"refCustomBodyElem",class:"vxe-table-custom-popup--handle-wrapper"},[k?d("div",{class:"vxe-table-custom-popup--table-top"},v.callSlot(k,L,d)):renderEmptyElement(v),d("div",{class:"vxe-table-custom-popup--table-wrapper"},[d("table",{},[d("colgroup",{},[g?d("col",{class:"vxe-table-custom-popup--table-col-seq"}):renderEmptyElement(v),d("col",{class:"vxe-table-custom-popup--table-col-title"}),b?d("col",{class:"vxe-table-custom-popup--table-col-width"}):renderEmptyElement(v),h?d("col",{class:"vxe-table-custom-popup--table-col-fixed"}):renderEmptyElement(v)]),d("thead",{},[d("tr",{},[g?d("th",{},[d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":V,"is--indeterminate":U}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:p.allOptionEvent}},[d("span",{class:["vxe-checkbox--icon",U?getIcon().TABLE_CHECKBOX_INDETERMINATE:V?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),d("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):renderEmptyElement(v),d("th",{},getI18n("vxe.custom.setting.colTitle")),b?d("th",{},getI18n("vxe.custom.setting.colResizable")):renderEmptyElement(v),h?d("th",{},getI18n("vxe.custom.setting."+(f?"colFixedMax":"colFixed"),[f])):renderEmptyElement(v)])]),d("transition-group",{class:"vxe-table-custom--panel-list",props:{tag:"tbody",name:"vxe-table-custom--list"}},w)])]),A?d("div",{class:"vxe-table-custom-popup--table-bottom"},v.callSlot(A,L,d)):renderEmptyElement(v),renderDragTip(d,p)])]),footer:()=>B?v.callSlot(B,L,d):d("div",{class:"vxe-table-custom-popup--footer"},[d(l,{props:{content:c.resetButtonText||getI18n("vxe.custom.cstmRestore"),disabled:!i},on:{click:p.resetCustomEvent}}),x?d(l,{props:{content:c.resetButtonText||getI18n("vxe.table.customClose")},on:{click:p.cancelCloseEvent}}):d(l,{props:{content:c.resetButtonText||getI18n("vxe.custom.cstmCancel")},on:{click:p.cancelCustomEvent}}),x?renderEmptyElement(v):d(l,{props:{status:"primary",content:c.confirmButtonText||getI18n("vxe.custom.cstmConfirm")},on:{click:p.confirmCustomEvent}})])};return O&&(o.header=()=>v.callSlot(O,L,d)),"drawer"===F?t?d(t,{key:"drawer",props:{className:["vxe-table-custom-drawer-wrapper","vxe-table--ignore-clear",D.className||""].join(" "),value:r.visible,title:D.title||getI18n("vxe.custom.cstmTitle"),width:D.width||Math.min(880,Math.floor(.6*document.documentElement.clientWidth)),position:D.position,resize:!!D.resize,escClosable:!!D.escClosable,maskClosable:!!D.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){r.visible=e}},scopedSlots:o}):renderEmptyElement(u):e?d(e,{key:"modal",props:{className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",s.className||""].join(" "),value:r.visible,title:s.title||getI18n("vxe.custom.cstmTitle"),width:s.width||Math.min(880,document.documentElement.clientWidth),minWidth:s.minWidth||700,height:s.height||Math.min(680,document.documentElement.clientHeight),minHeight:s.minHeight||400,showZoom:s.showZoom,showMaximize:s.showMaximize,showMinimize:s.showMinimize,mask:s.mask,lockView:s.lockView,resize:s.resize,escClosable:!!s.escClosable,maskClosable:!!s.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){r.visible=e}},scopedSlots:o}):renderEmptyElement(u)};var _default=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},provide(){return{$xeTableCustomPanel:this}},inject:{$xeTable:{default:null}},data(){return{reactData:{dragCol:null,dragTipText:""},internalData:{}}},computed:{},created(){let t=this,l=_ui.VxeUI.getComponent("VxeModal"),o=_ui.VxeUI.getComponent("VxeDrawer"),s=_ui.VxeUI.getComponent("VxeButton"),a=_ui.VxeUI.getComponent("VxeNumberInput"),r=_ui.VxeUI.getComponent("VxeRadioGroup");t.$nextTick(()=>{var e=t.$xeTable.customOpts,e=e.mode;l||"modal"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),o||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),s||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),a||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),r||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])})},render(e){var t=this.$xeTable.computeCustomOpts;return(["modal","drawer","popup"].includes(""+t.mode)?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent(e){var t=this.$xeTable,l=this.customStore;l.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent(e){let t=this.$xeTable;let l=this.customStore;l.activeWrapper=!1,setTimeout(()=>{l.activeBtn||l.activeWrapper||t.customCloseEvent(e)},300)},getStoreData(){return{}},confirmCustomEvent({$event:e}){var t=this.$xeTable;t.isCustomStatus=!0,t.saveCustom(),t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCloseEvent({$event:e}){var t=this.$xeTable;t.closeCustom(),t.emitCustomEvent("close",e)},cancelCustomEvent({$event:e}){var t=this.$xeTable;t.cancelCustom(),t.closeCustom(),t.emitCustomEvent("cancel",e)},handleResetCustomEvent(e){var t=this.$xeTable;t.resetCustom(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.handleResetCustomEvent(t)}):this.handleResetCustomEvent(t)},handleOptionCheck(t){var e=this.$xeTable.customColumnList,e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e.parent,e.children)&&e.children.length&&(e.visible=e.children.every(e=>e.visible),e.halfVisible=!e.visible&&e.children.some(e=>e.visible||e.halfVisible),this.handleOptionCheck(e))},changeCheckboxOption(e,t){var l=this.$xeTable,o=l,s=l.computeCustomOpts;let a=!e.renderVisible;s.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=a,e.renderVisible=a,e.halfVisible=!1}),o.isCustomStatus=!0,l.handleCustom(),l.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=a,e.halfVisible=!1}),this.handleOptionCheck(e),l.checkCustomStatus(),l.dispatchEvent("custom-visible-change",{column:e,checked:a},t)},changeColumnWidth(e){var t=this.$xeTable,l=t;t.computeCustomOpts.immediate&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth,l.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:width"))},changeFixedOption(e,t,l){var o=this.$xeTable,s=o,a=o.computeIsMaxFixedColumn;let r=null;o.computeCustomOpts.immediate?(e.renderFixed===t?(r="",_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""})):a&&!e.renderFixed||(r=t,_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t})),s.isCustomStatus=!0,o.handleCustom(),o.saveCustomStore("update:fixed")):e.renderFixed===t?(r="",_xeUtils.default.eachTree([e],e=>{e.renderFixed=""})):a&&!e.renderFixed||(r=t,_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})),null!==!r&&o.dispatchEvent("custom-fixed-change",{column:e,fixed:r},l)},allOptionEvent(e){var t=this.$xeTable,l=t.customStore,l=!l.isAll;t.toggleCustomAllCheckbox(),t.dispatchEvent("custom-visible-all",{checked:l},e)},updateColDropTipContent(){var e=this.$xeTable,t=this.reactData,l=t.dragCol,o=e.computeColumnDragOpts.tooltipMethod;let s="";s=o?""+(o({$table:e,column:l})||""):getI18n("vxe.custom.cstmDragTarget",[l&&"html"!==l.type?l.getTitle():""]),t.dragTipText=s},sortMousedownEvent(e){var t=this.$xeTable,l=this.reactData,e=e.currentTarget.parentElement.parentElement.parentElement,o=e.getAttribute("colid"),t=t.getColumnById(o);e.draggable=!0,l.dragCol=t,this.updateColDropTipContent(),(0,_dom.addClass)(e,"active--drag-origin")},sortMouseupEvent(e){var t=this.reactData,e=e.currentTarget.parentElement.parentElement.parentElement;hideDropTip(this),e.draggable=!1,(t.dragCol=null,_dom.removeClass)(e,"active--drag-origin")},sortDragstartEvent(e){var t=this.internalData;e.dataTransfer&&e.dataTransfer.setDragImage((0,_dom.getTpImg)(),0,0),t.prevDragGroup=null,t.prevDragValues=null},sortDragendEvent(d){let u=this.$xeTable;var e=u;let m=u;var t=u,l=this.reactData,o=this.internalData;let p=e.mouseConfig,v=m.customColumnList,x=t.collectColumn,g=u.computeCustomOpts.immediate;e=d.currentTarget;let{isCrossDrag:h,isSelfToChildDrag:b,isToChildDrag:C,dragEndMethod:s}=u.computeColumnDragOpts;t=l.dragCol;let{prevDragCol:a,prevDragGroup:r,prevDragValues:i,prevDragPos:E,prevDragToChild:T}=o,f="bottom"===E?1:0;if(r||i)u.handlePivotTableAggregatePanelDragendEvent&&u.handlePivotTableAggregatePanelDragendEvent(d);else if(a&&t&&a!==t){let n=t,c=a;Promise.resolve(!s||s({oldColumn:n,newColumn:c,dragColumn:n,dragPos:E,dragToChild:!!T,offsetIndex:f})).then(s=>{if(s){let e=-1,t=-1,l={},o=(_xeUtils.default.eachTree([n],e=>{l[e.id]=e}),!1);if(g){if(n.parentId&&c.parentId){if(!h)return;if(l[c.id]&&(o=!0,!h||!b))return void(_ui.VxeUI.modal&&_ui.VxeUI.modal.message({status:"error",content:getI18n("vxe.error.treeDragChild")}))}else if(n.parentId){if(!h)return}else if(c.parentId){if(!h)return;if(l[c.id]&&(o=!0,!h||!b))return void(_ui.VxeUI.modal&&_ui.VxeUI.modal.message({status:"error",content:getI18n("vxe.error.treeDragChild")}))}var a,r,i,s=_xeUtils.default.findTree(x,e=>e.id===n.id),s=(o&&h&&b?s&&({items:a,index:i}=s,(r=n.children||[]).forEach(e=>{e.parentId=n.parentId}),a.splice(i,1,...r),n.children=[]):s&&({items:a,index:i,parent:r}=s,a.splice(i,1),r||(e=i)),_xeUtils.default.findTree(x,e=>e.id===c.id));s&&({items:a,index:r,parent:i}=s,h&&C&&T?(n.parentId=c.id,c.children=(c.children||[]).concat([n])):(n.parentId=c.parentId,a.splice(r+f,0,n)),i||(t=r)),_xeUtils.default.eachTree(x,(e,t,l,o,s)=>{s||(e.renderSortNumber=t+1)})}else e=_xeUtils.default.findIndexOf(v,e=>e.id===n.id),v.splice(e,1),t=_xeUtils.default.findIndexOf(v,e=>e.id===c.id),v.splice(t+f,0,n);m.isDragColMove=!0,p&&(u.clearSelected&&u.clearSelected(),u.clearCellAreas)&&(u.clearCellAreas(),u.clearCopyCellArea()),u.dispatchEvent("column-dragend",{oldColumn:n,newColumn:c,dragColumn:n,dragPos:E,offsetIndex:f,_index:{newIndex:t,oldIndex:e}},d),g&&(m.customColumnList=x.slice(0),u.handleColDragSwapColumn())}}).catch(()=>{})}hideDropTip(this),l.dragCol=null,o.prevDragGroup=null,o.prevDragValues=null,e.draggable=!1,e.removeAttribute("drag-pos"),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin")},sortDragoverEvent(e){var t=this,l=t.$xeTable,o=t.internalData,s=t.reactData.dragCol,a=l.computeCustomOpts.immediate,{isCrossDrag:r,isToChildDrag:i}=l.computeColumnDragOpts,n=e.currentTarget,c=(0,_dom.hasControlKey)(e),d=n.getAttribute("colid"),l=l.getColumnById(d);o.prevDragGroup=null,o.prevDragValues=null,l&&(r||1===l.level)&&(e.preventDefault(),d=e.clientY-n.getBoundingClientRect().y<n.clientHeight/2?"top":"bottom",s&&s.id===l.id||!r&&1<l.level||!a&&1<l.level||l.renderFixed?showDropTip(t,e,n,!1,d):(o.prevDragToChild=!!(r&&i&&c&&a),o.prevDragCol=l,showDropTip(t,e,n,!0,o.prevDragPos=d)))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;function showDropTip(e,t,l,o,s){var a,r,i,n=e.internalData,d=e.$refs.refBodyWrapperElem;d&&(i=e.$refs.refCustomBodyElem)&&(n=n.prevDragToChild,a=d.getBoundingClientRect(),i=i.getBoundingClientRect(),r=e.$refs.refDragLineElem,l?r&&(o?(l=l.getBoundingClientRect(),r.style.display="block",r.style.left=Math.max(0,i.x-a.x)+"px",r.style.top=Math.max(1,l.y+d.scrollTop-a.y)+"px",r.style.height=l.height+"px",r.style.width=l.width+"px",r.setAttribute("drag-pos",s),r.setAttribute("drag-to-child",n?"y":"n")):r.style.display=""):r&&(r.style.display="node"),i=e.$refs.refDragTipElem)&&(i.style.display="block",i.style.top=Math.min(d.clientHeight+d.scrollTop-i.clientHeight,t.clientY+d.scrollTop-a.y)+"px",i.style.left=Math.min(d.clientWidth+d.scrollLeft-i.clientWidth,t.clientX+d.scrollLeft-a.x)+"px",i.setAttribute("drag-status",o?n?"sub":"normal":"disabled"))}function hideDropTip(e){var t=e.$refs.refDragTipElem,e=e.$refs.refDragLineElem;t&&(t.style.display=""),e&&(e.style.display="")}let renderDragTip=(e,t)=>{var l=t.$xeTable,t=t.reactData.dragTipText;return e("div",{},[e("div",{ref:"refDragLineElem",class:["vxe-table-custom-popup--drag-line",{"is--guides":l.computeColumnDragOpts.showGuidesStatus}]}),e("div",{ref:"refDragTipElem",class:"vxe-table-custom-popup--drag-tip"},[e("div",{class:"vxe-table-custom-popup--drag-tip-wrapper"},[e("div",{class:"vxe-table-custom-popup--drag-tip-status"},[e("span",{class:["vxe-table-custom-popup--drag-tip-normal-status",getIcon().TABLE_DRAG_STATUS_ROW]}),e("span",{class:["vxe-table-custom-popup--drag-tip-sub-status",getIcon().TABLE_DRAG_STATUS_SUB_ROW]}),e("span",{class:["vxe-table-custom-popup--drag-tip-group-status",getIcon().TABLE_DRAG_STATUS_AGG_GROUP]}),e("span",{class:["vxe-table-custom-popup--drag-tip-values-status",getIcon().TABLE_DRAG_STATUS_AGG_VALUES]}),e("span",{class:["vxe-table-custom-popup--drag-tip-disabled-status",getIcon().TABLE_DRAG_DISABLED]})]),e("div",{class:"vxe-table-custom-popup--drag-tip-content"},""+(t||""))])])])},renderSimplePanel=(c,u)=>{let m=_ui.VxeUI.getComponent("VxeButton");let p=u.$xeTable;var e=p,t=p,l=p.$xeGrid,o=u.customStore,{treeConfig:e,rowGroupConfig:s,aggregateConfig:a}=e,{isCustomStatus:t,customColumnList:r}=t,i=p.computeCustomOpts;let v=i.immediate;var n=p.computeColumnDragOpts,d=o.maxHeight;let{checkMethod:g,visibleMethod:x,allowVisible:h,allowSort:b,allowFixed:C,trigger:E,placement:T}=i,f=p.computeIsMaxFixedColumn,_=n.isCrossDrag;var n=i.slots||{},I=n.header,D=n.top,y=n.bottom,O=n.default,n=n.footer;let A=[];var k={},S=o.isAll,F=o.isIndeterminate,l=("hover"===E&&(k.mouseenter=u.handleWrapperMouseenterEvent,k.mouseleave=u.handleWrapperMouseleaveEvent),{$table:p,$grid:l,columns:r,isAllChecked:S,isAllIndeterminate:F,isCustomStatus:t});return _xeUtils.default.eachTree(r,(l,e,t,o,s)=>{if(!x||x({$table:p,column:l})){var a=l.renderVisible,r=l.halfVisible,i=l.children&&l.children.length,n=(0,_utils.formatText)(l.getTitle(),1);let t=!!g&&!g({$table:p,column:l});var d=!a;A.push(c("li",{key:l.id,attrs:{colid:l.id},class:["vxe-table-custom--option","level--"+l.level,{"is--hidden":t||d,"is--group":i}],on:{dragstart:u.sortDragstartEvent,dragend:u.sortDragendEvent,dragover:u.sortDragoverEvent}},[h?c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":a,"is--indeterminate":r,"is--disabled":t}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:e=>{t||u.changeCheckboxOption(l,e)}}},[c("span",{class:["vxe-checkbox--icon",r?getIcon().TABLE_CHECKBOX_INDETERMINATE:a?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):renderEmptyElement(p),c("div",{class:"vxe-table-custom--name-option"},[b&&(_&&v||1===l.level)?c("div",{class:"vxe-table-custom--sort-option"},[c("span",{class:["vxe-table-custom--sort-btn",{"is--disabled":t||d||l.renderFixed}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:t||d||l.renderFixed?{}:{mousedown:u.sortMousedownEvent,mouseup:u.sortMouseupEvent}},[c("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):renderEmptyElement(p),"html"===l.type?c("div",{key:"1",class:"vxe-table-custom--checkbox-label",domProps:{innerHTML:n}}):c("div",{key:"0",class:"vxe-table-custom--checkbox-label",attrs:{title:n}},n)]),!s&&C?c("div",{class:"vxe-table-custom--fixed-option"},[c(m,{props:{mode:"text",icon:"left"===l.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===l.renderFixed?"primary":"",disabled:t||d||f&&!l.renderFixed,title:getI18n("left"===l.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft")},on:{click:({$event:e})=>{u.changeFixedOption(l,"left",e)}}}),c(m,{props:{mode:"text",icon:"right"===l.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===l.renderFixed?"primary":"",disabled:t||d||f&&!l.renderFixed,title:getI18n("right"===l.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight")},on:{click:({$event:e})=>{u.changeFixedOption(l,"right",e)}}})]):renderEmptyElement(p)]))}}),c("div",{key:"simple",class:["vxe-table-custom-wrapper","placement--"+T,{"is--active":o.visible}],style:d&&!["left","right"].includes(T||"")?{maxHeight:d+"px"}:{}},o.visible?[c("div",{ref:"refBodyWrapperElem",class:"vxe-table-custom-simple--body-wrapper"},[!e&&(a||s)&&p.getPivotTableAggregateSimplePanel?c(p.getPivotTableAggregateSimplePanel(),{props:{customStore:o}}):renderEmptyElement(p),c("div",{ref:"refCustomBodyElem",class:"vxe-table-custom--handle-wrapper"},[c("div",{class:"vxe-table-custom--header"},I?p.callSlot(I,l,c):[c("ul",{class:"vxe-table-custom--panel-list"},[c("li",{class:"vxe-table-custom--option"},[h?c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":S,"is--indeterminate":F}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:u.allOptionEvent}},[c("span",{class:["vxe-checkbox--icon",F?getIcon().TABLE_CHECKBOX_INDETERMINATE:S?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),c("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):c("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),c("div",{class:"vxe-table-custom--body"},[D?c("div",{class:"vxe-table-custom--panel-top"},p.callSlot(D,l,c)):renderEmptyElement(p),O?c("div",{class:"vxe-table-custom--panel-body"},p.callSlot(O,l,c)):c("transition-group",{class:"vxe-table-custom--panel-list",props:{name:"vxe-table-custom--list",tag:"ul"},on:k},A),y?c("div",{class:"vxe-table-custom--panel-bottom"},p.callSlot(y,l,c)):renderEmptyElement(p)]),i.showFooter?c("div",{class:"vxe-table-custom--footer"},n?p.callSlot(n,l,c):[c("div",{class:"vxe-table-custom--footer-buttons"},[c(m,{props:{mode:"text",content:i.resetButtonText||getI18n("vxe.table.customRestore"),disabled:!t},on:{click:u.resetCustomEvent}}),v?c(m,{props:{mode:"text",content:i.closeButtonText||getI18n("vxe.table.customClose")},on:{click:u.cancelCloseEvent}}):c(m,{props:{mode:"text",content:i.resetButtonText||getI18n("vxe.table.customCancel")},on:{click:u.cancelCustomEvent}}),v?renderEmptyElement(p):c(m,{props:{mode:"text",status:"primary",content:i.confirmButtonText||getI18n("vxe.table.customConfirm")},on:{click:u.confirmCustomEvent}})])]):null]),renderDragTip(c,u)])]:[])},renderPopupPanel=(c,u)=>{var e=_ui.VxeUI.getComponent("VxeModal"),t=_ui.VxeUI.getComponent("VxeDrawer");let l=_ui.VxeUI.getComponent("VxeButton"),m=_ui.VxeUI.getComponent("VxeInput"),p=u,v=u.$xeTable;var o=v,s=v,a=v.$xeGrid;let r=u.customStore,V=o.resizable,{isCustomStatus:i,customColumnList:n}=s,d=v.computeCustomOpts,g=d.immediate;o=v.computeColumnDragOpts;let{mode:$,modalOptions:M,drawerOptions:R,allowVisible:x,allowSort:H,allowFixed:h,allowResizable:b,checkMethod:C,visibleMethod:E}=d,T=v.computeColumnOpts,f=T.maxFixedSize,{minWidth:_,maxWidth:I}=v.computeResizableOpts;var s=Object.assign({},M),D=Object.assign({},R);let y=v.computeIsMaxFixedColumn,W=o.isCrossDrag;o=d.slots||{};let O=o.header,A=o.top,k=o.bottom,S=o.default,F=o.footer,B=[],w=r.isAll,U=r.isIndeterminate,L={$table:v,$grid:a,columns:n,isAllChecked:w,isAllIndeterminate:U,isCustomStatus:i};_xeUtils.default.eachTree(n,(o,s,e,t,a)=>{if(!E||E({$table:v,column:o})){let e=0,t=0;b&&(s={$table:v,column:o,columnIndex:s,$columnIndex:s,$rowIndex:-1},_&&(e=_xeUtils.default.toNumber(_xeUtils.default.isFunction(_)?_(s):_)),I)&&(t=_xeUtils.default.toNumber(_xeUtils.default.isFunction(I)?I(s):I));var s=o.renderVisible,r=o.halfVisible,i=(0,_utils.formatText)(o.getTitle(),1),n=o.children&&o.children.length;let l=!!C&&!C({$table:v,column:o});var d=!s;B.push(c("tr",{key:o.id,attrs:{colid:o.id},class:["vxe-table-custom-popup--row level--"+o.level,{"is--group":n}],on:{dragstart:p.sortDragstartEvent,dragend:p.sortDragendEvent,dragover:p.sortDragoverEvent}},[x?c("td",{class:"vxe-table-custom-popup--column-item col--visible"},[c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":r,"is--disabled":l}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:e=>{l||p.changeCheckboxOption(o,e)}}},[c("span",{class:["vxe-checkbox--icon",r?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):renderEmptyElement(v),c("td",{class:"vxe-table-custom-popup--column-item col--name"},[c("div",{class:"vxe-table-custom-popup--name"},[H?W&&g||1===o.level?c("div",{class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":l||d||o.renderFixed}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:l||d||o.renderFixed?{}:{mousedown:p.sortMousedownEvent,mouseup:p.sortMouseupEvent}},[c("i",{class:getIcon().TABLE_CUSTOM_SORT})]):c("div",{class:"vxe-table-custom-popup--column-sort-placeholder"}):renderEmptyElement(v),"html"===o.type?c("div",{key:"1",class:"vxe-table-custom-popup--title",domProps:{innerHTML:i}}):c("div",{key:"0",class:"vxe-table-custom-popup--title",attrs:{title:i}},i)])]),b?c("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[o.children&&o.children.length||!(_xeUtils.default.isBoolean(o.resizable)?o.resizable:T.resizable||V)?c("span","-"):m?c(m,{props:{type:"integer",immediate:!1,disabled:l||d,value:o.renderResizeWidth,min:e||void 0,max:t||void 0},on:{modelValue(e){o.renderResizeWidth=Math.max(0,Number(e))},change(){p.changeColumnWidth(o)}}}):renderEmptyElement(u)]):renderEmptyElement(v),h?c("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[a?c("span","-"):c("vxe-radio-group",{props:{value:o.renderFixed||"",type:"button",size:"mini",disabled:l||d,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:l||d||y},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:l||d},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:l||d||y}]},on:{change({label:e,$event:t}){p.changeFixedOption(o,e,t)}}})]):renderEmptyElement(v)]))}});o={default:()=>c("div",{ref:"refBodyWrapperElem",class:"vxe-table-custom-popup--body-wrapper"},S?v.callSlot(S,L,c):[c("div",{ref:"refCustomBodyElem",class:"vxe-table-custom-popup--handle-wrapper"},[A?c("div",{class:"vxe-table-custom-popup--table-top"},v.callSlot(A,L,c)):renderEmptyElement(v),c("div",{class:"vxe-table-custom-popup--table-wrapper"},[c("table",{},[c("colgroup",{},[x?c("col",{class:"vxe-table-custom-popup--table-col-seq"}):renderEmptyElement(v),c("col",{class:"vxe-table-custom-popup--table-col-title"}),b?c("col",{class:"vxe-table-custom-popup--table-col-width"}):renderEmptyElement(v),h?c("col",{class:"vxe-table-custom-popup--table-col-fixed"}):renderEmptyElement(v)]),c("thead",{},[c("tr",{},[x?c("th",{},[c("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":w,"is--indeterminate":U}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:p.allOptionEvent}},[c("span",{class:["vxe-checkbox--icon",U?getIcon().TABLE_CHECKBOX_INDETERMINATE:w?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),c("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):renderEmptyElement(v),c("th",{},getI18n("vxe.custom.setting.colTitle")),b?c("th",{},getI18n("vxe.custom.setting.colResizable")):renderEmptyElement(v),h?c("th",{},getI18n("vxe.custom.setting."+(f?"colFixedMax":"colFixed"),[f])):renderEmptyElement(v)])]),c("transition-group",{class:"vxe-table-custom--panel-list",props:{tag:"tbody",name:"vxe-table-custom--list"}},B)])]),k?c("div",{class:"vxe-table-custom-popup--table-bottom"},v.callSlot(k,L,c)):renderEmptyElement(v),renderDragTip(c,p)])]),footer:()=>F?v.callSlot(F,L,c):c("div",{class:"vxe-table-custom-popup--footer"},[c(l,{props:{content:d.resetButtonText||getI18n("vxe.custom.cstmRestore"),disabled:!i},on:{click:p.resetCustomEvent}}),g?c(l,{props:{content:d.resetButtonText||getI18n("vxe.table.customClose")},on:{click:p.cancelCloseEvent}}):c(l,{props:{content:d.resetButtonText||getI18n("vxe.custom.cstmCancel")},on:{click:p.cancelCustomEvent}}),g?renderEmptyElement(v):c(l,{props:{status:"primary",content:d.confirmButtonText||getI18n("vxe.custom.cstmConfirm")},on:{click:p.confirmCustomEvent}})])};return O&&(o.header=()=>v.callSlot(O,L,c)),"drawer"===$?t?c(t,{key:"drawer",props:{className:["vxe-table-custom-drawer-wrapper","vxe-table--ignore-clear",D.className||""].join(" "),value:r.visible,title:D.title||getI18n("vxe.custom.cstmTitle"),width:D.width||Math.min(880,Math.floor(.6*document.documentElement.clientWidth)),position:D.position,resize:!!D.resize,escClosable:!!D.escClosable,maskClosable:!!D.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){r.visible=e}},scopedSlots:o}):renderEmptyElement(u):e?c(e,{key:"modal",props:{className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",s.className||""].join(" "),value:r.visible,title:s.title||getI18n("vxe.custom.cstmTitle"),width:s.width||Math.min(880,document.documentElement.clientWidth),minWidth:s.minWidth||700,height:s.height||Math.min(680,document.documentElement.clientHeight),minHeight:s.minHeight||400,showZoom:s.showZoom,showMaximize:s.showMaximize,showMinimize:s.showMinimize,mask:s.mask,lockView:s.lockView,resize:s.resize,escClosable:!!s.escClosable,maskClosable:!!s.maskClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){r.visible=e}},scopedSlots:o}):renderEmptyElement(u)};var _default=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},provide(){return{$xeTableCustomPanel:this}},inject:{$xeTable:{default:null}},data(){return{reactData:{dragCol:null,dragGroupField:null,dragAggFnCol:null,dragTipText:""},internalData:{}}},computed:{},created(){let t=this,l=_ui.VxeUI.getComponent("VxeModal"),o=_ui.VxeUI.getComponent("VxeDrawer"),s=_ui.VxeUI.getComponent("VxeButton"),a=_ui.VxeUI.getComponent("VxeNumberInput"),r=_ui.VxeUI.getComponent("VxeRadioGroup");t.$nextTick(()=>{var e=t.$xeTable.customOpts,e=e.mode;l||"modal"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),o||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),s||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),a||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),r||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])})},render(e){var t=this.$xeTable.computeCustomOpts;return(["modal","drawer","popup"].includes(""+t.mode)?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent(e){var t=this.$xeTable,l=this.customStore;l.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent(e){let t=this.$xeTable;let l=this.customStore;l.activeWrapper=!1,setTimeout(()=>{l.activeBtn||l.activeWrapper||t.customCloseEvent(e)},300)},getStoreData(){return{}},confirmCustomEvent({$event:e}){var t=this.$xeTable;t.isCustomStatus=!0,t.saveCustom(),t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCloseEvent({$event:e}){var t=this.$xeTable;t.closeCustom(),t.emitCustomEvent("close",e)},cancelCustomEvent({$event:e}){var t=this.$xeTable;t.cancelCustom(),t.closeCustom(),t.emitCustomEvent("cancel",e)},handleResetCustomEvent(e){var t=this.$xeTable;t.resetCustom(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.handleResetCustomEvent(t)}):this.handleResetCustomEvent(t)},handleOptionCheck(t){var e=this.$xeTable.customColumnList,e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e.parent,e.children)&&e.children.length&&(e.visible=e.children.every(e=>e.visible),e.halfVisible=!e.visible&&e.children.some(e=>e.visible||e.halfVisible),this.handleOptionCheck(e))},changeCheckboxOption(e,t){var l=this.$xeTable,o=l,s=l.computeCustomOpts;let a=!e.renderVisible;s.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=a,e.renderVisible=a,e.halfVisible=!1}),o.isCustomStatus=!0,l.handleCustom(),l.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=a,e.halfVisible=!1}),this.handleOptionCheck(e),l.checkCustomStatus(),l.dispatchEvent("custom-visible-change",{column:e,checked:a},t)},changeColumnWidth(e){var t=this.$xeTable,l=t;t.computeCustomOpts.immediate&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth,l.isCustomStatus=!0,t.handleCustom(),t.saveCustomStore("update:width"))},changeFixedOption(e,t,l){var o=this.$xeTable,s=o,a=o.computeIsMaxFixedColumn;let r=null;o.computeCustomOpts.immediate?(e.renderFixed===t?(r="",_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""})):a&&!e.renderFixed||(r=t,_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t})),s.isCustomStatus=!0,o.handleCustom(),o.saveCustomStore("update:fixed")):e.renderFixed===t?(r="",_xeUtils.default.eachTree([e],e=>{e.renderFixed=""})):a&&!e.renderFixed||(r=t,_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})),null!==!r&&o.dispatchEvent("custom-fixed-change",{column:e,fixed:r},l)},allOptionEvent(e){var t=this.$xeTable,l=t.customStore,l=!l.isAll;t.toggleCustomAllCheckbox(),t.dispatchEvent("custom-visible-all",{checked:l},e)},updateColDropTipContent(){var e=this.$xeTable,t=this.reactData,l=t.dragCol,o=e.computeColumnDragOpts.tooltipMethod;let s="";s=o?""+(o({$table:e,column:l})||""):getI18n("vxe.custom.cstmDragTarget",[l&&"html"!==l.type?l.getTitle():""]),t.dragTipText=s},sortMousedownEvent(e){var t=this.$xeTable,l=this.reactData,e=e.currentTarget.parentElement.parentElement.parentElement,o=e.getAttribute("colid"),t=t.getColumnById(o);e.draggable=!0,l.dragCol=t,l.dragGroupField=null,l.dragAggFnCol=null,this.updateColDropTipContent(),(0,_dom.addClass)(e,"active--drag-origin")},sortMouseupEvent(e){var t=this.reactData,e=e.currentTarget.parentElement.parentElement.parentElement;hideDropTip(this),e.draggable=!1,t.dragCol=null,t.dragGroupField=null,(t.dragAggFnCol=null,_dom.removeClass)(e,"active--drag-origin")},sortDragstartEvent(e){var t=this.internalData;e.dataTransfer&&e.dataTransfer.setDragImage((0,_dom.getTpImg)(),0,0),t.prevDragGroupField=null,t.prevDragAggFnColid=null},sortDragendEvent(c){let u=this.$xeTable;var e=u;let m=u;var t=u,l=this.reactData,o=this.internalData;let p=e.mouseConfig,v=m.customColumnList,g=t.collectColumn,x=u.computeCustomOpts.immediate;e=c.currentTarget;let{isCrossDrag:h,isSelfToChildDrag:b,isToChildDrag:C,dragEndMethod:s}=u.computeColumnDragOpts;t=l.dragCol;let{prevDragCol:a,prevDragGroupField:r,prevDragAggFnColid:i,prevDragPos:E,prevDragToChild:T}=o,f="bottom"===E?1:0;if(r||i)u.handlePivotTableAggregatePanelDragendEvent&&u.handlePivotTableAggregatePanelDragendEvent(c);else if(a&&t&&a!==t){let n=t,d=a;Promise.resolve(!s||s({oldColumn:n,newColumn:d,dragColumn:n,dragPos:E,dragToChild:!!T,offsetIndex:f})).then(s=>{if(s){let e=-1,t=-1,l={},o=(_xeUtils.default.eachTree([n],e=>{l[e.id]=e}),!1);if(x){if(n.parentId&&d.parentId){if(!h)return;if(l[d.id]&&(o=!0,!h||!b))return void(_ui.VxeUI.modal&&_ui.VxeUI.modal.message({status:"error",content:getI18n("vxe.error.treeDragChild")}))}else if(n.parentId){if(!h)return}else if(d.parentId){if(!h)return;if(l[d.id]&&(o=!0,!h||!b))return void(_ui.VxeUI.modal&&_ui.VxeUI.modal.message({status:"error",content:getI18n("vxe.error.treeDragChild")}))}var a,r,i,s=_xeUtils.default.findTree(g,e=>e.id===n.id),s=(o&&h&&b?s&&({items:a,index:i}=s,(r=n.children||[]).forEach(e=>{e.parentId=n.parentId}),a.splice(i,1,...r),n.children=[]):s&&({items:a,index:i,parent:r}=s,a.splice(i,1),r||(e=i)),_xeUtils.default.findTree(g,e=>e.id===d.id));s&&({items:a,index:r,parent:i}=s,h&&C&&T?(n.parentId=d.id,d.children=(d.children||[]).concat([n])):(n.parentId=d.parentId,a.splice(r+f,0,n)),i||(t=r)),_xeUtils.default.eachTree(g,(e,t,l,o,s)=>{s||(e.renderSortNumber=t+1)})}else e=_xeUtils.default.findIndexOf(v,e=>e.id===n.id),v.splice(e,1),t=_xeUtils.default.findIndexOf(v,e=>e.id===d.id),v.splice(t+f,0,n);m.isDragColMove=!0,p&&(u.clearSelected&&u.clearSelected(),u.clearCellAreas)&&(u.clearCellAreas(),u.clearCopyCellArea()),u.dispatchEvent("column-dragend",{oldColumn:n,newColumn:d,dragColumn:n,dragPos:E,offsetIndex:f,_index:{newIndex:t,oldIndex:e}},c),x&&(m.customColumnList=g.slice(0),u.handleColDragSwapColumn())}}).catch(()=>{})}hideDropTip(this),l.dragCol=null,l.dragGroupField=null,l.dragAggFnCol=null,o.prevDragGroupField=null,o.prevDragAggFnColid=null,e.draggable=!1,e.removeAttribute("drag-pos"),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin")},sortDragoverEvent(e){var t=this,l=t.$xeTable,o=t.internalData,s=t.reactData.dragCol,a=l.computeCustomOpts.immediate,{isCrossDrag:r,isToChildDrag:i}=l.computeColumnDragOpts,n=e.currentTarget,d=(0,_dom.hasControlKey)(e),c=n.getAttribute("colid"),l=l.getColumnById(c);o.prevDragGroupField=null,o.prevDragAggFnColid=null,l&&(r||1===l.level)&&(e.preventDefault(),c=e.clientY-n.getBoundingClientRect().y<n.clientHeight/2?"top":"bottom",!s||s.id===l.id||!r&&1<l.level||!a&&1<l.level||l.renderFixed?showDropTip(t,e,n,!1,c):(o.prevDragToChild=!!(r&&i&&d&&a),o.prevDragCol=l,showDropTip(t,e,n,!0,o.prevDragPos=c)))}}};

package/lib/table/src/columnInfo.js

@@ -124,6 +124,7 @@ class ColumnInfo {
       halfVisible: false,
       defaultVisible: visible,
       defaultFixed: _vm.fixed,
+      defaultAggFunc: _vm.aggFunc,
       checked: false,
       halfChecked: false,
       disabled: false,

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"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,s=n?n.proxyOpts:null,a=r.formatter,f=!_xeUtils.default.isBoolean(r.visible)||r.visible,u=["seq","checkbox","radio","expand","html"];r.type&&-1===u.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,u.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(u=d.treeConfig,u)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),a&&(_xeUtils.default.isString(a)?(d=formats.get(a)||_xeUtils.default[a])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a]):!_xeUtils.default.isArray(a)||(u=formats.get(a[0])||_xeUtils.default[a[0]])&&_xeUtils.default.isFunction(u.tableCellFormatMethod||u.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:a,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:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:r.aggFunc,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:f,halfVisible:!1,defaultVisible:f,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderFixed:"",renderVisible:!1,renderWidth:0,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}),s&&s.beforeColumn&&s.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(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"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,formats}=_ui.VxeUI;class ColumnInfo{constructor(e,r,{renderHeader:t,renderCell:o,renderFooter:l,renderData:i}={}){var d=e,n=e.$xeGrid,s=n?n.proxyOpts:null,a=r.formatter,u=!_xeUtils.default.isBoolean(r.visible)||r.visible,f=["seq","checkbox","radio","expand","html"];r.type&&-1===f.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type="+r.type,f.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render="+r.cellRender,"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render="+r.editRender,"column.edit-render={}"]),"expand"===r.type&&(f=d.treeConfig,f)&&(e.treeOpts.showLine||e.treeOpts.line)&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),r.remoteSort&&(0,_log.warnLog)("vxe.error.delProp",["column.remote-sort","sort-config.remote"]),r.sortMethod&&(0,_log.warnLog)("vxe.error.delProp",["column.sort-method","sort-config.sortMethod"]),a&&(_xeUtils.default.isString(a)?(d=formats.get(a)||_xeUtils.default[a])&&_xeUtils.default.isFunction(d.tableCellFormatMethod||d.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a]):!_xeUtils.default.isArray(a)||(f=formats.get(a[0])||_xeUtils.default[a[0]])&&_xeUtils.default.isFunction(f.tableCellFormatMethod||f.cellFormatMethod)||(0,_log.errLog)("vxe.error.notFormats",[a[0]])),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:a,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:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,rowGroupNode:r.rowGroupNode,treeNode:r.treeNode,dragSort:r.dragSort,rowResize:r.rowResize,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,titleSuffix:r.titleSuffix,aggFunc:r.aggFunc,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:u,halfVisible:!1,defaultVisible:u,defaultFixed:r.fixed,defaultAggFunc:r.aggFunc,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,sortNumber:0,renderSortNumber:0,renderAggFn:"",renderFixed:"",renderVisible:!1,renderWidth:0,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}),s&&s.beforeColumn&&s.beforeColumn({$grid:n,column:this})}getTitle(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?getI18n("vxe.table.seqTitle"):""))}getKey(){var e=this.type;return this.field||(e?"type="+e:null)}update(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)}}exports.ColumnInfo=ColumnInfo;

package/lib/table/src/methods.js

@@ -213,7 +213,8 @@ function restoreCustomStorage($xeTable) {
   const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
   const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
   const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
-  if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+  const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
+  if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
     if (!tableId) {
       (0, _log.errLog)('vxe.error.reqProp', ['id']);
       return;
@@ -3138,7 +3139,21 @@ function handleRecalculateLayout($xeTable, reFull) {
     }
   });
 }
-const handleUpdateRowGroup = ($xeTable, groupFields) => {
+function handleUpdateAggValues($xeTable) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    visibleColumn
+  } = internalData;
+  const aggCols = [];
+  visibleColumn.forEach(column => {
+    if (column.aggFunc) {
+      aggCols.push(column);
+    }
+  });
+  reactData.aggHandleAggColumns = aggCols;
+}
+function handleUpdateRowGroup($xeTable, groupFields) {
   const reactData = $xeTable;
   const aggFields = [];
   const aggConfs = [];
@@ -3152,7 +3167,8 @@ const handleUpdateRowGroup = ($xeTable, groupFields) => {
   }
   reactData.rowGroupList = aggConfs;
   reactData.aggHandleFields = aggFields;
-};
+  handleUpdateAggValues($xeTable);
+}
 function handleeGroupSummary($xeTable, aggList) {
   const aggregateOpts = $xeTable.computeAggregateOpts;
   const {
@@ -3706,6 +3722,7 @@ function parseColumns($xeTable, isReset) {
     }
   });
   handleTableColumn($xeTable);
+  handleUpdateAggValues($xeTable);
   if (isReset) {
     return $xeTable.updateFooter().then(() => {
       return $xeTable.recalculate();
@@ -5825,15 +5842,18 @@ const Methods = {
     const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
     const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
     const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
+    const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
     const resizableData = {};
     const sortData = {};
     const visibleData = {};
     const fixedData = {};
+    const aggFuncData = {};
     const storeData = {
       resizableData: undefined,
       sortData: undefined,
       visibleData: undefined,
-      fixedData: undefined
+      fixedData: undefined,
+      aggFuncData: undefined
     };
     if (!id) {
       if (storage) {
@@ -5845,6 +5865,7 @@ const Methods = {
     let hasSort = 0;
     let hasFixed = 0;
     let hasVisible = 0;
+    let hasAggFunc = 0;
     _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       const colKey = column.getKey();
       if (!colKey) {
@@ -5878,6 +5899,10 @@ const Methods = {
           visibleData[colKey] = true;
         }
       }
+      if (isCustomAggFunc && column.aggFunc !== column.defaultAggFunc) {
+        hasAggFunc = 1;
+        aggFuncData[colKey] = column.aggFunc;
+      }
     });
     if (hasResizable) {
       storeData.resizableData = resizableData;
@@ -5891,6 +5916,9 @@ const Methods = {
     if (hasVisible) {
       storeData.visibleData = visibleData;
     }
+    if (hasAggFunc) {
+      storeData.aggFuncData = aggFuncData;
+    }
     return storeData;
   },
   saveCustomStore(type) {
@@ -5904,18 +5932,20 @@ const Methods = {
     const customOpts = $xeTable.computeCustomOpts;
     const {
       updateStore,
-      storage
+      storage,
+      storeOptions
     } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-    const isCustomResizable = isAllCustom || storageOpts.resizable;
-    const isCustomVisible = isAllCustom || storageOpts.visible;
-    const isCustomFixed = isAllCustom || storageOpts.fixed;
-    const isCustomSort = isAllCustom || storageOpts.sort;
+    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
+    const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
     if (type !== 'reset') {
       reactData.isCustomStatus = true;
     }
-    if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+    if (storage && (customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
       if (!tableId) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return this.$nextTick();
@@ -6692,12 +6722,10 @@ const Methods = {
     const {
       actived
     } = editStore;
-    const {
-      customWrapper,
-      refValidTooltip
-    } = $refs;
     const tableFilter = $refs.refTableFilter;
     const tableMenu = $refs.refTableMenu;
+    const tableCustom = $refs.refTableCustom;
+    const validTooltip = $refs.refValidTooltip;
     // 筛选
     if (tableFilter) {
       if ((0, _dom.getEventTargetNode)(evnt, $el, 'vxe-cell--filter').flag) {
@@ -6711,10 +6739,10 @@ const Methods = {
       }
     }
     // 自定义列
-    if (customWrapper) {
+    if (tableCustom) {
       if (customStore.btnEl === evnt.target || (0, _dom.getEventTargetNode)(evnt, document.body, 'vxe-toolbar-custom-target').flag) {
         // 如果点击了自定义列按钮
-      } else if ((0, _dom.getEventTargetNode)(evnt, customWrapper.$el).flag) {
+      } else if ((0, _dom.getEventTargetNode)(evnt, tableCustom.$el).flag) {
         // 如果点击自定义列容器
       } else {
         if (!(0, _dom.getEventTargetNode)(evnt, document.body, 'vxe-table--ignore-clear').flag) {
@@ -6728,7 +6756,7 @@ const Methods = {
         // 如果是激活状态，点击了单元格之外
         const cell = actived.args.cell;
         if (!cell || !(0, _dom.getEventTargetNode)(evnt, cell).flag) {
-          if (refValidTooltip && (0, _dom.getEventTargetNode)(evnt, refValidTooltip.$el).flag) {
+          if (validTooltip && (0, _dom.getEventTargetNode)(evnt, validTooltip.$el).flag) {
             // 如果是激活状态，且点击了校验提示框
           } else if (!this.lastCallTime || this.lastCallTime + 50 < Date.now()) {
             if (!(0, _dom.getEventTargetNode)(evnt, document.body, 'vxe-table--ignore-clear').flag) {
@@ -11974,6 +12002,11 @@ const Methods = {
       return updateStyle($xeTable);
     });
   },
+  handleUpdateAggData() {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return loadTableData($xeTable, internalData.tableSynchData, true);
+  },
   updateZindex() {
     if (this.zIndex) {
       this.tZindex = this.zIndex;