@nokecy/qc-ui 1.0.38 → 1.0.40

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,

package/dist/cjs/ag-grid-plus/context/gridContext.d.ts

@@ -20,12 +20,12 @@ export declare const GridPlusContext: React.Context<{
      */
     applyToGlobal: (gridKey: string) => void;
     /**
-     * 恢复当前表格为“默认列配置”
+     * 恢复当前用户当前表格为“默认列配置”
      * @param gridKey 表格唯一标识
      */
     resetCurrent: (gridKey: string) => void;
     /**
-     * 全局恢复所有表格为默认列配置
+     * 恢复所有用户当前表格为“默认列配置”
      */
-    resetAll: () => void;
+    resetAll: (gridKey: string) => void;
 }>;

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

@@ -8,7 +8,7 @@ export declare const useGridPlusColumnState: () => {
     onSaveColumnState: (gridKey: string, columnState: any[]) => void;
     applyToGlobal: (gridKey: string) => void;
     resetCurrent: (gridKey: string) => void;
-    resetAll: () => void;
+    resetAll: (gridKey: string) => void;
 };
 export { AgGridPlus, AgGridColumn, GridPlusContext };
 export { dateValueFormatter, dateTimeValueFormatter, convertFilterModel, convertSortModel, flattenTreeDeep, toTree, flatten } from "./utils";

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,23 +240,12 @@ 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);
               setTimeout(function () {
                 gridApi.applyColumnState({

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;
@@ -110,12 +111,12 @@ var Setting = function Setting(props) {
       }
     }, "\u6062\u590D\u9ED8\u8BA4")
   }, {
-    key: '3',
+    key: '4',
     label: /*#__PURE__*/_react2.default.createElement("a", {
       target: "_blank",
       rel: "noopener noreferrer",
       onClick: function onClick() {
-        resetAll();
+        resetAll(gridKey);
       }
     }, "\u5168\u5C40\u6062\u590D\u9ED8\u8BA4")
   }];

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,

package/dist/esm/ag-grid-plus/context/gridContext.d.ts

@@ -20,12 +20,12 @@ export declare const GridPlusContext: React.Context<{
      */
     applyToGlobal: (gridKey: string) => void;
     /**
-     * 恢复当前表格为“默认列配置”
+     * 恢复当前用户当前表格为“默认列配置”
      * @param gridKey 表格唯一标识
      */
     resetCurrent: (gridKey: string) => void;
     /**
-     * 全局恢复所有表格为默认列配置
+     * 恢复所有用户当前表格为“默认列配置”
      */
-    resetAll: () => void;
+    resetAll: (gridKey: string) => void;
 }>;

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

@@ -8,7 +8,7 @@ export declare const useGridPlusColumnState: () => {
     onSaveColumnState: (gridKey: string, columnState: any[]) => void;
     applyToGlobal: (gridKey: string) => void;
     resetCurrent: (gridKey: string) => void;
-    resetAll: () => void;
+    resetAll: (gridKey: string) => void;
 };
 export { AgGridPlus, AgGridColumn, GridPlusContext };
 export { dateValueFormatter, dateTimeValueFormatter, convertFilterModel, convertSortModel, flattenTreeDeep, toTree, flatten } from "./utils";

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

@@ -44,21 +44,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: _uniqueId(),
-        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: _uniqueId(),
+              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(_uniqueId());
@@ -111,7 +125,7 @@ var DiySetting = function DiySetting(props) {
               })), /*#__PURE__*/React.createElement(SchemaField.Void, {
                 "x-component": "ArrayTable.Column",
                 "x-component-props": {
-                  width: 280,
+                  width: 180,
                   title: "列名"
                 }
               }, /*#__PURE__*/React.createElement(SchemaField.String, {
@@ -119,6 +133,16 @@ var DiySetting = function DiySetting(props) {
                 "x-decorator": "FormItem",
                 "x-component": "Input",
                 "x-read-pretty": true
+              })), /*#__PURE__*/React.createElement(SchemaField.Void, {
+                "x-component": "ArrayTable.Column",
+                "x-component-props": {
+                  width: 120,
+                  title: "分组名称"
+                }
+              }, /*#__PURE__*/React.createElement(SchemaField.String, {
+                name: "groupName",
+                "x-decorator": "FormItem",
+                "x-component": "Input"
               })), /*#__PURE__*/React.createElement(SchemaField.Void, {
                 "x-component": "ArrayTable.Column",
                 "x-component-props": {
@@ -207,23 +231,12 @@ var DiySetting = function DiySetting(props) {
                 name: "hide",
                 "x-decorator": "FormItem",
                 "x-component": "Switch"
-              })), /*#__PURE__*/React.createElement(SchemaField.Void, {
-                "x-component": "ArrayTable.Column",
-                "x-component-props": {
-                  width: 180,
-                  title: "分组名称"
-                }
-              }, /*#__PURE__*/React.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 = processColumnGroups(values.items);
-              console.log('record1', processedColumns);
               gridApi.setGridOption("columnDefs", processedColumns);
               setTimeout(function () {
                 gridApi.applyColumnState({

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

@@ -23,6 +23,7 @@ var Setting = function Setting(props) {
     gridApiState = props.gridApiState,
     onSaveColumnState = props.onSaveColumnState;
   var _useGridPlusColumnSta = useGridPlusColumnState(),
+    extensibleColumns = _useGridPlusColumnSta.extensibleColumns,
     applyToGlobal = _useGridPlusColumnSta.applyToGlobal,
     resetCurrent = _useGridPlusColumnSta.resetCurrent,
     resetAll = _useGridPlusColumnSta.resetAll;
@@ -101,12 +102,12 @@ var Setting = function Setting(props) {
       }
     }, "\u6062\u590D\u9ED8\u8BA4")
   }, {
-    key: '3',
+    key: '4',
     label: /*#__PURE__*/React.createElement("a", {
       target: "_blank",
       rel: "noopener noreferrer",
       onClick: function onClick() {
-        resetAll();
+        resetAll(gridKey);
       }
     }, "\u5168\u5C40\u6062\u590D\u9ED8\u8BA4")
   }];