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/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.24");
8185
+ var version = "gantt v".concat("3.0.26");
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.24";
8195
+ core_.VxeUI.ganttVersion = "3.0.26";
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
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
8417
- var es_array_filter = __webpack_require__(2008);
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
@@ -8909,63 +8966,6 @@ function getSlotVNs(vns) {
8909
8966
  }
8910
8967
  return [vns];
8911
8968
  }
8912
- ;// ./node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js
8913
- function _arrayWithHoles(r) {
8914
- if (Array.isArray(r)) return r;
8915
- }
8916
-
8917
- ;// ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js
8918
-
8919
-
8920
-
8921
-
8922
-
8923
-
8924
-
8925
-
8926
- function _iterableToArrayLimit(r, l) {
8927
- var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
8928
- if (null != t) {
8929
- var e,
8930
- n,
8931
- i,
8932
- u,
8933
- a = [],
8934
- f = !0,
8935
- o = !1;
8936
- try {
8937
- if (i = (t = t.call(r)).next, 0 === l) {
8938
- if (Object(t) !== t) return;
8939
- f = !1;
8940
- } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
8941
- } catch (r) {
8942
- o = !0, n = r;
8943
- } finally {
8944
- try {
8945
- if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return;
8946
- } finally {
8947
- if (o) throw n;
8948
- }
8949
- }
8950
- return a;
8951
- }
8952
- }
8953
-
8954
- ;// ./node_modules/@babel/runtime/helpers/esm/nonIterableRest.js
8955
-
8956
- function _nonIterableRest() {
8957
- throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
8958
- }
8959
-
8960
- ;// ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js
8961
-
8962
-
8963
-
8964
-
8965
- function _slicedToArray(r, e) {
8966
- return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
8967
- }
8968
-
8969
8969
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find.js
8970
8970
  var es_array_find = __webpack_require__(113);
8971
8971
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.find.js
@@ -9193,7 +9193,8 @@ var gantt_chart_viewType = 'chart';
9193
9193
  var showProgress = taskBarOpts.showProgress,
9194
9194
  showContent = taskBarOpts.showContent,
9195
9195
  contentMethod = taskBarOpts.contentMethod,
9196
- barStyle = taskBarOpts.barStyle;
9196
+ barStyle = taskBarOpts.barStyle,
9197
+ drag = taskBarOpts.drag;
9197
9198
  var isBarRowStyle = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(barStyle);
9198
9199
  var barStyObj = (barStyle ? isBarRowStyle ? barStyle(barParams) : barStyle : {}) || {};
9199
9200
  var round = barStyObj.round;
@@ -9238,6 +9239,7 @@ var gantt_chart_viewType = 'chart';
9238
9239
  },
9239
9240
  class: ['vxe-gantt-view--chart-row', {
9240
9241
  'is--round': round,
9242
+ 'is--drag': drag,
9241
9243
  'col--rs-height': isRsHeight
9242
9244
  }],
9243
9245
  style: {
@@ -11100,6 +11102,8 @@ var external_root_VxeUITable_commonjs_vxe_table_commonjs2_vxe_table_amd_vxe_tabl
11100
11102
 
11101
11103
 
11102
11104
 
11105
+
11106
+
11103
11107
 
11104
11108
 
11105
11109
 
@@ -11166,6 +11170,7 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
11166
11170
  });
11167
11171
  function gantt_createInternalData() {
11168
11172
  return {
11173
+ uFoot: false,
11169
11174
  resizeTableWidth: 0
11170
11175
  };
11171
11176
  }
