vxe-gantt 4.0.24 → 4.0.25

package/lib/gantt/src/gantt.js

@@ -35,6 +35,7 @@ const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadDat
 const defaultLayouts = [['Form'], ['Toolbar', 'Top', 'Gantt', 'Bottom', 'Pager']];
 function createInternalData() {
   return {
+    uFoot: false,
     resizeTableWidth: 0
   };
 }
@@ -99,6 +100,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       filterData: [],
       formData: {},
       sortData: [],
+      footerData: [],
       tZindex: 0,
       tablePage: {
         total: 0,
@@ -272,13 +274,17 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     });
     const computeTableExtendProps = (0, _vue.computed)(() => {
       const rest = {};
+      const ganttProps = props;
       tableComponentPropKeys.forEach(key => {
-        rest[key] = props[key];
+        if (ganttProps[key] !== undefined) {
+          rest[key] = ganttProps[key];
+        }
       });
       return rest;
     });
     const computeTableProps = (0, _vue.computed)(() => {
       const {
+        showFooter,
         seqConfig,
         pagerConfig,
         editConfig,
@@ -286,7 +292,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       } = props;
       const {
         isZMax,
-        tablePage
+        tablePage,
+        footerData
       } = reactData;
       const taskViewOpts = computeTaskViewOpts.value;
       const {
@@ -310,8 +317,15 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           tProps.border = border;
         }
       }
+      if (showFooter && !tProps.footerData) {
+        // 如果未设置自己的标位数据，则使用代理的
+        tProps.footerData = footerData;
+      } else if (proxyOpts.footer && footerData.length) {
+        // 如果代理标为数据，且未请求到数据，则用自己的
+        tProps.footerData = footerData;
+      }
       if (isZMax) {
-        if (tableExtendProps.maxHeight) {
+        if (tProps.maxHeight) {
           tProps.maxHeight = '100%';
         } else {
           tProps.height = '100%';
@@ -693,9 +707,12 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         reactData.filterData = params.filterList;
         if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
           reactData.tablePage.currentPage = 1;
+          internalData.uFoot = true;
           $xeGantt.commitProxy('query').then(rest => {
             $xeGantt.dispatchEvent('proxy-query', rest, params.$event);
           });
+          internalData.uFoot = false;
+          updateQueryFooter();
         }
       }
     };
@@ -716,11 +733,14 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         return;
       }
       if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
+        internalData.uFoot = true;
         $xeGantt.commitProxy('reload').then(rest => {
           $xeGantt.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
             isReload: true
           }), params.$event);
         });
+        internalData.uFoot = false;
+        updateQueryFooter();
       }
       $xeGantt.dispatchEvent('form-submit', params, params.$event);
     };
@@ -737,11 +757,14 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         if ($xeTable) {
           $xeTable.clearScroll();
         }
+        internalData.uFoot = true;
         $xeGantt.commitProxy('reload').then(rest => {
           $xeGantt.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
             isReload: true
           }), $event);
         });
+        internalData.uFoot = false;
+        updateQueryFooter();
       }
       $xeGantt.dispatchEvent('form-reset', params, $event);
     };
@@ -899,6 +922,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             let itemValue = null;
             if (itemRender) {
               const {
+                startField,
+                endField,
                 defaultValue
               } = itemRender;
               if (_xeUtils.default.isFunction(defaultValue)) {
@@ -908,6 +933,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
               } else if (!_xeUtils.default.isUndefined(defaultValue)) {
                 itemValue = defaultValue;
               }
+              if (startField && endField) {
+                _xeUtils.default.set(fData, startField, null);
+                _xeUtils.default.set(fData, endField, null);
+              }
             }
             fData[field] = itemValue;
           }
@@ -933,7 +962,13 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         if (!proxyInited) {
           reactData.proxyInited = true;
           if (proxyOpts.autoLoad !== false) {
-            (0, _vue.nextTick)().then(() => $xeGantt.commitProxy('initial')).then(rest => {
+            (0, _vue.nextTick)().then(() => {
+              internalData.uFoot = true;
+              const rest = $xeGantt.commitProxy('initial');
+              internalData.uFoot = false;
+              updateQueryFooter();
+              return rest;
+            }).then(rest => {
               dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
                 isInited: true
               }), new Event('initial'));
@@ -942,6 +977,15 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }
       }
     };
