@nokecy/qc-ui 1.0.50 → 1.0.52

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

@@ -24,7 +24,7 @@ var _customGroupCellRenderer = _interopRequireDefault(require("./_utils/customGr
 var _processColumnGroups = _interopRequireDefault(require("./_utils/processColumnGroups"));
 var _processFormColumnState = _interopRequireDefault(require("./_utils/processFormColumnState"));
 var _antdV = require("@formily/antd-v5");
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -67,6 +67,7 @@ function AgGridPlus(props) {
     defaultSearchExpand = props.defaultSearchExpand,
     overlayNoRowsTemplateText = props.overlayNoRowsTemplateText,
     queryDefaultRows = props.queryDefaultRows,
+    onSelectedRowsChange = props.onSelectedRowsChange,
     rest = _objectWithoutProperties(props, _excluded);
   var _useGridPlusColumnSta = (0, _.useGridPlusColumnState)(),
     onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -272,8 +273,46 @@ function AgGridPlus(props) {
   }, []);
   var onRowSelected = (0, _react.useCallback)(function (e) {
     setSelectRow(e.data);
+
+    // 处理选中行数据回调
+    if (onSelectedRowsChange && apiRef.current) {
+      // 获取所有选中的行
+      var allSelectedRows = apiRef.current.getSelectedRows();
+
+      // 获取当前显示的行（经过筛选后的行）
+      var displayedRows = [];
+      apiRef.current.forEachNodeAfterFilterAndSort(function (node) {
+        displayedRows.push(node.data);
+      });
+
+      // 获取行ID的方法，优先使用外部传入的getRowId，否则默认使用id字段
+      var getRowIdMethod = props.getRowId || function (params) {
+        var _params$data, _params$data2;
+        return ((_params$data = params.data) === null || _params$data === void 0 ? void 0 : _params$data.id) || ((_params$data2 = params.data) === null || _params$data2 === void 0 ? void 0 : _params$data2._id);
+      };
+
+      // 只保留既被选中又在当前显示的行
+      var visibleSelectedRows = allSelectedRows.filter(function (selectedRow) {
+        return displayedRows.some(function (displayedRow) {
+          var selectedRowId = getRowIdMethod({
+            data: selectedRow,
+            level: 0,
+            api: apiRef.current,
+            context: null
+          });
+          var displayedRowId = getRowIdMethod({
+            data: displayedRow,
+            level: 0,
+            api: apiRef.current,
+            context: null
+          });
+          return selectedRowId && displayedRowId && selectedRowId === displayedRowId;
+        });
+      });
+      onSelectedRowsChange(visibleSelectedRows);
+    }
     props.onRowSelected && props.onRowSelected(e);
-  }, []);
+  }, [onSelectedRowsChange, props.getRowId]);
   var onColumnStateChanged = function onColumnStateChanged(columnState) {
     if (gridKey) {
       onSaveColumnState && onSaveColumnState(gridKey, columnState);
@@ -285,7 +324,7 @@ function AgGridPlus(props) {
   };
   var sumFun = function sumFun(field, displayedData) {
     return (0, _sumBy2.default)(displayedData, function (cur) {
-      if (isValidNumber(cur[field])) {
+      if (cur && isValidNumber(cur[field])) {
         return cur[field];
       }
       return 0;
@@ -293,13 +332,13 @@ function AgGridPlus(props) {
   };
   var avgFun = function avgFun(field, displayedData) {
     var sum = (0, _sumBy2.default)(displayedData, function (cur) {
-      if (isValidNumber(cur[field]) && cur[field] !== undefined && cur[field] !== null) {
+      if (cur && isValidNumber(cur[field]) && cur[field] !== undefined && cur[field] !== null) {
         return cur[field];
       }
       return 0;
     });
     var count = displayedData.filter(function (cur) {
-      return cur[field] !== undefined && cur[field] !== null;
+      return cur && cur[field] !== undefined && cur[field] !== null;
     });
     return count ? sum / count.length : 0;
   };
@@ -311,7 +350,7 @@ function AgGridPlus(props) {
     if (count === 0) return 0;
     var mean = sumFun(field, displayedData) / count;
     var variance = (0, _sumBy2.default)(displayedData, function (cur) {
-      if (cur[field] !== undefined && cur[field] !== null) {
+      if (cur && cur[field] !== undefined && cur[field] !== null) {
         var diff = cur[field] - mean;
         return diff * diff;
       }
@@ -630,6 +669,10 @@ function AgGridPlus(props) {
     rowData: rowDataMemo,
     onGridReady: onGridReady,
     defaultColDef: defaultColDef,
+    getRowId: props.getRowId || function (params) {
+      var _params$data3, _params$data4;
+      return ((_params$data3 = params.data) === null || _params$data3 === void 0 ? void 0 : _params$data3.id) || ((_params$data4 = params.data) === null || _params$data4 === void 0 ? void 0 : _params$data4._id);
+    },
     onSortChanged: function onSortChanged(event) {
       sortChanged(event.api);
       props.onSortChanged && props.onSortChanged(event);

package/dist/cjs/ag-grid-plus/interface.d.ts

@@ -45,6 +45,10 @@ interface GridProps extends AgGridReactProps {
     pageSizeOptions?: number[];
     hidePagination?: boolean;
     gridRef?: React.Ref<GridRef | undefined>;
+    /**
+     * 选中行变化回调函数
+     */
+    onSelectedRowsChange?: (selectedRows: any[]) => void;
 }
 interface AgGridColumnPropsClone extends ColDef {
     /**

package/dist/cjs/array-table/index.js

@@ -104,7 +104,25 @@ var ArrayTable = (0, _react2.observer)(function (props) {
       onSaveColumnState && onSaveColumnState(props.gridKey, columnState);
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Space, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    ref: ref,
+    style: {
+      height: height ? height : 400
+    }
+  }, /*#__PURE__*/_react.default.createElement(_arrayBase.default, {
+    onAdd: onAdd,
+    onCopy: onCopy,
+    onRemove: onRemove,
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      width: '100%',
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Space, {
     style: {
       marginBottom: 5
     }
@@ -125,24 +143,7 @@ var ArrayTable = (0, _react2.observer)(function (props) {
       name: key,
       onlyRenderProperties: true
     });
-  })), /*#__PURE__*/_react.default.createElement("div", {
-    ref: ref,
-    style: {
-      height: height ? height : 400
-    }
-  }, /*#__PURE__*/_react.default.createElement(_arrayBase.default, {
-    onAdd: onAdd,
-    onCopy: onCopy,
-    onRemove: onRemove,
-    onMoveUp: onMoveUp,
-    onMoveDown: onMoveDown
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      width: '100%',
-      display: 'flex',
-      justifyContent: 'flex-end'
-    }
-  }, /*#__PURE__*/_react.default.createElement(_setting.default, {
+  })), /*#__PURE__*/_react.default.createElement(_setting.default, {
     gridKey: props.gridKey,
     gridApi: apiRef.current,
     gridApiState: gridApiState,

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

@@ -2,7 +2,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 import _sumBy from "lodash/sumBy";
 import _uniqueId from "lodash/uniqueId";
 import _isArray from "lodash/isArray";
-var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows"];
+var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows", "onSelectedRowsChange"];
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -58,6 +58,7 @@ function AgGridPlus(props) {
     defaultSearchExpand = props.defaultSearchExpand,
     overlayNoRowsTemplateText = props.overlayNoRowsTemplateText,
     queryDefaultRows = props.queryDefaultRows,
+    onSelectedRowsChange = props.onSelectedRowsChange,
     rest = _objectWithoutProperties(props, _excluded);
   var _useGridPlusColumnSta = useGridPlusColumnState(),
     onSaveColumnState = _useGridPlusColumnSta.onSaveColumnState,
@@ -263,8 +264,46 @@ function AgGridPlus(props) {
   }, []);
   var onRowSelected = useCallback(function (e) {
     setSelectRow(e.data);
+
+    // 处理选中行数据回调
+    if (onSelectedRowsChange && apiRef.current) {
+      // 获取所有选中的行
+      var allSelectedRows = apiRef.current.getSelectedRows();
+
+      // 获取当前显示的行（经过筛选后的行）
+      var displayedRows = [];
+      apiRef.current.forEachNodeAfterFilterAndSort(function (node) {
+        displayedRows.push(node.data);
+      });
+
+      // 获取行ID的方法，优先使用外部传入的getRowId，否则默认使用id字段
+      var getRowIdMethod = props.getRowId || function (params) {
+        var _params$data, _params$data2;
+        return ((_params$data = params.data) === null || _params$data === void 0 ? void 0 : _params$data.id) || ((_params$data2 = params.data) === null || _params$data2 === void 0 ? void 0 : _params$data2._id);
+      };
+
+      // 只保留既被选中又在当前显示的行
+      var visibleSelectedRows = allSelectedRows.filter(function (selectedRow) {
+        return displayedRows.some(function (displayedRow) {
+          var selectedRowId = getRowIdMethod({
+            data: selectedRow,
+            level: 0,
+            api: apiRef.current,
+            context: null
+          });
+          var displayedRowId = getRowIdMethod({
+            data: displayedRow,
+            level: 0,
+            api: apiRef.current,
+            context: null
+          });
+          return selectedRowId && displayedRowId && selectedRowId === displayedRowId;
+        });
+      });
+      onSelectedRowsChange(visibleSelectedRows);
+    }
     props.onRowSelected && props.onRowSelected(e);
-  }, []);
+  }, [onSelectedRowsChange, props.getRowId]);
   var onColumnStateChanged = function onColumnStateChanged(columnState) {
     if (gridKey) {
       onSaveColumnState && onSaveColumnState(gridKey, columnState);
@@ -276,7 +315,7 @@ function AgGridPlus(props) {
   };
   var sumFun = function sumFun(field, displayedData) {
     return _sumBy(displayedData, function (cur) {
-      if (isValidNumber(cur[field])) {
+      if (cur && isValidNumber(cur[field])) {
         return cur[field];
       }
       return 0;
@@ -284,13 +323,13 @@ function AgGridPlus(props) {
   };
   var avgFun = function avgFun(field, displayedData) {
     var sum = _sumBy(displayedData, function (cur) {
-      if (isValidNumber(cur[field]) && cur[field] !== undefined && cur[field] !== null) {
+      if (cur && isValidNumber(cur[field]) && cur[field] !== undefined && cur[field] !== null) {
         return cur[field];
       }
       return 0;
     });
     var count = displayedData.filter(function (cur) {
-      return cur[field] !== undefined && cur[field] !== null;
+      return cur && cur[field] !== undefined && cur[field] !== null;
     });
     return count ? sum / count.length : 0;
   };
@@ -302,7 +341,7 @@ function AgGridPlus(props) {
     if (count === 0) return 0;
     var mean = sumFun(field, displayedData) / count;
     var variance = _sumBy(displayedData, function (cur) {
-      if (cur[field] !== undefined && cur[field] !== null) {
+      if (cur && cur[field] !== undefined && cur[field] !== null) {
         var diff = cur[field] - mean;
         return diff * diff;
       }
@@ -621,6 +660,10 @@ function AgGridPlus(props) {
     rowData: rowDataMemo,
     onGridReady: onGridReady,
     defaultColDef: defaultColDef,
+    getRowId: props.getRowId || function (params) {
+      var _params$data3, _params$data4;
+      return ((_params$data3 = params.data) === null || _params$data3 === void 0 ? void 0 : _params$data3.id) || ((_params$data4 = params.data) === null || _params$data4 === void 0 ? void 0 : _params$data4._id);
+    },
     onSortChanged: function onSortChanged(event) {
       sortChanged(event.api);
       props.onSortChanged && props.onSortChanged(event);

package/dist/esm/ag-grid-plus/interface.d.ts

@@ -45,6 +45,10 @@ interface GridProps extends AgGridReactProps {
     pageSizeOptions?: number[];
     hidePagination?: boolean;
     gridRef?: React.Ref<GridRef | undefined>;
+    /**
+     * 选中行变化回调函数
+     */
+    onSelectedRowsChange?: (selectedRows: any[]) => void;
 }
 interface AgGridColumnPropsClone extends ColDef {
     /**

package/dist/esm/array-table/index.js

@@ -98,7 +98,25 @@ var ArrayTable = observer(function (props) {
       onSaveColumnState && onSaveColumnState(props.gridKey, columnState);
     }
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+    ref: ref,
+    style: {
+      height: height ? height : 400
+    }
+  }, /*#__PURE__*/React.createElement(ArrayBase, {
+    onAdd: onAdd,
+    onCopy: onCopy,
+    onRemove: onRemove,
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%',
+      display: 'flex',
+      justifyContent: 'space-between',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React.createElement(Space, {
     style: {
       marginBottom: 5
     }
@@ -119,24 +137,7 @@ var ArrayTable = observer(function (props) {
       name: key,
       onlyRenderProperties: true
     });
-  })), /*#__PURE__*/React.createElement("div", {
-    ref: ref,
-    style: {
-      height: height ? height : 400
-    }
-  }, /*#__PURE__*/React.createElement(ArrayBase, {
-    onAdd: onAdd,
-    onCopy: onCopy,
-    onRemove: onRemove,
-    onMoveUp: onMoveUp,
-    onMoveDown: onMoveDown
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      width: '100%',
-      display: 'flex',
-      justifyContent: 'flex-end'
-    }
-  }, /*#__PURE__*/React.createElement(Setting, {
+  })), /*#__PURE__*/React.createElement(Setting, {
     gridKey: props.gridKey,
     gridApi: apiRef.current,
     gridApiState: gridApiState,