vxe-gantt 3.0.24 → 3.0.26
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-chart.js +2 -1
- package/es/gantt/src/gantt.js +163 -36
- package/es/gantt/style.css +13 -0
- package/es/gantt/style.min.css +1 -1
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/es/vxe-gantt/style.css +13 -0
- package/es/vxe-gantt/style.min.css +1 -1
- package/lib/gantt/src/gantt-chart.js +3 -1
- package/lib/gantt/src/gantt-chart.min.js +1 -1
- package/lib/gantt/src/gantt.js +207 -77
- package/lib/gantt/src/gantt.min.js +1 -1
- package/lib/gantt/style/style.css +13 -0
- package/lib/gantt/style/style.min.css +1 -1
- package/lib/index.umd.js +268 -138
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +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/vxe-gantt/style/style.css +13 -0
- package/lib/vxe-gantt/style/style.min.css +1 -1
- package/package.json +3 -3
- package/packages/gantt/src/gantt-chart.ts +2 -1
- package/packages/gantt/src/gantt.ts +195 -67
- package/styles/components/gantt-module/gantt-chart.scss +6 -0
- package/styles/components/gantt.scss +3 -0
package/lib/gantt/src/gantt.js
CHANGED
|
@@ -20,10 +20,14 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
|
|
|
20
20
|
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); }
|
|
21
21
|
function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
|
|
22
22
|
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."); }
|
|
23
|
-
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; } }
|
|
24
23
|
function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
|
|
25
24
|
function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
|
|
25
|
+
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
26
|
+
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."); }
|
|
27
|
+
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; } }
|
|
26
28
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
29
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
30
|
+
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
27
31
|
var getConfig = _core.VxeUI.getConfig,
|
|
28
32
|
getIcon = _core.VxeUI.getIcon,
|
|
29
33
|
getI18n = _core.VxeUI.getI18n,
|
|
@@ -87,6 +91,7 @@ _xeUtils.default.each(_vxeTable.VxeTable.methods, function (fn, name) {
|
|
|
87
91
|
});
|
|
88
92
|
function createInternalData() {
|
|
89
93
|
return {
|
|
94
|
+
uFoot: false,
|
|
90
95
|
resizeTableWidth: 0
|
|
91
96
|
};
|
|
92
97
|
}
|
|
@@ -106,8 +111,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
106
111
|
taskViewConfig: Object,
|
|
107
112
|
taskBarConfig: Object,
|
|
108
113
|
taskSplitConfig: Object,
|
|
109
|
-
|
|
110
|
-
|
|
114
|
+
taskBarResizeConfig: Object,
|
|
115
|
+
taskBarDragConfig: Object,
|
|
111
116
|
size: {
|
|
112
117
|
type: String,
|
|
113
118
|
default: function _default() {
|
|
@@ -134,6 +139,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
134
139
|
filterData: [],
|
|
135
140
|
formData: {},
|
|
136
141
|
sortData: [],
|
|
142
|
+
footerData: [],
|
|
137
143
|
tZindex: 0,
|
|
138
144
|
tablePage: {
|
|
139
145
|
total: 0,
|
|
@@ -207,6 +213,16 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
207
213
|
var props = $xeGantt;
|
|
208
214
|
return Object.assign({}, getConfig().gantt.taskBarConfig, props.taskBarConfig);
|
|
209
215
|
},
|
|
216
|
+
computeTaskBarDragOpts: function computeTaskBarDragOpts() {
|
|
217
|
+
var $xeGantt = this;
|
|
218
|
+
var props = $xeGantt;
|
|
219
|
+
return Object.assign({}, getConfig().gantt.taskBarDragConfig, props.taskBarDragConfig);
|
|
220
|
+
},
|
|
221
|
+
computeTaskBarResizeOpts: function computeTaskBarResizeOpts() {
|
|
222
|
+
var $xeGantt = this;
|
|
223
|
+
var props = $xeGantt;
|
|
224
|
+
return Object.assign({}, getConfig().gantt.taskBarResizeConfig, props.taskBarResizeConfig);
|
|
225
|
+
},
|
|
210
226
|
computeTaskSplitOpts: function computeTaskSplitOpts() {
|
|
211
227
|
var $xeGantt = this;
|
|
212
228
|
var props = $xeGantt;
|
|
@@ -300,7 +316,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
300
316
|
var rest = {};
|
|
301
317
|
var gridProps = props;
|
|
302
318
|
propKeys.forEach(function (key) {
|
|
303
|
-
|
|
319
|
+
if (gridProps[key] !== undefined) {
|
|
320
|
+
rest[key] = gridProps[key];
|
|
321
|
+
}
|
|
304
322
|
});
|
|
305
323
|
return rest;
|
|
306
324
|
},
|
|
@@ -308,12 +326,14 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
308
326
|
var $xeGantt = this;
|
|
309
327
|
var props = $xeGantt;
|
|
310
328
|
var reactData = $xeGantt.reactData;
|
|
311
|
-
var
|
|
329
|
+
var showFooter = props.showFooter,
|
|
330
|
+
seqConfig = props.seqConfig,
|
|
312
331
|
pagerConfig = props.pagerConfig,
|
|
313
332
|
editConfig = props.editConfig,
|
|
314
333
|
proxyConfig = props.proxyConfig;
|
|
315
334
|
var isZMax = reactData.isZMax,
|
|
316
|
-
tablePage = reactData.tablePage
|
|
335
|
+
tablePage = reactData.tablePage,
|
|
336
|
+
footerData = reactData.footerData;
|
|
317
337
|
var taskViewOpts = $xeGantt.computeTaskViewOpts;
|
|
318
338
|
var tableStyle = taskViewOpts.tableStyle;
|
|
319
339
|
var tableExtendProps = $xeGantt.computeTableExtendProps;
|
|
@@ -332,8 +352,15 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
332
352
|
tProps.border = border;
|
|
333
353
|
}
|
|
334
354
|
}
|
|
355
|
+
if (showFooter && !tProps.footerData) {
|
|
356
|
+
// 如果未设置自己的标位数据,则使用代理的
|
|
357
|
+
tProps.footerData = footerData;
|
|
358
|
+
} else if (proxyOpts.footer && footerData.length) {
|
|
359
|
+
// 如果代理标为数据,且未请求到数据,则用自己的
|
|
360
|
+
tProps.footerData = footerData;
|
|
361
|
+
}
|
|
335
362
|
if (isZMax) {
|
|
336
|
-
if (
|
|
363
|
+
if (tProps.maxHeight) {
|
|
337
364
|
tProps.maxHeight = '100%';
|
|
338
365
|
} else {
|
|
339
366
|
tProps.height = '100%';
|
|
@@ -686,6 +713,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
686
713
|
var $xeGantt = this;
|
|
687
714
|
var props = $xeGantt;
|
|
688
715
|
var reactData = $xeGantt.reactData;
|
|
716
|
+
var internalData = $xeGantt.internalData;
|
|
689
717
|
var $xeTable = $xeGantt.$refs.refTable;
|
|
690
718
|
var proxyConfig = props.proxyConfig;
|
|
691
719
|
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
@@ -695,9 +723,12 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
695
723
|
reactData.filterData = params.filterList;
|
|
696
724
|
if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
|
|
697
725
|
reactData.tablePage.currentPage = 1;
|
|
726
|
+
internalData.uFoot = true;
|
|
698
727
|
$xeGantt.commitProxy('query').then(function (rest) {
|
|
699
728
|
$xeGantt.dispatchEvent('proxy-query', rest, params.$event);
|
|
700
729
|
});
|
|
730
|
+
internalData.uFoot = false;
|
|
731
|
+
$xeGantt.updateQueryFooter();
|
|
701
732
|
}
|
|
702
733
|
}
|
|
703
734
|
},
|
|
@@ -715,34 +746,42 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
715
746
|
var $xeGantt = this;
|
|
716
747
|
var props = $xeGantt;
|
|
717
748
|
var reactData = $xeGantt.reactData;
|
|
749
|
+
var internalData = $xeGantt.internalData;
|
|
718
750
|
var proxyConfig = props.proxyConfig;
|
|
719
751
|
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
720
752
|
if (reactData.tableLoading) {
|
|
721
753
|
return;
|
|
722
754
|
}
|
|
723
755
|
if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
|
|
756
|
+
internalData.uFoot = true;
|
|
724
757
|
$xeGantt.commitProxy('reload').then(function (rest) {
|
|
725
758
|
$xeGantt.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
|
|
726
759
|
isReload: true
|
|
727
760
|
}), params.$event);
|
|
728
761
|
});
|
|
762
|
+
internalData.uFoot = false;
|
|
763
|
+
$xeGantt.updateQueryFooter();
|
|
729
764
|
}
|
|
730
765
|
$xeGantt.dispatchEvent('form-submit', params, params.$event);
|
|
731
766
|
},
|
|
732
767
|
resetFormEvent: function resetFormEvent(params) {
|
|
733
768
|
var $xeGantt = this;
|
|
734
769
|
var props = $xeGantt;
|
|
770
|
+
var internalData = $xeGantt.internalData;
|
|
735
771
|
var $xeTable = $xeGantt.$refs.refTable;
|
|
736
772
|
var proxyConfig = props.proxyConfig;
|
|
737
773
|
var $event = params.$event;
|
|
738
774
|
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
739
775
|
if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
|
|
740
776
|
$xeTable.clearScroll();
|
|
777
|
+
internalData.uFoot = true;
|
|
741
778
|
$xeGantt.commitProxy('reload').then(function (rest) {
|
|
742
779
|
$xeGantt.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
|
|
743
780
|
isReload: true
|
|
744
781
|
}), $event);
|
|
745
782
|
});
|
|
783
|
+
internalData.uFoot = false;
|
|
784
|
+
$xeGantt.updateQueryFooter();
|
|
746
785
|
}
|
|
747
786
|
$xeGantt.dispatchEvent('form-reset', params, $event);
|
|
748
787
|
},
|
|
@@ -890,6 +929,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
890
929
|
var $xeGantt = this;
|
|
891
930
|
var props = $xeGantt;
|
|
892
931
|
var reactData = $xeGantt.reactData;
|
|
932
|
+
var internalData = $xeGantt.internalData;
|
|
893
933
|
var proxyConfig = props.proxyConfig,
|
|
894
934
|
formConfig = props.formConfig;
|
|
895
935
|
var proxyInited = reactData.proxyInited;
|
|
@@ -899,18 +939,32 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
899
939
|
if ((0, _utils.isEnableConf)(formConfig) && proxyOpts.form && formOpts.items) {
|
|
900
940
|
reactData.formData = $xeGantt.getDefaultFormData();
|
|
901
941
|
}
|
|
902
|
-
if (!proxyInited
|
|
942
|
+
if (!proxyInited) {
|
|
903
943
|
reactData.proxyInited = true;
|
|
904
|
-
|
|
905
|
-
|
|
906
|
-
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
910
|
-
|
|
944
|
+
if (proxyOpts.autoLoad !== false) {
|
|
945
|
+
$xeGantt.$nextTick().then(function () {
|
|
946
|
+
internalData.uFoot = true;
|
|
947
|
+
var rest = $xeGantt.commitProxy('initial');
|
|
948
|
+
internalData.uFoot = false;
|
|
949
|
+
$xeGantt.updateQueryFooter();
|
|
950
|
+
return rest;
|
|
951
|
+
}).then(function (rest) {
|
|
952
|
+
$xeGantt.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
|
|
953
|
+
isInited: true
|
|
954
|
+
}), new Event('initial'));
|
|
955
|
+
});
|
|
956
|
+
}
|
|
911
957
|
}
|
|
912
958
|
}
|
|
913
959
|
},
|
|
960
|
+
updateQueryFooter: function updateQueryFooter() {
|
|
961
|
+
var $xeGantt = this;
|
|
962
|
+
var proxyOpts = $xeGantt.computeProxyOpts;
|
|
963
|
+
var ajax = proxyOpts.ajax;
|
|
964
|
+
if (ajax && ajax.queryFooter) {
|
|
965
|
+
return $xeGantt.commitProxy('queryFooter');
|
|
966
|
+
}
|
|
967
|
+
},
|
|
914
968
|
handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
|
|
915
969
|
var $xeGantt = this;
|
|
916
970
|
var reactData = $xeGantt.reactData;
|
|
@@ -929,15 +983,20 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
929
983
|
* @param {String/Object} code 字符串或对象
|
|
930
984
|
*/
|
|
931
985
|
commitProxy: function commitProxy(proxyTarget) {
|
|
986
|
+
for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
|
|
987
|
+
args[_key2 - 1] = arguments[_key2];
|
|
988
|
+
}
|
|
932
989
|
var $xeGantt = this;
|
|
933
990
|
var props = $xeGantt;
|
|
934
991
|
var reactData = $xeGantt.reactData;
|
|
992
|
+
var internalData = $xeGantt.internalData;
|
|
935
993
|
/**
|
|
936
994
|
* 已废弃
|
|
937
995
|
* @deprecated
|
|
938
996
|
*/
|
|
939
997
|
var toolbar = props.toolbar;
|
|
940
|
-
var
|
|
998
|
+
var showFooter = props.showFooter,
|
|
999
|
+
proxyConfig = props.proxyConfig,
|
|
941
1000
|
toolbarConfig = props.toolbarConfig,
|
|
942
1001
|
pagerConfig = props.pagerConfig,
|
|
943
1002
|
editRules = props.editRules,
|
|
@@ -950,6 +1009,8 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
950
1009
|
var toolbarOpts = $xeGantt.computeToolbarOpts;
|
|
951
1010
|
var beforeQuery = proxyOpts.beforeQuery,
|
|
952
1011
|
afterQuery = proxyOpts.afterQuery,
|
|
1012
|
+
beforeQueryFooter = proxyOpts.beforeQueryFooter,
|
|
1013
|
+
afterQueryFooter = proxyOpts.afterQueryFooter,
|
|
953
1014
|
beforeDelete = proxyOpts.beforeDelete,
|
|
954
1015
|
afterDelete = proxyOpts.afterDelete,
|
|
955
1016
|
beforeSave = proxyOpts.beforeSave,
|
|
@@ -975,9 +1036,6 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
975
1036
|
code = button.code;
|
|
976
1037
|
}
|
|
977
1038
|
var btnParams = button ? button.params : null;
|
|
978
|
-
for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
|
|
979
|
-
args[_key2 - 1] = arguments[_key2];
|
|
980
|
-
}
|
|
981
1039
|
switch (code) {
|
|
982
1040
|
case 'insert':
|
|
983
1041
|
return $xeTable.insert({});
|
|
@@ -1019,23 +1077,25 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1019
1077
|
case 'reload':
|
|
1020
1078
|
case 'query':
|
|
1021
1079
|
{
|
|
1022
|
-
var
|
|
1023
|
-
var
|
|
1024
|
-
var
|
|
1025
|
-
if (
|
|
1080
|
+
var qMethods = ajax.query;
|
|
1081
|
+
var qsMethods = ajax.querySuccess;
|
|
1082
|
+
var qeMethods = ajax.queryError;
|
|
1083
|
+
if (qMethods) {
|
|
1026
1084
|
var isInited = code === 'initial';
|
|
1027
1085
|
var isReload = code === 'reload';
|
|
1028
1086
|
if (!isInited && reactData.tableLoading) {
|
|
1029
1087
|
return $xeGantt.$nextTick();
|
|
1030
1088
|
}
|
|
1089
|
+
var operPromise = null;
|
|
1031
1090
|
var sortList = [];
|
|
1032
1091
|
var filterList = [];
|
|
1033
1092
|
var pageParams = {};
|
|
1034
1093
|
if (pagerConfig) {
|
|
1035
1094
|
if (isInited || isReload) {
|
|
1095
|
+
// 重置分页
|
|
1036
1096
|
tablePage.currentPage = 1;
|
|
1037
1097
|
}
|
|
1038
|
-
if ((0, _utils.isEnableConf)(
|
|
1098
|
+
if ((0, _utils.isEnableConf)(pagerOpts)) {
|
|
1039
1099
|
pageParams = Object.assign({}, tablePage);
|
|
1040
1100
|
}
|
|
1041
1101
|
}
|
|
@@ -1081,7 +1141,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1081
1141
|
} else {
|
|
1082
1142
|
if ($xeTable) {
|
|
1083
1143
|
if (isReload) {
|
|
1084
|
-
$xeTable.clearAll();
|
|
1144
|
+
operPromise = $xeTable.clearAll();
|
|
1085
1145
|
} else {
|
|
1086
1146
|
sortList = $xeTable.getSortColumns();
|
|
1087
1147
|
filterList = $xeTable.getCheckedFilters();
|
|
@@ -1101,32 +1161,29 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1101
1161
|
sorts: sortList,
|
|
1102
1162
|
filters: filterList,
|
|
1103
1163
|
form: formData,
|
|
1104
|
-
options:
|
|
1164
|
+
options: qMethods
|
|
1105
1165
|
};
|
|
1106
1166
|
reactData.sortData = sortList;
|
|
1107
1167
|
reactData.filterData = filterList;
|
|
1108
1168
|
reactData.tableLoading = true;
|
|
1109
|
-
|
|
1110
|
-
|
|
1169
|
+
return Promise.all([Promise.resolve((beforeQuery || qMethods).apply(void 0, [commitParams].concat(args))), operPromise]).then(function (_ref3) {
|
|
1170
|
+
var _ref4 = _slicedToArray(_ref3, 1),
|
|
1171
|
+
rest = _ref4[0];
|
|
1111
1172
|
var tableData = [];
|
|
1112
1173
|
reactData.tableLoading = false;
|
|
1113
1174
|
if (rest) {
|
|
1175
|
+
var reParams = {
|
|
1176
|
+
data: rest,
|
|
1177
|
+
$table: $xeTable,
|
|
1178
|
+
$grid: null,
|
|
1179
|
+
$gantt: $xeGantt
|
|
1180
|
+
};
|
|
1114
1181
|
if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
|
|
1115
1182
|
var totalProp = resConfigs.total;
|
|
1116
|
-
var total = (_xeUtils.default.isFunction(totalProp) ? totalProp(
|
|
1117
|
-
data: rest,
|
|
1118
|
-
$table: $xeTable,
|
|
1119
|
-
$grid: null,
|
|
1120
|
-
$gantt: $xeGantt
|
|
1121
|
-
}) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
|
|
1183
|
+
var total = (_xeUtils.default.isFunction(totalProp) ? totalProp(reParams) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
|
|
1122
1184
|
tablePage.total = _xeUtils.default.toNumber(total);
|
|
1123
1185
|
var resultProp = resConfigs.result;
|
|
1124
|
-
tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp(
|
|
1125
|
-
data: rest,
|
|
1126
|
-
$table: $xeTable,
|
|
1127
|
-
$grid: null,
|
|
1128
|
-
$gantt: $xeGantt
|
|
1129
|
-
}) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
|
|
1186
|
+
tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp(reParams) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
|
|
1130
1187
|
// 检验当前页码,不能超出当前最大页数
|
|
1131
1188
|
var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
|
|
1132
1189
|
if (tablePage.currentPage > pageCount) {
|
|
@@ -1134,28 +1191,35 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1134
1191
|
}
|
|
1135
1192
|
} else {
|
|
1136
1193
|
var listProp = resConfigs.list;
|
|
1137
|
-
|
|
1138
|
-
|
|
1139
|
-
|
|
1140
|
-
|
|
1141
|
-
|
|
1142
|
-
|
|
1194
|
+
if (_xeUtils.default.isArray(rest)) {
|
|
1195
|
+
tableData = rest;
|
|
1196
|
+
} else if (listProp) {
|
|
1197
|
+
tableData = (_xeUtils.default.isFunction(listProp) ? listProp(reParams) : _xeUtils.default.get(rest, listProp)) || [];
|
|
1198
|
+
}
|
|
1199
|
+
}
|
|
1200
|
+
if (showFooter) {
|
|
1201
|
+
var fdProp = resConfigs.footerData;
|
|
1202
|
+
var footerList = fdProp ? _xeUtils.default.isFunction(fdProp) ? fdProp(reParams) : _xeUtils.default.get(rest, fdProp) : [];
|
|
1203
|
+
if (_xeUtils.default.isArray(footerList)) {
|
|
1204
|
+
reactData.footerData = footerList;
|
|
1205
|
+
}
|
|
1143
1206
|
}
|
|
1144
1207
|
}
|
|
1145
1208
|
if ($xeTable) {
|
|
1146
1209
|
$xeTable.loadData(tableData);
|
|
1147
1210
|
} else {
|
|
1148
|
-
$
|
|
1211
|
+
$xeGantt.$nextTick(function () {
|
|
1212
|
+
var $xeTable = $xeGantt.$refs.refTable;
|
|
1149
1213
|
if ($xeTable) {
|
|
1150
1214
|
$xeTable.loadData(tableData);
|
|
1151
1215
|
}
|
|
1152
1216
|
});
|
|
1153
1217
|
}
|
|
1154
1218
|
if (afterQuery) {
|
|
1155
|
-
afterQuery.apply(void 0,
|
|
1219
|
+
afterQuery.apply(void 0, [commitParams].concat(args));
|
|
1156
1220
|
}
|
|
1157
|
-
if (
|
|
1158
|
-
|
|
1221
|
+
if (qsMethods) {
|
|
1222
|
+
qsMethods(Object.assign(Object.assign({}, commitParams), {
|
|
1159
1223
|
response: rest
|
|
1160
1224
|
}));
|
|
1161
1225
|
}
|
|
@@ -1164,8 +1228,56 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1164
1228
|
};
|
|
1165
1229
|
}).catch(function (rest) {
|
|
1166
1230
|
reactData.tableLoading = false;
|
|
1167
|
-
if (
|
|
1168
|
-
|
|
1231
|
+
if (qeMethods) {
|
|
1232
|
+
qeMethods(Object.assign(Object.assign({}, commitParams), {
|
|
1233
|
+
response: rest
|
|
1234
|
+
}));
|
|
1235
|
+
}
|
|
1236
|
+
return {
|
|
1237
|
+
status: false
|
|
1238
|
+
};
|
|
1239
|
+
});
|
|
1240
|
+
} else {
|
|
1241
|
+
(0, _log.errLog)('vxe.error.notFunc', ['[gantt] proxy-config.ajax.query']);
|
|
1242
|
+
}
|
|
1243
|
+
break;
|
|
1244
|
+
}
|
|
1245
|
+
case 'queryFooter':
|
|
1246
|
+
{
|
|
1247
|
+
var qfMethods = ajax.queryFooter;
|
|
1248
|
+
var qfSuccessMethods = ajax.queryFooterSuccess;
|
|
1249
|
+
var qfErrorMethods = ajax.queryFooterError;
|
|
1250
|
+
if (qfMethods) {
|
|
1251
|
+
var _filterList = [];
|
|
1252
|
+
if ($xeTable) {
|
|
1253
|
+
_filterList = $xeTable.getCheckedFilters();
|
|
1254
|
+
}
|
|
1255
|
+
var _commitParams = {
|
|
1256
|
+
$table: $xeTable,
|
|
1257
|
+
$grid: null,
|
|
1258
|
+
$gantt: $xeGantt,
|
|
1259
|
+
code: code,
|
|
1260
|
+
button: button,
|
|
1261
|
+
filters: _filterList,
|
|
1262
|
+
form: formData,
|
|
1263
|
+
options: qfMethods
|
|
1264
|
+
};
|
|
1265
|
+
return Promise.resolve((beforeQueryFooter || qfMethods).apply(void 0, [_commitParams].concat(args))).then(function (rest) {
|
|
1266
|
+
reactData.footerData = _xeUtils.default.isArray(rest) ? rest : [];
|
|
1267
|
+
if (afterQueryFooter) {
|
|
1268
|
+
afterQueryFooter.apply(void 0, [_commitParams].concat(args));
|
|
1269
|
+
}
|
|
1270
|
+
if (qfSuccessMethods) {
|
|
1271
|
+
qfSuccessMethods(Object.assign(Object.assign({}, _commitParams), {
|
|
1272
|
+
response: rest
|
|
1273
|
+
}));
|
|
1274
|
+
}
|
|
1275
|
+
return {
|
|
1276
|
+
status: true
|
|
1277
|
+
};
|
|
1278
|
+
}).catch(function (rest) {
|
|
1279
|
+
if (qfErrorMethods) {
|
|
1280
|
+
qfErrorMethods(Object.assign(Object.assign({}, _commitParams), {
|
|
1169
1281
|
response: rest
|
|
1170
1282
|
}));
|
|
1171
1283
|
}
|
|
@@ -1174,16 +1286,16 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1174
1286
|
};
|
|
1175
1287
|
});
|
|
1176
1288
|
} else {
|
|
1177
|
-
(0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.
|
|
1289
|
+
(0, _log.errLog)('vxe.error.notFunc', ['[gantt] proxy-config.ajax.queryFooter']);
|
|
1178
1290
|
}
|
|
1179
1291
|
break;
|
|
1180
1292
|
}
|
|
1181
1293
|
case 'delete':
|
|
1182
1294
|
{
|
|
1183
|
-
var
|
|
1295
|
+
var ajaxMethods = ajax.delete;
|
|
1184
1296
|
var deleteSuccessMethods = ajax.deleteSuccess;
|
|
1185
1297
|
var deleteErrorMethods = ajax.deleteError;
|
|
1186
|
-
if (
|
|
1298
|
+
if (ajaxMethods) {
|
|
1187
1299
|
var selectRecords = $xeTable.getCheckboxRecords();
|
|
1188
1300
|
var removeRecords = selectRecords.filter(function (row) {
|
|
1189
1301
|
return !$xeTable.isInsertByRow(row);
|
|
@@ -1191,7 +1303,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1191
1303
|
var body = {
|
|
1192
1304
|
removeRecords: removeRecords
|
|
1193
1305
|
};
|
|
1194
|
-
var
|
|
1306
|
+
var _commitParams2 = {
|
|
1195
1307
|
$table: $xeTable,
|
|
1196
1308
|
$grid: null,
|
|
1197
1309
|
$gantt: $xeGantt,
|
|
@@ -1199,16 +1311,16 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1199
1311
|
button: button,
|
|
1200
1312
|
body: body,
|
|
1201
1313
|
form: formData,
|
|
1202
|
-
options:
|
|
1314
|
+
options: ajaxMethods
|
|
1203
1315
|
};
|
|
1204
|
-
var
|
|
1316
|
+
var applyArgs = [_commitParams2].concat(args);
|
|
1205
1317
|
if (selectRecords.length) {
|
|
1206
1318
|
return $xeGantt.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
|
|
1207
1319
|
if (!removeRecords.length) {
|
|
1208
1320
|
return $xeTable.remove(selectRecords);
|
|
1209
1321
|
}
|
|
1210
1322
|
reactData.tableLoading = true;
|
|
1211
|
-
return Promise.resolve((beforeDelete ||
|
|
1323
|
+
return Promise.resolve((beforeDelete || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
|
|
1212
1324
|
reactData.tableLoading = false;
|
|
1213
1325
|
$xeTable.setPendingRow(removeRecords, false);
|
|
1214
1326
|
if (isRespMsg) {
|
|
@@ -1222,12 +1334,15 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1222
1334
|
});
|
|
1223
1335
|
}
|
|
1224
1336
|
if (afterDelete) {
|
|
1225
|
-
afterDelete.apply(void 0, _toConsumableArray(
|
|
1337
|
+
afterDelete.apply(void 0, _toConsumableArray(applyArgs));
|
|
1226
1338
|
} else {
|
|
1339
|
+
internalData.uFoot = true;
|
|
1227
1340
|
$xeGantt.commitProxy('query');
|
|
1341
|
+
internalData.uFoot = false;
|
|
1342
|
+
$xeGantt.updateQueryFooter();
|
|
1228
1343
|
}
|
|
1229
1344
|
if (deleteSuccessMethods) {
|
|
1230
|
-
deleteSuccessMethods(Object.assign(Object.assign({},
|
|
1345
|
+
deleteSuccessMethods(Object.assign(Object.assign({}, _commitParams2), {
|
|
1231
1346
|
response: rest
|
|
1232
1347
|
}));
|
|
1233
1348
|
}
|
|
@@ -1248,7 +1363,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1248
1363
|
});
|
|
1249
1364
|
}
|
|
1250
1365
|
if (deleteErrorMethods) {
|
|
1251
|
-
deleteErrorMethods(Object.assign(Object.assign({},
|
|
1366
|
+
deleteErrorMethods(Object.assign(Object.assign({}, _commitParams2), {
|
|
1252
1367
|
response: rest
|
|
1253
1368
|
}));
|
|
1254
1369
|
}
|
|
@@ -1277,16 +1392,16 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1277
1392
|
}
|
|
1278
1393
|
case 'save':
|
|
1279
1394
|
{
|
|
1280
|
-
var
|
|
1395
|
+
var _ajaxMethods = ajax.save;
|
|
1281
1396
|
var saveSuccessMethods = ajax.saveSuccess;
|
|
1282
1397
|
var saveErrorMethods = ajax.saveError;
|
|
1283
|
-
if (
|
|
1398
|
+
if (_ajaxMethods) {
|
|
1284
1399
|
var _body = $xeGantt.getRecordset();
|
|
1285
1400
|
var insertRecords = _body.insertRecords,
|
|
1286
1401
|
_removeRecords = _body.removeRecords,
|
|
1287
1402
|
updateRecords = _body.updateRecords,
|
|
1288
1403
|
pendingRecords = _body.pendingRecords;
|
|
1289
|
-
var
|
|
1404
|
+
var _commitParams3 = {
|
|
1290
1405
|
$table: $xeTable,
|
|
1291
1406
|
$grid: null,
|
|
1292
1407
|
$gantt: $xeGantt,
|
|
@@ -1294,9 +1409,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1294
1409
|
button: button,
|
|
1295
1410
|
body: _body,
|
|
1296
1411
|
form: formData,
|
|
1297
|
-
options:
|
|
1412
|
+
options: _ajaxMethods
|
|
1298
1413
|
};
|
|
1299
|
-
var
|
|
1414
|
+
var _applyArgs = [_commitParams3].concat(args);
|
|
1300
1415
|
// 排除掉新增且标记为删除的数据
|
|
1301
1416
|
if (insertRecords.length) {
|
|
1302
1417
|
_body.pendingRecords = pendingRecords.filter(function (row) {
|
|
@@ -1321,7 +1436,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1321
1436
|
}
|
|
1322
1437
|
if (_body.insertRecords.length || _removeRecords.length || updateRecords.length || _body.pendingRecords.length) {
|
|
1323
1438
|
reactData.tableLoading = true;
|
|
1324
|
-
return Promise.resolve((beforeSave ||
|
|
1439
|
+
return Promise.resolve((beforeSave || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
|
|
1325
1440
|
reactData.tableLoading = false;
|
|
1326
1441
|
$xeTable.clearPendingRow();
|
|
1327
1442
|
if (isRespMsg) {
|
|
@@ -1335,12 +1450,15 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1335
1450
|
});
|
|
1336
1451
|
}
|
|
1337
1452
|
if (afterSave) {
|
|
1338
|
-
afterSave.apply(void 0, _toConsumableArray(
|
|
1453
|
+
afterSave.apply(void 0, _toConsumableArray(_applyArgs));
|
|
1339
1454
|
} else {
|
|
1455
|
+
internalData.uFoot = true;
|
|
1340
1456
|
$xeGantt.commitProxy('query');
|
|
1457
|
+
internalData.uFoot = false;
|
|
1458
|
+
$xeGantt.updateQueryFooter();
|
|
1341
1459
|
}
|
|
1342
1460
|
if (saveSuccessMethods) {
|
|
1343
|
-
saveSuccessMethods(Object.assign(Object.assign({},
|
|
1461
|
+
saveSuccessMethods(Object.assign(Object.assign({}, _commitParams3), {
|
|
1344
1462
|
response: rest
|
|
1345
1463
|
}));
|
|
1346
1464
|
}
|
|
@@ -1361,7 +1479,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1361
1479
|
});
|
|
1362
1480
|
}
|
|
1363
1481
|
if (saveErrorMethods) {
|
|
1364
|
-
saveErrorMethods(Object.assign(Object.assign({},
|
|
1482
|
+
saveErrorMethods(Object.assign(Object.assign({}, _commitParams3), {
|
|
1365
1483
|
response: rest
|
|
1366
1484
|
}));
|
|
1367
1485
|
}
|
|
@@ -1667,14 +1785,26 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
|
|
|
1667
1785
|
},
|
|
1668
1786
|
triggerToolbarCommitEvent: function triggerToolbarCommitEvent(params, evnt) {
|
|
1669
1787
|
var $xeGantt = this;
|
|
1788
|
+
var internalData = $xeGantt.internalData;
|
|
1670
1789
|
var code = params.code;
|
|
1671
|
-
|
|
1672
|
-
|
|
1673
|
-
|
|
1674
|
-
|
|
1675
|
-
}), evnt);
|
|
1790
|
+
if (code) {
|
|
1791
|
+
var isUf = ['reload', 'delete', 'save'].includes(code);
|
|
1792
|
+
if (isUf) {
|
|
1793
|
+
internalData.uFoot = true;
|
|
1676
1794
|
}
|
|
1677
|
-
|
|
1795
|
+
var rest = $xeGantt.commitProxy(params, evnt).then(function (rest) {
|
|
1796
|
+
if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
|
|
1797
|
+
$xeGantt.dispatchEvent(code === 'delete' || code === 'save' ? "proxy-".concat(code) : 'proxy-query', Object.assign(Object.assign({}, rest), {
|
|
1798
|
+
isReload: code === 'reload'
|
|
1799
|
+
}), evnt);
|
|
1800
|
+
}
|
|
1801
|
+
});
|
|
1802
|
+
if (isUf) {
|
|
1803
|
+
$xeGantt.updateQueryFooter();
|
|
1804
|
+
}
|
|
1805
|
+
internalData.uFoot = false;
|
|
1806
|
+
return rest;
|
|
1807
|
+
}
|
|
1678
1808
|
},
|
|
1679
1809
|
triggerToolbarBtnEvent: function triggerToolbarBtnEvent(button, evnt) {
|
|
1680
1810
|
var $xeGantt = this;
|