@nokecy/qc-ui 0.9.5 → 0.9.7

package/dist/cjs/ag-grid-plus/ag-gridPlus.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _sumBy2 = _interopRequireDefault(require("lodash/sumBy"));
+var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
 var _agGridReact = require("ag-grid-react");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
@@ -99,10 +100,6 @@ function AgGridPlus(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     pagination = _useState16[0],
     setPagination = _useState16[1];
-  var _useState17 = (0, _react.useState)([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    calculateArr = _useState18[0],
-    setCalculateArr = _useState18[1];
   (0, _react.useImperativeHandle)(propsGridRef, function () {
     return gridRef.current;
   });
@@ -244,34 +241,34 @@ function AgGridPlus(props) {
   var isValidNumber = function isValidNumber(value) {
     return typeof value === 'number' && !isNaN(value);
   };
-  var sumFun = function sumFun(field) {
-    return (0, _sumBy2.default)(rowData, function (cur) {
+  var sumFun = function sumFun(field, displayedData) {
+    return (0, _sumBy2.default)(displayedData, function (cur) {
       if (isValidNumber(cur[field])) {
         return cur[field];
       }
       return 0;
     });
   };
-  var avgFun = function avgFun(field) {
-    var sum = (0, _sumBy2.default)(rowData, function (cur) {
+  var avgFun = function avgFun(field, displayedData) {
+    var sum = (0, _sumBy2.default)(displayedData, function (cur) {
       if (isValidNumber(cur[field]) && cur[field] !== undefined && cur[field] !== null) {
         return cur[field];
       }
       return 0;
     });
-    var count = rowData.filter(function (cur) {
+    var count = displayedData.filter(function (cur) {
       return cur[field] !== undefined && cur[field] !== null;
     });
     return count ? sum / count.length : 0;
   };
-  var standardDeviationFun = function standardDeviationFun(field) {
-    var validValues = rowData.filter(function (cur) {
+  var standardDeviationFun = function standardDeviationFun(field, displayedData) {
+    var validValues = displayedData.filter(function (cur) {
       return isValidNumber(cur[field]);
     });
     var count = validValues.length;
     if (count === 0) return 0;
-    var mean = sumFun(field) / count;
-    var variance = (0, _sumBy2.default)(rowData, function (cur) {
+    var mean = sumFun(field, displayedData) / count;
+    var variance = (0, _sumBy2.default)(displayedData, function (cur) {
       if (cur[field] !== undefined && cur[field] !== null) {
         var diff = cur[field] - mean;
         return diff * diff;
@@ -282,20 +279,22 @@ function AgGridPlus(props) {
   };
 
   // sum 求和  avg 平均值  standardDeviation 标准差
-  var calculatefun = function calculatefun(calcColFields) {
+  var calculatefun = function calculatefun(calcColFields, displayedData) {
     var calculateArrCopy = [];
-    var calculateData = {};
+    var calculateData = {
+      id: (0, _uniqueId2.default)()
+    };
     calcColFields.map(function (i) {
       if (!i.cellRenderer) {
         switch (i.calculateType) {
           case "sum":
-            calculateData[i.field] = sumFun(i.field);
+            calculateData[i.field] = sumFun(i.field, displayedData);
             break;
           case "avg":
-            calculateData[i.field] = avgFun(i.field);
+            calculateData[i.field] = avgFun(i.field, displayedData);
             break;
           case "standardDeviation":
-            calculateData[i.field] = standardDeviationFun(i.field);
+            calculateData[i.field] = standardDeviationFun(i.field, displayedData);
             break;
           default:
             break;
@@ -338,7 +337,7 @@ function AgGridPlus(props) {
     var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
     columnDefs = columnDefs.map(function (col) {
       var dataType = getDataType(data, col.field);
-      if (col.type || col.customCellRenderer) {
+      if (col.type || col.cellRenderer) {
         return _objectSpread(_objectSpread({}, col), {}, {
           customCellRenderer: col.cellRenderer,
           cellRenderer: cellRenderer
@@ -362,6 +361,35 @@ function AgGridPlus(props) {
     });
     return columnDefs;
   };
+  var calculateSum = function calculateSum() {
+    var displayedData = [];
+    if (apiRef.current) {
+      apiRef.current.forEachNodeAfterFilter(function (node) {
+        displayedData.push(node.data);
+      });
+    }
+    if (!allColDefs || displayedData.length === 0) {
+      var _apiRef$current2;
+      (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 || _apiRef$current2.setGridOption('pinnedBottomRowData', undefined);
+      return;
+    }
+    var calcColFields = allColDefs.filter(function (col) {
+      return col.calculateType;
+    }).map(function (col) {
+      return {
+        field: col.field,
+        calculateType: col.calculateType
+      };
+    });
+    if (calcColFields.length > 0) {
+      var _apiRef$current3;
+      var calculatedValues = calculatefun(calcColFields, displayedData);
+      (_apiRef$current3 = apiRef.current) === null || _apiRef$current3 === void 0 || _apiRef$current3.setGridOption('pinnedBottomRowData', calculatedValues);
+    }
+  };
+  var onFilterChanged = function onFilterChanged(event) {
+    calculateSum();
+  };
   var colDefs = (0, _react.useMemo)(function () {
     var columnDefs = getTableColumns(rowData);
     columnDefs = columnDefs.filter(function (x) {
@@ -373,19 +401,7 @@ function AgGridPlus(props) {
     return getTableColumns(rowData);
   }, [children, props.columnDefs, extensibleColumns, rowData]);
   (0, _react.useEffect)(function () {
-    if (!allColDefs || rowData.length === 0) return;
-    var calcColFields = allColDefs.filter(function (col) {
-      return col.calculateType;
-    }).map(function (col) {
-      return {
-        field: col.field,
-        calculateType: col.calculateType
-      };
-    });
-    if (calcColFields.length > 0) {
-      var calculatedValues = calculatefun(calcColFields);
-      setCalculateArr(calculatedValues);
-    }
+    calculateSum();
   }, [allColDefs, rowData]);
   var rowDataMemo = (0, _react.useMemo)(function () {
     return props.treeData ? (0, _utils.flatten)((0, _utils.toTree)(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id") : rowData;
@@ -462,12 +478,13 @@ function AgGridPlus(props) {
       sortChanged(event.api);
       props.onSortChanged && props.onSortChanged(event);
     },
+    onFilterChanged: onFilterChanged,
     onSelectionChanged: onRowChanged,
     onRowSelected: onRowSelected,
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
-        var _apiRef$current2;
-        var _columnState = (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 ? void 0 : _apiRef$current2.getColumnState();
+        var _apiRef$current4;
+        var _columnState = (_apiRef$current4 = apiRef.current) === null || _apiRef$current4 === void 0 ? void 0 : _apiRef$current4.getColumnState();
         setColumnState(_columnState);
         onColumnStateChanged && onColumnStateChanged(_columnState);
       }
@@ -478,7 +495,6 @@ function AgGridPlus(props) {
     //     }
     // }}
     ,
-    pinnedBottomRowData: calculateArr,
     columnTypes: columnTypes,
     animateRows: true
     //停用默认分页组件

package/dist/esm/ag-grid-plus/ag-gridPlus.js

@@ -1,5 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import _sumBy from "lodash/sumBy";
+import _uniqueId from "lodash/uniqueId";
 var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -90,10 +91,6 @@ function AgGridPlus(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     pagination = _useState16[0],
     setPagination = _useState16[1];
-  var _useState17 = useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    calculateArr = _useState18[0],
-    setCalculateArr = _useState18[1];
   useImperativeHandle(propsGridRef, function () {
     return gridRef.current;
   });
@@ -235,34 +232,34 @@ function AgGridPlus(props) {
   var isValidNumber = function isValidNumber(value) {
     return typeof value === 'number' && !isNaN(value);
   };
-  var sumFun = function sumFun(field) {
-    return _sumBy(rowData, function (cur) {
+  var sumFun = function sumFun(field, displayedData) {
+    return _sumBy(displayedData, function (cur) {
       if (isValidNumber(cur[field])) {
         return cur[field];
       }
       return 0;
     });
   };
-  var avgFun = function avgFun(field) {
-    var sum = _sumBy(rowData, function (cur) {
+  var avgFun = function avgFun(field, displayedData) {
+    var sum = _sumBy(displayedData, function (cur) {
       if (isValidNumber(cur[field]) && cur[field] !== undefined && cur[field] !== null) {
         return cur[field];
       }
       return 0;
     });
-    var count = rowData.filter(function (cur) {
+    var count = displayedData.filter(function (cur) {
       return cur[field] !== undefined && cur[field] !== null;
     });
     return count ? sum / count.length : 0;
   };
-  var standardDeviationFun = function standardDeviationFun(field) {
-    var validValues = rowData.filter(function (cur) {
+  var standardDeviationFun = function standardDeviationFun(field, displayedData) {
+    var validValues = displayedData.filter(function (cur) {
       return isValidNumber(cur[field]);
     });
     var count = validValues.length;
     if (count === 0) return 0;
-    var mean = sumFun(field) / count;
-    var variance = _sumBy(rowData, function (cur) {
+    var mean = sumFun(field, displayedData) / count;
+    var variance = _sumBy(displayedData, function (cur) {
       if (cur[field] !== undefined && cur[field] !== null) {
         var diff = cur[field] - mean;
         return diff * diff;
@@ -273,20 +270,22 @@ function AgGridPlus(props) {
   };
 
   // sum 求和  avg 平均值  standardDeviation 标准差
-  var calculatefun = function calculatefun(calcColFields) {
+  var calculatefun = function calculatefun(calcColFields, displayedData) {
     var calculateArrCopy = [];
-    var calculateData = {};
+    var calculateData = {
+      id: _uniqueId()
+    };
     calcColFields.map(function (i) {
       if (!i.cellRenderer) {
         switch (i.calculateType) {
           case "sum":
-            calculateData[i.field] = sumFun(i.field);
+            calculateData[i.field] = sumFun(i.field, displayedData);
             break;
           case "avg":
-            calculateData[i.field] = avgFun(i.field);
+            calculateData[i.field] = avgFun(i.field, displayedData);
             break;
           case "standardDeviation":
-            calculateData[i.field] = standardDeviationFun(i.field);
+            calculateData[i.field] = standardDeviationFun(i.field, displayedData);
             break;
           default:
             break;
@@ -329,7 +328,7 @@ function AgGridPlus(props) {
     var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
     columnDefs = columnDefs.map(function (col) {
       var dataType = getDataType(data, col.field);
-      if (col.type || col.customCellRenderer) {
+      if (col.type || col.cellRenderer) {
         return _objectSpread(_objectSpread({}, col), {}, {
           customCellRenderer: col.cellRenderer,
           cellRenderer: cellRenderer
@@ -353,6 +352,35 @@ function AgGridPlus(props) {
     });
     return columnDefs;
   };
+  var calculateSum = function calculateSum() {
+    var displayedData = [];
+    if (apiRef.current) {
+      apiRef.current.forEachNodeAfterFilter(function (node) {
+        displayedData.push(node.data);
+      });
+    }
+    if (!allColDefs || displayedData.length === 0) {
+      var _apiRef$current2;
+      (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 || _apiRef$current2.setGridOption('pinnedBottomRowData', undefined);
+      return;
+    }
+    var calcColFields = allColDefs.filter(function (col) {
+      return col.calculateType;
+    }).map(function (col) {
+      return {
+        field: col.field,
+        calculateType: col.calculateType
+      };
+    });
+    if (calcColFields.length > 0) {
+      var _apiRef$current3;
+      var calculatedValues = calculatefun(calcColFields, displayedData);
+      (_apiRef$current3 = apiRef.current) === null || _apiRef$current3 === void 0 || _apiRef$current3.setGridOption('pinnedBottomRowData', calculatedValues);
+    }
+  };
+  var onFilterChanged = function onFilterChanged(event) {
+    calculateSum();
+  };
   var colDefs = useMemo(function () {
     var columnDefs = getTableColumns(rowData);
     columnDefs = columnDefs.filter(function (x) {
@@ -364,19 +392,7 @@ function AgGridPlus(props) {
     return getTableColumns(rowData);
   }, [children, props.columnDefs, extensibleColumns, rowData]);
   useEffect(function () {
-    if (!allColDefs || rowData.length === 0) return;
-    var calcColFields = allColDefs.filter(function (col) {
-      return col.calculateType;
-    }).map(function (col) {
-      return {
-        field: col.field,
-        calculateType: col.calculateType
-      };
-    });
-    if (calcColFields.length > 0) {
-      var calculatedValues = calculatefun(calcColFields);
-      setCalculateArr(calculatedValues);
-    }
+    calculateSum();
   }, [allColDefs, rowData]);
   var rowDataMemo = useMemo(function () {
     return props.treeData ? flatten(toTree(rowData, treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id", treeParentName !== null && treeParentName !== void 0 ? treeParentName : "parentId"), treeKeyName !== null && treeKeyName !== void 0 ? treeKeyName : "id") : rowData;
@@ -453,12 +469,13 @@ function AgGridPlus(props) {
       sortChanged(event.api);
       props.onSortChanged && props.onSortChanged(event);
     },
+    onFilterChanged: onFilterChanged,
     onSelectionChanged: onRowChanged,
     onRowSelected: onRowSelected,
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
-        var _apiRef$current2;
-        var _columnState = (_apiRef$current2 = apiRef.current) === null || _apiRef$current2 === void 0 ? void 0 : _apiRef$current2.getColumnState();
+        var _apiRef$current4;
+        var _columnState = (_apiRef$current4 = apiRef.current) === null || _apiRef$current4 === void 0 ? void 0 : _apiRef$current4.getColumnState();
         setColumnState(_columnState);
         onColumnStateChanged && onColumnStateChanged(_columnState);
       }
@@ -469,7 +486,6 @@ function AgGridPlus(props) {
     //     }
     // }}
     ,
-    pinnedBottomRowData: calculateArr,
     columnTypes: columnTypes,
     animateRows: true
     //停用默认分页组件