@nokecy/qc-ui 1.0.39 → 1.0.41

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

@@ -5,6 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 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; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -13,10 +19,27 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 var processColumnGroups = function processColumnGroups(columns) {
   var groupMap = new Map();
   var result = [];
-
-  // 第一次遍历：创建分组结构
+  var ungrouped = [];
   columns.forEach(function (col) {
-    if (col.groupName) {
+    var headerName = col.headerName;
+    if (col.children) {
+      if (!groupMap.has(headerName)) {
+        groupMap.set(headerName, {
+          headerName: headerName,
+          field: "".concat(headerName, "header"),
+          children: []
+        });
+      }
+      // 合并并去重 children
+      var group = groupMap.get(headerName);
+      col.children.forEach(function (child) {
+        if (!group.children.some(function (c) {
+          return c.field === child.field;
+        })) {
+          group.children.push(child);
+        }
+      });
+    } else if (col.groupName) {
       if (!groupMap.has(col.groupName)) {
         groupMap.set(col.groupName, {
           headerName: col.groupName,
@@ -24,27 +47,21 @@ var processColumnGroups = function processColumnGroups(columns) {
           children: []
         });
       }
-    }
-  });
-
-  // 第二次遍历：按原始顺序处理列
-  columns.forEach(function (col) {
-    if (col.groupName) {
       var groupCol = _objectSpread({}, col);
-      // delete groupCol.groupName;
-
-      // 如果这是该组的第一个元素，将组添加到结果中
-      if (groupMap.get(col.groupName).children.length === 0) {
-        result.push(groupMap.get(col.groupName));
+      delete groupCol.groupName;
+      var _group = groupMap.get(col.groupName);
+      if (!_group.children.some(function (c) {
+        return c.field === groupCol.field;
+      })) {
+        _group.children.push(groupCol);
       }
-
-      // 将列添加到对应的组中
-      groupMap.get(col.groupName).children.push(groupCol);
     } else {
-      // 未分组的列直接添加到结果中
-      result.push(col);
+      ungrouped.push(col);
     }
   });
+
+  // 直接从 groupMap 和 ungrouped 生成结果
+  result.push.apply(result, _toConsumableArray(Array.from(groupMap.values())).concat(ungrouped));
   return result;
 };
 var _default = exports.default = processColumnGroups;

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

@@ -0,0 +1,2 @@
+declare const flattenColumnState: (columnState: any[]) => any[];
+export default flattenColumnState;

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

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var flattenColumnState = function flattenColumnState(columnState) {
+  var result = [];
+  var processColumn = function processColumn(column) {
+    // 如果有children属性且不为空，递归处理
+    if (column.children && column.children.length > 0) {
+      // 处理子列
+      column.children.forEach(function (child) {
+        processColumn(child);
+      });
+    } else {
+      // 没有children的列直接添加到结果中
+      result.push(column);
+    }
+  };
+
+  // 处理每一列
+  columnState.forEach(function (column) {
+    processColumn(column);
+  });
+  return result;
+};
+var _default = exports.default = flattenColumnState;

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

@@ -22,6 +22,7 @@ var _setting = _interopRequireDefault(require("./setting"));
 var _ = require(".");
 var _customGroupCellRenderer = _interopRequireDefault(require("./_utils/customGroupCellRenderer"));
 var _processColumnGroups = _interopRequireDefault(require("./_utils/processColumnGroups"));
+var _processFormColumnState = _interopRequireDefault(require("./_utils/processFormColumnState"));
 var _excluded = ["style", "loading", "params", "request", "dataSource", "treeKeyName", "treeParentName", "rowData", "gridRef", "headerTitle", "toolBarRender", "search", "hideTool", "onGridReady", "gridKey", "children", "defaultSearchExpand", "overlayNoRowsTemplateText", "queryDefaultRows"];
 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; }
@@ -247,7 +248,6 @@ function AgGridPlus(props) {
         }
       });
     }
-    console.log('record1 columnState 3', cellMap);
     return cellMap;
   };
   var sortChanged = function sortChanged(columnApi) {
@@ -382,7 +382,6 @@ function AgGridPlus(props) {
       return _objectSpread({}, child.props);
     });
     var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
