vxe-table 3.22.9 → 3.22.10

package/lib/index.umd.js

@@ -3311,7 +3311,7 @@ function getClass(property, params) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.22.9";
+const version = "3.22.10";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4097,7 +4097,7 @@ function getPopupContainer(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.22.9"}`;
+const tableVersion = `table v${"3.22.10"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -12259,7 +12259,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
               class: 'vxe-table-custom-popup--column-td col--align'
             }, VxeUIRadioGroupComponent ? [h(VxeUIRadioGroupComponent, {
               props: {
-                value: column.renderAlign || '',
+                value: column.renderAlign || 'left',
                 type: 'button',
                 strict: false,
                 disabled: isHidden,
@@ -12281,7 +12281,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
               class: 'vxe-table-custom-popup--column-td col--header-align'
             }, isColGroup ? [h('span', '-')] : VxeUIRadioGroupComponent ? [h(VxeUIRadioGroupComponent, {
               props: {
-                value: column.renderHeaderAlign || '',
+                value: column.renderHeaderAlign || 'left',
                 type: 'button',
                 strict: false,
                 disabled: isHidden,
@@ -12303,7 +12303,7 @@ function panel_hideDropTip($xeTableCustomPanel) {
               class: 'vxe-table-custom-popup--column-td col--footer-align'
             }, isColGroup ? [h('span', '-')] : VxeUIRadioGroupComponent ? [h(VxeUIRadioGroupComponent, {
               props: {
-                value: column.renderFooterAlign || '',
+                value: column.renderFooterAlign || 'left',
                 type: 'button',
                 strict: false,
                 disabled: isHidden,
@@ -18400,18 +18400,20 @@ const convertToRows = originColumns => {
               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_mixin_errLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
             }
-            if (ajaxMethods) {
+            if (queryAllMethod) {
               const params = {
                 $table: $xeTable,
                 $grid: $xeGrid,
@@ -18422,44 +18424,72 @@ const convertToRows = originColumns => {
                 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($xeTable, handleOptions);
-              }).catch(rest => {
-                if (queryAllErrorMethods) {
-                  queryAllErrorMethods({
-                    ...params,
-                    response: rest
-                  });
-                }
-              });
+                  return handleExport($xeTable, 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();
             }
           }
         } else if (mode === 'current') {
@@ -24826,14 +24856,14 @@ function grid_createInternalData() {
       const pagerOpts = $xeGrid.computePagerOpts;
       const toolbarOpts = $xeGrid.computeToolbarOpts;
       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 || {};
@@ -24892,10 +24922,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) {
@@ -24981,82 +25013,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 {
-                  $xeGrid.$nextTick(() => {
-                    const $xeTable = $xeGrid.$refs.refTable;
                     if ($xeTable) {
                       $xeTable.loadData(tableData);
+                    } else {
+                      $xeGrid.$nextTick(() => {
+                        const $xeTable = $xeGrid.$refs.refTable;
+                        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']);
             }
@@ -25064,49 +25124,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(pagerConfig)) {
+                  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']);
             }
@@ -25114,10 +25213,12 @@ function grid_createInternalData() {
           }
         case 'delete':
           {
-            const dMethods = ajax.delete;
-            const deleteSuccessMethods = ajax.deleteSuccess;
-            const deleteErrorMethods = ajax.deleteError;
-            if (dMethods) {
+            const bdMethod = ajax.beforeDelete;
+            const dMethod = ajax.delete;
+            const adMethod = ajax.afterDelete;
+            const deleteSuccessMethod = ajax.deleteSuccess;
+            const deleteErrorMethod = ajax.deleteError;
+            if (dMethod) {
               const selectRecords = $xeTable.getCheckboxRecords();
               const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
               const body = {
@@ -25131,64 +25232,92 @@ function grid_createInternalData() {
                 button,
                 body,
                 form: formData,
-                options: dMethods
+                options: dMethod
               };
-              const applyArgs = [commitParams].concat(args);
               if (selectRecords.length) {
                 return $xeGrid.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                   if (!removeRecords.length) {
                     return $xeTable.remove(selectRecords);
                   }
-                  reactData.tableLoading = true;
-                  return Promise.resolve((beforeDelete || dMethods)(...applyArgs)).then(rest => {
-                    reactData.tableLoading = false;
-                    $xeTable.setPendingRow(removeRecords, false);
-                    if (isRespMsg) {
-                      if (core_.VxeUI.modal) {
-                        core_.VxeUI.modal.message({
-                          content: $xeGrid.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: $xeGrid.getRespMsg(rest, 'vxe.grid.delSuccess'),
+                              status: 'success'
+                            });
+                          }
+                        }
+                        if (oldAfterDelete) {
+                          oldAfterDelete({
+                            ...commitParams,
+                            response: rest
+                          }, ...args);
+                        } else {
+                          internalData.uFoot = true;
+                          $xeGrid.commitProxy('query');
+                          internalData.uFoot = false;
+                          $xeGrid.updateQueryFooter();
+                        }
+                      }
+                      if (deleteSuccessMethod) {
+                        deleteSuccessMethod({
+                          ...commitParams,
+                          response: rest
                         });
                       }
-                    }
-                    if (afterDelete) {
-                      afterDelete(...applyArgs);
-                    } else {
-                      internalData.uFoot = true;
-                      $xeGrid.commitProxy('query');
-                      internalData.uFoot = false;
-                      $xeGrid.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: $xeGrid.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: $xeGrid.getRespMsg(rest, 'vxe.grid.operError'),
+                              status: 'error'
+                            });
+                          }
+                        }
+                      }
+                      if (deleteErrorMethod) {
+                        deleteErrorMethod({
+                          ...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) {
@@ -25208,10 +25337,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 = $xeGrid.getRecordset();
               const {
                 insertRecords,
@@ -25227,9 +25358,8 @@ function grid_createInternalData() {
                 button,
                 body,
                 form: formData,
-                options: ajaxMethods
+                options: sMethod
               };
-              const applyArgs = [commitParams].concat(args);
               // 排除掉新增且标记为删除的数据
               if (insertRecords.length) {
                 body.pendingRecords = pendingRecords.filter(row => insertRecords.indexOf(row) === -1);
@@ -25249,56 +25379,79 @@ function grid_createInternalData() {
                   return;
                 }
                 if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
-                  reactData.tableLoading = true;
-                  return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs)).then(rest => {
-                    reactData.tableLoading = false;
-                    $xeTable.clearPendingRow();
-                    if (isRespMsg) {
-                      if (core_.VxeUI.modal) {
-                        core_.VxeUI.modal.message({
-                          content: $xeGrid.getRespMsg(rest, 'vxe.grid.saveSuccess'),
-                          status: 'success'
+                  const handleSave = () => {
+                    reactData.tableLoading = true;
+                    return Promise.resolve((oldBeforeSave || sMethod)(commitParams, ...args)).then(rest => {
+                      reactData.tableLoading = false;
+                      if (aSaveMethod) {
+                        $xeTable.clearPendingRow();
+                        if (isRespMsg) {
+                          if (core_.VxeUI.modal) {
+                            core_.VxeUI.modal.message({
+                              content: $xeGrid.getRespMsg(rest, 'vxe.grid.saveSuccess'),
+                              status: 'success'
+                            });
+                          }
+                        }
+                        if (oldAfterSave) {
+                          oldAfterSave({
+                            ...commitParams,
+                            response: rest
+                          }, ...args);
+                        } else {
+                          internalData.uFoot = true;
+                          $xeGrid.commitProxy('query');
+                          internalData.uFoot = false;
+                          $xeGrid.updateQueryFooter();
+                        }
+                      }
+                      if (sSuccessMethod) {
+                        sSuccessMethod({
+                          ...commitParams,
+                          response: rest
                         });
                       }
-                    }
-                    if (afterSave) {
-                      afterSave(...applyArgs);
-                    } else {
-                      internalData.uFoot = true;
-                      $xeGrid.commitProxy('query');
-                      internalData.uFoot = false;
-                      $xeGrid.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: $xeGrid.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: $xeGrid.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) {
@@ -27357,7 +27510,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,
@@ -27421,7 +27585,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,