vxe-gantt 3.6.4 → 3.6.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,10 +19,6 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
19
19
  function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
20
20
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
21
21
  function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
22
- function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
23
- function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
24
- function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
25
- function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
26
22
  function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
27
23
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
28
24
  function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -1160,9 +1156,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1160
1156
  return $xeGantt.$refs.refElem;
1161
1157
  },
1162
1158
  /**
1163
- * 提交指令,支持 code 或 button
1164
- * @param {String/Object} code 字符串或对象
1165
- */
1159
+ * 提交指令,支持 code 或 button
1160
+ * @param {String/Object} code 字符串或对象
1161
+ */
1166
1162
  commitProxy: function commitProxy(proxyTarget) {
1167
1163
  for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
1168
1164
  args[_key2 - 1] = arguments[_key2];
@@ -1188,14 +1184,14 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1188
1184
  var proxyOpts = $xeGantt.computeProxyOpts;
1189
1185
  var pagerOpts = $xeGantt.computePagerOpts;
1190
1186
  var toolbarOpts = $xeGantt.computeToolbarOpts;
1191
- var beforeQuery = proxyOpts.beforeQuery,
1192
- afterQuery = proxyOpts.afterQuery,
1193
- beforeQueryFooter = proxyOpts.beforeQueryFooter,
1194
- afterQueryFooter = proxyOpts.afterQueryFooter,
1195
- beforeDelete = proxyOpts.beforeDelete,
1196
- afterDelete = proxyOpts.afterDelete,
1197
- beforeSave = proxyOpts.beforeSave,
1198
- afterSave = proxyOpts.afterSave,
1187
+ var oldBeforeQuery = proxyOpts.beforeQuery,
1188
+ oldAfterQuery = proxyOpts.afterQuery,
1189
+ oldBeforeQueryFooter = proxyOpts.beforeQueryFooter,
1190
+ oldAfterQueryFooter = proxyOpts.afterQueryFooter,
1191
+ oldBeforeDelete = proxyOpts.beforeDelete,
1192
+ oldAfterDelete = proxyOpts.afterDelete,
1193
+ oldBeforeSave = proxyOpts.beforeSave,
1194
+ oldAfterSave = proxyOpts.afterSave,
1199
1195
  _proxyOpts$ajax = proxyOpts.ajax,
1200
1196
  ajax = _proxyOpts$ajax === void 0 ? {} : _proxyOpts$ajax;
1201
1197
  var resConfigs = proxyOpts.response || proxyOpts.props || {};
@@ -1258,10 +1254,12 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1258
1254
  case 'reload':
1259
1255
  case 'query':
1260
1256
  {
1261
- var qMethods = ajax.query;
1262
- var qsMethods = ajax.querySuccess;
1263
- var qeMethods = ajax.queryError;
1264
- if (qMethods) {
1257
+ var bqMethod = ajax.beforeQuery;
1258
+ var qMethod = ajax.query;
1259
+ var aqMethod = ajax.afterQuery;
1260
+ var qsMethod = ajax.querySuccess;
1261
+ var qeMethod = ajax.queryError;
1262
+ if (qMethod) {
1265
1263
  var isInited = code === 'initial';
1266
1264
  var isReload = code === 'reload';
1267
1265
  if (!isInited && reactData.tableLoading) {
@@ -1273,10 +1271,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1273
1271
  var pageParams = {};
1274
1272
  if (pagerConfig) {
1275
1273
  if (isInited || isReload) {
1276
- // 重置分页
1277
1274
  tablePage.currentPage = 1;
1278
1275
  }
1279
- if ((0, _utils.isEnableConf)(pagerOpts)) {
1276
+ if ((0, _utils.isEnableConf)(pagerConfig)) {
1280
1277
  pageParams = Object.assign({}, tablePage);
1281
1278
  }
1282
1279
  }
@@ -1342,82 +1339,107 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1342
1339
  sorts: sortList,
1343
1340
  filters: filterList,
1344
1341
  form: formData,
1345
- options: qMethods
1342
+ options: qMethod
1346
1343
  };
1347
- reactData.sortData = sortList;
1348
- reactData.filterData = filterList;
1349
- reactData.tableLoading = true;
1350
- return Promise.all([Promise.resolve((beforeQuery || qMethods).apply(void 0, [commitParams].concat(args))), operPromise]).then(function (_ref3) {
1351
- var _ref4 = _slicedToArray(_ref3, 1),
1352
- rest = _ref4[0];
1353
- var tableData = [];
1354
- reactData.tableLoading = false;
1355
- if (rest) {
1356
- var reParams = {
1357
- data: rest,
1358
- $table: $xeTable,
1359
- $grid: null,
1360
- $gantt: $xeGantt
1361
- };
1362
- if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
1363
- var totalProp = resConfigs.total;
1364
- var total = (_xeUtils.default.isFunction(totalProp) ? totalProp(reParams) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
1365
- tablePage.total = _xeUtils.default.toNumber(total);
1366
- var resultProp = resConfigs.result;
1367
- tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp(reParams) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
1368
- // 检验当前页码,不能超出当前最大页数
1369
- var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
1370
- if (tablePage.currentPage > pageCount) {
1371
- tablePage.currentPage = pageCount;
1372
- }
1344
+ var handleQuery = function handleQuery() {
1345
+ reactData.sortData = sortList;
1346
+ reactData.filterData = filterList;
1347
+ reactData.tableLoading = true;
1348
+ return Promise.all([Promise.resolve((oldBeforeQuery || qMethod).apply(void 0, [commitParams].concat(args))), operPromise]).then(function (_ref3) {
1349
+ var _ref4 = _slicedToArray(_ref3, 1),
1350
+ rest = _ref4[0];
1351
+ reactData.tableLoading = false;
1352
+ if (aqMethod) {
1353
+ aqMethod.apply(void 0, [Object.assign(Object.assign({}, commitParams), {
1354
+ response: rest,
1355
+ status: 'success'
1356
+ })].concat(args));
1373
1357
  } else {
1374
- var listProp = resConfigs.list;
1375
- if (_xeUtils.default.isArray(rest)) {
1376
- tableData = rest;
1377
- } else if (listProp) {
1378
- tableData = (_xeUtils.default.isFunction(listProp) ? listProp(reParams) : _xeUtils.default.get(rest, listProp)) || [];
1379
- }
1380
- }
1381
- if (showFooter) {
1382
- var fdProp = resConfigs.footerData;
1383
- var footerList = fdProp ? _xeUtils.default.isFunction(fdProp) ? fdProp(reParams) : _xeUtils.default.get(rest, fdProp) : [];
1384
- if (_xeUtils.default.isArray(footerList)) {
1385
- reactData.footerData = footerList;
1358
+ var tableData = [];
1359
+ if (rest) {
1360
+ var reParams = {
1361
+ data: rest,
1362
+ $grid: null,
1363
+ $table: $xeTable,
1364
+ $gantt: $xeGantt
1365
+ };
1366
+ if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
1367
+ var totalProp = resConfigs.total;
1368
+ var total = (_xeUtils.default.isFunction(totalProp) ? totalProp(reParams) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
1369
+ tablePage.total = _xeUtils.default.toNumber(total);
1370
+ var resultProp = resConfigs.result;
1371
+ tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp(reParams) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
1372
+ // 检验当前页码,不能超出当前最大页数
1373
+ var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
1374
+ if (tablePage.currentPage > pageCount) {
1375
+ tablePage.currentPage = pageCount;
1376
+ }
1377
+ } else {
1378
+ var listProp = resConfigs.list;
1379
+ if (_xeUtils.default.isArray(rest)) {
1380
+ tableData = rest;
1381
+ } else if (listProp) {
1382
+ tableData = (_xeUtils.default.isFunction(listProp) ? listProp(reParams) : _xeUtils.default.get(rest, listProp)) || [];
1383
+ }
1384
+ }
1385
+ if (showFooter) {
1386
+ var fdProp = resConfigs.footerData;
1387
+ var footerList = fdProp ? _xeUtils.default.isFunction(fdProp) ? fdProp(reParams) : _xeUtils.default.get(rest, fdProp) : [];
1388
+ if (_xeUtils.default.isArray(footerList)) {
1389
+ reactData.footerData = footerList;
1390
+ }
1391
+ }
1386
1392
  }
1387
- }
1388
- }
1389
- if ($xeTable) {
1390
- $xeTable.loadData(tableData);
1391
- } else {
1392
- $xeGantt.$nextTick(function () {
1393
- var $xeTable = $xeGantt.$refs.refTable;
1394
1393
  if ($xeTable) {
1395
1394
  $xeTable.loadData(tableData);
1395
+ } else {
1396
+ $xeGantt.$nextTick(function () {
1397
+ var $xeTable = $xeGantt.$refs.refTable;
1398
+ if ($xeTable) {
1399
+ $xeTable.loadData(tableData);
1400
+ }
1401
+ });
1396
1402
  }
1397
- });
1398
- }
1399
- if (afterQuery) {
1400
- afterQuery.apply(void 0, [commitParams].concat(args));
1401
- }
1402
- if (qsMethods) {
1403
- qsMethods(Object.assign(Object.assign({}, commitParams), {
1404
- response: rest
1405
- }));
1406
- }
1407
- return {
1408
- status: true
1409
- };
1410
- }).catch(function (rest) {
1411
- reactData.tableLoading = false;
1412
- if (qeMethods) {
1413
- qeMethods(Object.assign(Object.assign({}, commitParams), {
1414
- response: rest
1415
- }));
1416
- }
1417
- return {
1418
- status: false
1419
- };
1420
- });
1403
+ if (oldAfterQuery) {
1404
+ oldAfterQuery.apply(void 0, [Object.assign(Object.assign({}, commitParams), {
1405
+ response: rest
1406
+ })].concat(args));
1407
+ }
1408
+ }
1409
+ if (qsMethod) {
1410
+ qsMethod(Object.assign(Object.assign({}, commitParams), {
1411
+ response: rest
1412
+ }));
1413
+ }
1414
+ return {
1415
+ status: true
1416
+ };
1417
+ }).catch(function (rest) {
1418
+ reactData.tableLoading = false;
1419
+ if (aqMethod) {
1420
+ aqMethod.apply(void 0, [Object.assign(Object.assign({}, commitParams), {
1421
+ response: rest,
1422
+ status: 'error'
1423
+ })].concat(args));
1424
+ }
1425
+ if (qeMethod) {
1426
+ qeMethod(Object.assign(Object.assign({}, commitParams), {
1427
+ response: rest
1428
+ }));
1429
+ }
1430
+ return {
1431
+ status: false
1432
+ };
1433
+ });
1434
+ };
1435
+ if (bqMethod) {
1436
+ return Promise.resolve(bqMethod.apply(void 0, [commitParams].concat(args))).then(function (status) {
1437
+ if (status !== false) {
1438
+ return handleQuery();
1439
+ }
1440
+ });
1441
+ }
1442
+ return handleQuery();
1421
1443
  } else {
1422
1444
  errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
1423
1445
  }
@@ -1425,47 +1447,81 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1425
1447
  }
1426
1448
  case 'queryFooter':
1427
1449
  {
1428
- var qfMethods = ajax.queryFooter;
1429
- var qfSuccessMethods = ajax.queryFooterSuccess;
1430
- var qfErrorMethods = ajax.queryFooterError;
1431
- if (qfMethods) {
1450
+ var bqfMethod = ajax.beforeQueryFooter;
1451
+ var qfMethod = ajax.queryFooter;
1452
+ var aqfMethod = ajax.afterQueryFooter;
1453
+ var qfSuccessMethod = ajax.queryFooterSuccess;
1454
+ var qfErrorMethod = ajax.queryFooterError;
1455
+ if (qfMethod) {
1432
1456
  var _filterList = [];
1433
1457
  if ($xeTable) {
1434
1458
  _filterList = $xeTable.getCheckedFilters();
1435
1459
  }
1460
+ var _pageParams = {};
1461
+ if (pagerConfig) {
1462
+ if ((0, _utils.isEnableConf)(pagerConfig)) {
1463
+ _pageParams = Object.assign({}, tablePage);
1464
+ }
1465
+ }
1436
1466
  var _commitParams = {
1437
1467
  $table: $xeTable,
1438
1468
  $grid: null,
1439
1469
  $gantt: $xeGantt,
1440
1470
  code: code,
1441
1471
  button: button,
1472
+ page: _pageParams,
1442
1473
  filters: _filterList,
1443
1474
  form: formData,
1444
- options: qfMethods
1475
+ options: qfMethod
1445
1476
  };
1446
- return Promise.resolve((beforeQueryFooter || qfMethods).apply(void 0, [_commitParams].concat(args))).then(function (rest) {
1447
- reactData.footerData = _xeUtils.default.isArray(rest) ? rest : [];
1448
- if (afterQueryFooter) {
1449
- afterQueryFooter.apply(void 0, [_commitParams].concat(args));
1450
- }
1451
- if (qfSuccessMethods) {
1452
- qfSuccessMethods(Object.assign(Object.assign({}, _commitParams), {
1453
- response: rest
1454
- }));
1455
- }
1456
- return {
1457
- status: true
1458
- };
1459
- }).catch(function (rest) {
1460
- if (qfErrorMethods) {
1461
- qfErrorMethods(Object.assign(Object.assign({}, _commitParams), {
1462
- response: rest
1463
- }));
1464
- }
1465
- return {
1466
- status: false
1467
- };
1468
- });
1477
+ var handleQueryFooter = function handleQueryFooter() {
1478
+ return Promise.resolve((oldBeforeQueryFooter || qfMethod).apply(void 0, [_commitParams].concat(args))).then(function (rest) {
1479
+ if (aqfMethod) {
1480
+ aqfMethod.apply(void 0, [Object.assign(Object.assign({}, _commitParams), {
1481
+ response: rest,
1482
+ status: 'success'
1483
+ })].concat(args));
1484
+ } else {
1485
+ reactData.footerData = _xeUtils.default.isArray(rest) ? rest : [];
1486
+ if (oldAfterQueryFooter) {
1487
+ oldAfterQueryFooter.apply(void 0, [Object.assign(Object.assign({}, _commitParams), {
1488
+ response: rest
1489
+ })].concat(args));
1490
+ }
1491
+ }
1492
+ if (qfSuccessMethod) {
1493
+ qfSuccessMethod(Object.assign(Object.assign({}, _commitParams), {
1494
+ response: rest
1495
+ }));
1496
+ }
1497
+ return {
1498
+ status: true
1499
+ };
1500
+ }).catch(function (rest) {
1501
+ if (aqfMethod) {
1502
+ aqfMethod.apply(void 0, [Object.assign(Object.assign({}, _commitParams), {
1503
+ response: rest,
1504
+ status: 'error'
1505
+ })].concat(args));
1506
+ }
1507
+ if (qfErrorMethod) {
1508
+ qfErrorMethod(Object.assign(Object.assign({}, _commitParams), {
1509
+ response: rest
1510
+ }));
1511
+ }
1512
+ return {
1513
+ status: false
1514
+ };
1515
+ });
1516
+ };
1517
+ if (bqfMethod) {
1518
+ return Promise.resolve(bqfMethod.apply(void 0, [_commitParams].concat(args))).then(function (status) {
1519
+ if (status !== false) {
1520
+ return handleQueryFooter();
1521
+ }
1522
+ });
1523
+ }
1524
+ handleQueryFooter();
1469
1525
  } else {
1470
1526
  errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter']);
1471
1527
  }
@@ -1473,10 +1529,12 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1473
1529
  }
1474
1530
  case 'delete':
1475
1531
  {
1476
- var ajaxMethods = ajax.delete;
1477
- var deleteSuccessMethods = ajax.deleteSuccess;
1478
- var deleteErrorMethods = ajax.deleteError;
1479
- if (ajaxMethods) {
1532
+ var bdMethod = ajax.beforeDelete;
1533
+ var dMethod = ajax.delete;
1534
+ var adMethod = ajax.afterDelete;
1535
+ var deleteSuccessMethod = ajax.deleteSuccess;
1536
+ var deleteErrorMethod = ajax.deleteError;
1537
+ if (dMethod) {
1480
1538
  var selectRecords = $xeTable.getCheckboxRecords();
1481
1539
  var removeRecords = selectRecords.filter(function (row) {
1482
1540
  return !$xeTable.isInsertByRow(row);
@@ -1492,78 +1550,97 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1492
1550
  button: button,
1493
1551
  body: body,
1494
1552
  form: formData,
1495
- options: ajaxMethods
1553
+ options: dMethod
1496
1554
  };
1497
- var applyArgs = [_commitParams2].concat(args);
1498
1555
  if (selectRecords.length) {
1499
1556
  return $xeGantt.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
1500
1557
  if (!removeRecords.length) {
1501
1558
  return $xeTable.remove(selectRecords);
1502
1559
  }
1503
- reactData.tableLoading = true;
1504
- return Promise.resolve((beforeDelete || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
1505
- reactData.tableLoading = false;
1506
- $xeTable.setPendingRow(removeRecords, false);
1507
- if (isRespMsg) {
1508
- // 检测弹窗模块
1509
- if (!_core.VxeUI.modal) {
1510
- errLog('vxe.error.reqModule', ['Modal']);
1560
+ var handleDelete = function handleDelete() {
1561
+ reactData.tableLoading = true;
1562
+ return Promise.resolve((oldBeforeDelete || dMethod).apply(void 0, [_commitParams2].concat(args))).then(function (rest) {
1563
+ reactData.tableLoading = false;
1564
+ if (adMethod) {
1565
+ adMethod.apply(void 0, [Object.assign(Object.assign({}, _commitParams2), {
1566
+ response: rest,
1567
+ status: 'success'
1568
+ })].concat(args));
1569
+ } else {
1570
+ $xeTable.setPendingRow(removeRecords, false);
1571
+ if (isRespMsg) {
1572
+ if (_core.VxeUI.modal) {
1573
+ _core.VxeUI.modal.message({
1574
+ content: $xeGantt.getRespMsg(rest, 'vxe.grid.delSuccess'),
1575
+ status: 'success'
1576
+ });
1577
+ }
1578
+ }
1579
+ if (oldAfterDelete) {
1580
+ oldAfterDelete.apply(void 0, [Object.assign(Object.assign({}, _commitParams2), {
1581
+ response: rest
1582
+ })].concat(args));
1583
+ } else {
1584
+ internalData.uFoot = true;
1585
+ $xeGantt.commitProxy('query');
1586
+ internalData.uFoot = false;
1587
+ $xeGantt.updateQueryFooter();
1588
+ }
1511
1589
  }
1512
- _core.VxeUI.modal.message({
1513
- content: $xeGantt.getRespMsg(rest, 'vxe.grid.delSuccess'),
1514
- status: 'success'
1515
- });
1516
- }
1517
- if (afterDelete) {
1518
- afterDelete.apply(void 0, _toConsumableArray(applyArgs));
1519
- } else {
1520
- internalData.uFoot = true;
1521
- $xeGantt.commitProxy('query');
1522
- internalData.uFoot = false;
1523
- $xeGantt.updateQueryFooter();
1524
- }
1525
- if (deleteSuccessMethods) {
1526
- deleteSuccessMethods(Object.assign(Object.assign({}, _commitParams2), {
1527
- response: rest
1528
- }));
1529
- }
1530
- return {
1531
- status: true
1532
- };
1533
- }).catch(function (rest) {
1534
- reactData.tableLoading = false;
1535
- if (isRespMsg) {
1536
- // 检测弹窗模块
1537
- if (!_core.VxeUI.modal) {
1538
- errLog('vxe.error.reqModule', ['Modal']);
1590
+ if (deleteSuccessMethod) {
1591
+ deleteSuccessMethod(Object.assign(Object.assign({}, _commitParams2), {
1592
+ response: rest
1593
+ }));
1539
1594
  }
1540
- _core.VxeUI.modal.message({
1541
- id: code,
1542
- content: $xeGantt.getRespMsg(rest, 'vxe.grid.operError'),
1543
- status: 'error'
1544
- });
1545
- }
1546
- if (deleteErrorMethods) {
1547
- deleteErrorMethods(Object.assign(Object.assign({}, _commitParams2), {
1548
- response: rest
1549
- }));
1550
- }
1551
- return {
1552
- status: false
1553
- };
1554
- });
1595
+ return {
1596
+ status: true
1597
+ };
1598
+ }).catch(function (rest) {
1599
+ reactData.tableLoading = false;
1600
+ if (adMethod) {
1601
+ adMethod.apply(void 0, [Object.assign(Object.assign({}, _commitParams2), {
1602
+ response: rest,
1603
+ status: 'error'
1604
+ })].concat(args));
1605
+ } else {
1606
+ if (isRespMsg) {
1607
+ if (_core.VxeUI.modal) {
1608
+ _core.VxeUI.modal.message({
1609
+ id: code,
1610
+ content: $xeGantt.getRespMsg(rest, 'vxe.grid.operError'),
1611
+ status: 'error'
1612
+ });
1613
+ }
1614
+ }
1615
+ }
1616
+ if (deleteErrorMethod) {
1617
+ deleteErrorMethod(Object.assign(Object.assign({}, _commitParams2), {
1618
+ response: rest
1619
+ }));
1620
+ }
1621
+ return {
1622
+ status: false
1623
+ };
1624
+ });
1625
+ };
1626
+ if (bdMethod) {
1627
+ return Promise.resolve(bdMethod.apply(void 0, [_commitParams2].concat(args))).then(function (status) {
1628
+ if (status !== false) {
1629
+ return handleDelete();
1630
+ }
1631
+ });
1632
+ }
1633
+ return handleDelete();
1555
1634
  });
1556
1635
  } else {
1557
1636
  if (isActiveMsg) {
1558
- // 检测弹窗模块
1559
- if (!_core.VxeUI.modal) {
1560
- errLog('vxe.error.reqModule', ['Modal']);
1637
+ if (_core.VxeUI.modal) {
1638
+ _core.VxeUI.modal.message({
1639
+ id: code,
1640
+ content: getI18n('vxe.grid.selectOneRecord'),
1641
+ status: 'warning'
1642
+ });
1561
1643
  }
1562
- _core.VxeUI.modal.message({
1563
- id: code,
1564
- content: getI18n('vxe.grid.selectOneRecord'),
1565
- status: 'warning'
1566
- });
1567
1644
  }
1568
1645
  }
1569
1646
  } else {
@@ -1573,10 +1650,12 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1573
1650
  }
1574
1651
  case 'save':
1575
1652
  {
1576
- var _ajaxMethods = ajax.save;
1577
- var saveSuccessMethods = ajax.saveSuccess;
1578
- var saveErrorMethods = ajax.saveError;
1579
- if (_ajaxMethods) {
1653
+ var bSaveMethod = ajax.beforeSave;
1654
+ var sMethod = ajax.save;
1655
+ var aSaveMethod = ajax.afterSave;
1656
+ var sSuccessMethod = ajax.saveSuccess;
1657
+ var sErrorMethod = ajax.saveError;
1658
+ if (sMethod) {
1580
1659
  var _body = $xeGantt.getRecordset();
1581
1660
  var insertRecords = _body.insertRecords,
1582
1661
  _removeRecords = _body.removeRecords,
@@ -1590,9 +1669,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1590
1669
  button: button,
1591
1670
  body: _body,
1592
1671
  form: formData,
1593
- options: _ajaxMethods
1672
+ options: sMethod
1594
1673
  };
1595
- var _applyArgs = [_commitParams3].concat(args);
1596
1674
  // 排除掉新增且标记为删除的数据
1597
1675
  if (insertRecords.length) {
1598
1676
  _body.pendingRecords = pendingRecords.filter(function (row) {
@@ -1616,69 +1694,84 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1616
1694
  return;
1617
1695
  }
1618
1696
  if (_body.insertRecords.length || _removeRecords.length || updateRecords.length || _body.pendingRecords.length) {
1619
- reactData.tableLoading = true;
1620
- return Promise.resolve((beforeSave || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
1621
- reactData.tableLoading = false;
1622
- $xeTable.clearPendingRow();
1623
- if (isRespMsg) {
1624
- // 检测弹窗模块
1625
- if (!_core.VxeUI.modal) {
1626
- errLog('vxe.error.reqModule', ['Modal']);
1697
+ var handleSave = function handleSave() {
1698
+ reactData.tableLoading = true;
1699
+ return Promise.resolve((oldBeforeSave || sMethod).apply(void 0, [_commitParams3].concat(args))).then(function (rest) {
1700
+ reactData.tableLoading = false;
1701
+ if (aSaveMethod) {
1702
+ $xeTable.clearPendingRow();
1703
+ if (isRespMsg) {
1704
+ if (_core.VxeUI.modal) {
1705
+ _core.VxeUI.modal.message({
1706
+ content: $xeGantt.getRespMsg(rest, 'vxe.grid.saveSuccess'),
1707
+ status: 'success'
1708
+ });
1709
+ }
1710
+ }
1711
+ if (oldAfterSave) {
1712
+ oldAfterSave.apply(void 0, [Object.assign(Object.assign({}, _commitParams3), {
1713
+ response: rest
1714
+ })].concat(args));
1715
+ } else {
1716
+ internalData.uFoot = true;
1717
+ $xeGantt.commitProxy('query');
1718
+ internalData.uFoot = false;
1719
+ $xeGantt.updateQueryFooter();
1720
+ }
1627
1721
  }
1628
- _core.VxeUI.modal.message({
1629
- content: $xeGantt.getRespMsg(rest, 'vxe.grid.saveSuccess'),
1630
- status: 'success'
1631
- });
1632
- }
1633
- if (afterSave) {
1634
- afterSave.apply(void 0, _toConsumableArray(_applyArgs));
1635
- } else {
1636
- internalData.uFoot = true;
1637
- $xeGantt.commitProxy('query');
1638
- internalData.uFoot = false;
1639
- $xeGantt.updateQueryFooter();
1640
- }
1641
- if (saveSuccessMethods) {
1642
- saveSuccessMethods(Object.assign(Object.assign({}, _commitParams3), {
1643
- response: rest
1644
- }));
1645
- }
1646
- return {
1647
- status: true
1648
- };
1649
- }).catch(function (rest) {
1650
- reactData.tableLoading = false;
1651
- if (isRespMsg) {
1652
- // 检测弹窗模块
1653
- if (!_core.VxeUI.modal) {
1654
- errLog('vxe.error.reqModule', ['Modal']);
1722
+ if (sSuccessMethod) {
1723
+ sSuccessMethod(Object.assign(Object.assign({}, _commitParams3), {
1724
+ response: rest
1725
+ }));
1726
+ }
1727
+ return {
1728
+ status: true
1729
+ };
1730
+ }).catch(function (rest) {
1731
+ reactData.tableLoading = false;
1732
+ if (aSaveMethod) {
1733
+ aSaveMethod.apply(void 0, [Object.assign(Object.assign({}, _commitParams3), {
1734
+ response: rest,
1735
+ status: 'error'
1736
+ })].concat(args));
1737
+ } else {
1738
+ if (isRespMsg) {
1739
+ if (_core.VxeUI.modal) {
1740
+ _core.VxeUI.modal.message({
1741
+ id: code,
1742
+ content: $xeGantt.getRespMsg(rest, 'vxe.grid.operError'),
1743
+ status: 'error'
1744
+ });
1745
+ }
1746
+ }
1747
+ }
1748
+ if (sErrorMethod) {
1749
+ sErrorMethod(Object.assign(Object.assign({}, _commitParams3), {
1750
+ response: rest
1751
+ }));
1752
+ }
1753
+ return {
1754
+ status: false
1755
+ };
1756
+ });
1757
+ };
1758
+ if (bSaveMethod) {
1759
+ return Promise.resolve(bSaveMethod.apply(void 0, [_commitParams3].concat(args))).then(function (status) {
1760
+ if (status !== false) {
1761
+ return handleSave();
1655
1762
  }
1763
+ });
1764
+ }
1765
+ return handleSave();
1766
+ } else {
1767
+ if (isActiveMsg) {
1768
+ if (_core.VxeUI.modal) {
1656
1769
  _core.VxeUI.modal.message({
1657
1770
  id: code,
1658
- content: $xeGantt.getRespMsg(rest, 'vxe.grid.operError'),
1659
- status: 'error'
1771
+ content: getI18n('vxe.grid.dataUnchanged'),
1772
+ status: 'info'
1660
1773
  });
1661
1774
  }
1662
- if (saveErrorMethods) {
1663
- saveErrorMethods(Object.assign(Object.assign({}, _commitParams3), {
1664
- response: rest
1665
- }));
1666
- }
1667
- return {
1668
- status: false
1669
- };
1670
- });
1671
- } else {
1672
- if (isActiveMsg) {
1673
- // 检测弹窗模块
1674
- if (!_core.VxeUI.modal) {
1675
- errLog('vxe.error.reqModule', ['Modal']);
1676
- }
1677
- _core.VxeUI.modal.message({
1678
- id: code,
1679
- content: getI18n('vxe.grid.dataUnchanged'),
1680
- status: 'info'
1681
- });
1682
1775
  }
1683
1776
  }
1684
1777
  });
@@ -1879,6 +1972,20 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
1879
1972
  }
1880
1973
  return null;
1881
1974
  },
1975
+ getCustomPagerData: function getCustomPagerData() {
1976
+ var $xeGrid = this;
1977
+ var props = $xeGrid;
1978
+ var reactData = $xeGrid.reactData;
1979
+ var pagerConfig = props.pagerConfig;
1980
+ var tablePage = reactData.tablePage;
1981
+ var pagerOpts = $xeGrid.computePagerOpts;
1982
+ if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
1983
+ return {
1984
+ pSize: tablePage.pageSize
1985
+ };
1986
+ }
1987
+ return {};
1988
+ },
1882
1989
  refreshTaskView: function refreshTaskView() {
1883
1990
  var $xeGantt = this;
1884
1991
  var $ganttView = $xeGantt.$refs.refGanttView;