@nokecy/qc-ui 1.0.87 → 1.0.89

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

@@ -43,8 +43,10 @@ var processColumnGroups = function processColumnGroups(columns) {
   }
 
   // 检查是否是新格式（FlatColumnItem）
+  // 注意：不能用 col.type 判断，因为 AG-Grid 列定义也有 type 字段（如 type: 'dateTimeColumn'）
+  // FlatColumnItem 的特征是：有 id, parentId, level, order 等字段，且 type 的值是 'group' 或 'column'
   var isNewFormat = columns.some(function (col) {
-    return col.type !== undefined;
+    return col.id !== undefined && col.level !== undefined && col.order !== undefined && (col.type === 'group' || col.type === 'column');
   });
   if (isNewFormat) {
     // 新格式：使用 flatConfigToGridState 转换

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

@@ -284,83 +284,36 @@ function AgGridPlus(props) {
     }
   }, [gridKey, columnSchemeManager === null || columnSchemeManager === void 0 || (_columnSchemeManager$2 = columnSchemeManager.currentScheme) === null || _columnSchemeManager$2 === void 0 ? void 0 : _columnSchemeManager$2.columnConfig]);
 
-  // 同步 apiRef 和 currentScheme,确保方案在两者都准备好时应用
+  // 【修复】使用 applyColumnState 来应用列的顺序、宽度、隐藏等状态
+  // applyColumnState 是 AG-Grid 推荐的方式，专门用于控制列状态
   (0, _react.useEffect)(function () {
-    var _currentScheme$column;
     var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
-
-    // 两个依赖都不存在时,直接返回
     if (!apiRef.current || !currentScheme) {
-      console.log('[AgGridPlus] useEffect: 等待依赖准备', {
-        hasApiRef: !!apiRef.current,
-        hasCurrentScheme: !!currentScheme
-      });
       return;
     }
-    console.log('[AgGridPlus] useEffect: 两个依赖都准备好,应用方案', {
-      schemeId: currentScheme.id,
-      schemeName: currentScheme.name,
-      hasColumnConfig: !!currentScheme.columnConfig,
-      columnConfigCount: ((_currentScheme$column = currentScheme.columnConfig) === null || _currentScheme$column === void 0 ? void 0 : _currentScheme$column.length) || 0
-    });
-    var timer = setTimeout(function () {
-      // 优先使用 columnConfig(包含完整的分组结构)
-      if (currentScheme.columnConfig) {
-        var _require2 = require("./setting/columnGroupUtils"),
-          flatConfigToGridState = _require2.flatConfigToGridState;
-        var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
-        console.log('[AgGridPlus] useEffect: 应用方案的 columnConfig:', {
-          columnConfig: currentScheme.columnConfig,
-          columnConfigLength: currentScheme.columnConfig.length,
-          gridColumnDefs: gridColumnDefs,
-          gridColumnDefsLength: gridColumnDefs.length,
-          columnConfigDetail: currentScheme.columnConfig.map(function (item) {
-            return {
-              type: item.type,
-              field: item.field,
-              headerName: item.headerName,
-              order: item.order,
-              parentId: item.parentId
-            };
-          }),
-          gridColumnDefsDetail: gridColumnDefs.map(function (def, idx) {
-            var _def$children;
-            return {
-              index: idx,
-              field: def.field,
-              headerName: def.headerName,
-              groupId: def.groupId,
-              children: (_def$children = def.children) === null || _def$children === void 0 ? void 0 : _def$children.length
-            };
-          })
-        });
 
-        // 1. 先设置列定义(包含分组结构)
-        if (apiRef.current) {
-          apiRef.current.setGridOption("columnDefs", gridColumnDefs);
+    // 如果有 columnConfig，使用 applyColumnState 应用列状态
+    if (currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
+      var _require2 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require2.flatConfigToColumnState;
+      var _columnState2 = flatConfigToColumnState(currentScheme.columnConfig);
 
-          // 等待 columnDefs 应用完成后再设置过滤器
-          // 原因: setGridOption("columnDefs") 会触发 Grid 重新渲染,可能重置内部状态
-          // 必须在下一个渲染周期后应用 filterModel,否则会被覆盖
-          if (currentScheme.filterModel) {
-            requestAnimationFrame(function () {
-              if (apiRef.current) {
-                console.log('[AgGridPlus] 应用过滤器状态:', currentScheme.filterModel);
-                apiRef.current.setFilterModel(currentScheme.filterModel);
-              }
-            });
-          }
-        }
+      // 使用 applyColumnState 应用列状态
+      // applyOrder: true 表示按照 state 数组的顺序重新排列列
+      apiRef.current.applyColumnState({
+        state: _columnState2,
+        applyOrder: true
+      });
+    }
 
-        // 2. 【重要修改】使用 columnConfig 时，不应用 columnState
-        // 原因：columnConfig 已经包含了完整的列配置（宽度、隐藏、顺序、分组等）
-        // 如果再应用 columnState，会导致分组子列被视为独立列，破坏分组结构
-        console.log('[AgGridPlus] useEffect: 使用 columnConfig，跳过 columnState 应用');
-      }
-    }, 10);
-    return function () {
-      return clearTimeout(timer);
-    };
+    // 应用过滤器状态
+    if (currentScheme.filterModel) {
+      setTimeout(function () {
+        if (apiRef.current) {
+          apiRef.current.setFilterModel(currentScheme.filterModel);
+        }
+      }, 50); // 延迟稍长一点，等待 columnState 应用完成
+    }
   }, [apiRef.current, columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme]);
   (0, _react.useEffect)(function () {
     setRowData(dataSource || propRowData || []);
@@ -943,6 +896,17 @@ function AgGridPlus(props) {
     calculateSum();
   };
   var colDefs = (0, _react.useMemo)(function () {
+    var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
+
+    // 【修复】优先使用方案的 columnConfig，避免被默认逻辑覆盖
+    if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
+      var _require3 = require("./setting/columnGroupUtils"),
+        flatConfigToGridState = _require3.flatConfigToGridState;
+      var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
+      return gridColumnDefs;
+    }
+
+    // 【默认逻辑】没有方案配置时，使用原有的列定义生成逻辑
     // 使用缓存的首行数据进行类型推断,而不是当前的 rowData
     // 这样 rowData 更新时不会触发 colDefs 重新计算
     var dataForTypeInference = firstRowDataRef.current || (rowData.length > 0 ? rowData[0] : {});
@@ -978,16 +942,8 @@ function AgGridPlus(props) {
       return !x.hideInTable;
     });
     var processedColumns = (0, _processColumnGroups.default)(columnDefs);
-    console.log('[AgGridPlus] colDefs 重新计算:', {
-      childrenCount: _react.default.Children.count(children),
-      hasPropsColumnDefs: !!props.columnDefs,
-      extensibleColumnsCount: Object.keys(extensibleColumns || {}).length,
-      columnCellClassCount: Object.keys(columnCellClass).length,
-      processedColumnsCount: processedColumns.length,
-      usingCachedData: !!firstRowDataRef.current
-    });
     return processedColumns;
-  }, [_react.default.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass]);
+  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, _react.default.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass]);
 
   // 构建查询表单项（带 order 属性）
   var queryFormItems = (0, _react.useMemo)(function () {
@@ -1145,8 +1101,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current5;
-        var _columnState2 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
-        setColumnState(_columnState2);
+        var _columnState3 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
+        setColumnState(_columnState3);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }

package/dist/cjs/ag-grid-plus/schemes/hooks/useColumnSchemes.js

@@ -10,10 +10,13 @@ var _uuid = require("uuid");
 var _localStorageAdapter = require("../storage/localStorageAdapter");
 var _validator = require("../utils/validator");
 var _constants = require("../constants");
+var _excluded = ["activate"];
 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 _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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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; }
