vxe-gantt 3.0.23 → 3.0.25
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.
- package/es/gantt/src/gantt-body.js +31 -10
- package/es/gantt/src/gantt-view.js +97 -2
- package/es/gantt/src/gantt.js +152 -35
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/es/ui/src/utils.js +3 -0
- package/lib/gantt/src/gantt-body.js +30 -5
- package/lib/gantt/src/gantt-body.min.js +1 -1
- package/lib/gantt/src/gantt-view.js +96 -2
- package/lib/gantt/src/gantt-view.min.js +1 -1
- package/lib/gantt/src/gantt.js +195 -75
- package/lib/gantt/src/gantt.min.js +1 -1
- package/lib/index.umd.js +383 -142
- package/lib/index.umd.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/lib/ui/src/utils.js +4 -0
- package/lib/ui/src/utils.min.js +1 -1
- package/package.json +3 -3
- package/packages/gantt/src/gantt-body.ts +39 -17
- package/packages/gantt/src/gantt-view.ts +99 -2
- package/packages/gantt/src/gantt.ts +181 -65
- package/packages/ui/src/utils.ts +4 -0
package/lib/index.umd.js
CHANGED
|
@@ -8182,7 +8182,7 @@ var core_ = __webpack_require__(4345);
|
|
|
8182
8182
|
;// ./packages/ui/src/log.ts
|
|
8183
8183
|
|
|
8184
8184
|
var log = core_.VxeUI.log;
|
|
8185
|
-
var version = "gantt v".concat("3.0.
|
|
8185
|
+
var version = "gantt v".concat("3.0.25");
|
|
8186
8186
|
var warnLog = log.create('warn', version);
|
|
8187
8187
|
var errLog = log.create('error', version);
|
|
8188
8188
|
;// ./packages/ui/index.ts
|
|
@@ -8192,7 +8192,7 @@ var errLog = log.create('error', version);
|
|
|
8192
8192
|
var setConfig = core_.VxeUI.setConfig,
|
|
8193
8193
|
setIcon = core_.VxeUI.setIcon,
|
|
8194
8194
|
checkVersion = core_.VxeUI.checkVersion;
|
|
8195
|
-
core_.VxeUI.ganttVersion = "3.0.
|
|
8195
|
+
core_.VxeUI.ganttVersion = "3.0.25";
|
|
8196
8196
|
setConfig({
|
|
8197
8197
|
gantt: {
|
|
8198
8198
|
// size: null,
|
|
@@ -8413,10 +8413,67 @@ function _toConsumableArray(r) {
|
|
|
8413
8413
|
return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
|
|
8414
8414
|
}
|
|
8415
8415
|
|
|
8416
|
-
|
|
8417
|
-
|
|
8416
|
+
;// ./node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js
|
|
8417
|
+
function _arrayWithHoles(r) {
|
|
8418
|
+
if (Array.isArray(r)) return r;
|
|
8419
|
+
}
|
|
8420
|
+
|
|
8418
8421
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
|
|
8419
8422
|
var es_array_push = __webpack_require__(4114);
|
|
8423
|
+
;// ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js
|
|
8424
|
+
|
|
8425
|
+
|
|
8426
|
+
|
|
8427
|
+
|
|
8428
|
+
|
|
8429
|
+
|
|
8430
|
+
|
|
8431
|
+
|
|
8432
|
+
function _iterableToArrayLimit(r, l) {
|
|
8433
|
+
var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
|
|
8434
|
+
if (null != t) {
|
|
8435
|
+
var e,
|
|
8436
|
+
n,
|
|
8437
|
+
i,
|
|
8438
|
+
u,
|
|
8439
|
+
a = [],
|
|
8440
|
+
f = !0,
|
|
8441
|
+
o = !1;
|
|
8442
|
+
try {
|
|
8443
|
+
if (i = (t = t.call(r)).next, 0 === l) {
|
|
8444
|
+
if (Object(t) !== t) return;
|
|
8445
|
+
f = !1;
|
|
8446
|
+
} else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
|
|
8447
|
+
} catch (r) {
|
|
8448
|
+
o = !0, n = r;
|
|
8449
|
+
} finally {
|
|
8450
|
+
try {
|
|
8451
|
+
if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return;
|
|
8452
|
+
} finally {
|
|
8453
|
+
if (o) throw n;
|
|
8454
|
+
}
|
|
8455
|
+
}
|
|
8456
|
+
return a;
|
|
8457
|
+
}
|
|
8458
|
+
}
|
|
8459
|
+
|
|
8460
|
+
;// ./node_modules/@babel/runtime/helpers/esm/nonIterableRest.js
|
|
8461
|
+
|
|
8462
|
+
function _nonIterableRest() {
|
|
8463
|
+
throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
8464
|
+
}
|
|
8465
|
+
|
|
8466
|
+
;// ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js
|
|
8467
|
+
|
|
8468
|
+
|
|
8469
|
+
|
|
8470
|
+
|
|
8471
|
+
function _slicedToArray(r, e) {
|
|
8472
|
+
return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
|
|
8473
|
+
}
|
|
8474
|
+
|
|
8475
|
+
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
|
|
8476
|
+
var es_array_filter = __webpack_require__(2008);
|
|
8420
8477
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.constructor.js
|
|
8421
8478
|
var es_iterator_constructor = __webpack_require__(8111);
|
|
8422
8479
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
|
|
@@ -8687,6 +8744,9 @@ function eqEmptyValue(cellValue) {
|
|
|
8687
8744
|
function getStringValue(cellValue) {
|
|
8688
8745
|
return eqEmptyValue(cellValue) ? '' : cellValue;
|
|
8689
8746
|
}
|
|
8747
|
+
function getClass(property, params) {
|
|
8748
|
+
return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(property) ? property(params) : property : '';
|
|
8749
|
+
}
|
|
8690
8750
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.constructor.js
|
|
8691
8751
|
var es_regexp_constructor = __webpack_require__(4864);
|
|
8692
8752
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.dot-all.js
|
|
@@ -8906,63 +8966,6 @@ function getSlotVNs(vns) {
|
|
|
8906
8966
|
}
|
|
8907
8967
|
return [vns];
|
|
8908
8968
|
}
|
|
8909
|
-
;// ./node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js
|
|
8910
|
-
function _arrayWithHoles(r) {
|
|
8911
|
-
if (Array.isArray(r)) return r;
|
|
8912
|
-
}
|
|
8913
|
-
|
|
8914
|
-
;// ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js
|
|
8915
|
-
|
|
8916
|
-
|
|
8917
|
-
|
|
8918
|
-
|
|
8919
|
-
|
|
8920
|
-
|
|
8921
|
-
|
|
8922
|
-
|
|
8923
|
-
function _iterableToArrayLimit(r, l) {
|
|
8924
|
-
var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
|
|
8925
|
-
if (null != t) {
|
|
8926
|
-
var e,
|
|
8927
|
-
n,
|
|
8928
|
-
i,
|
|
8929
|
-
u,
|
|
8930
|
-
a = [],
|
|
8931
|
-
f = !0,
|
|
8932
|
-
o = !1;
|
|
8933
|
-
try {
|
|
8934
|
-
if (i = (t = t.call(r)).next, 0 === l) {
|
|
8935
|
-
if (Object(t) !== t) return;
|
|
8936
|
-
f = !1;
|
|
8937
|
-
} else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
|
|
8938
|
-
} catch (r) {
|
|
8939
|
-
o = !0, n = r;
|
|
8940
|
-
} finally {
|
|
8941
|
-
try {
|
|
8942
|
-
if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return;
|
|
8943
|
-
} finally {
|
|
8944
|
-
if (o) throw n;
|
|
8945
|
-
}
|
|
8946
|
-
}
|
|
8947
|
-
return a;
|
|
8948
|
-
}
|
|
8949
|
-
}
|
|
8950
|
-
|
|
8951
|
-
;// ./node_modules/@babel/runtime/helpers/esm/nonIterableRest.js
|
|
8952
|
-
|
|
8953
|
-
function _nonIterableRest() {
|
|
8954
|
-
throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
|
|
8955
|
-
}
|
|
8956
|
-
|
|
8957
|
-
;// ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js
|
|
8958
|
-
|
|
8959
|
-
|
|
8960
|
-
|
|
8961
|
-
|
|
8962
|
-
function _slicedToArray(r, e) {
|
|
8963
|
-
return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
|
|
8964
|
-
}
|
|
8965
|
-
|
|
8966
8969
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find.js
|
|
8967
8970
|
var es_array_find = __webpack_require__(113);
|
|
8968
8971
|
// EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.find.js
|
|
@@ -9355,6 +9358,9 @@ var gantt_chart_viewType = 'chart';
|
|
|
9355
9358
|
|
|
9356
9359
|
|
|
9357
9360
|
|
|
9361
|
+
|
|
9362
|
+
|
|
9363
|
+
|
|
9358
9364
|
var gantt_body_sourceType = 'gantt';
|
|
9359
9365
|
var gantt_body_viewType = 'body';
|
|
9360
9366
|
/* harmony default export */ var gantt_body = (defineVxeComponent({
|
|
@@ -9391,10 +9397,15 @@ var gantt_body_viewType = 'body';
|
|
|
9391
9397
|
var headerGroups = reactData.headerGroups;
|
|
9392
9398
|
var todayDateMaps = internalData.todayDateMaps;
|
|
9393
9399
|
var taskViewOpts = $xeGantt.computeTaskViewOpts;
|
|
9394
|
-
var showNowLine = taskViewOpts.showNowLine
|
|
9400
|
+
var showNowLine = taskViewOpts.showNowLine,
|
|
9401
|
+
viewStyle = taskViewOpts.viewStyle;
|
|
9395
9402
|
var _ref = headerGroups[headerGroups.length - 1] || {},
|
|
9396
9403
|
scaleItem = _ref.scaleItem;
|
|
9397
|
-
var field = column.field
|
|
9404
|
+
var field = column.field,
|
|
9405
|
+
dateObj = column.dateObj;
|
|
9406
|
+
var _ref2 = viewStyle || {},
|
|
9407
|
+
cellClassName = _ref2.cellClassName,
|
|
9408
|
+
cellStyle = _ref2.cellStyle;
|
|
9398
9409
|
var todayValue = showNowLine && scaleItem ? todayDateMaps[scaleItem.type] : null;
|
|
9399
9410
|
var rowRest = fullAllDataRowIdData[rowid] || {};
|
|
9400
9411
|
var resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
|
|
@@ -9442,6 +9453,7 @@ var gantt_body_viewType = 'body';
|
|
|
9442
9453
|
var ctParams = {
|
|
9443
9454
|
source: gantt_body_sourceType,
|
|
9444
9455
|
type: gantt_body_viewType,
|
|
9456
|
+
dateObj: dateObj,
|
|
9445
9457
|
row: row,
|
|
9446
9458
|
column: column,
|
|
9447
9459
|
$rowIndex: $rowIndex,
|
|
@@ -9453,8 +9465,10 @@ var gantt_body_viewType = 'body';
|
|
|
9453
9465
|
class: ['vxe-gantt-view--body-column', {
|
|
9454
9466
|
'is--now': showNowLine && todayValue === field,
|
|
9455
9467
|
'col--rs-height': isRsHeight
|
|
9456
|
-
}],
|
|
9457
|
-
style: {
|
|
9468
|
+
}, getClass(cellClassName, ctParams)],
|
|
9469
|
+
style: cellStyle ? Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(ctParams) : cellStyle, {
|
|
9470
|
+
height: "".concat(cellHeight, "px")
|
|
9471
|
+
}) : {
|
|
9458
9472
|
height: "".concat(cellHeight, "px")
|
|
9459
9473
|
},
|
|
9460
9474
|
on: {
|
|
@@ -9479,6 +9493,7 @@ var gantt_body_viewType = 'body';
|
|
|
9479
9493
|
renderRows: function renderRows(h, $xeTable, tableData) {
|
|
9480
9494
|
var _vm = this;
|
|
9481
9495
|
var $xeGanttView = _vm.$xeGanttView;
|
|
9496
|
+
var $xeGantt = _vm.$xeGantt;
|
|
9482
9497
|
var reactData = $xeGanttView.reactData;
|
|
9483
9498
|
var tableProps = $xeTable;
|
|
9484
9499
|
var treeConfig = tableProps.treeConfig,
|
|
@@ -9500,6 +9515,11 @@ var gantt_body_viewType = 'body';
|
|
|
9500
9515
|
var treeOpts = $xeTable.computeTreeOpts;
|
|
9501
9516
|
var transform = treeOpts.transform;
|
|
9502
9517
|
var childrenField = treeOpts.children || treeOpts.childrenField;
|
|
9518
|
+
var taskViewOpts = $xeGantt.computeTaskViewOpts;
|
|
9519
|
+
var viewStyle = taskViewOpts.viewStyle;
|
|
9520
|
+
var _ref3 = viewStyle || {},
|
|
9521
|
+
rowClassName = _ref3.rowClassName,
|
|
9522
|
+
rowStyle = _ref3.rowStyle;
|
|
9503
9523
|
var tableColumn = reactData.tableColumn,
|
|
9504
9524
|
scrollYLoad = reactData.scrollYLoad;
|
|
9505
9525
|
var trVNs = [];
|
|
@@ -9536,6 +9556,14 @@ var gantt_body_viewType = 'body';
|
|
|
9536
9556
|
trOns.dragend = $xeTable.handleRowDragDragendEvent;
|
|
9537
9557
|
trOns.dragover = $xeTable.handleRowDragDragoverEvent;
|
|
9538
9558
|
}
|
|
9559
|
+
var rowParams = {
|
|
9560
|
+
source: gantt_body_sourceType,
|
|
9561
|
+
type: gantt_body_viewType,
|
|
9562
|
+
row: row,
|
|
9563
|
+
rowIndex: rowIndex,
|
|
9564
|
+
$rowIndex: $rowIndex,
|
|
9565
|
+
_rowIndex: _rowIndex
|
|
9566
|
+
};
|
|
9539
9567
|
trVNs.push(h('tr', {
|
|
9540
9568
|
key: treeConfig ? rowid : $rowIndex,
|
|
9541
9569
|
class: ['vxe-gantt-view--body-row', {
|
|
@@ -9544,7 +9572,8 @@ var gantt_body_viewType = 'body';
|
|
|
9544
9572
|
'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
|
|
9545
9573
|
'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
|
|
9546
9574
|
'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
|
|
9547
|
-
}],
|
|
9575
|
+
}, getClass(rowClassName, rowParams)],
|
|
9576
|
+
style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(rowParams) : rowStyle : undefined,
|
|
9548
9577
|
attrs: {
|
|
9549
9578
|
rowid: rowid
|
|
9550
9579
|
},
|
|
@@ -9725,6 +9754,7 @@ var gantt_footer_viewType = 'footer';
|
|
|
9725
9754
|
|
|
9726
9755
|
|
|
9727
9756
|
var globalEvents = core_.VxeUI.globalEvents;
|
|
9757
|
+
var gantt_view_sourceType = 'gantt';
|
|
9728
9758
|
function createInternalData() {
|
|
9729
9759
|
return {
|
|
9730
9760
|
xeTable: null,
|
|
@@ -10530,10 +10560,103 @@ function checkLastSyncScroll($xeGanttView, isRollX, isRollY) {
|
|
|
10530
10560
|
reactData.lazScrollLoading = false;
|
|
10531
10561
|
}, 200);
|
|
10532
10562
|
}
|
|
10533
|
-
|
|
10534
|
-
|
|
10563
|
+
function handleScrollData($xeGanttView, isRollY, isRollX, scrollTop, scrollLeft) {
|
|
10564
|
+
var reactData = $xeGanttView.reactData;
|
|
10565
|
+
var internalData = $xeGanttView.internalData;
|
|
10566
|
+
if (isRollX) {
|
|
10567
|
+
internalData.lastScrollLeft = scrollLeft;
|
|
10568
|
+
}
|
|
10569
|
+
if (isRollY) {
|
|
10570
|
+
internalData.lastScrollTop = scrollTop;
|
|
10571
|
+
}
|
|
10572
|
+
reactData.lastScrollTime = Date.now();
|
|
10535
10573
|
checkLastSyncScroll($xeGanttView, isRollX, isRollY);
|
|
10536
10574
|
}
|
|
10575
|
+
function handleScrollEvent($xeGanttView, evnt, isRollY, isRollX, scrollTop, scrollLeft) {
|
|
10576
|
+
var $xeGantt = $xeGanttView.$xeGantt;
|
|
10577
|
+
var internalData = $xeGanttView.internalData;
|
|
10578
|
+
var $xeTable = internalData.xeTable;
|
|
10579
|
+
var lastScrollLeft = internalData.lastScrollLeft,
|
|
10580
|
+
lastScrollTop = internalData.lastScrollTop;
|
|
10581
|
+
var xHandleEl = $xeGanttView.$refs.refScrollXHandleElem;
|
|
10582
|
+
var yHandleEl = $xeGanttView.$refs.refScrollYHandleElem;
|
|
10583
|
+
if (!xHandleEl || !yHandleEl) {
|
|
10584
|
+
return;
|
|
10585
|
+
}
|
|
10586
|
+
if (!$xeTable) {
|
|
10587
|
+
return;
|
|
10588
|
+
}
|
|
10589
|
+
var bodyHeight = yHandleEl.clientHeight;
|
|
10590
|
+
var bodyWidth = xHandleEl.clientWidth;
|
|
10591
|
+
var scrollHeight = yHandleEl.scrollHeight;
|
|
10592
|
+
var scrollWidth = xHandleEl.scrollWidth;
|
|
10593
|
+
var isTop = false;
|
|
10594
|
+
var isBottom = false;
|
|
10595
|
+
var isLeft = false;
|
|
10596
|
+
var isRight = false;
|
|
10597
|
+
var direction = '';
|
|
10598
|
+
var isTopBoundary = false;
|
|
10599
|
+
var isBottomBoundary = false;
|
|
10600
|
+
var isLeftBoundary = false;
|
|
10601
|
+
var isRightBoundary = false;
|
|
10602
|
+
if (isRollX) {
|
|
10603
|
+
var xThreshold = $xeTable.computeScrollXThreshold;
|
|
10604
|
+
isLeft = scrollLeft <= 0;
|
|
10605
|
+
if (!isLeft) {
|
|
10606
|
+
isRight = scrollLeft + bodyWidth >= scrollWidth - 1;
|
|
10607
|
+
}
|
|
10608
|
+
if (scrollLeft > lastScrollLeft) {
|
|
10609
|
+
direction = 'right';
|
|
10610
|
+
if (scrollLeft + bodyWidth >= scrollWidth - xThreshold) {
|
|
10611
|
+
isRightBoundary = true;
|
|
10612
|
+
}
|
|
10613
|
+
} else {
|
|
10614
|
+
direction = 'left';
|
|
10615
|
+
if (scrollLeft <= xThreshold) {
|
|
10616
|
+
isLeftBoundary = true;
|
|
10617
|
+
}
|
|
10618
|
+
}
|
|
10619
|
+
}
|
|
10620
|
+
if (isRollY) {
|
|
10621
|
+
var yThreshold = $xeTable.computeScrollYThreshold;
|
|
10622
|
+
isTop = scrollTop <= 0;
|
|
10623
|
+
if (!isTop) {
|
|
10624
|
+
isBottom = scrollTop + bodyHeight >= scrollHeight - 1;
|
|
10625
|
+
}
|
|
10626
|
+
if (scrollTop > lastScrollTop) {
|
|
10627
|
+
direction = 'bottom';
|
|
10628
|
+
if (scrollTop + bodyHeight >= scrollHeight - yThreshold) {
|
|
10629
|
+
isBottomBoundary = true;
|
|
10630
|
+
}
|
|
10631
|
+
} else {
|
|
10632
|
+
direction = 'top';
|
|
10633
|
+
if (scrollTop <= yThreshold) {
|
|
10634
|
+
isTopBoundary = true;
|
|
10635
|
+
}
|
|
10636
|
+
}
|
|
10637
|
+
}
|
|
10638
|
+
handleScrollData($xeGanttView, isRollY, isRollX, scrollTop, scrollLeft);
|
|
10639
|
+
var evntParams = {
|
|
10640
|
+
source: gantt_view_sourceType,
|
|
10641
|
+
scrollTop: scrollTop,
|
|
10642
|
+
scrollLeft: scrollLeft,
|
|
10643
|
+
bodyHeight: bodyHeight,
|
|
10644
|
+
bodyWidth: bodyWidth,
|
|
10645
|
+
scrollHeight: scrollHeight,
|
|
10646
|
+
scrollWidth: scrollWidth,
|
|
10647
|
+
isX: isRollX,
|
|
10648
|
+
isY: isRollY,
|
|
10649
|
+
isTop: isTop,
|
|
10650
|
+
isBottom: isBottom,
|
|
10651
|
+
isLeft: isLeft,
|
|
10652
|
+
isRight: isRight,
|
|
10653
|
+
direction: direction
|
|
10654
|
+
};
|
|
10655
|
+
if (isBottomBoundary || isTopBoundary || isRightBoundary || isLeftBoundary) {
|
|
10656
|
+
$xeGantt.dispatchEvent('scroll-boundary', evntParams, evnt);
|
|
10657
|
+
}
|
|
10658
|
+
$xeGantt.dispatchEvent('scroll', evntParams, evnt);
|
|
10659
|
+
}
|
|
10537
10660
|
/**
|
|
10538
10661
|
* 同步表格滚动
|
|
10539
10662
|
*/
|
|
@@ -10977,6 +11100,8 @@ var external_root_VxeUITable_commonjs_vxe_table_commonjs2_vxe_table_amd_vxe_tabl
|
|
|
10977
11100
|
|
|
10978
11101
|
|
|
10979
11102
|
|
|
11103
|
+
|
|
11104
|
+
|
|
10980
11105
|
|
|
10981
11106
|
|
|
10982
11107
|
|
|
@@ -11043,6 +11168,7 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
|
|
|
11043
11168
|
});
|
|
11044
11169
|
function gantt_createInternalData() {
|
|
11045
11170
|
return {
|
|
11171
|
+
uFoot: false,
|
|
11046
11172
|
resizeTableWidth: 0
|
|
11047
11173
|
};
|
|
11048
11174
|
}
|
|
@@ -11090,6 +11216,7 @@ function gantt_createInternalData() {
|
|
|
11090
11216
|
filterData: [],
|
|
11091
11217
|
formData: {},
|
|
11092
11218
|
sortData: [],
|
|
11219
|
+
footerData: [],
|
|
11093
11220
|
tZindex: 0,
|
|
11094
11221
|
tablePage: {
|
|
11095
11222
|
total: 0,
|
|
@@ -11256,7 +11383,9 @@ function gantt_createInternalData() {
|
|
|
11256
11383
|
var rest = {};
|
|
11257
11384
|
var gridProps = props;
|
|
11258
11385
|
propKeys.forEach(function (key) {
|
|
11259
|
-
|
|
11386
|
+
if (gridProps[key] !== undefined) {
|
|
11387
|
+
rest[key] = gridProps[key];
|
|
11388
|
+
}
|
|
11260
11389
|
});
|
|
11261
11390
|
return rest;
|
|
11262
11391
|
},
|
|
@@ -11264,12 +11393,14 @@ function gantt_createInternalData() {
|
|
|
11264
11393
|
var $xeGantt = this;
|
|
11265
11394
|
var props = $xeGantt;
|
|
11266
11395
|
var reactData = $xeGantt.reactData;
|
|
11267
|
-
var
|
|
11396
|
+
var showFooter = props.showFooter,
|
|
11397
|
+
seqConfig = props.seqConfig,
|
|
11268
11398
|
pagerConfig = props.pagerConfig,
|
|
11269
11399
|
editConfig = props.editConfig,
|
|
11270
11400
|
proxyConfig = props.proxyConfig;
|
|
11271
11401
|
var isZMax = reactData.isZMax,
|
|
11272
|
-
tablePage = reactData.tablePage
|
|
11402
|
+
tablePage = reactData.tablePage,
|
|
11403
|
+
footerData = reactData.footerData;
|
|
11273
11404
|
var taskViewOpts = $xeGantt.computeTaskViewOpts;
|
|
11274
11405
|
var tableStyle = taskViewOpts.tableStyle;
|
|
11275
11406
|
var tableExtendProps = $xeGantt.computeTableExtendProps;
|
|
@@ -11288,8 +11419,15 @@ function gantt_createInternalData() {
|
|
|
11288
11419
|
tProps.border = border;
|
|
11289
11420
|
}
|
|
11290
11421
|
}
|
|
11422
|
+
if (showFooter && !tProps.footerData) {
|
|
11423
|
+
// 如果未设置自己的标位数据,则使用代理的
|
|
11424
|
+
tProps.footerData = footerData;
|
|
11425
|
+
} else if (proxyOpts.footer && footerData.length) {
|
|
11426
|
+
// 如果代理标为数据,且未请求到数据,则用自己的
|
|
11427
|
+
tProps.footerData = footerData;
|
|
11428
|
+
}
|
|
11291
11429
|
if (isZMax) {
|
|
11292
|
-
if (
|
|
11430
|
+
if (tProps.maxHeight) {
|
|
11293
11431
|
tProps.maxHeight = '100%';
|
|
11294
11432
|
} else {
|
|
11295
11433
|
tProps.height = '100%';
|
|
@@ -11642,6 +11780,7 @@ function gantt_createInternalData() {
|
|
|
11642
11780
|
var $xeGantt = this;
|
|
11643
11781
|
var props = $xeGantt;
|
|
11644
11782
|
var reactData = $xeGantt.reactData;
|
|
11783
|
+
var internalData = $xeGantt.internalData;
|
|
11645
11784
|
var $xeTable = $xeGantt.$refs.refTable;
|
|
11646
11785
|
var proxyConfig = props.proxyConfig;
|
|
11647
11786
|
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
@@ -11651,9 +11790,12 @@ function gantt_createInternalData() {
|
|
|
11651
11790
|
reactData.filterData = params.filterList;
|
|
11652
11791
|
if (proxyConfig && isEnableConf(proxyOpts)) {
|
|
11653
11792
|
reactData.tablePage.currentPage = 1;
|
|
11793
|
+
internalData.uFoot = true;
|
|
11654
11794
|
$xeGantt.commitProxy('query').then(function (rest) {
|
|
11655
11795
|
$xeGantt.dispatchEvent('proxy-query', rest, params.$event);
|
|
11656
11796
|
});
|
|
11797
|
+
internalData.uFoot = false;
|
|
11798
|
+
$xeGantt.updateQueryFooter();
|
|
11657
11799
|
}
|
|
11658
11800
|
}
|
|
11659
11801
|
},
|
|
@@ -11671,34 +11813,42 @@ function gantt_createInternalData() {
|
|
|
11671
11813
|
var $xeGantt = this;
|
|
11672
11814
|
var props = $xeGantt;
|
|
11673
11815
|
var reactData = $xeGantt.reactData;
|
|
11816
|
+
var internalData = $xeGantt.internalData;
|
|
11674
11817
|
var proxyConfig = props.proxyConfig;
|
|
11675
11818
|
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
11676
11819
|
if (reactData.tableLoading) {
|
|
11677
11820
|
return;
|
|
11678
11821
|
}
|
|
11679
11822
|
if (proxyConfig && isEnableConf(proxyOpts)) {
|
|
11823
|
+
internalData.uFoot = true;
|
|
11680
11824
|
$xeGantt.commitProxy('reload').then(function (rest) {
|
|
11681
11825
|
$xeGantt.dispatchEvent('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
|
|
11682
11826
|
isReload: true
|
|
11683
11827
|
}), params.$event);
|
|
11684
11828
|
});
|
|
11829
|
+
internalData.uFoot = false;
|
|
11830
|
+
$xeGantt.updateQueryFooter();
|
|
11685
11831
|
}
|
|
11686
11832
|
$xeGantt.dispatchEvent('form-submit', params, params.$event);
|
|
11687
11833
|
},
|
|
11688
11834
|
resetFormEvent: function resetFormEvent(params) {
|
|
11689
11835
|
var $xeGantt = this;
|
|
11690
11836
|
var props = $xeGantt;
|
|
11837
|
+
var internalData = $xeGantt.internalData;
|
|
11691
11838
|
var $xeTable = $xeGantt.$refs.refTable;
|
|
11692
11839
|
var proxyConfig = props.proxyConfig;
|
|
11693
11840
|
var $event = params.$event;
|
|
11694
11841
|
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
11695
11842
|
if (proxyConfig && isEnableConf(proxyOpts)) {
|
|
11696
11843
|
$xeTable.clearScroll();
|
|
11844
|
+
internalData.uFoot = true;
|
|
11697
11845
|
$xeGantt.commitProxy('reload').then(function (rest) {
|
|
11698
11846
|
$xeGantt.dispatchEvent('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
|
|
11699
11847
|
isReload: true
|
|
11700
11848
|
}), $event);
|
|
11701
11849
|
});
|
|
11850
|
+
internalData.uFoot = false;
|
|
11851
|
+
$xeGantt.updateQueryFooter();
|
|
11702
11852
|
}
|
|
11703
11853
|
$xeGantt.dispatchEvent('form-reset', params, $event);
|
|
11704
11854
|
},
|
|
@@ -11846,6 +11996,7 @@ function gantt_createInternalData() {
|
|
|
11846
11996
|
var $xeGantt = this;
|
|
11847
11997
|
var props = $xeGantt;
|
|
11848
11998
|
var reactData = $xeGantt.reactData;
|
|
11999
|
+
var internalData = $xeGantt.internalData;
|
|
11849
12000
|
var proxyConfig = props.proxyConfig,
|
|
11850
12001
|
formConfig = props.formConfig;
|
|
11851
12002
|
var proxyInited = reactData.proxyInited;
|
|
@@ -11855,18 +12006,32 @@ function gantt_createInternalData() {
|
|
|
11855
12006
|
if (isEnableConf(formConfig) && proxyOpts.form && formOpts.items) {
|
|
11856
12007
|
reactData.formData = $xeGantt.getDefaultFormData();
|
|
11857
12008
|
}
|
|
11858
|
-
if (!proxyInited
|
|
12009
|
+
if (!proxyInited) {
|
|
11859
12010
|
reactData.proxyInited = true;
|
|
11860
|
-
|
|
11861
|
-
|
|
11862
|
-
|
|
11863
|
-
|
|
11864
|
-
|
|
11865
|
-
|
|
11866
|
-
|
|
12011
|
+
if (proxyOpts.autoLoad !== false) {
|
|
12012
|
+
$xeGantt.$nextTick().then(function () {
|
|
12013
|
+
internalData.uFoot = true;
|
|
12014
|
+
var rest = $xeGantt.commitProxy('initial');
|
|
12015
|
+
internalData.uFoot = false;
|
|
12016
|
+
$xeGantt.updateQueryFooter();
|
|
12017
|
+
return rest;
|
|
12018
|
+
}).then(function (rest) {
|
|
12019
|
+
$xeGantt.dispatchEvent('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
|
|
12020
|
+
isInited: true
|
|
12021
|
+
}), new Event('initial'));
|
|
12022
|
+
});
|
|
12023
|
+
}
|
|
11867
12024
|
}
|
|
11868
12025
|
}
|
|
11869
12026
|
},
|
|
12027
|
+
updateQueryFooter: function updateQueryFooter() {
|
|
12028
|
+
var $xeGantt = this;
|
|
12029
|
+
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
12030
|
+
var ajax = proxyOpts.ajax;
|
|
12031
|
+
if (ajax && ajax.queryFooter) {
|
|
12032
|
+
return $xeGantt.commitProxy('queryFooter');
|
|
12033
|
+
}
|
|
12034
|
+
},
|
|
11870
12035
|
handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
|
|
11871
12036
|
var $xeGantt = this;
|
|
11872
12037
|
var reactData = $xeGantt.reactData;
|
|
@@ -11885,15 +12050,20 @@ function gantt_createInternalData() {
|
|
|
11885
12050
|
* @param {String/Object} code 字符串或对象
|
|
11886
12051
|
*/
|
|
11887
12052
|
commitProxy: function commitProxy(proxyTarget) {
|
|
12053
|
+
for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
|
|
12054
|
+
args[_key2 - 1] = arguments[_key2];
|
|
12055
|
+
}
|
|
11888
12056
|
var $xeGantt = this;
|
|
11889
12057
|
var props = $xeGantt;
|
|
11890
12058
|
var reactData = $xeGantt.reactData;
|
|
12059
|
+
var internalData = $xeGantt.internalData;
|
|
11891
12060
|
/**
|
|
11892
12061
|
* 已废弃
|
|
11893
12062
|
* @deprecated
|
|
11894
12063
|
*/
|
|
11895
12064
|
var toolbar = props.toolbar;
|
|
11896
|
-
var
|
|
12065
|
+
var showFooter = props.showFooter,
|
|
12066
|
+
proxyConfig = props.proxyConfig,
|
|
11897
12067
|
toolbarConfig = props.toolbarConfig,
|
|
11898
12068
|
pagerConfig = props.pagerConfig,
|
|
11899
12069
|
editRules = props.editRules,
|
|
@@ -11906,6 +12076,8 @@ function gantt_createInternalData() {
|
|
|
11906
12076
|
var toolbarOpts = $xeGantt.computeToolbarOpts;
|
|
11907
12077
|
var beforeQuery = proxyOpts.beforeQuery,
|
|
11908
12078
|
afterQuery = proxyOpts.afterQuery,
|
|
12079
|
+
beforeQueryFooter = proxyOpts.beforeQueryFooter,
|
|
12080
|
+
afterQueryFooter = proxyOpts.afterQueryFooter,
|
|
11909
12081
|
beforeDelete = proxyOpts.beforeDelete,
|
|
11910
12082
|
afterDelete = proxyOpts.afterDelete,
|
|
11911
12083
|
beforeSave = proxyOpts.beforeSave,
|
|
@@ -11931,9 +12103,6 @@ function gantt_createInternalData() {
|
|
|
11931
12103
|
code = button.code;
|
|
11932
12104
|
}
|
|
11933
12105
|
var btnParams = button ? button.params : null;
|
|
11934
|
-
for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
|
|
11935
|
-
args[_key2 - 1] = arguments[_key2];
|
|
11936
|
-
}
|
|
11937
12106
|
switch (code) {
|
|
11938
12107
|
case 'insert':
|
|
11939
12108
|
return $xeTable.insert({});
|
|
@@ -11975,23 +12144,25 @@ function gantt_createInternalData() {
|
|
|
11975
12144
|
case 'reload':
|
|
11976
12145
|
case 'query':
|
|
11977
12146
|
{
|
|
11978
|
-
var
|
|
11979
|
-
var
|
|
11980
|
-
var
|
|
11981
|
-
if (
|
|
12147
|
+
var qMethods = ajax.query;
|
|
12148
|
+
var qsMethods = ajax.querySuccess;
|
|
12149
|
+
var qeMethods = ajax.queryError;
|
|
12150
|
+
if (qMethods) {
|
|
11982
12151
|
var isInited = code === 'initial';
|
|
11983
12152
|
var isReload = code === 'reload';
|
|
11984
12153
|
if (!isInited && reactData.tableLoading) {
|
|
11985
12154
|
return $xeGantt.$nextTick();
|
|
11986
12155
|
}
|
|
12156
|
+
var operPromise = null;
|
|
11987
12157
|
var sortList = [];
|
|
11988
12158
|
var filterList = [];
|
|
11989
12159
|
var pageParams = {};
|
|
11990
12160
|
if (pagerConfig) {
|
|
11991
12161
|
if (isInited || isReload) {
|
|
12162
|
+
// 重置分页
|
|
11992
12163
|
tablePage.currentPage = 1;
|
|
11993
12164
|
}
|
|
11994
|
-
if (isEnableConf(
|
|
12165
|
+
if (isEnableConf(pagerOpts)) {
|
|
11995
12166
|
pageParams = _objectSpread2({}, tablePage);
|
|
11996
12167
|
}
|
|
11997
12168
|
}
|
|
@@ -12037,7 +12208,7 @@ function gantt_createInternalData() {
|
|
|
12037
12208
|
} else {
|
|
12038
12209
|
if ($xeTable) {
|
|
12039
12210
|
if (isReload) {
|
|
12040
|
-
$xeTable.clearAll();
|
|
12211
|
+
operPromise = $xeTable.clearAll();
|
|
12041
12212
|
} else {
|
|
12042
12213
|
sortList = $xeTable.getSortColumns();
|
|
12043
12214
|
filterList = $xeTable.getCheckedFilters();
|
|
@@ -12057,32 +12228,29 @@ function gantt_createInternalData() {
|
|
|
12057
12228
|
sorts: sortList,
|
|
12058
12229
|
filters: filterList,
|
|
12059
12230
|
form: formData,
|
|
12060
|
-
options:
|
|
12231
|
+
options: qMethods
|
|
12061
12232
|
};
|
|
12062
12233
|
reactData.sortData = sortList;
|
|
12063
12234
|
reactData.filterData = filterList;
|
|
12064
12235
|
reactData.tableLoading = true;
|
|
12065
|
-
|
|
12066
|
-
|
|
12236
|
+
return Promise.all([Promise.resolve((beforeQuery || qMethods).apply(void 0, [commitParams].concat(args))), operPromise]).then(function (_ref3) {
|
|
12237
|
+
var _ref4 = _slicedToArray(_ref3, 1),
|
|
12238
|
+
rest = _ref4[0];
|
|
12067
12239
|
var tableData = [];
|
|
12068
12240
|
reactData.tableLoading = false;
|
|
12069
12241
|
if (rest) {
|
|
12242
|
+
var reParams = {
|
|
12243
|
+
data: rest,
|
|
12244
|
+
$table: $xeTable,
|
|
12245
|
+
$grid: null,
|
|
12246
|
+
$gantt: $xeGantt
|
|
12247
|
+
};
|
|
12070
12248
|
if (pagerConfig && isEnableConf(pagerOpts)) {
|
|
12071
12249
|
var totalProp = resConfigs.total;
|
|
12072
|
-
var total = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(totalProp) ? totalProp(
|
|
12073
|
-
data: rest,
|
|
12074
|
-
$table: $xeTable,
|
|
12075
|
-
$grid: null,
|
|
12076
|
-
$gantt: $xeGantt
|
|
12077
|
-
}) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, totalProp || 'page.total')) || 0;
|
|
12250
|
+
var 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;
|
|
12078
12251
|
tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(total);
|
|
12079
12252
|
var resultProp = resConfigs.result;
|
|
12080
|
-
tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resultProp) ? resultProp(
|
|
12081
|
-
data: rest,
|
|
12082
|
-
$table: $xeTable,
|
|
12083
|
-
$grid: null,
|
|
12084
|
-
$gantt: $xeGantt
|
|
12085
|
-
}) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, resultProp || 'result')) || [];
|
|
12253
|
+
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')) || [];
|
|
12086
12254
|
// 检验当前页码,不能超出当前最大页数
|
|
12087
12255
|
var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
|
|
12088
12256
|
if (tablePage.currentPage > pageCount) {
|
|
@@ -12090,28 +12258,35 @@ function gantt_createInternalData() {
|
|
|
12090
12258
|
}
|
|
12091
12259
|
} else {
|
|
12092
12260
|
var listProp = resConfigs.list;
|
|
12093
|
-
|
|
12094
|
-
|
|
12095
|
-
|
|
12096
|
-
|
|
12097
|
-
|
|
12098
|
-
|
|
12261
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest)) {
|
|
12262
|
+
tableData = rest;
|
|
12263
|
+
} else if (listProp) {
|
|
12264
|
+
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)) || [];
|
|
12265
|
+
}
|
|
12266
|
+
}
|
|
12267
|
+
if (showFooter) {
|
|
12268
|
+
var fdProp = resConfigs.footerData;
|
|
12269
|
+
var 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) : [];
|
|
12270
|
+
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerList)) {
|
|
12271
|
+
reactData.footerData = footerList;
|
|
12272
|
+
}
|
|
12099
12273
|
}
|
|
12100
12274
|
}
|
|
12101
12275
|
if ($xeTable) {
|
|
12102
12276
|
$xeTable.loadData(tableData);
|
|
12103
12277
|
} else {
|
|
12104
|
-
$
|
|
12278
|
+
$xeGantt.$nextTick(function () {
|
|
12279
|
+
var $xeTable = $xeGantt.$refs.refTable;
|
|
12105
12280
|
if ($xeTable) {
|
|
12106
12281
|
$xeTable.loadData(tableData);
|
|
12107
12282
|
}
|
|
12108
12283
|
});
|
|
12109
12284
|
}
|
|
12110
12285
|
if (afterQuery) {
|
|
12111
|
-
afterQuery.apply(void 0,
|
|
12286
|
+
afterQuery.apply(void 0, [commitParams].concat(args));
|
|
12112
12287
|
}
|
|
12113
|
-
if (
|
|
12114
|
-
|
|
12288
|
+
if (qsMethods) {
|
|
12289
|
+
qsMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
|
|
12115
12290
|
response: rest
|
|
12116
12291
|
}));
|
|
12117
12292
|
}
|
|
@@ -12120,8 +12295,8 @@ function gantt_createInternalData() {
|
|
|
12120
12295
|
};
|
|
12121
12296
|
}).catch(function (rest) {
|
|
12122
12297
|
reactData.tableLoading = false;
|
|
12123
|
-
if (
|
|
12124
|
-
|
|
12298
|
+
if (qeMethods) {
|
|
12299
|
+
qeMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
|
|
12125
12300
|
response: rest
|
|
12126
12301
|
}));
|
|
12127
12302
|
}
|
|
@@ -12130,16 +12305,64 @@ function gantt_createInternalData() {
|
|
|
12130
12305
|
};
|
|
12131
12306
|
});
|
|
12132
12307
|
} else {
|
|
12133
|
-
errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
|
|
12308
|
+
errLog('vxe.error.notFunc', ['[gantt] proxy-config.ajax.query']);
|
|
12309
|
+
}
|
|
12310
|
+
break;
|
|
12311
|
+
}
|
|
12312
|
+
case 'queryFooter':
|
|
12313
|
+
{
|
|
12314
|
+
var qfMethods = ajax.queryFooter;
|
|
12315
|
+
var qfSuccessMethods = ajax.queryFooterSuccess;
|
|
12316
|
+
var qfErrorMethods = ajax.queryFooterError;
|
|
12317
|
+
if (qfMethods) {
|
|
12318
|
+
var _filterList = [];
|
|
12319
|
+
if ($xeTable) {
|
|
12320
|
+
_filterList = $xeTable.getCheckedFilters();
|
|
12321
|
+
}
|
|
12322
|
+
var _commitParams = {
|
|
12323
|
+
$table: $xeTable,
|
|
12324
|
+
$grid: null,
|
|
12325
|
+
$gantt: $xeGantt,
|
|
12326
|
+
code: code,
|
|
12327
|
+
button: button,
|
|
12328
|
+
filters: _filterList,
|
|
12329
|
+
form: formData,
|
|
12330
|
+
options: qfMethods
|
|
12331
|
+
};
|
|
12332
|
+
return Promise.resolve((beforeQueryFooter || qfMethods).apply(void 0, [_commitParams].concat(args))).then(function (rest) {
|
|
12333
|
+
reactData.footerData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest) ? rest : [];
|
|
12334
|
+
if (afterQueryFooter) {
|
|
12335
|
+
afterQueryFooter.apply(void 0, [_commitParams].concat(args));
|
|
12336
|
+
}
|
|
12337
|
+
if (qfSuccessMethods) {
|
|
12338
|
+
qfSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
|
|
12339
|
+
response: rest
|
|
12340
|
+
}));
|
|
12341
|
+
}
|
|
12342
|
+
return {
|
|
12343
|
+
status: true
|
|
12344
|
+
};
|
|
12345
|
+
}).catch(function (rest) {
|
|
12346
|
+
if (qfErrorMethods) {
|
|
12347
|
+
qfErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
|
|
12348
|
+
response: rest
|
|
12349
|
+
}));
|
|
12350
|
+
}
|
|
12351
|
+
return {
|
|
12352
|
+
status: false
|
|
12353
|
+
};
|
|
12354
|
+
});
|
|
12355
|
+
} else {
|
|
12356
|
+
errLog('vxe.error.notFunc', ['[gantt] proxy-config.ajax.queryFooter']);
|
|
12134
12357
|
}
|
|
12135
12358
|
break;
|
|
12136
12359
|
}
|
|
12137
12360
|
case 'delete':
|
|
12138
12361
|
{
|
|
12139
|
-
var
|
|
12362
|
+
var ajaxMethods = ajax.delete;
|
|
12140
12363
|
var deleteSuccessMethods = ajax.deleteSuccess;
|
|
12141
12364
|
var deleteErrorMethods = ajax.deleteError;
|
|
12142
|
-
if (
|
|
12365
|
+
if (ajaxMethods) {
|
|
12143
12366
|
var selectRecords = $xeTable.getCheckboxRecords();
|
|
12144
12367
|
var removeRecords = selectRecords.filter(function (row) {
|
|
12145
12368
|
return !$xeTable.isInsertByRow(row);
|
|
@@ -12147,7 +12370,7 @@ function gantt_createInternalData() {
|
|
|
12147
12370
|
var body = {
|
|
12148
12371
|
removeRecords: removeRecords
|
|
12149
12372
|
};
|
|
12150
|
-
var
|
|
12373
|
+
var _commitParams2 = {
|
|
12151
12374
|
$table: $xeTable,
|
|
12152
12375
|
$grid: null,
|
|
12153
12376
|
$gantt: $xeGantt,
|
|
@@ -12155,16 +12378,16 @@ function gantt_createInternalData() {
|
|
|
12155
12378
|
button: button,
|
|
12156
12379
|
body: body,
|
|
12157
12380
|
form: formData,
|
|
12158
|
-
options:
|
|
12381
|
+
options: ajaxMethods
|
|
12159
12382
|
};
|
|
12160
|
-
var
|
|
12383
|
+
var applyArgs = [_commitParams2].concat(args);
|
|
12161
12384
|
if (selectRecords.length) {
|
|
12162
12385
|
return $xeGantt.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
|
|
12163
12386
|
if (!removeRecords.length) {
|
|
12164
12387
|
return $xeTable.remove(selectRecords);
|
|
12165
12388
|
}
|
|
12166
12389
|
reactData.tableLoading = true;
|
|
12167
|
-
return Promise.resolve((beforeDelete ||
|
|
12390
|
+
return Promise.resolve((beforeDelete || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
|
|
12168
12391
|
reactData.tableLoading = false;
|
|
12169
12392
|
$xeTable.setPendingRow(removeRecords, false);
|
|
12170
12393
|
if (isRespMsg) {
|
|
@@ -12178,12 +12401,15 @@ function gantt_createInternalData() {
|
|
|
12178
12401
|
});
|
|
12179
12402
|
}
|
|
12180
12403
|
if (afterDelete) {
|
|
12181
|
-
afterDelete.apply(void 0, _toConsumableArray(
|
|
12404
|
+
afterDelete.apply(void 0, _toConsumableArray(applyArgs));
|
|
12182
12405
|
} else {
|
|
12406
|
+
internalData.uFoot = true;
|
|
12183
12407
|
$xeGantt.commitProxy('query');
|
|
12408
|
+
internalData.uFoot = false;
|
|
12409
|
+
$xeGantt.updateQueryFooter();
|
|
12184
12410
|
}
|
|
12185
12411
|
if (deleteSuccessMethods) {
|
|
12186
|
-
deleteSuccessMethods(_objectSpread2(_objectSpread2({},
|
|
12412
|
+
deleteSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
|
|
12187
12413
|
response: rest
|
|
12188
12414
|
}));
|
|
12189
12415
|
}
|
|
@@ -12204,7 +12430,7 @@ function gantt_createInternalData() {
|
|
|
12204
12430
|
});
|
|
12205
12431
|
}
|
|
12206
12432
|
if (deleteErrorMethods) {
|
|
12207
|
-
deleteErrorMethods(_objectSpread2(_objectSpread2({},
|
|
12433
|
+
deleteErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
|
|
12208
12434
|
response: rest
|
|
12209
12435
|
}));
|
|
12210
12436
|
}
|
|
@@ -12233,16 +12459,16 @@ function gantt_createInternalData() {
|
|
|
12233
12459
|
}
|
|
12234
12460
|
case 'save':
|
|
12235
12461
|
{
|
|
12236
|
-
var
|
|
12462
|
+
var _ajaxMethods = ajax.save;
|
|
12237
12463
|
var saveSuccessMethods = ajax.saveSuccess;
|
|
12238
12464
|
var saveErrorMethods = ajax.saveError;
|
|
12239
|
-
if (
|
|
12465
|
+
if (_ajaxMethods) {
|
|
12240
12466
|
var _body = $xeGantt.getRecordset();
|
|
12241
12467
|
var insertRecords = _body.insertRecords,
|
|
12242
12468
|
_removeRecords = _body.removeRecords,
|
|
12243
12469
|
updateRecords = _body.updateRecords,
|
|
12244
12470
|
pendingRecords = _body.pendingRecords;
|
|
12245
|
-
var
|
|
12471
|
+
var _commitParams3 = {
|
|
12246
12472
|
$table: $xeTable,
|
|
12247
12473
|
$grid: null,
|
|
12248
12474
|
$gantt: $xeGantt,
|
|
@@ -12250,9 +12476,9 @@ function gantt_createInternalData() {
|
|
|
12250
12476
|
button: button,
|
|
12251
12477
|
body: _body,
|
|
12252
12478
|
form: formData,
|
|
12253
|
-
options:
|
|
12479
|
+
options: _ajaxMethods
|
|
12254
12480
|
};
|
|
12255
|
-
var
|
|
12481
|
+
var _applyArgs = [_commitParams3].concat(args);
|
|
12256
12482
|
// 排除掉新增且标记为删除的数据
|
|
12257
12483
|
if (insertRecords.length) {
|
|
12258
12484
|
_body.pendingRecords = pendingRecords.filter(function (row) {
|
|
@@ -12277,7 +12503,7 @@ function gantt_createInternalData() {
|
|
|
12277
12503
|
}
|
|
12278
12504
|
if (_body.insertRecords.length || _removeRecords.length || updateRecords.length || _body.pendingRecords.length) {
|
|
12279
12505
|
reactData.tableLoading = true;
|
|
12280
|
-
return Promise.resolve((beforeSave ||
|
|
12506
|
+
return Promise.resolve((beforeSave || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
|
|
12281
12507
|
reactData.tableLoading = false;
|
|
12282
12508
|
$xeTable.clearPendingRow();
|
|
12283
12509
|
if (isRespMsg) {
|
|
@@ -12291,12 +12517,15 @@ function gantt_createInternalData() {
|
|
|
12291
12517
|
});
|
|
12292
12518
|
}
|
|
12293
12519
|
if (afterSave) {
|
|
12294
|
-
afterSave.apply(void 0, _toConsumableArray(
|
|
12520
|
+
afterSave.apply(void 0, _toConsumableArray(_applyArgs));
|
|
12295
12521
|
} else {
|
|
12522
|
+
internalData.uFoot = true;
|
|
12296
12523
|
$xeGantt.commitProxy('query');
|
|
12524
|
+
internalData.uFoot = false;
|
|
12525
|
+
$xeGantt.updateQueryFooter();
|
|
12297
12526
|
}
|
|
12298
12527
|
if (saveSuccessMethods) {
|
|
12299
|
-
saveSuccessMethods(_objectSpread2(_objectSpread2({},
|
|
12528
|
+
saveSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams3), {}, {
|
|
12300
12529
|
response: rest
|
|
12301
12530
|
}));
|
|
12302
12531
|
}
|
|
@@ -12317,7 +12546,7 @@ function gantt_createInternalData() {
|
|
|
12317
12546
|
});
|
|
12318
12547
|
}
|
|
12319
12548
|
if (saveErrorMethods) {
|
|
12320
|
-
saveErrorMethods(_objectSpread2(_objectSpread2({},
|
|
12549
|
+
saveErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams3), {}, {
|
|
12321
12550
|
response: rest
|
|
12322
12551
|
}));
|
|
12323
12552
|
}
|
|
@@ -12623,14 +12852,26 @@ function gantt_createInternalData() {
|
|
|
12623
12852
|
},
|
|
12624
12853
|
triggerToolbarCommitEvent: function triggerToolbarCommitEvent(params, evnt) {
|
|
12625
12854
|
var $xeGantt = this;
|
|
12855
|
+
var internalData = $xeGantt.internalData;
|
|
12626
12856
|
var code = params.code;
|
|
12627
|
-
|
|
12628
|
-
|
|
12629
|
-
|
|
12630
|
-
|
|
12631
|
-
}), evnt);
|
|
12857
|
+
if (code) {
|
|
12858
|
+
var isUf = ['reload', 'delete', 'save'].includes(code);
|
|
12859
|
+
if (isUf) {
|
|
12860
|
+
internalData.uFoot = true;
|
|
12632
12861
|
}
|
|
12633
|
-
|
|
12862
|
+
var rest = $xeGantt.commitProxy(params, evnt).then(function (rest) {
|
|
12863
|
+
if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
|
|
12864
|
+
$xeGantt.dispatchEvent(code === 'delete' || code === 'save' ? "proxy-".concat(code) : 'proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
|
|
12865
|
+
isReload: code === 'reload'
|
|
12866
|
+
}), evnt);
|
|
12867
|
+
}
|
|
12868
|
+
});
|
|
12869
|
+
if (isUf) {
|
|
12870
|
+
$xeGantt.updateQueryFooter();
|
|
12871
|
+
}
|
|
12872
|
+
internalData.uFoot = false;
|
|
12873
|
+
return rest;
|
|
12874
|
+
}
|
|
12634
12875
|
},
|
|
12635
12876
|
triggerToolbarBtnEvent: function triggerToolbarBtnEvent(button, evnt) {
|
|
12636
12877
|
var $xeGantt = this;
|