vxe-gantt 4.6.5 → 4.6.7

package/dist/all.esm.js

@@ -6,7 +6,7 @@ import DomZIndex from 'dom-zindex';
 import { VxeTable } from 'vxe-table';
 
 const { setConfig: setConfig$1, setIcon } = VxeUI;
-VxeUI.ganttVersion = "4.6.5";
+VxeUI.ganttVersion = "4.6.7";
 const ymdFormat = 'yyyy-MM-dd';
 const ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig$1({
@@ -115,7 +115,7 @@ setIcon({
 });
 
 const { log } = VxeUI;
-const ganttVersion = `gantt v${"4.6.5"}`;
+const ganttVersion = `gantt v${"4.6.7"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
@@ -451,7 +451,7 @@ var GanttViewHeaderComponent = defineVxeComponent({
     setup() {
         const $xeGantt = inject('$xeGantt', {});
         const $xeGanttView = inject('$xeGanttView', {});
-        const { computeTaskViewOpts } = $xeGantt.getComputeMaps();
+        const { computeTaskViewOpts, computeScaleStep, computeMinScale } = $xeGantt.getComputeMaps();
         const { reactData, internalData } = $xeGanttView;
         const refElem = ref();
         const refHeaderScroll = ref();
@@ -461,6 +461,8 @@ var GanttViewHeaderComponent = defineVxeComponent({
             const { headerGroups, viewCellWidth } = reactData;
             const { todayDateMaps, visibleColumn } = internalData;
             const taskViewOpts = computeTaskViewOpts.value;
+            const minScale = computeMinScale.value;
+            const scaleStep = computeScaleStep.value;
             const { showNowLine } = taskViewOpts;
             return h('div', {
                 ref: refElem,
@@ -495,17 +497,31 @@ var GanttViewHeaderComponent = defineVxeComponent({
                             return h('tr', {
                                 key: $rowIndex
                             }, columns.map((column, cIndex) => {
-                                const { field, childCount, dateObj } = column;
+                                const { field, childCount, dateObj, startDateObj, endDateObj } = column;
                                 let label = `${column.title}`;
-                                if (scaleItem.type === 'day') {
-                                    label = getI18n$1(`vxe.gantt.dayss.w${dateObj.e}`);
+                                if ((isLast || (minScale && (minScale.type === 'date' || minScale.type === 'day') && (type === 'date' || type === 'day'))) && scaleStep > 1) {
+                                    label = getI18n$1(`vxe.gantt.stepFormat.${type}`, {
+                                        start: startDateObj,
+                                        end: endDateObj,
+                                        eStartLabel: getI18n$1(`vxe.gantt.dayss.w${startDateObj.e}`),
+                                        eEndLabel: getI18n$1(`vxe.gantt.dayss.w${endDateObj.e}`)
+                                    });
                                 }
                                 else {
-                                    if ($rowIndex) {
-                                        label = getI18n$1(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
+                                    if (type === 'day') {
+                                        if ($rowIndex) {
+                                            label = getI18n$1(`vxe.gantt.tSimpleFormat.${type}`, {
+                                                eLabel: getI18n$1(`vxe.gantt.dayss.w${dateObj.e}`)
+                                            });
+                                        }
+                                        else {
+                                            label = getI18n$1(`vxe.gantt.tFullFormat.${type}`, {
+                                                eLabel: getI18n$1(`vxe.gantt.dayss.w${dateObj.e}`)
+                                            });
+                                        }
                                     }
                                     else {
-                                        if (isLast && scaleItem.type === 'week') {
+                                        if ($rowIndex) {
                                             label = getI18n$1(`vxe.gantt.tSimpleFormat.${type}`, dateObj);
                                         }
                                         else {
@@ -514,7 +530,17 @@ var GanttViewHeaderComponent = defineVxeComponent({
                                     }
                                 }
                                 let cellVNs = label;
-                                const ctParams = { source: sourceType$4, type: viewType$3, column, scaleObj: scaleItem, title: label, dateObj: dateObj, $rowIndex };
+                                const ctParams = {
+                                    source: sourceType$4,
+                                    type: viewType$3,
+                                    column,
+                                    scaleObj: scaleItem,
+                                    title: label,
+                                    dateObj,
+                                    startDateObj,
+                                    endDateObj,
+                                    $rowIndex
+                                };
                                 if (titleSlot) {
                                     cellVNs = $xeGantt.callSlot(titleSlot, ctParams);
                                 }
@@ -1022,7 +1048,7 @@ var GanttViewBodyComponent = defineVxeComponent({
             const { showNowLine, viewStyle } = taskViewOpts;
             const scaleUnit = computeScaleUnit.value;
             const { scaleItem } = headerGroups[headerGroups.length - 1] || {};
-            const { field, dateObj } = column;
+            const { field, dateObj, startDateObj, endDateObj } = column;
             const { cellClassName, cellStyle } = viewStyle || {};
             const todayValue = showNowLine && scaleItem ? todayDateMaps[scaleItem.type] : null;
             const rowRest = fullAllDataRowIdData[rowid] || {};
@@ -1066,6 +1092,8 @@ var GanttViewBodyComponent = defineVxeComponent({
                 type: viewType$1,
                 scaleType: scaleUnit,
                 dateObj,
+                startDateObj,
+                endDateObj,
                 row,
                 column,
                 $rowIndex,
@@ -1393,7 +1421,7 @@ var GanttViewComponent = defineVxeComponent({
             let rightSize = ganttReactData.currRightSpacing + XEUtils.toNumber(gridding ? gridding.rightSpacing || 0 : 0);
             if (scaleStep > 0) {
                 leftSize *= scaleStep;
-                rightSize *= rightSize;
+                rightSize *= scaleStep;
             }
             switch (type) {
                 case 'year': {
@@ -1561,6 +1589,8 @@ var GanttViewComponent = defineVxeComponent({
             const minScale = computeMinScale.value;
             const weekScale = computeWeekScale.value;
             const scaleDateList = computeScaleDateList.value;
+            const scaleStep = computeScaleStep.value;
+            const weekStartDay = weekScale ? weekScale.startDay : undefined;
             const fullCols = [];
             const groupCols = [];
             if (minScale && scaleUnit && scaleDateList.length) {
@@ -1606,65 +1636,88 @@ var GanttViewComponent = defineVxeComponent({
                         currGpCol.children.push(minCol);
                     }
                 };
-                for (let i = 0; i < scaleDateList.length; i++) {
-                    const itemDate = scaleDateList[i];
-                    let [yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss] = XEUtils.toDateString(itemDate, 'yy-yyyy-M-MM-d-dd-H-HH-m-mm-s-ss').split('-');
-                    const e = itemDate.getDay();
+                const createDateObj = (date) => {
+                    let [yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss] = XEUtils.toDateString(date, 'yy-yyyy-M-MM-d-dd-H-HH-m-mm-s-ss').split('-');
+                    const e = date.getDay();
                     const E = e + 1;
-                    const q = Math.ceil((itemDate.getMonth() + 1) / 3);
-                    const W = `${XEUtils.getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined)}`;
+                    const q = Math.ceil((date.getMonth() + 1) / 3);
+                    const W = `${XEUtils.getYearWeek(date, weekScale ? weekScale.startDay : undefined)}`;
                     const WW = XEUtils.padStart(W, 2, '0');
                     if (isMinWeek && checkWeekOfsetYear(W, M)) {
                         yyyy = `${Number(yyyy) + 1}`;
                         M = '1';
                         MM = '0' + M;
                     }
-                    const dateObj = { date: itemDate, yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss, q, W, WW, E, e };
+                    return { date, yy, yyyy, M, MM, d, dd, H, HH, m, mm, s, ss, q, W, WW, E, e };
+                };
+                for (let i = 0; i < scaleDateList.length; i++) {
+                    const itemDate = scaleDateList[i];
+                    const dateObj = createDateObj(itemDate);
+                    const { yyyy, MM, dd, HH, mm, ss, q, W, E } = dateObj;
+                    const startDateObj = dateObj;
                     const colMaps = {
                         year: {
                             field: yyyy,
                             title: yyyy,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatYear(itemDate, scaleStep - 1)) : startDateObj
                         },
                         quarter: {
                             field: `${yyyy}_q${q}`,
                             title: `${q}`,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatQuarter(itemDate, scaleStep - 1)) : startDateObj
                         },
                         month: {
                             field: `${yyyy}_${MM}`,
                             title: MM,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatMonth(itemDate, scaleStep - 1)) : startDateObj
                         },
                         week: {
                             field: `${yyyy}_W${W}`,
                             title: `${W}`,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatWeek(itemDate, scaleStep - 1, weekStartDay, weekStartDay)) : startDateObj
                         },
                         day: {
                             field: `${yyyy}_${MM}_${dd}_E${E}`,
                             title: `${E}`,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatDay(itemDate, scaleStep - 1)) : startDateObj
                         },
                         date: {
                             field: `${yyyy}_${MM}_${dd}`,
                             title: dd,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatDay(itemDate, scaleStep - 1)) : startDateObj
                         },
                         hour: {
                             field: `${yyyy}_${MM}_${dd}_${HH}`,
                             title: HH,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatHours(itemDate, scaleStep - 1)) : startDateObj
                         },
                         minute: {
                             field: `${yyyy}_${MM}_${dd}_${HH}_${mm}`,
                             title: mm,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatMinutes(itemDate, scaleStep - 1)) : startDateObj
                         },
                         second: {
                             field: `${yyyy}_${MM}_${dd}_${HH}_${mm}_${ss}`,
                             title: ss,
-                            dateObj
+                            dateObj,
+                            startDateObj,
+                            endDateObj: scaleStep > 1 ? createDateObj(XEUtils.getWhatSeconds(itemDate, scaleStep - 1)) : startDateObj
                         }
                     };
                     const minCol = colMaps[minScale.type];
@@ -4221,7 +4274,7 @@ var VxeGanttComponent = defineVxeComponent({
                 const proxyOpts = computeProxyOpts.value;
                 const pagerOpts = computePagerOpts.value;
                 const toolbarOpts = computeToolbarOpts.value;
-                const { beforeQuery, afterQuery, beforeQueryFooter, afterQueryFooter, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts;
+                const { beforeQuery: oldBeforeQuery, afterQuery: oldAfterQuery, beforeQueryFooter: oldBeforeQueryFooter, afterQueryFooter: oldAfterQueryFooter, beforeDelete: oldBeforeDelete, afterDelete: oldAfterDelete, beforeSave: oldBeforeSave, afterSave: oldAfterSave, ajax = {} } = proxyOpts;
                 const resConfigs = (proxyOpts.response || proxyOpts.props || {});
                 const $xeTable = refTable.value;
                 if (!$xeTable) {
@@ -4272,10 +4325,12 @@ var VxeGanttComponent = defineVxeComponent({
                     case 'initial':
                     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) {
@@ -4357,73 +4412,91 @@ var VxeGanttComponent = defineVxeComponent({
                                 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: null, $gantt: $xeGantt };
-                                    if (pagerConfig && isEnableConf(pagerOpts)) {
-                                        const totalProp = resConfigs.total;
-                                        const total = (XEUtils.isFunction(totalProp) ? totalProp(reParams) : XEUtils.get(rest, totalProp || 'page.total')) || 0;
-                                        tablePage.total = XEUtils.toNumber(total);
-                                        const resultProp = resConfigs.result;
-                                        tableData = (XEUtils.isFunction(resultProp) ? resultProp(reParams) : XEUtils.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(Object.assign(Object.assign({}, commitParams), { response: rest, status: 'success' }), ...args);
                                     }
                                     else {
-                                        const listProp = resConfigs.list;
-                                        if (XEUtils.isArray(rest)) {
-                                            tableData = rest;
-                                        }
-                                        else if (listProp) {
-                                            tableData = (XEUtils.isFunction(listProp) ? listProp(reParams) : XEUtils.get(rest, listProp)) || [];
-                                        }
-                                    }
-                                    if (showFooter) {
-                                        const fdProp = resConfigs.footerData;
-                                        const footerList = fdProp ? (XEUtils.isFunction(fdProp) ? fdProp(reParams) : XEUtils.get(rest, fdProp)) : [];
-                                        if (XEUtils.isArray(footerList)) {
-                                            reactData.footerData = footerList;
+                                        let tableData = [];
+                                        if (rest) {
+                                            const reParams = { data: rest, $table: $xeTable, $grid: null, $gantt: $xeGantt };
+                                            if (pagerConfig && isEnableConf(pagerOpts)) {
+                                                const totalProp = resConfigs.total;
+                                                const total = (XEUtils.isFunction(totalProp) ? totalProp(reParams) : XEUtils.get(rest, totalProp || 'page.total')) || 0;
+                                                tablePage.total = XEUtils.toNumber(total);
+                                                const resultProp = resConfigs.result;
+                                                tableData = (XEUtils.isFunction(resultProp) ? resultProp(reParams) : XEUtils.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 (XEUtils.isArray(rest)) {
+                                                    tableData = rest;
+                                                }
+                                                else if (listProp) {
+                                                    tableData = (XEUtils.isFunction(listProp) ? listProp(reParams) : XEUtils.get(rest, listProp)) || [];
+                                                }
+                                            }
+                                            if (showFooter) {
+                                                const fdProp = resConfigs.footerData;
+                                                const footerList = fdProp ? (XEUtils.isFunction(fdProp) ? fdProp(reParams) : XEUtils.get(rest, fdProp)) : [];
+                                                if (XEUtils.isArray(footerList)) {
+                                                    reactData.footerData = footerList;
+                                                }
+                                            }
                                         }
-                                    }
-                                }
-                                if ($xeTable) {
-                                    $xeTable.loadData(tableData);
-                                }
-                                else {
-                                    nextTick(() => {
-                                        const $xeTable = refTable.value;
                                         if ($xeTable) {
                                             $xeTable.loadData(tableData);
                                         }
-                                    });
-                                }
-                                if (afterQuery) {
-                                    afterQuery(commitParams, ...args);
-                                }
-                                if (qsMethods) {
-                                    qsMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
-                                }
-                                return { status: true };
-                            }).catch((rest) => {
-                                reactData.tableLoading = false;
-                                if (qeMethods) {
-                                    qeMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
-                                }
-                                return { status: false };
-                            });
+                                        else {
+                                            nextTick(() => {
+                                                const $xeTable = refTable.value;
+                                                if ($xeTable) {
+                                                    $xeTable.loadData(tableData);
+                                                }
+                                            });
+                                        }
+                                        if (oldAfterQuery) {
+                                            oldAfterQuery(Object.assign(Object.assign({}, commitParams), { response: rest }), ...args);
+                                        }
+                                    }
+                                    if (qsMethod) {
+                                        qsMethod(Object.assign(Object.assign({}, commitParams), { response: rest }));
+                                    }
+                                    return { status: true };
+                                }).catch((rest) => {
+                                    reactData.tableLoading = false;
+                                    if (aqMethod) {
+                                        aqMethod(Object.assign(Object.assign({}, commitParams), { response: rest, status: 'error' }), ...args);
+                                    }
+                                    if (qeMethod) {
+                                        qeMethod(Object.assign(Object.assign({}, commitParams), { response: rest }));
+                                    }
+                                    return { status: false };
+                                });
+                            };
+                            if (bqMethod) {
+                                return Promise.resolve(bqMethod(commitParams, ...args)).then(status => {
+                                    if (status !== false) {
+                                        return handleQuery();
+                                    }
+                                });
+                            }
+                            return handleQuery();
                         }
                         else {
                             errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
@@ -4431,39 +4504,66 @@ var VxeGanttComponent = defineVxeComponent({
                         break;
                     }
                     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 = Object.assign({}, tablePage);
+                                }
+                            }
                             const commitParams = {
                                 $table: $xeTable,
                                 $grid: null,
                                 $gantt: $xeGantt,
                                 code,
                                 button,
+                                page: pageParams,
                                 filters: filterList,
                                 form: formData,
-                                options: qfMethods
+                                options: qfMethod
                             };
-                            return Promise.resolve((beforeQueryFooter || qfMethods)(commitParams, ...args)).then(rest => {
-                                reactData.footerData = XEUtils.isArray(rest) ? rest : [];
-                                if (afterQueryFooter) {
-                                    afterQueryFooter(commitParams, ...args);
-                                }
-                                if (qfSuccessMethods) {
-                                    qfSuccessMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
-                                }
-                                return { status: true };
-                            }).catch((rest) => {
-                                if (qfErrorMethods) {
-                                    qfErrorMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
-                                }
-                                return { status: false };
-                            });
+                            const handleQueryFooter = () => {
+                                return Promise.resolve((oldBeforeQueryFooter || qfMethod)(commitParams, ...args)).then(rest => {
+                                    if (aqfMethod) {
+                                        aqfMethod(Object.assign(Object.assign({}, commitParams), { response: rest, status: 'success' }), ...args);
+                                    }
+                                    else {
+                                        reactData.footerData = XEUtils.isArray(rest) ? rest : [];
+                                        if (oldAfterQueryFooter) {
+                                            oldAfterQueryFooter(Object.assign(Object.assign({}, commitParams), { response: rest }), ...args);
+                                        }
+                                    }
+                                    if (qfSuccessMethod) {
+                                        qfSuccessMethod(Object.assign(Object.assign({}, commitParams), { response: rest }));
+                                    }
+                                    return { status: true };
+                                }).catch((rest) => {
+                                    if (aqfMethod) {
+                                        aqfMethod(Object.assign(Object.assign({}, commitParams), { response: rest, status: 'error' }), ...args);
+                                    }
+                                    if (qfErrorMethod) {
+                                        qfErrorMethod(Object.assign(Object.assign({}, commitParams), { response: rest }));
+                                    }
+                                    return { status: false };
+                                });
+                            };
+                            if (bqfMethod) {
+                                return Promise.resolve(bqfMethod(commitParams, ...args)).then(status => {
+                                    if (status !== false) {
+                                        return handleQueryFooter();
+                                    }
+                                });
+                            }
+                            return handleQueryFooter();
                         }
                         else {
                             errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter']);
@@ -4471,10 +4571,12 @@ var VxeGanttComponent = defineVxeComponent({
                         break;
                     }
                     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 = $xeGantt.getCheckboxRecords();
                             const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
                             const body = { removeRecords };
@@ -4486,49 +4588,69 @@ var VxeGanttComponent = defineVxeComponent({
                                 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 (VxeUI.modal) {
-                                                VxeUI.modal.message({ content: getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' });
+                                    const handleDelete = () => {
+                                        reactData.tableLoading = true;
+                                        return Promise.resolve((oldBeforeDelete || dMethod)(commitParams, ...args))
+                                            .then(rest => {
+                                            reactData.tableLoading = false;
+                                            if (adMethod) {
+                                                adMethod(Object.assign(Object.assign({}, commitParams), { response: rest, status: 'success' }), ...args);
                                             }
-                                        }
-                                        if (afterDelete) {
-                                            afterDelete(commitParams, ...args);
-                                        }
-                                        else {
-                                            internalData.uFoot = true;
-                                            $xeGantt.commitProxy('query');
-                                            internalData.uFoot = false;
-                                            updateQueryFooter();
-                                        }
-                                        if (deleteSuccessMethods) {
-                                            deleteSuccessMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
-                                        }
-                                        return { status: true };
-                                    })
-                                        .catch(rest => {
-                                        reactData.tableLoading = false;
-                                        if (isRespMsg) {
-                                            if (VxeUI.modal) {
-                                                VxeUI.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
+                                            else {
+                                                $xeTable.setPendingRow(removeRecords, false);
+                                                if (isRespMsg) {
+                                                    if (VxeUI.modal) {
+                                                        VxeUI.modal.message({ content: getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' });
+                                                    }
+                                                }
+                                                if (oldAfterDelete) {
+                                                    oldAfterDelete(Object.assign(Object.assign({}, commitParams), { response: rest }), ...args);
+                                                }
+                                                else {
+                                                    internalData.uFoot = true;
+                                                    $xeGantt.commitProxy('query');
+                                                    internalData.uFoot = false;
+                                                    updateQueryFooter();
+                                                }
                                             }
-                                        }
-                                        if (deleteErrorMethods) {
-                                            deleteErrorMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
-                                        }
-                                        return { status: false };
-                                    });
+                                            if (deleteSuccessMethods) {
+                                                deleteSuccessMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
+                                            }
+                                            return { status: true };
+                                        })
+                                            .catch(rest => {
+                                            reactData.tableLoading = false;
+                                            if (adMethod) {
+                                                adMethod(Object.assign(Object.assign({}, commitParams), { response: rest, status: 'error' }), ...args);
+                                            }
+                                            else {
+                                                if (isRespMsg) {
+                                                    if (VxeUI.modal) {
+                                                        VxeUI.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
+                                                    }
+                                                }
+                                            }
+                                            if (deleteErrorMethods) {
+                                                deleteErrorMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
+                                            }
+                                            return { status: false };
+                                        });
+                                    };
+                                    if (bdMethod) {
+                                        return Promise.resolve(bdMethod(commitParams, ...args)).then(status => {
+                                            if (status !== false) {
+                                                return handleDelete();
+                                            }
+                                        });
+                                    }
+                                    return handleDelete();
                                 });
                             }
                             else {
@@ -4545,10 +4667,12 @@ var VxeGanttComponent = defineVxeComponent({
                         break;
                     }
                     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, removeRecords, updateRecords, pendingRecords } = body;
                             const commitParams = {
@@ -4559,7 +4683,7 @@ var VxeGanttComponent = defineVxeComponent({
                                 button,
                                 body,
                                 form: formData,
-                                options: ajaxMethods
+                                options: sMethod
                             };
                             // 排除掉新增且标记为删除的数据
                             if (insertRecords.length) {
@@ -4580,42 +4704,62 @@ var VxeGanttComponent = defineVxeComponent({
                                     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 (VxeUI.modal) {
-                                                VxeUI.modal.message({ content: 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) {
+                                                aSaveMethod(Object.assign(Object.assign({}, commitParams), { response: rest, status: 'success' }), ...args);
                                             }
-                                        }
-                                        if (afterSave) {
-                                            afterSave(commitParams, ...args);
-                                        }
-                                        else {
-                                            internalData.uFoot = true;
-                                            $xeGantt.commitProxy('query');
-                                            internalData.uFoot = false;
-                                            updateQueryFooter();
-                                        }
-                                        if (saveSuccessMethods) {
-                                            saveSuccessMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
-                                        }
-                                        return { status: true };
-                                    })
-                                        .catch(rest => {
-                                        reactData.tableLoading = false;
-                                        if (isRespMsg) {
-                                            if (VxeUI.modal) {
-                                                VxeUI.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
+                                            else {
+                                                $xeTable.clearPendingRow();
+                                                if (isRespMsg) {
+                                                    if (VxeUI.modal) {
+                                                        VxeUI.modal.message({ content: getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' });
+                                                    }
+                                                }
+                                                if (oldAfterSave) {
+                                                    oldAfterSave(Object.assign(Object.assign({}, commitParams), { response: rest }), ...args);
+                                                }
+                                                else {
+                                                    internalData.uFoot = true;
+                                                    $xeGantt.commitProxy('query');
+                                                    internalData.uFoot = false;
+                                                    updateQueryFooter();
+                                                }
                                             }
-                                        }
-                                        if (saveErrorMethods) {
-                                            saveErrorMethods(Object.assign(Object.assign({}, commitParams), { response: rest }));
-                                        }
-                                        return { status: false };
-                                    });
+                                            if (sSuccessMethod) {
+                                                sSuccessMethod(Object.assign(Object.assign({}, commitParams), { response: rest }));
+                                            }
+                                            return { status: true };
+                                        })
+                                            .catch(rest => {
+                                            reactData.tableLoading = false;
+                                            if (aSaveMethod) {
+                                                aSaveMethod(Object.assign(Object.assign({}, commitParams), { response: rest, status: 'error' }), ...args);
+                                            }
+                                            else {
+                                                if (isRespMsg) {
+                                                    if (VxeUI.modal) {
+                                                        VxeUI.modal.message({ id: code, content: getRespMsg(rest, 'vxe.grid.operError'), status: 'error' });
+                                                    }
+                                                }
+                                            }
+                                            if (sErrorMethod) {
+                                                sErrorMethod(Object.assign(Object.assign({}, commitParams), { response: rest }));
+                                            }
+                                            return { status: false };
+                                        });
+                                    };
+                                    if (bSaveMethod) {
+                                        return Promise.resolve(bSaveMethod(commitParams, ...args)).then(status => {
+                                            if (status !== false) {
+                                                return handleSave();
+                                            }
+                                        });
+                                    }
+                                    return handleSave();
                                 }
                                 else {
                                     if (isActiveMsg) {