@@ -336,7 +339,7 @@ function useColumnSchemes(config) {
    */
   var createScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(name, columnConfig, options) {
-      var nameValidation, uniqueName, newScheme, updatedSchemes;
+      var nameValidation, uniqueName, _ref6, activate, schemeOptions, newScheme, updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -355,14 +358,15 @@ function useColumnSchemes(config) {
             throw new Error("\u65B9\u6848\u6570\u91CF\u5DF2\u8FBE\u4E0A\u9650\uFF08".concat(_constants.MAX_SCHEMES_PER_GRID, "\u4E2A\uFF09\uFF0C\u8BF7\u5220\u9664\u4E00\u4E9B\u65B9\u6848\u540E\u518D\u8BD5"));
           case 5:
             // 处理重名情况
-            uniqueName = (0, _validator.checkDuplicateName)(name, schemes) ? (0, _validator.generateUniqueName)(name, schemes) : name;
+            uniqueName = (0, _validator.checkDuplicateName)(name, schemes) ? (0, _validator.generateUniqueName)(name, schemes) : name; // 提取 activate 选项
+            _ref6 = options || {}, activate = _ref6.activate, schemeOptions = _objectWithoutProperties(_ref6, _excluded);
             newScheme = _objectSpread({
               id: (0, _uuid.v4)(),
               name: uniqueName,
               createdAt: Date.now(),
               updatedAt: Date.now(),
               columnConfig: columnConfig
-            }, options); // 如果设置为默认方案，取消其他方案的默认标记
+            }, schemeOptions); // 如果设置为默认方案，取消其他方案的默认标记
             updatedSchemes = schemes;
             if (newScheme.isDefault) {
               updatedSchemes = schemes.map(function (s) {
@@ -372,27 +376,52 @@ function useColumnSchemes(config) {
               });
             }
             updatedSchemes = [].concat(_toConsumableArray(updatedSchemes), [newScheme]);
-            _context5.next = 12;
+            _context5.next = 13;
             return saveSchemesToStorage(updatedSchemes);
-          case 12:
+          case 13:
+            if (!activate) {
+              _context5.next = 26;
+              break;
+            }
+            setCurrentScheme(newScheme);
+            setIsDirty(false);
+
+            // 保存当前方案ID
+            if (!storageAdapter.saveCurrentSchemeId) {
+              _context5.next = 25;
+              break;
+            }
+            _context5.prev = 17;
+            _context5.next = 20;
+            return storageAdapter.saveCurrentSchemeId(gridId, newScheme.id);
+          case 20:
+            _context5.next = 25;
+            break;
+          case 22:
+            _context5.prev = 22;
+            _context5.t0 = _context5["catch"](17);
+            console.error('[useColumnSchemes] 保存当前方案ID失败:', _context5.t0);
+          case 25:
+            onSchemeChange === null || onSchemeChange === void 0 || onSchemeChange(newScheme);
+          case 26:
             onSchemeSave === null || onSchemeSave === void 0 || onSchemeSave(newScheme);
             return _context5.abrupt("return", newScheme);
-          case 14:
+          case 28:
           case "end":
             return _context5.stop();
         }
-      }, _callee5);
+      }, _callee5, null, [[17, 22]]);
     }));
     return function (_x4, _x5, _x6) {
       return _ref5.apply(this, arguments);
     };
