@nokecy/qc-ui 1.0.30 → 1.0.32

package/dist/cjs/ag-grid-plus/_utils/customGroupCellRenderer.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { CustomCellRendererProps } from 'ag-grid-react';
+declare const CustomGroupCellRenderer: (props: CustomCellRendererProps) => React.JSX.Element;
+export default CustomGroupCellRenderer;

package/dist/cjs/ag-grid-plus/_utils/customGroupCellRenderer.js

@@ -0,0 +1,75 @@
+"use strict";
+
+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); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _icons = require("@ant-design/icons");
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var CustomGroupCellRenderer = function CustomGroupCellRenderer(props) {
+  var node = props.node,
+    value = props.value;
+  var _useState = (0, _react.useState)(node.expanded),
+    _useState2 = _slicedToArray(_useState, 2),
+    expanded = _useState2[0],
+    setExpanded = _useState2[1];
+  (0, _react.useEffect)(function () {
+    var expandListener = function expandListener(event) {
+      return setExpanded(event.node.expanded);
+    };
+    node.addEventListener('expandedChanged', expandListener);
+    return function () {
+      node.removeEventListener('expandedChanged', expandListener);
+    };
+  }, []);
+  var onClick = (0, _react.useCallback)(function () {
+    return node.setExpanded(!node.expanded);
+  }, [node]);
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      paddingLeft: "".concat(node.level * 15, "px")
+    }
+  }, node.group && (expanded ? /*#__PURE__*/_react.default.createElement("div", {
+    className: "jf-anticon",
+    onClick: onClick,
+    style: {
+      display: 'inline-flex',
+      borderRadius: '4px',
+      border: '1px solid #00b96b',
+      padding: '2px',
+      transition: 'transform 0.3s ease',
+      transform: 'rotate(0deg)'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_icons.MinusOutlined, {
+    style: {
+      fontSize: '10px',
+      color: '#00b96b'
+    }
+  })) : /*#__PURE__*/_react.default.createElement("div", {
+    className: "jf-anticon",
+    onClick: onClick,
+    style: {
+      display: 'inline-flex',
+      borderRadius: '4px',
+      border: '1px solid #00b96b',
+      padding: '2px',
+      transition: 'transform 0.3s ease',
+      transform: 'rotate(180deg)'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, {
+    style: {
+      fontSize: '10px',
+      color: '#00b96b'
+    }
+  }))), "\xA0", value);
+};
+var _default = exports.default = CustomGroupCellRenderer;

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

@@ -20,6 +20,7 @@ var _icons = require("@ant-design/icons");
 var _utils = require("./utils");
 var _setting = _interopRequireDefault(require("./setting"));
 var _ = require(".");
+var _customGroupCellRenderer = _interopRequireDefault(require("./_utils/customGroupCellRenderer"));
 var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText"];
 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; }
@@ -239,6 +240,7 @@ function AgGridPlus(props) {
     }
     return cellMap;
   };