+    const updateQueryFooter = () => {
+      const proxyOpts = computeProxyOpts.value;
+      const {
+        ajax
+      } = proxyOpts;
+      if (ajax && ajax.queryFooter) {
+        return $xeGantt.commitProxy('queryFooter');
+      }
+    };
     const handleGlobalKeydownEvent = evnt => {
       const zoomOpts = computeZoomOpts.value;
       const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
@@ -966,6 +1010,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
        */
       commitProxy(proxyTarget, ...args) {
         const {
+          showFooter,
           proxyConfig,
           toolbarConfig,
           pagerConfig,
@@ -983,6 +1028,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         const {
           beforeQuery,
           afterQuery,
+          beforeQueryFooter,
+          afterQueryFooter,
           beforeDelete,
           afterDelete,
           beforeSave,
@@ -1047,15 +1094,16 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           case 'reload':
           case 'query':
             {
-              const ajaxMethods = ajax.query;
-              const querySuccessMethods = ajax.querySuccess;
-              const queryErrorMethods = ajax.queryError;
-              if (ajaxMethods) {
+              const qMethods = ajax.query;
+              const qsMethods = ajax.querySuccess;
+              const qeMethods = ajax.queryError;
+              if (qMethods) {
                 const isInited = code === 'initial';
                 const isReload = code === 'reload';
                 if (!isInited && reactData.tableLoading) {
                   return (0, _vue.nextTick)();
                 }
+                let operPromise = null;
                 let sortList = [];
                 let filterList = [];
                 let pageParams = {};
@@ -1117,7 +1165,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                 } else {
                   if ($xeTable) {
                     if (isReload) {
-                      $xeTable.clearAll();
+                      operPromise = $xeTable.clearAll();
                     } else {
                       sortList = $xeTable.getSortColumns();
                       filterList = $xeTable.getCheckedFilters();
@@ -1137,31 +1185,27 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   sorts: sortList,
                   filters: filterList,
                   form: formData,
-                  options: ajaxMethods
+                  options: qMethods
                 };
                 reactData.sortData = sortList;
                 reactData.filterData = filterList;
                 reactData.tableLoading = true;
-                return Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args)).then(rest => {
+                return Promise.all([Promise.resolve((beforeQuery || qMethods)(commitParams, ...args)), operPromise]).then(([rest]) => {
                   let tableData = [];
                   reactData.tableLoading = false;
                   if (rest) {
+                    const reParams = {
+                      data: rest,
+                      $table: $xeTable,
+                      $grid: null,
+                      $gantt: $xeGantt
+                    };
                     if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
                       const totalProp = resConfigs.total;
-                      const total = (_xeUtils.default.isFunction(totalProp) ? totalProp({
-                        data: rest,
-                        $table: $xeTable,
-                        $grid: null,
-                        $gantt: $xeGantt
-                      }) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
+                      const total = (_xeUtils.default.isFunction(totalProp) ? totalProp(reParams) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
                       tablePage.total = _xeUtils.default.toNumber(total);
                       const resultProp = resConfigs.result;
-                      tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp({
-                        data: rest,
-                        $table: $xeTable,
-                        $grid: null,
-                        $gantt: $xeGantt
-                      }) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
+                      tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp(reParams) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
                       // 检验当前页码，不能超出当前最大页数
                       const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
                       if (tablePage.currentPage > pageCount) {
@@ -1169,18 +1213,25 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                       }
                     } else {
                       const listProp = resConfigs.list;
-                      tableData = (listProp ? _xeUtils.default.isFunction(listProp) ? listProp({
-                        data: rest,
-                        $table: $xeTable,
-                        $grid: null,
-                        $gantt: $xeGantt
-                      }) : _xeUtils.default.get(rest, listProp) : rest) || [];
+                      if (_xeUtils.default.isArray(rest)) {
+                        tableData = rest;
+                      } else if (listProp) {
+                        tableData = (_xeUtils.default.isFunction(listProp) ? listProp(reParams) : _xeUtils.default.get(rest, listProp)) || [];
+                      }
+                    }
+                    if (showFooter) {
+                      const fdProp = resConfigs.footerData;
+                      const footerList = fdProp ? _xeUtils.default.isFunction(fdProp) ? fdProp(reParams) : _xeUtils.default.get(rest, fdProp) : [];
+                      if (_xeUtils.default.isArray(footerList)) {
+                        reactData.footerData = footerList;
+                      }
                     }
                   }
                   if ($xeTable) {
                     $xeTable.loadData(tableData);
                   } else {
                     (0, _vue.nextTick)(() => {
+                      const $xeTable = refTable.value;
                       if ($xeTable) {
                         $xeTable.loadData(tableData);
                       }
@@ -1189,8 +1240,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   if (afterQuery) {
                     afterQuery(commitParams, ...args);
                   }
-                  if (querySuccessMethods) {
-                    querySuccessMethods(Object.assign(Object.assign({}, commitParams), {
+                  if (qsMethods) {
+                    qsMethods(Object.assign(Object.assign({}, commitParams), {
                       response: rest
                     }));
                   }
@@ -1199,8 +1250,56 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   };
                 }).catch(rest => {
                   reactData.tableLoading = false;
-                  if (queryErrorMethods) {
-                    queryErrorMethods(Object.assign(Object.assign({}, commitParams), {
+                  if (qeMethods) {
+                    qeMethods(Object.assign(Object.assign({}, commitParams), {
+                      response: rest
+                    }));
+                  }
+                  return {
+                    status: false
+                  };
+                });
+              } else {
+                (0, _log.errLog)('vxe.error.notFunc', ['[gantt] proxy-config.ajax.query']);
+              }
+              break;
+            }
+          case 'queryFooter':
+            {
+              const qfMethods = ajax.queryFooter;
+              const qfSuccessMethods = ajax.queryFooterSuccess;
+              const qfErrorMethods = ajax.queryFooterError;
+              if (qfMethods) {
+                let filterList = [];
+                if ($xeTable) {
+                  filterList = $xeTable.getCheckedFilters();
+                }
+                const commitParams = {
+                  $table: $xeTable,
+                  $grid: null,
+                  $gantt: $xeGantt,
+                  code,
+                  button,
+                  filters: filterList,
+                  form: formData,
+                  options: qfMethods
+                };
+                return Promise.resolve((beforeQueryFooter || qfMethods)(commitParams, ...args)).then(rest => {
+                  reactData.footerData = _xeUtils.default.isArray(rest) ? rest : [];
+                  if (afterQueryFooter) {
+                    afterQueryFooter(commitParams, ...args);
+                  }
+                  if (qfSuccessMethods) {
+                    qfSuccessMethods(Object.assign(Object.assign({}, commitParams), {
+                      response: rest
+                    }));
+                  }
+                  return {
+                    status: true
+                  };
+                }).catch(rest => {
+                  if (qfErrorMethods) {
+                    qfErrorMethods(Object.assign(Object.assign({}, commitParams), {
                       response: rest
                     }));
                   }
@@ -1209,16 +1308,16 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   };
                 });
               } else {
-                (0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.query']);
+                (0, _log.errLog)('vxe.error.notFunc', ['[gantt] proxy-config.ajax.queryFooter']);
               }
               break;
             }
           case 'delete':
             {
-              const ajaxMethods = ajax.delete;
+              const dMethods = ajax.delete;
               const deleteSuccessMethods = ajax.deleteSuccess;
               const deleteErrorMethods = ajax.deleteError;
-              if (ajaxMethods) {
+              if (dMethods) {
                 const selectRecords = $xeGantt.getCheckboxRecords();
                 const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
                 const body = {
@@ -1232,7 +1331,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   button,
                   body,
                   form: formData,
-                  options: ajaxMethods
+                  options: dMethods
                 };
                 if (selectRecords.length) {
                   return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
@@ -1240,7 +1339,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                       return $xeTable.remove(selectRecords);
                     }
                     reactData.tableLoading = true;
-                    return Promise.resolve((beforeDelete || ajaxMethods)(commitParams, ...args)).then(rest => {
+                    return Promise.resolve((beforeDelete || dMethods)(commitParams, ...args)).then(rest => {
                       reactData.tableLoading = false;
                       $xeTable.setPendingRow(removeRecords, false);
                       if (isRespMsg) {
@@ -1254,7 +1353,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                       if (afterDelete) {
                         afterDelete(commitParams, ...args);
                       } else {
+                        internalData.uFoot = true;
                         $xeGantt.commitProxy('query');
+                        internalData.uFoot = false;
+                        updateQueryFooter();
                       }
                       if (deleteSuccessMethods) {
                         deleteSuccessMethods(Object.assign(Object.assign({}, commitParams), {
@@ -1297,7 +1399,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   }
                 }
               } else {
-                (0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.delete']);
+                (0, _log.errLog)('vxe.error.notFunc', ['[gantt] proxy-config.ajax.delete']);
               }
               break;
             }
@@ -1358,7 +1460,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                       if (afterSave) {
                         afterSave(commitParams, ...args);
                       } else {
+                        internalData.uFoot = true;
                         $xeGantt.commitProxy('query');
+                        internalData.uFoot = false;
+                        updateQueryFooter();
                       }
                       if (saveSuccessMethods) {
                         saveSuccessMethods(Object.assign(Object.assign({}, commitParams), {
@@ -1401,7 +1506,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   }
                 });
               } else {
-                (0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.save']);
+                (0, _log.errLog)('vxe.error.notFunc', ['[gantt] proxy-config.ajax.save']);
               }
               break;
             }
@@ -1419,7 +1524,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                     $gantt: $xeGantt
                   }, ...args);
                 } else {
-                  (0, _log.errLog)('vxe.error.notCommands', [code]);
+                  (0, _log.errLog)('vxe.error.notCommands', [`[grid] ${code}`]);
                 }
               }
             }
@@ -1638,6 +1743,9 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
        * 获取需要排除的高度
        */
       getExcludeHeight() {
+        const {
+          height
+        } = props;
         const {
           isZMax
         } = reactData;
@@ -1649,7 +1757,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           const bottomWrapper = refBottomWrapper.value;
           const pagerWrapper = refPagerWrapper.value;
           const parentEl = el.parentElement;
-          const parentPaddingSize = isZMax ? 0 : parentEl ? (0, _dom.getPaddingTopBottomSize)(parentEl) : 0;
+          let parentPaddingSize = 0;
+          if (parentEl && (height === '100%' || height === 'auto')) {
+            parentPaddingSize = isZMax ? 0 : (0, _dom.getPaddingTopBottomSize)(parentEl);
+          }
           return parentPaddingSize + (0, _dom.getPaddingTopBottomSize)(el) + (0, _dom.getOffsetHeight)(formWrapper) + (0, _dom.getOffsetHeight)(toolbarWrapper) + (0, _dom.getOffsetHeight)(topWrapper) + (0, _dom.getOffsetHeight)(bottomWrapper) + (0, _dom.getOffsetHeight)(pagerWrapper);
         }
         return 0;
@@ -1666,13 +1777,25 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         const {
           code
         } = params;
-        return $xeGantt.commitProxy(params, evnt).then(rest => {
-          if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
-            $xeGantt.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', Object.assign(Object.assign({}, rest), {
-              isReload: code === 'reload'
-            }), evnt);
+        if (code) {
+          const isUf = ['reload', 'delete', 'save'].includes(code);
+          if (isUf) {
+            internalData.uFoot = true;
           }
-        });
+          const rest = $xeGantt.commitProxy(params, evnt).then(rest => {
+            if (rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
+              $xeGantt.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', Object.assign(Object.assign({}, rest), {
+                isReload: code === 'reload'
+              }), evnt);
+            }
+          });
+          internalData.uFoot = false;
+          if (isUf) {
+            updateQueryFooter();
+          }
+          return rest;
+        }
+        return (0, _vue.nextTick)();
       },
       triggerToolbarBtnEvent(button, evnt) {
         $xeGantt.triggerToolbarCommitEvent(button, evnt);