@@ -11185,8 +11190,8 @@ function gantt_createInternalData() {
11185
11190
  taskViewConfig: Object,
11186
11191
  taskBarConfig: Object,
11187
11192
  taskSplitConfig: Object,
11188
- taskResizeConfig: Object,
11189
- taskDragConfig: Object,
11193
+ taskBarResizeConfig: Object,
11194
+ taskBarDragConfig: Object,
11190
11195
  size: {
11191
11196
  type: String,
11192
11197
  default: function _default() {
@@ -11213,6 +11218,7 @@ function gantt_createInternalData() {
11213
11218
  filterData: [],
11214
11219
  formData: {},
11215
11220
  sortData: [],
11221
+ footerData: [],
11216
11222
  tZindex: 0,
11217
11223
  tablePage: {
11218
11224
  total: 0,
@@ -11286,6 +11292,16 @@ function gantt_createInternalData() {
11286
11292
  var props = $xeGantt;
11287
11293
  return Object.assign({}, gantt_getConfig().gantt.taskBarConfig, props.taskBarConfig);
11288
11294
  },
11295
+ computeTaskBarDragOpts: function computeTaskBarDragOpts() {
11296
+ var $xeGantt = this;
11297
+ var props = $xeGantt;
11298
+ return Object.assign({}, gantt_getConfig().gantt.taskBarDragConfig, props.taskBarDragConfig);
11299
+ },
11300
+ computeTaskBarResizeOpts: function computeTaskBarResizeOpts() {
11301
+ var $xeGantt = this;
11302
+ var props = $xeGantt;
11303
+ return Object.assign({}, gantt_getConfig().gantt.taskBarResizeConfig, props.taskBarResizeConfig);
11304
+ },
11289
11305
  computeTaskSplitOpts: function computeTaskSplitOpts() {
11290
11306
  var $xeGantt = this;
11291
11307
  var props = $xeGantt;
@@ -11379,7 +11395,9 @@ function gantt_createInternalData() {
11379
11395
  var rest = {};
11380
11396
  var gridProps = props;
11381
11397
  propKeys.forEach(function (key) {
11382
- rest[key] = gridProps[key];
11398
+ if (gridProps[key] !== undefined) {
11399
+ rest[key] = gridProps[key];
11400
+ }
11383
11401
  });
11384
11402
  return rest;
11385
11403
  },
@@ -11387,12 +11405,14 @@ function gantt_createInternalData() {
11387
11405
  var $xeGantt = this;
11388
11406
  var props = $xeGantt;
11389
11407
  var reactData = $xeGantt.reactData;
11390
- var seqConfig = props.seqConfig,
11408
+ var showFooter = props.showFooter,
11409
+ seqConfig = props.seqConfig,
11391
11410
  pagerConfig = props.pagerConfig,
11392
11411
  editConfig = props.editConfig,
11393
11412
  proxyConfig = props.proxyConfig;
11394
11413
  var isZMax = reactData.isZMax,
11395
- tablePage = reactData.tablePage;
11414
+ tablePage = reactData.tablePage,
11415
+ footerData = reactData.footerData;
11396
11416
  var taskViewOpts = $xeGantt.computeTaskViewOpts;
11397
11417
  var tableStyle = taskViewOpts.tableStyle;
11398
11418
  var tableExtendProps = $xeGantt.computeTableExtendProps;
@@ -11411,8 +11431,15 @@ function gantt_createInternalData() {
11411
11431
  tProps.border = border;
11412
11432
  }
11413
11433
  }
11434
+ if (showFooter && !tProps.footerData) {
11435
+ // 如果未设置自己的标位数据,则使用代理的
11436
+ tProps.footerData = footerData;
11437
+ } else if (proxyOpts.footer && footerData.length) {
11438
+ // 如果代理标为数据,且未请求到数据,则用自己的
11439
+ tProps.footerData = footerData;
11440
+ }
11414
11441
  if (isZMax) {
11415
- if (tableExtendProps.maxHeight) {
11442
+ if (tProps.maxHeight) {
11416
11443
  tProps.maxHeight = '100%';
11417
11444
  } else {
11418
11445
  tProps.height = '100%';
@@ -11765,6 +11792,7 @@ function gantt_createInternalData() {
11765
11792
  var $xeGantt = this;
11766
11793
  var props = $xeGantt;
11767
11794
  var reactData = $xeGantt.reactData;
11795
+ var internalData = $xeGantt.internalData;
11768
11796
  var $xeTable = $xeGantt.$refs.refTable;
11769
11797
  var proxyConfig = props.proxyConfig;
11770
11798
  var proxyOpts = $xeGantt.computeProxyOpts;
@@ -11774,9 +11802,12 @@ function gantt_createInternalData() {
11774
11802
  reactData.filterData = params.filterList;
11775
11803
  if (proxyConfig && isEnableConf(proxyOpts)) {
11776
11804
  reactData.tablePage.currentPage = 1;
11805
+ internalData.uFoot = true;
11777
11806
  $xeGantt.commitProxy('query').then(function (rest) {
11778
11807
  $xeGantt.dispatchEvent('proxy-query', rest, params.$event);
11779
11808
  });
11809
+ internalData.uFoot = false;
11810
+ $xeGantt.updateQueryFooter();
11780
11811
  }
11781
11812
  }
11782
11813
  },
@@ -11794,34 +11825,42 @@ function gantt_createInternalData() {
11794
11825
  var $xeGantt = this;
11795
11826
  var props = $xeGantt;
11796
11827
  var reactData = $xeGantt.reactData;
11828
+ var internalData = $xeGantt.internalData;
11797
11829
  var proxyConfig = props.proxyConfig;
11798
11830
  var proxyOpts = $xeGantt.computeProxyOpts;
11799
11831
  if (reactData.tableLoading) {
11800
11832
  return;
11801
11833
  }
11802
11834
  if (proxyConfig && isEnableConf(proxyOpts)) {
11835
+ internalData.uFoot = true;
11803
11836
  $xeGantt.commitProxy('reload').then(function (rest) {
11804
11837
  $xeGantt.dispatchEvent('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
11805
11838
  isReload: true
11806
11839
  }), params.$event);
11807
11840
  });
11841
+ internalData.uFoot = false;
11842
+ $xeGantt.updateQueryFooter();
11808
11843
  }
11809
11844
  $xeGantt.dispatchEvent('form-submit', params, params.$event);
11810
11845
  },
11811
11846
  resetFormEvent: function resetFormEvent(params) {
11812
11847
  var $xeGantt = this;
11813
11848
  var props = $xeGantt;
11849
+ var internalData = $xeGantt.internalData;
11814
11850
  var $xeTable = $xeGantt.$refs.refTable;
11815
11851
  var proxyConfig = props.proxyConfig;
11816
11852
  var $event = params.$event;
11817
11853
  var proxyOpts = $xeGantt.computeProxyOpts;
11818
11854
  if (proxyConfig && isEnableConf(proxyOpts)) {
11819
11855
  $xeTable.clearScroll();
11856
+ internalData.uFoot = true;
11820
11857
  $xeGantt.commitProxy('reload').then(function (rest) {
11821
11858
  $xeGantt.dispatchEvent('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
11822
11859
  isReload: true
11823
11860
  }), $event);
11824
11861
  });
11862
+ internalData.uFoot = false;
11863
+ $xeGantt.updateQueryFooter();
11825
11864
  }
11826
11865
  $xeGantt.dispatchEvent('form-reset', params, $event);
11827
11866
  },
@@ -11969,6 +12008,7 @@ function gantt_createInternalData() {
11969
12008
  var $xeGantt = this;
11970
12009
  var props = $xeGantt;
11971
12010
  var reactData = $xeGantt.reactData;
12011
+ var internalData = $xeGantt.internalData;
11972
12012
  var proxyConfig = props.proxyConfig,
11973
12013
  formConfig = props.formConfig;
11974
12014
  var proxyInited = reactData.proxyInited;
@@ -11978,18 +12018,32 @@ function gantt_createInternalData() {
11978
12018
  if (isEnableConf(formConfig) && proxyOpts.form && formOpts.items) {
11979
12019
  reactData.formData = $xeGantt.getDefaultFormData();
11980
12020
  }
11981
- if (!proxyInited && proxyOpts.autoLoad !== false) {
12021
+ if (!proxyInited) {
11982
12022
  reactData.proxyInited = true;
11983
- $xeGantt.$nextTick().then(function () {
11984
- return $xeGantt.commitProxy('initial');
11985
- }).then(function (rest) {
11986
- $xeGantt.dispatchEvent('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
11987
- isInited: true
11988
- }), new Event('initial'));
11989
- });
12023
+ if (proxyOpts.autoLoad !== false) {
12024
+ $xeGantt.$nextTick().then(function () {
12025
+ internalData.uFoot = true;
12026
+ var rest = $xeGantt.commitProxy('initial');
12027
+ internalData.uFoot = false;
12028
+ $xeGantt.updateQueryFooter();
12029
+ return rest;
12030
+ }).then(function (rest) {
12031
+ $xeGantt.dispatchEvent('proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
12032
+ isInited: true
12033
+ }), new Event('initial'));
12034
+ });
12035
+ }
11990
12036
  }
11991
12037
  }
11992
12038
  },
12039
+ updateQueryFooter: function updateQueryFooter() {
12040
+ var $xeGantt = this;
12041
+ var proxyOpts = $xeGantt.computeProxyOpts;
12042
+ var ajax = proxyOpts.ajax;
12043
+ if (ajax && ajax.queryFooter) {
12044
+ return $xeGantt.commitProxy('queryFooter');
12045
+ }
12046
+ },
11993
12047
  handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
11994
12048
  var $xeGantt = this;
11995
12049
  var reactData = $xeGantt.reactData;
@@ -12008,15 +12062,20 @@ function gantt_createInternalData() {
12008
12062
  * @param {String/Object} code 字符串或对象
12009
12063
  */
12010
12064
  commitProxy: function commitProxy(proxyTarget) {
12065
+ for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
12066
+ args[_key2 - 1] = arguments[_key2];
12067
+ }
12011
12068
  var $xeGantt = this;
12012
12069
  var props = $xeGantt;
12013
12070
  var reactData = $xeGantt.reactData;
12071
+ var internalData = $xeGantt.internalData;
12014
12072
  /**
12015
12073
  * 已废弃
12016
12074
  * @deprecated
12017
12075
  */
12018
12076
  var toolbar = props.toolbar;
12019
- var proxyConfig = props.proxyConfig,
12077
+ var showFooter = props.showFooter,
12078
+ proxyConfig = props.proxyConfig,
12020
12079
  toolbarConfig = props.toolbarConfig,
12021
12080
  pagerConfig = props.pagerConfig,
12022
12081
  editRules = props.editRules,
@@ -12029,6 +12088,8 @@ function gantt_createInternalData() {
12029
12088
  var toolbarOpts = $xeGantt.computeToolbarOpts;
12030
12089
  var beforeQuery = proxyOpts.beforeQuery,
12031
12090
  afterQuery = proxyOpts.afterQuery,
12091
+ beforeQueryFooter = proxyOpts.beforeQueryFooter,
12092
+ afterQueryFooter = proxyOpts.afterQueryFooter,
12032
12093
  beforeDelete = proxyOpts.beforeDelete,
12033
12094
  afterDelete = proxyOpts.afterDelete,
12034
12095
  beforeSave = proxyOpts.beforeSave,
@@ -12054,9 +12115,6 @@ function gantt_createInternalData() {
12054
12115
  code = button.code;
12055
12116
  }
12056
12117
  var btnParams = button ? button.params : null;
12057
- for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
12058
- args[_key2 - 1] = arguments[_key2];
12059
- }
12060
12118
  switch (code) {
12061
12119
  case 'insert':
12062
12120
  return $xeTable.insert({});
@@ -12098,23 +12156,25 @@ function gantt_createInternalData() {
12098
12156
  case 'reload':
12099
12157
  case 'query':
12100
12158
  {
12101
- var ajaxMethods = ajax.query;
12102
- var querySuccessMethods = ajax.querySuccess;
12103
- var queryErrorMethods = ajax.queryError;
12104
- if (ajaxMethods) {
12159
+ var qMethods = ajax.query;
12160
+ var qsMethods = ajax.querySuccess;
12161
+ var qeMethods = ajax.queryError;
12162
+ if (qMethods) {
12105
12163
  var isInited = code === 'initial';
12106
12164
  var isReload = code === 'reload';
12107
12165
  if (!isInited && reactData.tableLoading) {
12108
12166
  return $xeGantt.$nextTick();
12109
12167
  }
12168
+ var operPromise = null;
12110
12169
  var sortList = [];
12111
12170
  var filterList = [];
12112
12171
  var pageParams = {};
12113
12172
  if (pagerConfig) {
12114
12173
  if (isInited || isReload) {
12174
+ // 重置分页
12115
12175
  tablePage.currentPage = 1;
12116
12176
  }
12117
- if (isEnableConf(pagerConfig)) {
12177
+ if (isEnableConf(pagerOpts)) {
12118
12178
  pageParams = _objectSpread2({}, tablePage);
12119
12179
  }
12120
12180
  }
@@ -12160,7 +12220,7 @@ function gantt_createInternalData() {
12160
12220
  } else {
12161
12221
  if ($xeTable) {
12162
12222
  if (isReload) {
12163
- $xeTable.clearAll();
12223
+ operPromise = $xeTable.clearAll();
12164
12224
  } else {
12165
12225
  sortList = $xeTable.getSortColumns();
12166
12226
  filterList = $xeTable.getCheckedFilters();
@@ -12180,32 +12240,29 @@ function gantt_createInternalData() {
12180
12240
  sorts: sortList,
12181
12241
  filters: filterList,
12182
12242
  form: formData,
12183
- options: ajaxMethods
12243
+ options: qMethods
12184
12244
  };
12185
12245
  reactData.sortData = sortList;
12186
12246
  reactData.filterData = filterList;
12187
12247
  reactData.tableLoading = true;
12188
- var applyArgs = [commitParams].concat(args);
12189
- return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
12248
+ return Promise.all([Promise.resolve((beforeQuery || qMethods).apply(void 0, [commitParams].concat(args))), operPromise]).then(function (_ref3) {
12249
+ var _ref4 = _slicedToArray(_ref3, 1),
12250
+ rest = _ref4[0];
12190
12251
  var tableData = [];
12191
12252
  reactData.tableLoading = false;
12192
12253
  if (rest) {
12254
+ var reParams = {
12255
+ data: rest,
12256
+ $table: $xeTable,
12257
+ $grid: null,
12258
+ $gantt: $xeGantt
12259
+ };
12193
12260
  if (pagerConfig && isEnableConf(pagerOpts)) {
12194
12261
  var totalProp = resConfigs.total;
12195
- var total = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(totalProp) ? totalProp({
12196
- data: rest,
12197
- $table: $xeTable,
12198
- $grid: null,
12199
- $gantt: $xeGantt
12200
- }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, totalProp || 'page.total')) || 0;
12262
+ 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;
12201
12263
  tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(total);
12202
12264
  var resultProp = resConfigs.result;
12203
- tableData = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(resultProp) ? resultProp({
12204
- data: rest,
12205
- $table: $xeTable,
12206
- $grid: null,
12207
- $gantt: $xeGantt
12208
- }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, resultProp || 'result')) || [];
12265
+ 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')) || [];
12209
12266
  // 检验当前页码,不能超出当前最大页数
12210
12267
  var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
12211
12268
  if (tablePage.currentPage > pageCount) {
@@ -12213,28 +12270,35 @@ function gantt_createInternalData() {
12213
12270
  }
12214
12271
  } else {
12215
12272
  var listProp = resConfigs.list;
12216
- tableData = (listProp ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(listProp) ? listProp({
12217
- data: rest,
12218
- $table: $xeTable,
12219
- $grid: null,
12220
- $gantt: $xeGantt
12221
- }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, listProp) : rest) || [];
12273
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest)) {
12274
+ tableData = rest;
12275
+ } else if (listProp) {
12276
+ 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)) || [];
12277
+ }
12278
+ }
12279
+ if (showFooter) {
12280
+ var fdProp = resConfigs.footerData;
12281
+ 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) : [];
12282
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(footerList)) {
12283
+ reactData.footerData = footerList;
12284
+ }
12222
12285
  }
12223
12286
  }
12224
12287
  if ($xeTable) {
12225
12288
  $xeTable.loadData(tableData);
12226
12289
  } else {
12227
- $xeTable.$nextTick(function () {
12290
+ $xeGantt.$nextTick(function () {
12291
+ var $xeTable = $xeGantt.$refs.refTable;
12228
12292
  if ($xeTable) {
12229
12293
  $xeTable.loadData(tableData);
12230
12294
  }
12231
12295
  });
12232
12296
  }
12233
12297
  if (afterQuery) {
12234
- afterQuery.apply(void 0, _toConsumableArray(applyArgs));
12298
+ afterQuery.apply(void 0, [commitParams].concat(args));
12235
12299
  }
12236
- if (querySuccessMethods) {
12237
- querySuccessMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
12300
+ if (qsMethods) {
12301
+ qsMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
12238
12302
  response: rest
12239
12303
  }));
12240
12304
  }
@@ -12243,8 +12307,8 @@ function gantt_createInternalData() {
12243
12307
  };
12244
12308
  }).catch(function (rest) {
12245
12309
  reactData.tableLoading = false;
12246
- if (queryErrorMethods) {
12247
- queryErrorMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
12310
+ if (qeMethods) {
12311
+ qeMethods(_objectSpread2(_objectSpread2({}, commitParams), {}, {
12248
12312
  response: rest
12249
12313
  }));
12250
12314
  }
@@ -12253,16 +12317,64 @@ function gantt_createInternalData() {
12253
12317
  };
12254
12318
  });
12255
12319
  } else {
12256
- errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
12320
+ errLog('vxe.error.notFunc', ['[gantt] proxy-config.ajax.query']);
12321
+ }
12322
+ break;
12323
+ }
12324
+ case 'queryFooter':
12325
+ {
12326
+ var qfMethods = ajax.queryFooter;
12327
+ var qfSuccessMethods = ajax.queryFooterSuccess;
12328
+ var qfErrorMethods = ajax.queryFooterError;
12329
+ if (qfMethods) {
12330
+ var _filterList = [];
12331
+ if ($xeTable) {
12332
+ _filterList = $xeTable.getCheckedFilters();
12333
+ }
12334
+ var _commitParams = {
12335
+ $table: $xeTable,
12336
+ $grid: null,
12337
+ $gantt: $xeGantt,
12338
+ code: code,
12339
+ button: button,
12340
+ filters: _filterList,
12341
+ form: formData,
12342
+ options: qfMethods
12343
+ };
12344
+ return Promise.resolve((beforeQueryFooter || qfMethods).apply(void 0, [_commitParams].concat(args))).then(function (rest) {
12345
+ reactData.footerData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rest) ? rest : [];
12346
+ if (afterQueryFooter) {
12347
+ afterQueryFooter.apply(void 0, [_commitParams].concat(args));
12348
+ }
12349
+ if (qfSuccessMethods) {
12350
+ qfSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
12351
+ response: rest
12352
+ }));
12353
+ }
12354
+ return {
12355
+ status: true
12356
+ };
12357
+ }).catch(function (rest) {
12358
+ if (qfErrorMethods) {
12359
+ qfErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
12360
+ response: rest
12361
+ }));
12362
+ }
12363
+ return {
12364
+ status: false
12365
+ };
12366
+ });
12367
+ } else {
12368
+ errLog('vxe.error.notFunc', ['[gantt] proxy-config.ajax.queryFooter']);
12257
12369
  }