+  var groupRowRenderer = (0, _react.useCallback)(_customGroupCellRenderer.default, []);
   var sortChanged = function sortChanged(columnApi) {
     var sortedColumn = columnApi.getColumnState().find(function (col) {
       return Boolean(col.sort);
@@ -539,7 +541,9 @@ function AgGridPlus(props) {
     },
     overlayNoRowsTemplate: "<span style=\"\n                                        display: flex; \n                                        justify-content: center; \n                                        align-items: center; \n                                        height: 100%; \n                                        font-size: 14px; \n                                        color: #aaa; \n                                        line-height: 1.5;\n                                        text-align: center;\">\n                                        ".concat(overlayNoRowsTemplateText || '没有找到数据，试试调整筛选条件吧！', "\n                                        </span>"),
     enableRangeSelection: true,
-    suppressCopyRowsToClipboard: true
+    suppressCopyRowsToClipboard: true,
+    groupRowRenderer: props.treeData ? groupRowRenderer : null,
+    groupDisplayType: props.treeData ? "groupRows" : "custom"
     //指定客户端模式
     ,
     rowModelType: "clientSide",

package/dist/cjs/ag-grid-plus/index.less

@@ -1,15 +1,43 @@
 .grid-spin {
-    height: 100%;
+  height: 100%;
 
-    .ant-spin-container {
-        height: 100%;
-    }
+  .ant-spin-container {
+    height: 100%;
+  }
 }
 
 .ag-icon-filter:before {
-    -webkit-mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
-    
-    mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
+  -webkit-mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
+
+  mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
+
+  color: #8a8a8a;
+}
+
+.ag-row-group {
+  display: flex;
+  align-items: center;
+  padding-left: 16px;
+}
 
-    color: #8a8a8a;
-}
+.jf-anticon {
+  cursor: pointer;
+  display: inline-block;
+  box-sizing: border-box;
+  margin-right: 16rpx;
+}
+
+.ag-checkbox {
+	width: 18px !important;
+	height: 18px !important;
+}
+.ag-checkbox .ag-checkbox-input-wrapper {
+	width: 18px !important;
+	height: 18px !important;
+}
+
+.ag-checkbox-input-wrapper .ag-checkbox-input {
+	width: 18px !important;
+	height: 18px !important;
+	transform: scale(1.5); /* 放大 */
+}

package/dist/cjs/ag-grid-plus/queryForm/index.js

@@ -175,7 +175,13 @@ var FormRender = function FormRender(props) {
   (0, _react2.useEffect)(function () {
     var new_schema = getSchema(onReset);
     setSchema(new_schema);
-  }, [JSON.stringify(columnStates), JSON.stringify(colDefs)]);
+  }, [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (c) {
+    return c.colId;
+  }).join('|'), // 列ID变化监听
+  colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (c) {
+    return "".concat(c.field, "|").concat(c.headerName);
+  }).join('|') // 同时监听字段名和显示名称
+  ]);
   return /*#__PURE__*/_react2.default.createElement("div", {
     className: (0, _classnames.default)(className, "ag-grid-table-search ag-grid-table-search-query-filter")
   }, /*#__PURE__*/_react2.default.createElement(_antdV.Form, {

package/dist/esm/ag-grid-plus/_utils/customGroupCellRenderer.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { CustomCellRendererProps } from 'ag-grid-react';
+declare const CustomGroupCellRenderer: (props: CustomCellRendererProps) => React.JSX.Element;
+export default CustomGroupCellRenderer;

package/dist/esm/ag-grid-plus/_utils/customGroupCellRenderer.js

@@ -0,0 +1,66 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useCallback, useEffect, useState } from 'react';
+import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
+var CustomGroupCellRenderer = function CustomGroupCellRenderer(props) {
+  var node = props.node,
+    value = props.value;
+  var _useState = useState(node.expanded),
+    _useState2 = _slicedToArray(_useState, 2),
+    expanded = _useState2[0],
+    setExpanded = _useState2[1];
+  useEffect(function () {
+    var expandListener = function expandListener(event) {
+      return setExpanded(event.node.expanded);
+    };
+    node.addEventListener('expandedChanged', expandListener);
+    return function () {
+      node.removeEventListener('expandedChanged', expandListener);
+    };
+  }, []);
+  var onClick = useCallback(function () {
+    return node.setExpanded(!node.expanded);
+  }, [node]);
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      paddingLeft: "".concat(node.level * 15, "px")
+    }
+  }, node.group && (expanded ? /*#__PURE__*/React.createElement("div", {
+    className: "jf-anticon",
+    onClick: onClick,
+    style: {
+      display: 'inline-flex',
+      borderRadius: '4px',
+      border: '1px solid #00b96b',
+      padding: '2px',
+      transition: 'transform 0.3s ease',
+      transform: 'rotate(0deg)'
+    }
+  }, /*#__PURE__*/React.createElement(MinusOutlined, {
+    style: {
+      fontSize: '10px',
+      color: '#00b96b'
+    }
+  })) : /*#__PURE__*/React.createElement("div", {
+    className: "jf-anticon",
+    onClick: onClick,
+    style: {
+      display: 'inline-flex',
+      borderRadius: '4px',
+      border: '1px solid #00b96b',
+      padding: '2px',
+      transition: 'transform 0.3s ease',
+      transform: 'rotate(180deg)'
+    }
+  }, /*#__PURE__*/React.createElement(PlusOutlined, {
+    style: {
+      fontSize: '10px',
+      color: '#00b96b'
+    }
+  }))), "\xA0", value);
+};
+export default CustomGroupCellRenderer;

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

@@ -29,6 +29,7 @@ import { RedoOutlined } from '@ant-design/icons';
 import { convertFilterModel, dateTimeValueFormatter, dateValueFormatter, flatten, toTree } from "./utils";
 import Setting from "./setting";
 import { useGridPlusColumnState } from '.';
+import CustomGroupCellRenderer from "./_utils/customGroupCellRenderer";
 var Paragraph = Typography.Paragraph,
   Text = Typography.Text;
 var getSort = function getSort(columnState) {
@@ -230,6 +231,7 @@ function AgGridPlus(props) {
     }
     return cellMap;
   };