-  }(), [schemes, saveSchemesToStorage, onSchemeSave]);
+  }(), [schemes, gridId, storageAdapter, saveSchemesToStorage, onSchemeChange, onSchemeSave]);
 
   /**
    * 更新方案信息（不影响 columnState）
    */
   var updateScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId, updates) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId, updates) {
       var scheme, nameValidation, updatedScheme, updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -456,7 +485,7 @@ function useColumnSchemes(config) {
       }, _callee6);
     }));
     return function (_x7, _x8) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }(), [schemes, currentScheme, saveSchemesToStorage]);
 
@@ -464,7 +493,7 @@ function useColumnSchemes(config) {
    * 删除方案
    */
   var deleteScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(schemeId) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(schemeId) {
       var scheme, updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
@@ -523,7 +552,7 @@ function useColumnSchemes(config) {
       }, _callee7, null, [[12, 17]]);
     }));
     return function (_x9) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }(), [schemes, currentScheme, gridId, storageAdapter, saveSchemesToStorage, onSchemeChange, onSchemeDelete]);
 
@@ -542,7 +571,7 @@ function useColumnSchemes(config) {
    * 设置默认方案
    */
   var setDefaultScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(schemeId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(schemeId) {
       var updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
@@ -561,7 +590,7 @@ function useColumnSchemes(config) {
       }, _callee8);
     }));
     return function (_x10) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }(), [schemes, saveSchemesToStorage]);
 

