vxe-table 4.20.9 → 4.20.10

package/lib/index.umd.js

@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "4.20.9";
+const version = "4.20.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4120,7 +4120,7 @@ function getPopupContainer(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"4.20.9"}`;
+const tableVersion = `table v${"4.20.10"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -11200,7 +11200,7 @@ function panel_createInternalData() {
               key: 'aa',
               class: 'vxe-table-custom-popup--column-td col--align'
             }, VxeUIRadioGroupComponent ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIRadioGroupComponent, {
-              modelValue: column.renderAlign || '',
+              modelValue: column.renderAlign || 'left',
               type: 'button',
               strict: false,
               disabled: isHidden,
@@ -11218,7 +11218,7 @@ function panel_createInternalData() {
               key: 'aha',
               class: 'vxe-table-custom-popup--column-td col--header-align'
             }, isColGroup ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-')] : VxeUIRadioGroupComponent ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIRadioGroupComponent, {
-              modelValue: column.renderHeaderAlign || '',
+              modelValue: column.renderHeaderAlign || 'left',
               type: 'button',
               strict: false,
               disabled: isHidden,
@@ -11236,7 +11236,7 @@ function panel_createInternalData() {
               key: 'afa',
               class: 'vxe-table-custom-popup--column-td col--footer-align'
             }, isColGroup ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-')] : VxeUIRadioGroupComponent ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIRadioGroupComponent, {
-              modelValue: column.renderFooterAlign || '',
+              modelValue: column.renderFooterAlign || 'left',
               type: 'button',
               strict: false,
               disabled: isHidden,
@@ -17067,18 +17067,20 @@ export_hook_hooks.add('tableExportModule', {
                 sortData
               } = gridReactData;
               const {
-                beforeQueryAll,
-                afterQueryAll,
+                beforeQueryAll: oldBeforeQueryAll,
+                afterQueryAll: oldAfterQueryAll,
                 ajax = {}
               } = proxyOpts;
               const resConfigs = proxyOpts.response || proxyOpts.props || {};
-              const ajaxMethods = ajax.queryAll;
-              const queryAllSuccessMethods = ajax.queryAllSuccess;
-              const queryAllErrorMethods = ajax.queryAllError;
-              if (!ajaxMethods) {
+              const beforeQueryAllMethod = ajax.beforeQueryAll;
+              const queryAllMethod = ajax.queryAll;
+              const afterQueryAllMethod = ajax.afterQueryAll;
+              const queryAllSuccessMethod = ajax.queryAllSuccess;
+              const queryAllErrorMethod = ajax.queryAllError;
+              if (!queryAllMethod) {
                 export_hook_errLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
               }
-              if (ajaxMethods) {
+              if (queryAllMethod) {
                 const params = {
                   $table: $xeTable,
                   $grid: $xeGrid,
@@ -17089,44 +17091,72 @@ export_hook_hooks.add('tableExportModule', {
                   form: gridReactData.formData,
                   options: handleOptions
                 };
-                return Promise.resolve((beforeQueryAll || ajaxMethods)(params)).then(rest => {
-                  const listProp = resConfigs.list;
-                  let tdData = [];
-                  if (listProp) {
-                    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp)) {
-                      tdData = listProp({
-                        data: rest,
-                        $table: $xeTable,
-                        $grid: $xeGrid,
-                        $gantt: $xeGantt
+                const handleQueryAll = () => {
+                  return Promise.resolve((oldBeforeQueryAll || queryAllMethod)(params)).then(rest => {
+                    if (afterQueryAllMethod) {
+                      afterQueryAllMethod({
+                        ...params,
+                        response: rest,
+                        status: 'success'
                       });
                     } else {
-                      tdData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest) ? rest : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp);
+                      const listProp = resConfigs.list;
+                      let tdData = [];
+                      if (listProp) {
+                        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp)) {
+                          tdData = listProp({
+                            data: rest,
+                            $table: $xeTable,
+                            $grid: $xeGrid,
+                            $gantt: $xeGantt
+                          });
+                        } else {
+                          tdData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest) ? rest : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp);
+                        }
+                      } else {
+                        if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest)) {
+                          tdData = rest;
+                        }
+                      }
+                      handleOptions.data = tdData;
+                      if (oldAfterQueryAll) {
+                        oldAfterQueryAll({
+                          ...params,
+                          response: rest
+                        });
+                      }
                     }
-                  } else {
-                    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest)) {
-                      tdData = rest;
+                    if (queryAllSuccessMethod) {
+                      queryAllSuccessMethod({
+                        ...params,
+                        response: rest
+                      });
                     }
-                  }
-                  handleOptions.data = tdData;
-                  if (afterQueryAll) {
-                    afterQueryAll(params);
-                  }
-                  if (queryAllSuccessMethods) {
-                    queryAllSuccessMethods({
-                      ...params,
-                      response: rest
-                    });
-                  }
-                  return handleExport(handleOptions);
-                }).catch(rest => {
-                  if (queryAllErrorMethods) {
-                    queryAllErrorMethods({
-                      ...params,
-                      response: rest
-                    });
-                  }
-                });
+                    return handleExport(handleOptions);
+                  }).catch(rest => {
+                    if (afterQueryAllMethod) {
+                      afterQueryAllMethod({
+                        ...params,
+                        response: rest,
+                        status: 'error'
+                      });
+                    }
+                    if (queryAllErrorMethod) {
+                      queryAllErrorMethod({
+                        ...params,
+                        response: rest
+                      });
+                    }
+                  });
+                };
+                if (beforeQueryAllMethod) {
+                  return Promise.resolve(beforeQueryAllMethod(params)).then(status => {
+                    if (status !== false) {
+                      return handleQueryAll();
+                    }
+                  });
+                }
+                return handleQueryAll();
               }
             }
           }
@@ -20375,7 +20405,18 @@ render_renderer.mixin({
   },
   FormatNumberInput: {
     renderTableDefault: handleNumberCell,
-    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableFilterDefaultMethod({
+      option,
+      row,
+      column
+    }) {
+      const {
+        data
+      } = option;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      /* eslint-disable eqeqeq */
+      return cellValue == data;
+    },
     tableExportMethod(params) {
       const {
         row,
@@ -20439,7 +20480,18 @@ render_renderer.mixin({
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,
     renderTableFloatingFilter: defaultFloatingFilterRender,
-    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableFilterDefaultMethod({
+      option,
+      row,
+      column
+    }) {
+      const {
+        data
+      } = option;
+      const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
+      /* eslint-disable eqeqeq */
+      return cellValue == data;
+    },
     tableExportMethod(params) {
       const {
         row,
@@ -21391,7 +21443,7 @@ reactData.rowHeight=rowHeight;const{toVisibleIndex:toYVisibleIndex,visibleSize:v
 if(reWidth){calcCellWidth();}if(reWidth||reFull){autoCellWidth();}if(reHeight){calcCellHeight();}updateStyle();calcScrollbar();if(reFull){updateRowOffsetTop();}updateRowExpandStyle();if(reFull){updateTreeLineStyle();}internalData.rceRunTime=Date.now();if(reFull){return computeScrollLoad();}});};const defaultMinRunDelay=50;const handleLazyRecalculate=(reFull,reWidth,reHeight,options)=>{const minRunDelay=(options?options.minRunDelay:defaultMinRunDelay)||defaultMinRunDelay;return new Promise(resolve=>{const $xeGanttView=internalData.xeGanttView;const{customStore,tableData,tableColumn}=reactData;const{rceTimeout,rceRunTime}=internalData;const resizeOpts=computeResizeOpts.value;let rceDelay=internalData.rceDelay;// 如果在500毫秒内频繁执行，则执行次数减缓
 if(rceRunTime&&rceRunTime>Date.now()-500){rceDelay=Math.min(Math.max(60,Math.min(800,tableData.length/8)),rceDelay+50);}else{rceDelay=0;}internalData.rceDelay=rceDelay;const refreshDelay=resizeOpts.refreshDelay||30;const reDelay=rceDelay+refreshDelay;const el=refElem.value;if(el&&el.clientWidth){autoCellWidth();updateRowExpandStyle();}if(customStore.visible&&$xeTable.handleCustomStyle){$xeTable.handleCustomStyle();}const renderCellSize=tableData.length*tableColumn.length;// 渲染量低的场景
 if(renderCellSize<400){rceDelay=20;}else if(renderCellSize<600){rceDelay=40;}else if(renderCellSize<800){rceDelay=80;}if(rceTimeout){clearTimeout(rceTimeout);// 多少毫秒内至少执行一次
-if(rceRunTime&&rceRunTime+minRunDelay<Date.now()){resolve(handleRecalculateStyle(reFull,reWidth,reHeight));}else{(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{resolve();});}}else{resolve(handleRecalculateStyle(reFull,reWidth,reHeight));}if($xeGanttView&&$xeGanttView.handleLazyRecalculate){$xeGanttView.handleLazyRecalculate();}internalData.rceTimeout=setTimeout(()=>{internalData.rceDelay=0;internalData.rceTimeout=undefined;handleRecalculateStyle(reFull,reWidth,reHeight);if($xeGanttView&&$xeGanttView.handleLazyRecalculate){$xeGanttView.handleLazyRecalculate();}},reDelay);});};const handleResizeEvent=()=>{if(internalData.rsePending){return;}internalData.rsePending=true;handleLazyRecalculate(false,true,true,{minRunDelay:200}).then(()=>{internalData.rsePending=false;}).catch(()=>{internalData.rsePending=false;});};const handleUpdateAggValues=()=>{const{visibleColumn}=internalData;const aggCols=[];visibleColumn.forEach(column=>{if(column.aggFunc){aggCols.push(column);}});reactData.aggHandleAggColumns=aggCols;};const handleUpdateRowGroup=groupFields=>{const aggGroupFields=[];const aggGroupConfs=[];if(groupFields){(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(groupFields)?groupFields:[groupFields]).forEach(field=>{aggGroupFields.push(field);aggGroupConfs.push({field});});}reactData.rowGroupList=aggGroupConfs;reactData.aggHandleFields=aggGroupFields;handleUpdateAggValues();};const handleeGroupSummary=aggList=>{const{fullColumnFieldData}=internalData;const aggregateOpts=computeAggregateOpts.value;const aggFuncColumns=computeAggFuncColumns.value;const{mapChildrenField}=aggregateOpts;const aggCalcMethod=aggregateOpts.calcValuesMethod||aggregateOpts.countMethod||aggregateOpts.aggregateMethod;if(mapChildrenField){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().lastEach(aggList,aggRow=>{let count=0;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(aggRow[mapChildrenField],row=>{if(row.isAggregate){count+=row.childCount||0;}else{count++;}});aggRow.childCount=count;});if($xeTable.handlePivotTableAggData){$xeTable.handlePivotTableAggData(aggList);}else{if(aggFuncColumns.length){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().lastEach(aggList,aggRow=>{const aggDtObj={};const aggData=aggRow.aggData;const groupField=aggRow.groupField;const groupContent=aggRow.groupContent;const childList=mapChildrenField?aggRow[mapChildrenField]||[]:[];const childCount=aggRow.childCount;const colRest=fullColumnFieldData[groupField]||{};aggFuncColumns.forEach(column=>{const{field}=column;const currAggData=aggData?aggData[field]:null;const ctParams={$table:$xeTable,groupField,groupColumn:colRest?colRest.column:null,column,groupValue:groupContent,childList,childCount,aggValue:currAggData?currAggData.value:0,/**
+if(rceRunTime&&rceRunTime+minRunDelay<Date.now()){resolve(handleRecalculateStyle(reFull,reWidth,reHeight));}else{(0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(()=>{resolve();});}}else{resolve(handleRecalculateStyle(reFull,reWidth,reHeight));}if($xeGanttView&&$xeGanttView.handleLazyRecalculate){$xeGanttView.handleLazyRecalculate();}internalData.rceTimeout=setTimeout(()=>{internalData.rceDelay=0;internalData.rceTimeout=undefined;handleRecalculateStyle(reFull,reWidth,reHeight);if($xeGanttView&&$xeGanttView.handleLazyRecalculate){$xeGanttView.handleLazyRecalculate();}},reDelay);});};const handleResizeEvent=()=>{if(internalData.rsePending){return;}internalData.rsePending=true;handleLazyRecalculate(true,true,true,{minRunDelay:200}).then(()=>{internalData.rsePending=false;}).catch(()=>{internalData.rsePending=false;});};const handleUpdateAggValues=()=>{const{visibleColumn}=internalData;const aggCols=[];visibleColumn.forEach(column=>{if(column.aggFunc){aggCols.push(column);}});reactData.aggHandleAggColumns=aggCols;};const handleUpdateRowGroup=groupFields=>{const aggGroupFields=[];const aggGroupConfs=[];if(groupFields){(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(groupFields)?groupFields:[groupFields]).forEach(field=>{aggGroupFields.push(field);aggGroupConfs.push({field});});}reactData.rowGroupList=aggGroupConfs;reactData.aggHandleFields=aggGroupFields;handleUpdateAggValues();};const handleeGroupSummary=aggList=>{const{fullColumnFieldData}=internalData;const aggregateOpts=computeAggregateOpts.value;const aggFuncColumns=computeAggFuncColumns.value;const{mapChildrenField}=aggregateOpts;const aggCalcMethod=aggregateOpts.calcValuesMethod||aggregateOpts.countMethod||aggregateOpts.aggregateMethod;if(mapChildrenField){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().lastEach(aggList,aggRow=>{let count=0;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(aggRow[mapChildrenField],row=>{if(row.isAggregate){count+=row.childCount||0;}else{count++;}});aggRow.childCount=count;});if($xeTable.handlePivotTableAggData){$xeTable.handlePivotTableAggData(aggList);}else{if(aggFuncColumns.length){external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().lastEach(aggList,aggRow=>{const aggDtObj={};const aggData=aggRow.aggData;const groupField=aggRow.groupField;const groupContent=aggRow.groupContent;const childList=mapChildrenField?aggRow[mapChildrenField]||[]:[];const childCount=aggRow.childCount;const colRest=fullColumnFieldData[groupField]||{};aggFuncColumns.forEach(column=>{const{field}=column;const currAggData=aggData?aggData[field]:null;const ctParams={$table:$xeTable,groupField,groupColumn:colRest?colRest.column:null,column,groupValue:groupContent,childList,childCount,aggValue:currAggData?currAggData.value:0,/**
                                    * 已废弃
                                    * @deprecated
                                    */children:childList,/**
@@ -24049,14 +24101,14 @@ function grid_createInternalData() {
         const pagerOpts = computePagerOpts.value;
         const toolbarOpts = computeToolbarOpts.value;
         const {
-          beforeQuery,
-          afterQuery,
-          beforeQueryFooter,
-          afterQueryFooter,
-          beforeDelete,
-          afterDelete,
-          beforeSave,
-          afterSave,
+          beforeQuery: oldBeforeQuery,
+          afterQuery: oldAfterQuery,
+          beforeQueryFooter: oldBeforeQueryFooter,
+          afterQueryFooter: oldAfterQueryFooter,
+          beforeDelete: oldBeforeDelete,
+          afterDelete: oldAfterDelete,
+          beforeSave: oldBeforeSave,
+          afterSave: oldAfterSave,
           ajax = {}
         } = proxyOpts;
         const resConfigs = proxyOpts.response || proxyOpts.props || {};
@@ -24117,10 +24169,12 @@ function grid_createInternalData() {
           case 'reload':
           case 'query':
             {
-              const qMethods = ajax.query;
-              const qsMethods = ajax.querySuccess;
-              const qeMethods = ajax.queryError;
-              if (qMethods) {
+              const bqMethod = ajax.beforeQuery;
+              const qMethod = ajax.query;
+              const aqMethod = ajax.afterQuery;
+              const qsMethod = ajax.querySuccess;
+              const qeMethod = ajax.queryError;
+              if (qMethod) {
                 const isInited = code === 'initial';
                 const isReload = code === 'reload';
                 if (!isInited && reactData.tableLoading) {
@@ -24210,82 +24264,110 @@ function grid_createInternalData() {
                   sorts: sortList,
                   filters: filterList,
                   form: formData,
-                  options: qMethods
+                  options: qMethod
                 };
-                reactData.sortData = sortList;
-                reactData.filterData = filterList;
-                reactData.tableLoading = true;
-                return Promise.all([Promise.resolve((beforeQuery || qMethods)(commitParams, ...args)), operPromise]).then(([rest]) => {
-                  let tableData = [];
-                  reactData.tableLoading = false;
-                  if (rest) {
-                    const reParams = {
-                      data: rest,
-                      $table: $xeTable,
-                      $grid: $xeGrid,
-                      $gantt: null
-                    };
-                    if (pagerConfig && isEnableConf(pagerOpts)) {
-                      const totalProp = resConfigs.total;
-                      const total = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(totalProp) ? totalProp(reParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, totalProp || 'page.total')) || 0;
-                      tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(total);
-                      const resultProp = resConfigs.result;
-                      tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resultProp) ? resultProp(reParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, resultProp || 'result')) || [];
-                      // 检验当前页码，不能超出当前最大页数
-                      const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
-                      if (tablePage.currentPage > pageCount) {
-                        tablePage.currentPage = pageCount;
-                      }
+                const handleQuery = () => {
+                  reactData.sortData = sortList;
+                  reactData.filterData = filterList;
+                  reactData.tableLoading = true;
+                  return Promise.all([Promise.resolve((oldBeforeQuery || qMethod)(commitParams, ...args)), operPromise]).then(([rest]) => {
+                    reactData.tableLoading = false;
+                    if (aqMethod) {
+                      aqMethod({
+                        ...commitParams,
+                        response: rest,
+                        status: 'success'
+                      }, ...args);
                     } else {
-                      const listProp = resConfigs.list;
-                      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest)) {
-                        tableData = rest;
-                      } else if (listProp) {
-                        tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp(reParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp)) || [];
-                      }
-                    }
-                    if (showFooter) {
-                      const fdProp = resConfigs.footerData;
-                      const footerList = fdProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(fdProp) ? fdProp(reParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, fdProp) : [];
-                      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerList)) {
-                        reactData.footerData = footerList;
+                      let tableData = [];
+                      if (rest) {
+                        const reParams = {
+                          data: rest,
+                          $table: $xeTable,
+                          $grid: $xeGrid,
+                          $gantt: null
+                        };
+                        if (pagerConfig && isEnableConf(pagerOpts)) {
+                          const totalProp = resConfigs.total;
+                          const total = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(totalProp) ? totalProp(reParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, totalProp || 'page.total')) || 0;
+                          tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(total);
+                          const resultProp = resConfigs.result;
+                          tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resultProp) ? resultProp(reParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, resultProp || 'result')) || [];
+                          // 检验当前页码，不能超出当前最大页数
+                          const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
+                          if (tablePage.currentPage > pageCount) {
+                            tablePage.currentPage = pageCount;
+                          }
+                        } else {
+                          const listProp = resConfigs.list;
+                          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest)) {
+                            tableData = rest;
+                          } else if (listProp) {
+                            tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp(reParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp)) || [];
+                          }
+                        }
+                        if (showFooter) {
+                          const fdProp = resConfigs.footerData;
+                          const footerList = fdProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(fdProp) ? fdProp(reParams) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, fdProp) : [];
+                          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerList)) {
+                            reactData.footerData = footerList;
+                          }
+                        }
                       }
-                    }
-                  }
-                  if ($xeTable) {
-                    $xeTable.loadData(tableData);
-                  } else {
-                    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-                      const $xeTable = refTable.value;
                       if ($xeTable) {
                         $xeTable.loadData(tableData);
+                      } else {
+                        (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+                          const $xeTable = refTable.value;
+                          if ($xeTable) {
+                            $xeTable.loadData(tableData);
+                          }
+                        });
                       }
-                    });
-                  }
-                  if (afterQuery) {
-                    afterQuery(commitParams, ...args);
-                  }
-                  if (qsMethods) {
-                    qsMethods({
-                      ...commitParams,
-                      response: rest
-                    });
-                  }
-                  return {
-                    status: true
-                  };
-                }).catch(rest => {
-                  reactData.tableLoading = false;
-                  if (qeMethods) {
-                    qeMethods({
-                      ...commitParams,
-                      response: rest
-                    });
-                  }
-                  return {
-                    status: false
-                  };
-                });
+                      if (oldAfterQuery) {
+                        oldAfterQuery({
+                          ...commitParams,
+                          response: rest
+                        }, ...args);
+                      }
+                    }
+                    if (qsMethod) {
+                      qsMethod({
+                        ...commitParams,
+                        response: rest
+                      });
+                    }
+                    return {
+                      status: true
+                    };
+                  }).catch(rest => {
+                    reactData.tableLoading = false;
+                    if (aqMethod) {
+                      aqMethod({
+                        ...commitParams,
+                        response: rest,
+                        status: 'error'
+                      }, ...args);
+                    }
+                    if (qeMethod) {
+                      qeMethod({
+                        ...commitParams,
+                        response: rest
+                      });
+                    }
+                    return {
+                      status: false
+                    };
+                  });
+                };
+                if (bqMethod) {
+                  return Promise.resolve(bqMethod(commitParams, ...args)).then(status => {
+                    if (status !== false) {
+                      return handleQuery();
+                    }
+                  });
+                }
+                return handleQuery();
               } else {
                 grid_errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
               }
@@ -24293,49 +24375,88 @@ function grid_createInternalData() {
             }
           case 'queryFooter':
             {
-              const qfMethods = ajax.queryFooter;
-              const qfSuccessMethods = ajax.queryFooterSuccess;
-              const qfErrorMethods = ajax.queryFooterError;
-              if (qfMethods) {
+              const bqfMethod = ajax.beforeQueryFooter;
+              const qfMethod = ajax.queryFooter;
+              const aqfMethod = ajax.afterQueryFooter;
+              const qfSuccessMethod = ajax.queryFooterSuccess;
+              const qfErrorMethod = ajax.queryFooterError;
+              if (qfMethod) {
                 let filterList = [];
                 if ($xeTable) {
                   filterList = $xeTable.getCheckedFilters();
                 }
+                let pageParams = {};
+                if (pagerConfig) {
+                  if (isEnableConf(pagerOpts)) {
+                    pageParams = {
+                      ...tablePage
+                    };
+                  }
+                }
                 const commitParams = {
                   $table: $xeTable,
                   $grid: $xeGrid,
                   $gantt: null,
                   code,
                   button,
+                  page: pageParams,
                   filters: filterList,
                   form: formData,
-                  options: qfMethods
+                  options: qfMethod
                 };
-                return Promise.resolve((beforeQueryFooter || qfMethods)(commitParams, ...args)).then(rest => {
-                  reactData.footerData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest) ? rest : [];
-                  if (afterQueryFooter) {
-                    afterQueryFooter(commitParams, ...args);
-                  }
-                  if (qfSuccessMethods) {
-                    qfSuccessMethods({
-                      ...commitParams,
-                      response: rest
-                    });
-                  }
-                  return {
-                    status: true
-                  };
-                }).catch(rest => {
-                  if (qfErrorMethods) {
-                    qfErrorMethods({
-                      ...commitParams,
-                      response: rest
-                    });
-                  }
-                  return {
-                    status: false
-                  };
-                });
+                const handleQueryFooter = () => {
+                  return Promise.resolve((oldBeforeQueryFooter || qfMethod)(commitParams, ...args)).then(rest => {
+                    if (aqfMethod) {
+                      aqfMethod({
+                        ...commitParams,
+                        response: rest,
+                        status: 'success'
+                      }, ...args);
+                    } else {
+                      reactData.footerData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest) ? rest : [];
+                      if (oldAfterQueryFooter) {
+                        oldAfterQueryFooter({
+                          ...commitParams,
+                          response: rest
+                        }, ...args);
+                      }
+                    }
+                    if (qfSuccessMethod) {
+                      qfSuccessMethod({
+                        ...commitParams,
+                        response: rest
+                      });
+                    }
+                    return {
+                      status: true
+                    };
+                  }).catch(rest => {
+                    if (aqfMethod) {
+                      aqfMethod({
+                        ...commitParams,
+                        response: rest,
+                        status: 'error'
+                      }, ...args);
+                    }
+                    if (qfErrorMethod) {
+                      qfErrorMethod({
+                        ...commitParams,
+                        response: rest
+                      });
+                    }
+                    return {
+                      status: false
+                    };
+                  });
+                };
+                if (bqfMethod) {
+                  return Promise.resolve(bqfMethod(commitParams, ...args)).then(status => {
+                    if (status !== false) {
+                      return handleQueryFooter();
+                    }
+                  });
+                }
+                return handleQueryFooter();
               } else {
                 grid_errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter']);
               }
@@ -24343,10 +24464,12 @@ function grid_createInternalData() {
             }
           case 'delete':
             {
-              const dMethods = ajax.delete;
+              const bdMethod = ajax.beforeDelete;
+              const dMethod = ajax.delete;
+              const adMethod = ajax.afterDelete;
               const deleteSuccessMethods = ajax.deleteSuccess;
               const deleteErrorMethods = ajax.deleteError;
-              if (dMethods) {
+              if (dMethod) {
                 const selectRecords = $xeGrid.getCheckboxRecords();
                 const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
                 const body = {
@@ -24360,63 +24483,92 @@ function grid_createInternalData() {
                   button,
                   body,
                   form: formData,
-                  options: dMethods
+                  options: dMethod
                 };
                 if (selectRecords.length) {
                   return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                     if (!removeRecords.length) {
                       return $xeTable.remove(selectRecords);
                     }
-                    reactData.tableLoading = true;
-                    return Promise.resolve((beforeDelete || dMethods)(commitParams, ...args)).then(rest => {
-                      reactData.tableLoading = false;
-                      $xeTable.setPendingRow(removeRecords, false);
-                      if (isRespMsg) {
-                        if (core_.VxeUI.modal) {
-                          core_.VxeUI.modal.message({
-                            content: getRespMsg(rest, 'vxe.grid.delSuccess'),
+                    const handleDelete = () => {
+                      reactData.tableLoading = true;
+                      return Promise.resolve((oldBeforeDelete || dMethod)(commitParams, ...args)).then(rest => {
+                        reactData.tableLoading = false;
+                        if (adMethod) {
+                          adMethod({
+                            ...commitParams,
+                            response: rest,
                             status: 'success'
+                          }, ...args);
+                        } else {
+                          $xeTable.setPendingRow(removeRecords, false);
+                          if (isRespMsg) {
+                            if (core_.VxeUI.modal) {
+                              core_.VxeUI.modal.message({
+                                content: getRespMsg(rest, 'vxe.grid.delSuccess'),
+                                status: 'success'
+                              });
+                            }
+                          }
+                          if (oldAfterDelete) {
+                            oldAfterDelete({
+                              ...commitParams,
+                              response: rest
+                            }, ...args);
+                          } else {
+                            internalData.uFoot = true;
+                            $xeGrid.commitProxy('query');
+                            internalData.uFoot = false;
+                            updateQueryFooter();
+                          }
+                        }
+                        if (deleteSuccessMethods) {
+                          deleteSuccessMethods({
+                            ...commitParams,
+                            response: rest
                           });
                         }
-                      }
-                      if (afterDelete) {
-                        afterDelete(commitParams, ...args);
-                      } else {
-                        internalData.uFoot = true;
-                        $xeGrid.commitProxy('query');
-                        internalData.uFoot = false;
-                        updateQueryFooter();
-                      }
-                      if (deleteSuccessMethods) {
-                        deleteSuccessMethods({
-                          ...commitParams,
-                          response: rest
-                        });
-                      }
-                      return {
-                        status: true
-                      };
-                    }).catch(rest => {
-                      reactData.tableLoading = false;
-                      if (isRespMsg) {
-                        if (core_.VxeUI.modal) {
-                          core_.VxeUI.modal.message({
-                            id: code,
-                            content: getRespMsg(rest, 'vxe.grid.operError'),
+                        return {
+                          status: true
+                        };
+                      }).catch(rest => {
+                        reactData.tableLoading = false;
+                        if (adMethod) {
+                          adMethod({
+                            ...commitParams,
+                            response: rest,
                             status: 'error'
+                          }, ...args);
+                        } else {
+                          if (isRespMsg) {
+                            if (core_.VxeUI.modal) {
+                              core_.VxeUI.modal.message({
+                                id: code,
+                                content: getRespMsg(rest, 'vxe.grid.operError'),
+                                status: 'error'
+                              });
+                            }
+                          }
+                        }
+                        if (deleteErrorMethods) {
+                          deleteErrorMethods({
+                            ...commitParams,
+                            response: rest
                           });
                         }
-                      }
-                      if (deleteErrorMethods) {
-                        deleteErrorMethods({
-                          ...commitParams,
-                          response: rest
-                        });
-                      }
-                      return {
-                        status: false
-                      };
-                    });
+                        return {
+                          status: false
+                        };
+                      });
+                    };
+                    if (bdMethod) {
+                      return Promise.resolve(bdMethod(commitParams, ...args)).then(status => {
+                        if (status !== false) {
+                          return handleDelete();
+                        }
+                      });
+                    }
+                    return handleDelete();
                   });
                 } else {
                   if (isActiveMsg) {
@@ -24436,10 +24588,12 @@ function grid_createInternalData() {
             }
           case 'save':
             {
-              const ajaxMethods = ajax.save;
-              const saveSuccessMethods = ajax.saveSuccess;
-              const saveErrorMethods = ajax.saveError;
-              if (ajaxMethods) {
+              const bSaveMethod = ajax.beforeSave;
+              const sMethod = ajax.save;
+              const aSaveMethod = ajax.afterSave;
+              const sSuccessMethod = ajax.saveSuccess;
+              const sErrorMethod = ajax.saveError;
+              if (sMethod) {
                 const body = $xeTable.getRecordset();
                 const {
                   insertRecords,
@@ -24455,7 +24609,7 @@ function grid_createInternalData() {
                   button,
                   body,
                   form: formData,
-                  options: ajaxMethods
+                  options: sMethod
                 };
                 // 排除掉新增且标记为删除的数据
                 if (insertRecords.length) {
@@ -24476,56 +24630,85 @@ function grid_createInternalData() {
                     return;
                   }
                   if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
-                    reactData.tableLoading = true;
-                    return Promise.resolve((beforeSave || ajaxMethods)(commitParams, ...args)).then(rest => {
-                      reactData.tableLoading = false;
-                      $xeTable.clearPendingRow();
-                      if (isRespMsg) {
-                        if (core_.VxeUI.modal) {
-                          core_.VxeUI.modal.message({
-                            content: getRespMsg(rest, 'vxe.grid.saveSuccess'),
+                    const handleSave = () => {
+                      reactData.tableLoading = true;
+                      return Promise.resolve((oldBeforeSave || sMethod)(commitParams, ...args)).then(rest => {
+                        reactData.tableLoading = false;
+                        if (aSaveMethod) {
+                          aSaveMethod({
+                            ...commitParams,
+                            response: rest,
                             status: 'success'
+                          }, ...args);
+                        } else {
+                          $xeTable.clearPendingRow();
+                          if (isRespMsg) {
+                            if (core_.VxeUI.modal) {
+                              core_.VxeUI.modal.message({
+                                content: getRespMsg(rest, 'vxe.grid.saveSuccess'),
+                                status: 'success'
+                              });
+                            }
+                          }
+                          if (oldAfterSave) {
+                            oldAfterSave({
+                              ...commitParams,
+                              response: rest
+                            }, ...args);
+                          } else {
+                            internalData.uFoot = true;
+                            $xeGrid.commitProxy('query');
+                            internalData.uFoot = false;
+                            updateQueryFooter();
+                          }
+                        }
+                        if (sSuccessMethod) {
+                          sSuccessMethod({
+                            ...commitParams,
+                            response: rest
                           });
                         }
-                      }
-                      if (afterSave) {
-                        afterSave(commitParams, ...args);
-                      } else {
-                        internalData.uFoot = true;
-                        $xeGrid.commitProxy('query');
-                        internalData.uFoot = false;
-                        updateQueryFooter();
-                      }
-                      if (saveSuccessMethods) {
-                        saveSuccessMethods({
-                          ...commitParams,
-                          response: rest
-                        });
-                      }
-                      return {
-                        status: true
-                      };
-                    }).catch(rest => {
-                      reactData.tableLoading = false;
-                      if (isRespMsg) {
-                        if (core_.VxeUI.modal) {
-                          core_.VxeUI.modal.message({
-                            id: code,
-                            content: getRespMsg(rest, 'vxe.grid.operError'),
+                        return {
+                          status: true
+                        };
+                      }).catch(rest => {
+                        reactData.tableLoading = false;
+                        if (aSaveMethod) {
+                          aSaveMethod({
+                            ...commitParams,
+                            response: rest,
                             status: 'error'
+                          }, ...args);
+                        } else {
+                          if (isRespMsg) {
+                            if (core_.VxeUI.modal) {
+                              core_.VxeUI.modal.message({
+                                id: code,
+                                content: getRespMsg(rest, 'vxe.grid.operError'),
+                                status: 'error'
+                              });
+                            }
+                          }
+                        }
+                        if (sErrorMethod) {
+                          sErrorMethod({
+                            ...commitParams,
+                            response: rest
                           });
                         }
-                      }
-                      if (saveErrorMethods) {
-                        saveErrorMethods({
-                          ...commitParams,
-                          response: rest
-                        });
-                      }
-                      return {
-                        status: false
-                      };
-                    });
+                        return {
+                          status: false
+                        };
+                      });
+                    };
+                    if (bSaveMethod) {
+                      return Promise.resolve(bSaveMethod(commitParams, ...args)).then(status => {
+                        if (status !== false) {
+                          return handleSave();
+                        }
+                      });
+                    }
+                    return handleSave();
                   } else {
                     if (isActiveMsg) {
                       if (core_.VxeUI.modal) {