vxe-table 3.19.20 → 3.19.22

package/lib/table/src/methods.js

@@ -28,6 +28,7 @@ const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
+const sourceType = 'table';
 let crossTableDragRowObj = null;
 function eqCellValue(row1, row2, field) {
   const val1 = _xeUtils.default.get(row1, field);
@@ -2993,11 +2994,39 @@ const calcCellHeight = $xeTable => {
   }
 };
 function getOrderField($xeTable, column) {
+  const reactData = $xeTable;
+  const {
+    isRowGroupStatus
+  } = reactData;
   const {
     sortBy,
-    sortType
+    sortType,
+    aggFunc
   } = column;
-  return row => {
+  return isRowGroupStatus && aggFunc ? row => {
+    if (row.isAggregate) {
+      const aggData = row.aggData;
+      const currAggData = aggData ? aggData[column.field] : null;
+      return currAggData ? currAggData.value : null;
+    }
+    let cellValue;
+    if (sortBy) {
+      cellValue = _xeUtils.default.isFunction(sortBy) ? sortBy({
+        row,
+        column
+      }) : _xeUtils.default.get(row, sortBy);
+    } else {
+      cellValue = $xeTable.getCellLabel(row, column);
+    }
+    if (!sortType || sortType === 'auto') {
+      return isNaN(cellValue) ? cellValue : _xeUtils.default.toNumber(cellValue);
+    } else if (sortType === 'number') {
+      return _xeUtils.default.toNumber(cellValue);
+    } else if (sortType === 'string') {
+      return _xeUtils.default.toValueString(cellValue);
+    }
+    return cellValue;
+  } : row => {
     let cellValue;
     if (sortBy) {
       cellValue = _xeUtils.default.isFunction(sortBy) ? sortBy({
@@ -3602,10 +3631,16 @@ function handleUpdateRowGroup($xeTable, groupFields) {
   handleUpdateAggValues($xeTable);
 }
 function handleeGroupSummary($xeTable, aggList) {
+  const internalData = $xeTable;
+  const {
+    fullColumnFieldData
+  } = internalData;
   const aggregateOpts = $xeTable.computeAggregateOpts;
+  const aggFuncColumns = $xeTable.computeAggFuncColumns;
   const {
     mapChildrenField
   } = aggregateOpts;
+  const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
   if (mapChildrenField) {
     _xeUtils.default.lastEach(aggList, aggRow => {
       let count = 0;
@@ -3620,6 +3655,62 @@ function handleeGroupSummary($xeTable, aggList) {
     });
     if ($xeTable.handlePivotTableAggregateData) {
       $xeTable.handlePivotTableAggregateData(aggList);
+    } else {
+      _xeUtils.default.lastEach(aggList, aggRow => {
+        const aggDtObj = {};
+        const aggData = aggRow.aggData;
+        const groupField = aggRow.groupField;
+        const groupContent = aggRow.groupContent;
+        const childList = mapChildrenField ? aggRow[mapChildrenField] || [] : [];
+        const childCount = aggRow.childCount;
+        const colRest = fullColumnFieldData[groupField] || {};
+        aggFuncColumns.forEach(column => {
+          const {
+            field
+          } = column;
+          const currAggData = aggData ? aggData[field] : null;
+          const ctParams = {
+            $table: $xeTable,
+            groupField,
+            groupColumn: colRest ? colRest.column : null,
+            column,
+            groupValue: groupContent,
+            childList,
+            childCount,
+            aggValue: currAggData ? currAggData.value : 0,
+            /**
+             * 已废弃
+             * @deprecated
+             */
+            children: childList,
+            /**
+             * 已废弃
+             * @deprecated
+             */
+            totalValue: childCount
+          };
+          let aggVal = 0;
+          // 如果下层同时也是分组
+          if (childList.length && childList[0].isAggregate) {
+            _xeUtils.default.each(childList, row => {
+              if (row.isAggregate) {
+                const currAggData = row.aggData[field];
+                if (currAggData) {
+                  aggVal += currAggData.value;
+                }
+              }
+            });
+          } else {
+            aggVal = aggCalcMethod ? aggCalcMethod(ctParams) : aggRow.childCount;
+          }
+          aggDtObj[field] = {
+            type: 'count',
+            value: aggVal,
+            label: aggVal
+          };
+        });
+        aggRow.aggData = aggDtObj;
+      });
     }
   }
 }
@@ -4834,7 +4925,35 @@ function handleRowExpandScroll($xeTable) {
     rowExpandEl.scrollTop = bodyScrollElem.scrollTop;
   }
 }
-const Methods = {
+function handleColumnVisible(visible) {
+  const $xeTable = this;
+  return function (fieldOrColumn) {
+    let status = false;
+    const cols = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+    cols.forEach(item => {
+      const column = (0, _util.handleFieldOrColumn)($xeTable, item);
+      if (column) {
+        if (column.children && column.children.length) {
+          _xeUtils.default.eachTree([column], item => {
+            item.visible = visible;
+            item.renderVisible = visible;
+          });
+        } else {
+          column.visible = visible;
+          column.renderVisible = visible;
+        }
+        if (!status) {
+          status = true;
+        }
+      }
+    });
+    if (status) {
+      return $xeTable.handleCustom();
+    }
+    return $xeTable.$nextTick();
+  };
+}
+const tableMethods = {
   callSlot(slotFunc, params, h, vNodes) {
     const $xeTable = this;
     // const slots = $xeTable.$scopedSlots
@@ -5751,15 +5870,27 @@ const Methods = {
   },
   getCellLabel(row, fieldOrColumn) {
     const $xeTable = this;
+    const props = $xeTable;
     const internalData = $xeTable;
-    const column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
+    const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
     if (!column) {
       return null;
     }
-    const formatter = column.formatter;
+    const {
+      editConfig
+    } = props;
+    const {
+      formatter,
+      editRender,
+      cellRender
+    } = column;
+    // formatter > tableCellFormatter
+    const renderOpts = formatter ? null : editConfig && (0, _utils.isEnableConf)(editRender) ? editRender : (0, _utils.isEnableConf)(cellRender) ? cellRender : null;
+    const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
+    const tcFormatter = compConf ? compConf.tableCellFormatter : null;
     const cellValue = (0, _util.getCellValue)(row, column);
     let cellLabel = cellValue;
-    if (formatter) {
+    if (formatter || tcFormatter) {
       let formatData;
       const {
         fullAllDataRowIdData
@@ -5779,22 +5910,27 @@ const Methods = {
         }
       }
       const formatParams = {
+        $table: $xeTable,
         cellValue,
         row,
-        rowIndex: this.getRowIndex(row),
+        rowIndex: $xeTable.getRowIndex(row),
         column,
-        columnIndex: this.getColumnIndex(column)
+        columnIndex: $xeTable.getColumnIndex(column)
       };
-      if (_xeUtils.default.isString(formatter)) {
-        const gFormatOpts = formats.get(formatter);
-        const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
-        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
-      } else if (_xeUtils.default.isArray(formatter)) {
-        const gFormatOpts = formats.get(formatter[0]);
-        const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
-        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
-      } else {
-        cellLabel = formatter(formatParams);
+      if (formatter) {
+        if (_xeUtils.default.isString(formatter)) {
+          const gFormatOpts = formats.get(formatter);
+          const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
+          cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : '';
+        } else if (_xeUtils.default.isArray(formatter)) {
+          const gFormatOpts = formats.get(formatter[0]);
+          const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
+          cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
+        } else {
+          cellLabel = formatter(formatParams);
+        }
+      } else if (renderOpts && tcFormatter) {
+        cellLabel = `${tcFormatter(renderOpts, formatParams)}`;
       }
       if (formatData) {
         formatData[colid] = {
@@ -5852,6 +5988,7 @@ const Methods = {
         }
       }
       const footerFormatParams = {
+        $table: $xeTable,
         cellValue: itemValue,
         itemValue,
         row,
@@ -6467,45 +6604,11 @@ const Methods = {
   /**
    * 隐藏指定列
    */
-  hideColumn(fieldOrColumn) {
-    const $xeTable = this;
-    let status = false;
-    const cols = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-    cols.forEach(item => {
-      const column = (0, _util.handleFieldOrColumn)($xeTable, item);
-      if (column && column.visible) {
-        column.visible = false;
-        if (!status) {
-          status = true;
-        }
-      }
-    });
-    if (status) {
-      return $xeTable.handleCustom();
-    }
-    return $xeTable.$nextTick();
-  },
+  hideColumn: handleColumnVisible(false),
   /**
    * 显示指定列
    */
-  showColumn(fieldOrColumn) {
-    const $xeTable = this;
-    let status = false;
-    const cols = _xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-    cols.forEach(item => {
-      const column = (0, _util.handleFieldOrColumn)($xeTable, item);
-      if (column && !column.visible) {
-        column.visible = true;
-        if (!status) {
-          status = true;
-        }
-      }
-    });
-    if (status) {
-      return $xeTable.handleCustom();
-    }
-    return $xeTable.$nextTick();
-  },
+  showColumn: handleColumnVisible(true),
   setColumnWidth(fieldOrColumn, width) {
     const $xeTable = this;
     const internalData = $xeTable;
@@ -12658,6 +12761,7 @@ const Methods = {
     }
     reactData.lastScrollTime = Date.now();
     const evntParams = Object.assign({
+      source: sourceType,
       scrollTop,
       scrollLeft,
       bodyHeight,
@@ -13976,7 +14080,7 @@ const Methods = {
 // Module methods
 const funcs = 'setFilter,openFilter,clearFilter,saveFilter,saveFilterByEvent,resetFilter,resetFilterByEvent,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,getCustomVisible,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
-  Methods[name] = function (...args) {
+  tableMethods[name] = function (...args) {
     // if (!this[`_${name}`]) {
     //   if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
     //     errLog('vxe.error.reqModule', ['Export'])
@@ -13993,4 +14097,4 @@ funcs.forEach(name => {
     return this[`_${name}`] ? this[`_${name}`](...args) : null;
   };
 });
-var _default = exports.default = Methods;
+var _default = exports.default = tableMethods;