-    console.log('record1 columnDefs 2', columnDefs);
     columnDefs = columnDefs.map(function (col) {
       var dataType = getDataType(data, col.field);
       if (col.type || typeof col.cellRenderer == "string") {
@@ -475,7 +474,6 @@ function AgGridPlus(props) {
       return !x.hideInTable;
     });
     var processedColumns = (0, _processColumnGroups.default)(columnDefs);
-    console.log('record1 columnDefs 1', processedColumns);
     return processedColumns;
   }, [children === null || children === void 0 ? void 0 : children.length, props.columnDefs, extensibleColumns, columnCellClass]);
   var allColDefs = (0, _react.useMemo)(function () {
@@ -505,7 +503,7 @@ function AgGridPlus(props) {
       height: "100%"
     }
   }, search == false ? null : /*#__PURE__*/_react.default.createElement(_queryForm.default, {
-    colDefs: allColDefs,
+    colDefs: (0, _processFormColumnState.default)(allColDefs),
     defaultRows: queryDefaultRows,
     columnStates: columnState || [],
     defaultExpand: defaultSearchExpand,
@@ -521,6 +519,9 @@ function AgGridPlus(props) {
         onRequest && onRequest(formValues);
         return prev;
       });
+    },
+    onInit: function onInit(defaultValues) {
+      setQueryFilter(defaultValues);
     }
   }), /*#__PURE__*/_react.default.createElement(_antd.Card, {
     bordered: false,

package/dist/cjs/ag-grid-plus/queryForm/index.d.ts

@@ -9,5 +9,6 @@ declare const FormRender: (props: {
     defaultExpand?: Boolean | undefined;
     defaultRows?: number | undefined;
     onQuery: (formValue: any) => void;
+    onInit?: ((defaultValues: any) => void) | undefined;
 }) => React.JSX.Element;
 export default FormRender;

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

@@ -57,6 +57,9 @@ var FormRender = function FormRender(props) {
       }
     });
   }, []);