package/dist/cjs/ag-grid-plus/schemes/types.d.ts

@@ -109,7 +109,9 @@ export interface UseColumnSchemesReturn {
     /** 保存当前方案（更新现有方案） */
     saveScheme: (updates?: Partial<ColumnScheme>) => Promise<void>;
     /** 创建新方案 */
-    createScheme: (name: string, columnConfig: FlatColumnItem[], options?: Partial<ColumnScheme>) => Promise<ColumnScheme>;
+    createScheme: (name: string, columnConfig: FlatColumnItem[], options?: Partial<ColumnScheme> & {
+        activate?: boolean;
+    }) => Promise<ColumnScheme>;
     /** 更新方案信息（不影响 columnConfig） */
     updateScheme: (schemeId: string, updates: Partial<Omit<ColumnScheme, 'id' | 'columnConfig'>>) => Promise<void>;
     /** 删除方案 */

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

@@ -254,7 +254,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   if (!(schemeManager && gridKey)) {
-                    _context.next = 29;
+                    _context.next = 27;
                     break;
                   }
                   _context.prev = 1;
@@ -287,7 +287,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
                     filterModel: filterModel
                   });
                 case 8:
-                  _context.next = 24;
+                  _context.next = 22;
                   break;
                 case 10:
                   // 如果没有激活的方案，查找或创建"默认配置"方案
@@ -308,7 +308,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
                     filterModel: filterModel
                   });
                 case 16:
-                  _context.next = 24;
+                  _context.next = 22;
                   break;
                 case 18:
                   _context.next = 20;
@@ -317,33 +317,29 @@ var ColumnSetting = function ColumnSetting(_ref) {
                   {
                     isDefault: true,
                     description: '自动保存的默认列配置',
-                    filterModel: filterModel
+                    filterModel: filterModel,
+                    activate: true // 立即激活该方案
                   });
                 case 20:
                   newScheme = _context.sent;
-                  console.log('[ColumnSetting] 创建默认方案成功,准备应用:', {
+                  console.log('[ColumnSetting] 创建默认方案成功并已激活:', {
                     schemeId: newScheme.id,
                     schemeName: newScheme.name,
                     hasColumnConfig: !!newScheme.columnConfig,
                     columnConfigLength: ((_newScheme$columnConf = newScheme.columnConfig) === null || _newScheme$columnConf === void 0 ? void 0 : _newScheme$columnConf.length) || 0
                   });
-
-                  // 【修复】直接加载方案,确保立即应用
-                  // loadScheme 会设置 currentScheme 并触发 onSchemeChange
-                  _context.next = 24;
-                  return schemeManager.loadScheme(newScheme.id);
-                case 24:
-                  _context.next = 29;
+                case 22:
+                  _context.next = 27;
                   break;
-                case 26:
-                  _context.prev = 26;
+                case 24:
+                  _context.prev = 24;
                   _context.t0 = _context["catch"](1);
                   console.error('[ColumnSetting] 保存列配置到方案失败:', _context.t0);
-                case 29:
+                case 27:
                 case "end":
                   return _context.stop();
               }
-            }, _callee, null, [[1, 26]]);
+            }, _callee, null, [[1, 24]]);
           })), 50);
 
           // 保存成功后清除备份

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

@@ -38,8 +38,10 @@ var processColumnGroups = function processColumnGroups(columns) {
   }
 
   // 检查是否是新格式（FlatColumnItem）