+  var groupRowRenderer = useCallback(CustomGroupCellRenderer, []);
   var sortChanged = function sortChanged(columnApi) {
     var sortedColumn = columnApi.getColumnState().find(function (col) {
       return Boolean(col.sort);
@@ -530,7 +532,9 @@ function AgGridPlus(props) {
     },
     overlayNoRowsTemplate: "<span style=\"\n                                        display: flex; \n                                        justify-content: center; \n                                        align-items: center; \n                                        height: 100%; \n                                        font-size: 14px; \n                                        color: #aaa; \n                                        line-height: 1.5;\n                                        text-align: center;\">\n                                        ".concat(overlayNoRowsTemplateText || '没有找到数据，试试调整筛选条件吧！', "\n                                        </span>"),
     enableRangeSelection: true,
-    suppressCopyRowsToClipboard: true
+    suppressCopyRowsToClipboard: true,
+    groupRowRenderer: props.treeData ? groupRowRenderer : null,
+    groupDisplayType: props.treeData ? "groupRows" : "custom"
     //指定客户端模式
     ,
     rowModelType: "clientSide",

package/dist/esm/ag-grid-plus/index.less

@@ -1,15 +1,43 @@
 .grid-spin {
-    height: 100%;
+  height: 100%;
 
-    .ant-spin-container {
-        height: 100%;
-    }
+  .ant-spin-container {
+    height: 100%;
+  }
 }
 
 .ag-icon-filter:before {
-    -webkit-mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
-    
-    mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
+  -webkit-mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
+
+  mask-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNzIzNjg0NDAwMDY0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI0MjgiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjIwMCI+PHBhdGggZD0iTTMyNS43MTQyODYgODg0LjU3MTQyOWMwIDIwLjIyODU3MSAxNi4yMjg1NzEgMzYuNTcxNDI5IDM2LjM0Mjg1NyAzNi41NzE0MjhoMjk5Ljg4NTcxNGMyMC4xMTQyODYgMCAzNi4zNDI4NTctMTYuMzQyODU3IDM2LjM0Mjg1Ny0zNi41NzE0MjhWNjYwLjU3MTQyOUgzMjUuNzE0Mjg2djIyNHogbTYwNi45NzE0MjgtNzgxLjcxNDI4Nkg5MS4zMTQyODZjLTI4IDAtNDUuNDg1NzE0IDMwLjUxNDI4Ni0zMS40Mjg1NzIgNTQuODU3MTQzbDI1Mi45MTQyODYgNDI5LjcxNDI4NWgzOTguNjI4NTcxbDI1Mi45MTQyODYtNDI5LjcxNDI4NWMxMy44Mjg1NzEtMjQuMzQyODU3LTMuNjU3MTQzLTU0Ljg1NzE0My0zMS42NTcxNDMtNTQuODU3MTQzeiIgcC1pZD0iMjQyOSIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg==) !important;
+
+  color: #8a8a8a;
+}
+
+.ag-row-group {
+  display: flex;
+  align-items: center;
+  padding-left: 16px;
+}
 
-    color: #8a8a8a;
-}
+.jf-anticon {
+  cursor: pointer;
+  display: inline-block;
+  box-sizing: border-box;
+  margin-right: 16rpx;
+}
+
+.ag-checkbox {
+	width: 18px !important;
+	height: 18px !important;
+}
+.ag-checkbox .ag-checkbox-input-wrapper {
+	width: 18px !important;
+	height: 18px !important;
+}
+
+.ag-checkbox-input-wrapper .ag-checkbox-input {
+	width: 18px !important;
+	height: 18px !important;
+	transform: scale(1.5); /* 放大 */
+}

package/dist/esm/ag-grid-plus/queryForm/index.js

@@ -167,7 +167,13 @@ var FormRender = function FormRender(props) {
   useEffect(function () {
     var new_schema = getSchema(onReset);
     setSchema(new_schema);
-  }, [JSON.stringify(columnStates), JSON.stringify(colDefs)]);
+  }, [columnStates === null || columnStates === void 0 ? void 0 : columnStates.map(function (c) {
+    return c.colId;
+  }).join('|'), // 列ID变化监听
+  colDefs === null || colDefs === void 0 ? void 0 : colDefs.map(function (c) {
+    return "".concat(c.field, "|").concat(c.headerName);
+  }).join('|') // 同时监听字段名和显示名称
+  ]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(className, "ag-grid-table-search ag-grid-table-search-query-filter")
   }, /*#__PURE__*/React.createElement(Form, {