+  (0, _react2.useEffect)(function () {
+    props.onInit && props.onInit(form.values);
+  }, []);
   var SchemaField = (0, _react2.useMemo)(function () {
     return (0, _react.createSchemaField)({
       components: {
@@ -144,12 +147,12 @@ var FormRender = function FormRender(props) {
       //表单自定义组件
       var component = getComponent(colDef);
       if (colDef.filter != false) {
-        var _colDef$searchCompone, _colDef$searchCompone2;
+        var _colDef$searchCompone, _colDef$searchCompone2, _colDef$searchCompone3;
         var filedSchema = {
           type: 'string',
           title: headerName,
           required: (colDef === null || colDef === void 0 || (_colDef$searchCompone = colDef.searchComponentProps) === null || _colDef$searchCompone === void 0 ? void 0 : _colDef$searchCompone.required) || false,
-          default: colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.default,
+          default: (colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.default) || (colDef === null || colDef === void 0 || (_colDef$searchCompone3 = colDef.searchComponentProps) === null || _colDef$searchCompone3 === void 0 ? void 0 : _colDef$searchCompone3.defaultValue),
           enum: colDef === null || colDef === void 0 ? void 0 : colDef.enum,
           "x-component": component,
           "x-component-props": _objectSpread({

package/dist/cjs/ag-grid-plus/setting/diySetting/index.d.ts

@@ -3,6 +3,7 @@ import React from "react";
 declare const DiySetting: (props: {
     gridKey?: string | undefined;
     gridApi?: GridApi<any> | undefined;
+    type?: string | undefined;
     gridApiState?: GridApi<any> | undefined;
     onSaveColumnState: (state: any) => void;
 }) => React.JSX.Element | null;

package/dist/cjs/ag-grid-plus/setting/diySetting/index.js

@@ -53,21 +53,35 @@ var DiySetting = function DiySetting(props) {
   var getColumnData = function getColumnData() {
     var columnStates = gridApi.getColumnState();
     var columnRowData = [];
-    columnStates.forEach(function (columnState) {
-      var colDef = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDef(columnState.colId);
+    var columnDefs = (gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnDefs()) || [];
 
-      // 将列信息和 cellClass 一并加入到 columnRowData 中
-      columnRowData.push(_objectSpread({
-        id: (0, _uniqueId2.default)(),
-        field: colDef.field,
-        headerName: colDef.headerName,
-        width: columnState.width,
-        hide: columnState.hide,
-        cellClass: colDef.cellClass,
-        // 添加 cellClass
-        suppressHeaderFilterButton: !colDef.suppressHeaderFilterButton
-      }, columnState));
-    });
+    // 递归处理列定义
+    var processColumns = function processColumns(columns, parentGroup) {
+      columns.forEach(function (column) {
+        if (column.children && column.children.length > 0) {
+          // 处理子列，将当前headerName作为分组名传递下去
+          processColumns(column.children, column.headerName);
+        } else {
+          // 找到对应的columnState
+          var columnState = columnStates.find(function (state) {
+            return state.colId === column.field;
+          });
+          if (columnState) {
+            columnRowData.push(_objectSpread({
+              id: (0, _uniqueId2.default)(),
+              field: column.field,
+              headerName: column.headerName,
+              width: columnState.width,
+              hide: columnState.hide,
+              cellClass: column.cellClass,
+              suppressHeaderFilterButton: !column.suppressHeaderFilterButton,
+              groupName: parentGroup
+            }, columnState));
+          }
+        }
+      });
+    };
+    processColumns(columnDefs);
     return columnRowData;
   };
   var portalId = "workProcedure".concat((0, _uniqueId2.default)());
@@ -120,7 +134,7 @@ var DiySetting = function DiySetting(props) {
               })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
                 "x-component": "ArrayTable.Column",
                 "x-component-props": {
-                  width: 280,
+                  width: 180,
                   title: "列名"
                 }
               }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
@@ -128,6 +142,16 @@ var DiySetting = function DiySetting(props) {
                 "x-decorator": "FormItem",
                 "x-component": "Input",
                 "x-read-pretty": true
+              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
+                "x-component": "ArrayTable.Column",
+                "x-component-props": {
+                  width: 120,
+                  title: "分组名称"
+                }
+              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
+                name: "groupName",
+                "x-decorator": "FormItem",
+                "x-component": "Input"
               })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
                 "x-component": "ArrayTable.Column",
                 "x-component-props": {
@@ -216,24 +240,15 @@ var DiySetting = function DiySetting(props) {
                 name: "hide",
                 "x-decorator": "FormItem",
                 "x-component": "Switch"
-              })), /*#__PURE__*/_react2.default.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 180,
-                  title: "分组名称"
-                }
-              }, /*#__PURE__*/_react2.default.createElement(SchemaField.String, {
-                name: "groupName",
-                "x-decorator": "FormItem",
-                "x-component": "Input"
               })))))));
             });
             formDialog.forConfirm(function (payload, next) {
               var values = payload.values;
               onSaveColumnState && onSaveColumnState(values.items);
               var processedColumns = (0, _processColumnGroups.default)(values.items);
-              console.log('record1', processedColumns);
-              gridApi.setGridOption("columnDefs", processedColumns);
+              if (props.type !== 'formArrayTable') {
+                gridApi.setGridOption("columnDefs", processedColumns);
+              }
               setTimeout(function () {
                 gridApi.applyColumnState({
                   state: processedColumns,

package/dist/cjs/ag-grid-plus/setting/index.d.ts

@@ -4,6 +4,7 @@ declare const Setting: (props: {
     gridKey?: string | undefined;
     gridApi?: GridApi<any> | undefined;
     gridApiState?: GridApi<any> | undefined;
+    type?: string | undefined;
     onSaveColumnState: (state: any) => void;
 }) => React.JSX.Element | null;
 export default Setting;

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

@@ -32,6 +32,7 @@ var Setting = function Setting(props) {
     gridApiState = props.gridApiState,
     onSaveColumnState = props.onSaveColumnState;
   var _useGridPlusColumnSta = (0, _.useGridPlusColumnState)(),
+    extensibleColumns = _useGridPlusColumnSta.extensibleColumns,
     applyToGlobal = _useGridPlusColumnSta.applyToGlobal,
     resetCurrent = _useGridPlusColumnSta.resetCurrent,
     resetAll = _useGridPlusColumnSta.resetAll;
@@ -89,7 +90,8 @@ var Setting = function Setting(props) {
     label: /*#__PURE__*/_react2.default.createElement(_diySetting.default, {
       gridKey: gridKey,
       gridApi: gridApi,
-      onSaveColumnState: onSaveColumnState
+      onSaveColumnState: onSaveColumnState,
+      type: props.type
     })
   }, {
     key: '2',

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

@@ -61,13 +61,74 @@ var ArrayTable = (0, _react2.observer)(function (props) {
     gridPlusColumnState = _useGridPlusColumnSta.columnState,
     extensibleColumns = _useGridPlusColumnSta.extensibleColumns;
   // const teststyle = '[{\"id\":\"18\",\"field\":\"xdxcp47tycp\",\"headerName\":\"A1\",\"width\":800,\"hide\":false,\"colId\":\"a1\",\"pinned\":null,\"sort\":null,\"sortIndex\":null,\"aggFunc\":null,\"rowGroup\":false,\"rowGroupIndex\":null,\"pivot\":false,\"pivotIndex\":null,\"flex\":null},{\"id\":\"19\",\"field\":\"nvhezzkyak9\",\"headerName\":\"Operations\",\"width\":60,\"hide\":false,\"colId\":\"nvhezzkyak9\",\"pinned\":null,\"sort\":null,\"sortIndex\":null,\"aggFunc\":null,\"rowGroup\":false,\"rowGroupIndex\":null,\"pivot\":false,\"pivotIndex\":null,\"flex\":null}]'
+  // const teststyle = [
+  //   {
+  //     "id": "5",
+  //     "field": "NO_NAME_FIELD_$1",
+  //     "headerName": "Index",
+  //     "width": 80,
+  //     "hide": false,
+  //     "cellClass": "custom-cell-left",
+  //     "suppressHeaderFilterButton": true,
+  //     "colId": "NO_NAME_FIELD_$1",
+  //     "pinned": null,
+  //     "sort": null,
+  //     "sortIndex": null,
+  //     "aggFunc": null,
+  //     "rowGroup": false,
+  //     "rowGroupIndex": null,
+  //     "pivot": false,
+  //     "pivotIndex": null,
+  //     "flex": null
+  //   },
+  //   {
+  //     "id": "6",
+  //     "field": "a1",
+  //     "headerName": "A1",
+  //     "width": 1200,
+  //     "hide": false,
+  //     "cellClass": "custom-cell-left",
+  //     "suppressHeaderFilterButton": true,
+  //     "colId": "a1",
+  //     "pinned": null,
+  //     "sort": null,
+  //     "sortIndex": null,
+  //     "aggFunc": null,
+  //     "rowGroup": false,
+  //     "rowGroupIndex": null,
+  //     "pivot": false,
+  //     "pivotIndex": null,
+  //     "flex": null
+  //   },
+  //   {
+  //     "id": "7",
+  //     "field": "operations",
+  //     "headerName": "Operations",
+  //     "width": 80,
+  //     "hide": false,
+  //     "cellClass": "custom-cell-left",
+  //     "suppressHeaderFilterButton": true,
+  //     "colId": "operations",
+  //     "pinned": "right",
+  //     "sort": null,
+  //     "sortIndex": null,
+  //     "aggFunc": null,
+  //     "rowGroup": false,
+  //     "rowGroupIndex": null,
+  //     "pivot": false,
+  //     "pivotIndex": null,
+  //     "flex": null
+  //   }
+  // ]
 
   (0, _react.useEffect)(function () {
     if (props.gridKey && gridPlusColumnState && gridPlusColumnState[props.gridKey] && apiRef.current) {
-      apiRef.current.applyColumnState({
-        state: gridPlusColumnState[props.gridKey],
-        applyOrder: true
-      });
+      setTimeout(function () {
+        apiRef.current.applyColumnState({
+          state: gridPlusColumnState[props.gridKey],
+          applyOrder: true
+        });
+      }, 10);
     }
   }, [gridPlusColumnState, apiRef.current, dataSource]);
 
@@ -138,6 +199,7 @@ var ArrayTable = (0, _react2.observer)(function (props) {
     gridKey: props.gridKey,
     gridApi: apiRef.current,
     gridApiState: gridApiState,
+    type: 'formArrayTable',
     onSaveColumnState: onColumnStateChanged
   })), /*#__PURE__*/_react.default.createElement(_agGridReact.AgGridReact, {
     onGridReady: function onGridReady(params) {

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

@@ -1,4 +1,10 @@
 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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 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; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -7,10 +13,27 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 var processColumnGroups = function processColumnGroups(columns) {
   var groupMap = new Map();
   var result = [];
-
-  // 第一次遍历：创建分组结构
+  var ungrouped = [];
   columns.forEach(function (col) {
-    if (col.groupName) {
+    var headerName = col.headerName;
+    if (col.children) {
+      if (!groupMap.has(headerName)) {
+        groupMap.set(headerName, {
+          headerName: headerName,
+          field: "".concat(headerName, "header"),
+          children: []
+        });
+      }
+      // 合并并去重 children
+      var group = groupMap.get(headerName);
+      col.children.forEach(function (child) {
+        if (!group.children.some(function (c) {
+          return c.field === child.field;
+        })) {
+          group.children.push(child);
+        }
+      });
+    } else if (col.groupName) {
       if (!groupMap.has(col.groupName)) {
         groupMap.set(col.groupName, {
           headerName: col.groupName,
@@ -18,27 +41,21 @@ var processColumnGroups = function processColumnGroups(columns) {
           children: []
         });
       }
-    }
-  });
-
-  // 第二次遍历：按原始顺序处理列
-  columns.forEach(function (col) {
-    if (col.groupName) {
       var groupCol = _objectSpread({}, col);
-      // delete groupCol.groupName;
-
-      // 如果这是该组的第一个元素，将组添加到结果中
-      if (groupMap.get(col.groupName).children.length === 0) {
-        result.push(groupMap.get(col.groupName));
+      delete groupCol.groupName;
+      var _group = groupMap.get(col.groupName);
+      if (!_group.children.some(function (c) {
+        return c.field === groupCol.field;
+      })) {
+        _group.children.push(groupCol);
       }
-
-      // 将列添加到对应的组中
-      groupMap.get(col.groupName).children.push(groupCol);
     } else {
-      // 未分组的列直接添加到结果中
-      result.push(col);
+      ungrouped.push(col);
     }
   });
+
+  // 直接从 groupMap 和 ungrouped 生成结果
+  result.push.apply(result, _toConsumableArray(Array.from(groupMap.values())).concat(ungrouped));
   return result;
 };
 export default processColumnGroups;

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

@@ -0,0 +1,2 @@
+declare const flattenColumnState: (columnState: any[]) => any[];
+export default flattenColumnState;

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

@@ -0,0 +1,22 @@
+var flattenColumnState = function flattenColumnState(columnState) {
+  var result = [];
+  var processColumn = function processColumn(column) {
+    // 如果有children属性且不为空，递归处理
+    if (column.children && column.children.length > 0) {
+      // 处理子列
+      column.children.forEach(function (child) {
+        processColumn(child);
+      });
+    } else {
+      // 没有children的列直接添加到结果中
+      result.push(column);
+    }
+  };
+
+  // 处理每一列
+  columnState.forEach(function (column) {
+    processColumn(column);
+  });
+  return result;
+};
+export default flattenColumnState;

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

@@ -31,6 +31,7 @@ import Setting from "./setting";
 import { useGridPlusColumnState } from '.';
 import CustomGroupCellRenderer from "./_utils/customGroupCellRenderer";
 import processColumnGroups from "./_utils/processColumnGroups";
+import flattenColumnState from "./_utils/processFormColumnState";
 var Paragraph = Typography.Paragraph,
   Text = Typography.Text;
 var getSort = function getSort(columnState) {
@@ -238,7 +239,6 @@ function AgGridPlus(props) {
         }
       });
     }
-    console.log('record1 columnState 3', cellMap);
     return cellMap;
   };
   var sortChanged = function sortChanged(columnApi) {
@@ -373,7 +373,6 @@ function AgGridPlus(props) {
       return _objectSpread({}, child.props);
     });
     var columnDefs = !columnProps ? props.columnDefs ? props.columnDefs : [] : columnProps;
-    console.log('record1 columnDefs 2', columnDefs);
     columnDefs = columnDefs.map(function (col) {
       var dataType = getDataType(data, col.field);
       if (col.type || typeof col.cellRenderer == "string") {
@@ -466,7 +465,6 @@ function AgGridPlus(props) {
       return !x.hideInTable;
     });
     var processedColumns = processColumnGroups(columnDefs);
-    console.log('record1 columnDefs 1', processedColumns);
     return processedColumns;
   }, [children === null || children === void 0 ? void 0 : children.length, props.columnDefs, extensibleColumns, columnCellClass]);
   var allColDefs = useMemo(function () {
@@ -496,7 +494,7 @@ function AgGridPlus(props) {
       height: "100%"
     }
   }, search == false ? null : /*#__PURE__*/React.createElement(FormRender, {
-    colDefs: allColDefs,
+    colDefs: flattenColumnState(allColDefs),
     defaultRows: queryDefaultRows,
     columnStates: columnState || [],
     defaultExpand: defaultSearchExpand,
@@ -512,6 +510,9 @@ function AgGridPlus(props) {
         onRequest && onRequest(formValues);
         return prev;
       });
+    },
+    onInit: function onInit(defaultValues) {
+      setQueryFilter(defaultValues);
     }
   }), /*#__PURE__*/React.createElement(Card, {
     bordered: false,

package/dist/esm/ag-grid-plus/queryForm/index.d.ts

@@ -9,5 +9,6 @@ declare const FormRender: (props: {
     defaultExpand?: Boolean | undefined;
     defaultRows?: number | undefined;
     onQuery: (formValue: any) => void;
+    onInit?: ((defaultValues: any) => void) | undefined;
 }) => React.JSX.Element;
 export default FormRender;

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

@@ -49,6 +49,9 @@ var FormRender = function FormRender(props) {
       }
     });
   }, []);
+  useEffect(function () {
+    props.onInit && props.onInit(form.values);
+  }, []);
   var SchemaField = useMemo(function () {
     return createSchemaField({
       components: {
@@ -136,12 +139,12 @@ var FormRender = function FormRender(props) {
       //表单自定义组件
       var component = getComponent(colDef);
       if (colDef.filter != false) {
-        var _colDef$searchCompone, _colDef$searchCompone2;
+        var _colDef$searchCompone, _colDef$searchCompone2, _colDef$searchCompone3;
         var filedSchema = {
           type: 'string',
           title: headerName,
           required: (colDef === null || colDef === void 0 || (_colDef$searchCompone = colDef.searchComponentProps) === null || _colDef$searchCompone === void 0 ? void 0 : _colDef$searchCompone.required) || false,
-          default: colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.default,
+          default: (colDef === null || colDef === void 0 || (_colDef$searchCompone2 = colDef.searchComponentProps) === null || _colDef$searchCompone2 === void 0 ? void 0 : _colDef$searchCompone2.default) || (colDef === null || colDef === void 0 || (_colDef$searchCompone3 = colDef.searchComponentProps) === null || _colDef$searchCompone3 === void 0 ? void 0 : _colDef$searchCompone3.defaultValue),
           enum: colDef === null || colDef === void 0 ? void 0 : colDef.enum,
           "x-component": component,
           "x-component-props": _objectSpread({

package/dist/esm/ag-grid-plus/setting/diySetting/index.d.ts

@@ -3,6 +3,7 @@ import React from "react";
 declare const DiySetting: (props: {
     gridKey?: string | undefined;
     gridApi?: GridApi<any> | undefined;
+    type?: string | undefined;
     gridApiState?: GridApi<any> | undefined;
     onSaveColumnState: (state: any) => void;
 }) => React.JSX.Element | null;