12258
12370
  break;
12259
12371
  }
12260
12372
  case 'delete':
12261
12373
  {
12262
- var _ajaxMethods = ajax.delete;
12374
+ var ajaxMethods = ajax.delete;
12263
12375
  var deleteSuccessMethods = ajax.deleteSuccess;
12264
12376
  var deleteErrorMethods = ajax.deleteError;
12265
- if (_ajaxMethods) {
12377
+ if (ajaxMethods) {
12266
12378
  var selectRecords = $xeTable.getCheckboxRecords();
12267
12379
  var removeRecords = selectRecords.filter(function (row) {
12268
12380
  return !$xeTable.isInsertByRow(row);
@@ -12270,7 +12382,7 @@ function gantt_createInternalData() {
12270
12382
  var body = {
12271
12383
  removeRecords: removeRecords
12272
12384
  };
12273
- var _commitParams = {
12385
+ var _commitParams2 = {
12274
12386
  $table: $xeTable,
12275
12387
  $grid: null,
12276
12388
  $gantt: $xeGantt,
@@ -12278,16 +12390,16 @@ function gantt_createInternalData() {
12278
12390
  button: button,
12279
12391
  body: body,
12280
12392
  form: formData,
12281
- options: _ajaxMethods
12393
+ options: ajaxMethods
12282
12394
  };
12283
- var _applyArgs = [_commitParams].concat(args);
12395
+ var applyArgs = [_commitParams2].concat(args);
12284
12396
  if (selectRecords.length) {
12285
12397
  return $xeGantt.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
12286
12398
  if (!removeRecords.length) {
12287
12399
  return $xeTable.remove(selectRecords);
12288
12400
  }
12289
12401
  reactData.tableLoading = true;
12290
- return Promise.resolve((beforeDelete || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
12402
+ return Promise.resolve((beforeDelete || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
12291
12403
  reactData.tableLoading = false;
12292
12404
  $xeTable.setPendingRow(removeRecords, false);
12293
12405
  if (isRespMsg) {
@@ -12301,12 +12413,15 @@ function gantt_createInternalData() {
12301
12413
  });
12302
12414
  }
12303
12415
  if (afterDelete) {
12304
- afterDelete.apply(void 0, _toConsumableArray(_applyArgs));
12416
+ afterDelete.apply(void 0, _toConsumableArray(applyArgs));
12305
12417
  } else {
12418
+ internalData.uFoot = true;
12306
12419
  $xeGantt.commitProxy('query');
12420
+ internalData.uFoot = false;
12421
+ $xeGantt.updateQueryFooter();
12307
12422
  }
12308
12423
  if (deleteSuccessMethods) {
12309
- deleteSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
12424
+ deleteSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
12310
12425
  response: rest
12311
12426
  }));
12312
12427
  }
@@ -12327,7 +12442,7 @@ function gantt_createInternalData() {
12327
12442
  });
12328
12443
  }
12329
12444
  if (deleteErrorMethods) {
12330
- deleteErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams), {}, {
12445
+ deleteErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
12331
12446
  response: rest
12332
12447
  }));
12333
12448
  }
@@ -12356,16 +12471,16 @@ function gantt_createInternalData() {
12356
12471
  }
12357
12472
  case 'save':
12358
12473
  {
12359
- var _ajaxMethods2 = ajax.save;
12474
+ var _ajaxMethods = ajax.save;
12360
12475
  var saveSuccessMethods = ajax.saveSuccess;
12361
12476
  var saveErrorMethods = ajax.saveError;
12362
- if (_ajaxMethods2) {
12477
+ if (_ajaxMethods) {
12363
12478
  var _body = $xeGantt.getRecordset();
12364
12479
  var insertRecords = _body.insertRecords,
12365
12480
  _removeRecords = _body.removeRecords,
12366
12481
  updateRecords = _body.updateRecords,
12367
12482
  pendingRecords = _body.pendingRecords;
12368
- var _commitParams2 = {
12483
+ var _commitParams3 = {
12369
12484
  $table: $xeTable,
12370
12485
  $grid: null,
12371
12486
  $gantt: $xeGantt,
@@ -12373,9 +12488,9 @@ function gantt_createInternalData() {
12373
12488
  button: button,
12374
12489
  body: _body,
12375
12490
  form: formData,
12376
- options: _ajaxMethods2
12491
+ options: _ajaxMethods
12377
12492
  };
12378
- var _applyArgs2 = [_commitParams2].concat(args);
12493
+ var _applyArgs = [_commitParams3].concat(args);
12379
12494
  // 排除掉新增且标记为删除的数据
12380
12495
  if (insertRecords.length) {
12381
12496
  _body.pendingRecords = pendingRecords.filter(function (row) {
@@ -12400,7 +12515,7 @@ function gantt_createInternalData() {
12400
12515
  }
12401
12516
  if (_body.insertRecords.length || _removeRecords.length || updateRecords.length || _body.pendingRecords.length) {
12402
12517
  reactData.tableLoading = true;
12403
- return Promise.resolve((beforeSave || _ajaxMethods2).apply(void 0, _toConsumableArray(_applyArgs2))).then(function (rest) {
12518
+ return Promise.resolve((beforeSave || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
12404
12519
  reactData.tableLoading = false;
12405
12520
  $xeTable.clearPendingRow();
12406
12521
  if (isRespMsg) {
@@ -12414,12 +12529,15 @@ function gantt_createInternalData() {
12414
12529
  });
12415
12530
  }
12416
12531
  if (afterSave) {
12417
- afterSave.apply(void 0, _toConsumableArray(_applyArgs2));
12532
+ afterSave.apply(void 0, _toConsumableArray(_applyArgs));
12418
12533
  } else {
12534
+ internalData.uFoot = true;
12419
12535
  $xeGantt.commitProxy('query');
12536
+ internalData.uFoot = false;
12537
+ $xeGantt.updateQueryFooter();
12420
12538
  }
12421
12539
  if (saveSuccessMethods) {
12422
- saveSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
12540
+ saveSuccessMethods(_objectSpread2(_objectSpread2({}, _commitParams3), {}, {
12423
12541
  response: rest
12424
12542
  }));
12425
12543
  }
@@ -12440,7 +12558,7 @@ function gantt_createInternalData() {
12440
12558
  });
12441
12559
  }
12442
12560
  if (saveErrorMethods) {
12443
- saveErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams2), {}, {
12561
+ saveErrorMethods(_objectSpread2(_objectSpread2({}, _commitParams3), {}, {
12444
12562
  response: rest
12445
12563
  }));
12446
12564
  }
@@ -12746,14 +12864,26 @@ function gantt_createInternalData() {
12746
12864
  },
12747
12865
  triggerToolbarCommitEvent: function triggerToolbarCommitEvent(params, evnt) {
12748
12866
  var $xeGantt = this;
12867
+ var internalData = $xeGantt.internalData;
12749
12868
  var code = params.code;
12750
- return $xeGantt.commitProxy(params, evnt).then(function (rest) {
12751
- if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
12752
- $xeGantt.dispatchEvent(code === 'delete' || code === 'save' ? "proxy-".concat(code) : 'proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
12753
- isReload: code === 'reload'
12754
- }), evnt);
12869
+ if (code) {
12870
+ var isUf = ['reload', 'delete', 'save'].includes(code);
12871
+ if (isUf) {
12872
+ internalData.uFoot = true;
12755
12873
  }
12756
- });
12874
+ var rest = $xeGantt.commitProxy(params, evnt).then(function (rest) {
12875
+ if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
12876
+ $xeGantt.dispatchEvent(code === 'delete' || code === 'save' ? "proxy-".concat(code) : 'proxy-query', _objectSpread2(_objectSpread2({}, rest), {}, {
12877
+ isReload: code === 'reload'
12878
+ }), evnt);
12879
+ }
12880
+ });
12881
+ if (isUf) {
12882
+ $xeGantt.updateQueryFooter();
12883
+ }
12884
+ internalData.uFoot = false;
12885
+ return rest;
12886
+ }
12757
12887
  },
12758
12888
  triggerToolbarBtnEvent: function triggerToolbarBtnEvent(button, evnt) {
12759
12889
  var $xeGantt = this;