+  // 注意：不能用 col.type 判断，因为 AG-Grid 列定义也有 type 字段（如 type: 'dateTimeColumn'）
+  // FlatColumnItem 的特征是：有 id, parentId, level, order 等字段，且 type 的值是 'group' 或 'column'
   var isNewFormat = columns.some(function (col) {
-    return col.type !== undefined;
+    return col.id !== undefined && col.level !== undefined && col.order !== undefined && (col.type === 'group' || col.type === 'column');
   });
   if (isNewFormat) {
     // 新格式：使用 flatConfigToGridState 转换

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

@@ -277,83 +277,36 @@ function AgGridPlus(props) {
     }
   }, [gridKey, columnSchemeManager === null || columnSchemeManager === void 0 || (_columnSchemeManager$2 = columnSchemeManager.currentScheme) === null || _columnSchemeManager$2 === void 0 ? void 0 : _columnSchemeManager$2.columnConfig]);
 
-  // 同步 apiRef 和 currentScheme,确保方案在两者都准备好时应用
+  // 【修复】使用 applyColumnState 来应用列的顺序、宽度、隐藏等状态
+  // applyColumnState 是 AG-Grid 推荐的方式，专门用于控制列状态
   useEffect(function () {
-    var _currentScheme$column;
     var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
-
-    // 两个依赖都不存在时,直接返回
     if (!apiRef.current || !currentScheme) {
-      console.log('[AgGridPlus] useEffect: 等待依赖准备', {
-        hasApiRef: !!apiRef.current,
-        hasCurrentScheme: !!currentScheme
-      });
       return;
     }
-    console.log('[AgGridPlus] useEffect: 两个依赖都准备好,应用方案', {
-      schemeId: currentScheme.id,
-      schemeName: currentScheme.name,
-      hasColumnConfig: !!currentScheme.columnConfig,
-      columnConfigCount: ((_currentScheme$column = currentScheme.columnConfig) === null || _currentScheme$column === void 0 ? void 0 : _currentScheme$column.length) || 0
-    });
-    var timer = setTimeout(function () {
-      // 优先使用 columnConfig(包含完整的分组结构)
-      if (currentScheme.columnConfig) {
-        var _require2 = require("./setting/columnGroupUtils"),
-          flatConfigToGridState = _require2.flatConfigToGridState;
-        var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
-        console.log('[AgGridPlus] useEffect: 应用方案的 columnConfig:', {
-          columnConfig: currentScheme.columnConfig,
-          columnConfigLength: currentScheme.columnConfig.length,
-          gridColumnDefs: gridColumnDefs,
-          gridColumnDefsLength: gridColumnDefs.length,
-          columnConfigDetail: currentScheme.columnConfig.map(function (item) {
-            return {
-              type: item.type,
-              field: item.field,
-              headerName: item.headerName,
-              order: item.order,
-              parentId: item.parentId
-            };
-          }),
-          gridColumnDefsDetail: gridColumnDefs.map(function (def, idx) {
-            var _def$children;
-            return {
-              index: idx,
-              field: def.field,
-              headerName: def.headerName,
-              groupId: def.groupId,
-              children: (_def$children = def.children) === null || _def$children === void 0 ? void 0 : _def$children.length
-            };
-          })
-        });
 
-        // 1. 先设置列定义(包含分组结构)
-        if (apiRef.current) {
-          apiRef.current.setGridOption("columnDefs", gridColumnDefs);
+    // 如果有 columnConfig，使用 applyColumnState 应用列状态
+    if (currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
+      var _require2 = require("./setting/columnGroupUtils"),
+        flatConfigToColumnState = _require2.flatConfigToColumnState;
+      var _columnState2 = flatConfigToColumnState(currentScheme.columnConfig);
 
-          // 等待 columnDefs 应用完成后再设置过滤器
-          // 原因: setGridOption("columnDefs") 会触发 Grid 重新渲染,可能重置内部状态
-          // 必须在下一个渲染周期后应用 filterModel,否则会被覆盖
-          if (currentScheme.filterModel) {
-            requestAnimationFrame(function () {
-              if (apiRef.current) {
-                console.log('[AgGridPlus] 应用过滤器状态:', currentScheme.filterModel);
-                apiRef.current.setFilterModel(currentScheme.filterModel);
-              }
-            });
-          }
-        }
+      // 使用 applyColumnState 应用列状态
+      // applyOrder: true 表示按照 state 数组的顺序重新排列列
+      apiRef.current.applyColumnState({
+        state: _columnState2,
+        applyOrder: true
+      });
+    }
 
-        // 2. 【重要修改】使用 columnConfig 时，不应用 columnState
-        // 原因：columnConfig 已经包含了完整的列配置（宽度、隐藏、顺序、分组等）
-        // 如果再应用 columnState，会导致分组子列被视为独立列，破坏分组结构
-        console.log('[AgGridPlus] useEffect: 使用 columnConfig，跳过 columnState 应用');
-      }
-    }, 10);
-    return function () {
-      return clearTimeout(timer);
-    };
+    // 应用过滤器状态
+    if (currentScheme.filterModel) {
+      setTimeout(function () {
+        if (apiRef.current) {
+          apiRef.current.setFilterModel(currentScheme.filterModel);
+        }
+      }, 50); // 延迟稍长一点，等待 columnState 应用完成
+    }
   }, [apiRef.current, columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme]);
   useEffect(function () {
     setRowData(dataSource || propRowData || []);
@@ -936,6 +889,17 @@ function AgGridPlus(props) {
     calculateSum();
   };
   var colDefs = useMemo(function () {
+    var currentScheme = columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme;
+
+    // 【修复】优先使用方案的 columnConfig，避免被默认逻辑覆盖
+    if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig && currentScheme.columnConfig.length > 0) {
+      var _require3 = require("./setting/columnGroupUtils"),
+        flatConfigToGridState = _require3.flatConfigToGridState;
+      var gridColumnDefs = flatConfigToGridState(currentScheme.columnConfig);
+      return gridColumnDefs;
+    }
+
+    // 【默认逻辑】没有方案配置时，使用原有的列定义生成逻辑
     // 使用缓存的首行数据进行类型推断,而不是当前的 rowData
     // 这样 rowData 更新时不会触发 colDefs 重新计算
     var dataForTypeInference = firstRowDataRef.current || (rowData.length > 0 ? rowData[0] : {});
@@ -971,16 +935,8 @@ function AgGridPlus(props) {
       return !x.hideInTable;
     });
     var processedColumns = processColumnGroups(columnDefs);
-    console.log('[AgGridPlus] colDefs 重新计算:', {
-      childrenCount: React.Children.count(children),
-      hasPropsColumnDefs: !!props.columnDefs,
-      extensibleColumnsCount: Object.keys(extensibleColumns || {}).length,
-      columnCellClassCount: Object.keys(columnCellClass).length,
-      processedColumnsCount: processedColumns.length,
-      usingCachedData: !!firstRowDataRef.current
-    });
     return processedColumns;
-  }, [React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass]);
+  }, [columnSchemeManager === null || columnSchemeManager === void 0 ? void 0 : columnSchemeManager.currentScheme, React.Children.count(children), props.columnDefs, extensibleColumns, columnCellClass]);
 
   // 构建查询表单项（带 order 属性）
   var queryFormItems = useMemo(function () {
@@ -1138,8 +1094,8 @@ function AgGridPlus(props) {
     onDragStopped: function onDragStopped(e) {
       if (apiRef.current) {
         var _apiRef$current5;
-        var _columnState2 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
-        setColumnState(_columnState2);
+        var _columnState3 = (_apiRef$current5 = apiRef.current) === null || _apiRef$current5 === void 0 ? void 0 : _apiRef$current5.getColumnState();
+        setColumnState(_columnState3);
 
         // onColumnStateChanged && onColumnStateChanged(columnState)
       }