@nokecy/qc-ui 1.0.81 → 1.0.83

package/dist/cjs/ag-grid-plus/querySchemes/components/QuerySchemesManager.js

@@ -196,76 +196,104 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
   /**
    * 应用当前顺序
    */
-  var handleApplyOrder = (0, _react.useCallback)(function () {
-    onOrderChange(editingOrder);
-    _antd.message.success('已应用新顺序');
-  }, [editingOrder, onOrderChange]);
+  var handleApplyOrder = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          if (!currentScheme) {
+            _context.next = 4;
+            break;
+          }
+          _context.next = 4;
+          return saveScheme({
+            itemsOrder: editingOrder
+          });
+        case 4:
+          // 应用顺序到表单
+          onOrderChange(editingOrder);
+          _antd.message.success('已应用新顺序');
+
+          // 关闭弹窗,让用户看到效果
+          onClose();
+          _context.next = 12;
+          break;
+        case 9:
+          _context.prev = 9;
+          _context.t0 = _context["catch"](0);
+          _antd.message.error(_context.t0.message || '应用失败');
+        case 12:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 9]]);
+  })), [editingOrder, onOrderChange, currentScheme, saveScheme, onClose]);
 
   /**
    * 保存为新方案
    */
-  var handleSaveAsNew = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var handleSaveAsNew = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
           if (schemeName.trim()) {
-            _context.next = 3;
+            _context2.next = 3;
             break;
           }
           _antd.message.warning('请输入方案名称');
-          return _context.abrupt("return");
+          return _context2.abrupt("return");
         case 3:
-          _context.prev = 3;
-          _context.next = 6;
+          _context2.prev = 3;
+          _context2.next = 6;
           return createScheme(schemeName, editingOrder);
         case 6:
           _antd.message.success('保存成功');
           setSchemeName('');
-          _context.next = 13;
+          _context2.next = 13;
           break;
         case 10:
-          _context.prev = 10;
-          _context.t0 = _context["catch"](3);
-          _antd.message.error(_context.t0.message || '保存失败');
+          _context2.prev = 10;
+          _context2.t0 = _context2["catch"](3);
+          _antd.message.error(_context2.t0.message || '保存失败');
         case 13:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[3, 10]]);
+    }, _callee2, null, [[3, 10]]);
   })), [schemeName, editingOrder, createScheme]);
 
   /**
    * 更新当前方案
    */
-  var handleUpdateCurrent = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  var handleUpdateCurrent = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (currentScheme) {
-            _context2.next = 3;
+            _context3.next = 3;
             break;
           }
           _antd.message.warning('请先选择一个方案');
-          return _context2.abrupt("return");
+          return _context3.abrupt("return");
         case 3:
-          _context2.prev = 3;
-          _context2.next = 6;
+          _context3.prev = 3;
+          _context3.next = 6;
           return saveScheme({
             itemsOrder: editingOrder
           });
         case 6:
           _antd.message.success('更新成功');
-          _context2.next = 12;
+          _context3.next = 12;
           break;
         case 9:
-          _context2.prev = 9;
-          _context2.t0 = _context2["catch"](3);
-          _antd.message.error(_context2.t0.message || '更新失败');
+          _context3.prev = 9;
+          _context3.t0 = _context3["catch"](3);
+          _antd.message.error(_context3.t0.message || '更新失败');
         case 12:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[3, 9]]);
+    }, _callee3, null, [[3, 9]]);
   })), [currentScheme, editingOrder, saveScheme]);
 
   /**
@@ -280,18 +308,18 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
   /**
    * 保存编辑
    */
-  var handleSaveEdit = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  var handleSaveEdit = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           if (editingId) {
-            _context3.next = 2;
+            _context4.next = 2;
             break;
           }
-          return _context3.abrupt("return");
+          return _context4.abrupt("return");
         case 2:
-          _context3.prev = 2;
-          _context3.next = 5;
+          _context4.prev = 2;
+          _context4.next = 5;
           return updateScheme(editingId, {
             name: editingName.trim(),
             description: editingDescription.trim() || undefined
@@ -299,17 +327,17 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
         case 5:
           _antd.message.success('更新成功');
           setEditingId(null);
-          _context3.next = 12;
+          _context4.next = 12;
           break;
         case 9:
-          _context3.prev = 9;
-          _context3.t0 = _context3["catch"](2);
-          _antd.message.error(_context3.t0.message || '更新失败');
+          _context4.prev = 9;
+          _context4.t0 = _context4["catch"](2);
+          _antd.message.error(_context4.t0.message || '更新失败');
         case 12:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3, null, [[2, 9]]);
+    }, _callee4, null, [[2, 9]]);
   })), [editingId, editingName, editingDescription, updateScheme]);
 
   /**
@@ -325,29 +353,29 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
    * 删除方案
    */
   var handleDelete = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId, schemeName) {
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId, schemeName) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.prev = 0;
-            _context4.next = 3;
+            _context5.prev = 0;
+            _context5.next = 3;
             return deleteScheme(schemeId);
           case 3:
             _antd.message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664"));
-            _context4.next = 9;
+            _context5.next = 9;
             break;
           case 6:
-            _context4.prev = 6;
-            _context4.t0 = _context4["catch"](0);
-            _antd.message.error(_context4.t0.message || '删除失败');
+            _context5.prev = 6;
+            _context5.t0 = _context5["catch"](0);
+            _antd.message.error(_context5.t0.message || '删除失败');
           case 9:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[0, 6]]);
+      }, _callee5, null, [[0, 6]]);
     }));
     return function (_x, _x2) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }(), [deleteScheme]);
 
@@ -355,29 +383,29 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
    * 设置为默认方案
    */
   var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId, schemeName) {
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId, schemeName) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.prev = 0;
-            _context5.next = 3;
+            _context6.prev = 0;
+            _context6.next = 3;
             return setDefaultScheme(schemeId);
           case 3:
             _antd.message.success("\u5DF2\u5C06\"".concat(schemeName, "\"\u8BBE\u4E3A\u9ED8\u8BA4\u65B9\u6848"));
-            _context5.next = 9;
+            _context6.next = 9;
             break;
           case 6:
-            _context5.prev = 6;
-            _context5.t0 = _context5["catch"](0);
-            _antd.message.error(_context5.t0.message || '设置失败');
+            _context6.prev = 6;
+            _context6.t0 = _context6["catch"](0);
+            _antd.message.error(_context6.t0.message || '设置失败');
           case 9:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5, null, [[0, 6]]);
+      }, _callee6, null, [[0, 6]]);
     }));
     return function (_x3, _x4) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }(), [setDefaultScheme]);
 
@@ -385,13 +413,13 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
    * 应用方案
    */
   var handleApply = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(schemeId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(schemeId) {
       var scheme;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _context6.prev = 0;
-            _context6.next = 3;
+            _context7.prev = 0;
+            _context7.next = 3;
             return loadScheme(schemeId);
           case 3:
             scheme = schemes.find(function (s) {
@@ -401,20 +429,20 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
               onOrderChange(scheme.itemsOrder);
               _antd.message.success('方案已应用');
             }
-            _context6.next = 10;
+            _context7.next = 10;
             break;
           case 7:
-            _context6.prev = 7;
-            _context6.t0 = _context6["catch"](0);
-            _antd.message.error(_context6.t0.message || '应用失败');
+            _context7.prev = 7;
+            _context7.t0 = _context7["catch"](0);
+            _antd.message.error(_context7.t0.message || '应用失败');
           case 10:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6, null, [[0, 7]]);
+      }, _callee7, null, [[0, 7]]);
     }));
     return function (_x5) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }(), [loadScheme, schemes, onOrderChange]);
   return /*#__PURE__*/_react.default.createElement(_antd.Modal, {
@@ -436,6 +464,30 @@ var QuerySchemesManager = exports.QuerySchemesManager = function QuerySchemesMan
       children: /*#__PURE__*/_react.default.createElement("div", {
         className: "query-order-editor"
       }, /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          marginBottom: 16,
+          padding: '12px 16px',
+          background: currentScheme ? '#e6f7ff' : '#f5f5f5',
+          borderRadius: 4,
+          border: '1px solid',
+          borderColor: currentScheme ? '#91d5ff' : '#d9d9d9'
+        }
+      }, currentScheme ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          fontWeight: 600,
+          marginBottom: 4,
+          color: '#1890ff'
+        }
+      }, "\u5F53\u524D\u65B9\u6848: ", currentScheme.name), currentScheme.description && /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          fontSize: 12,
+          color: '#666'
+        }
+      }, currentScheme.description)) : /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          color: '#666'
+        }
+      }, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u4E34\u65F6\u914D\u7F6E")), /*#__PURE__*/_react.default.createElement("div", {
         className: "query-order-tips",
         style: {
           marginBottom: 16,

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

@@ -4,7 +4,7 @@ import './SchemeSelector.less';
 export interface SchemeSelectorProps {
     /** 方案管理器 */
     schemeManager: UseColumnSchemesReturn;
-    /** 当前表格的列状态（用于创建/更新方案） */
+    /** 当前表格的列配置（用于创建/更新方案） */
     currentColumnState: any[];
     /** 样式类名 */
     className?: string;

package/dist/cjs/ag-grid-plus/schemes/components/SchemeSelector.js

@@ -133,7 +133,7 @@ var SchemeSelector = exports.SchemeSelector = function SchemeSelector(_ref) {
           _context3.prev = 6;
           _context3.next = 9;
           return saveScheme({
-            columnState: currentColumnState
+            columnConfig: currentColumnState
           });
         case 9:
           _antd.message.success('保存成功');

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

@@ -75,7 +75,7 @@ function useColumnSchemes(config) {
    * 加载方案列表
    */
   var loadSchemesList = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var loadedSchemes, schemeToLoad, lastSchemeId;
+    var loadedSchemes, schemeToLoad, lastSchemeId, _schemeToLoad$columnC;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -116,6 +116,12 @@ function useColumnSchemes(config) {
 
           // 3. 应用方案
           if (schemeToLoad) {
+            console.log('[useColumnSchemes] 加载方案完成,准备调用 onSchemeChange:', {
+              schemeId: schemeToLoad.id,
+              schemeName: schemeToLoad.name,
+              hasColumnConfig: !!schemeToLoad.columnConfig,
+              columnConfigCount: ((_schemeToLoad$columnC = schemeToLoad.columnConfig) === null || _schemeToLoad$columnC === void 0 ? void 0 : _schemeToLoad$columnC.length) || 0
+            });
             setCurrentScheme(schemeToLoad);
             onSchemeChange === null || onSchemeChange === void 0 || onSchemeChange(schemeToLoad);
           }
@@ -223,6 +229,7 @@ function useColumnSchemes(config) {
    */
   var saveScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(updates) {
+      var _updates$columnConfig, _updates$columnConfig2, _updatedScheme$column, _updatedScheme$column2, _updatedScheme$column3;
       var nameValidation, descValidation, updatedScheme, updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -234,47 +241,86 @@ function useColumnSchemes(config) {
             console.error('[useColumnSchemes] 没有激活的方案');
             return _context4.abrupt("return");
           case 3:
+            console.log('[useColumnSchemes] saveScheme 被调用:', {
+              currentSchemeId: currentScheme.id,
+              currentSchemeName: currentScheme.name,
+              updates: updates,
+              hasColumnConfig: !!(updates !== null && updates !== void 0 && updates.columnConfig),
+              columnConfigLength: (updates === null || updates === void 0 || (_updates$columnConfig = updates.columnConfig) === null || _updates$columnConfig === void 0 ? void 0 : _updates$columnConfig.length) || 0,
+              columnConfigDetail: updates === null || updates === void 0 || (_updates$columnConfig2 = updates.columnConfig) === null || _updates$columnConfig2 === void 0 ? void 0 : _updates$columnConfig2.map(function (item) {
+                return {
+                  type: item.type,
+                  headerName: item.headerName,
+                  field: item.field,
+                  order: item.order,
+                  parentId: item.parentId
+                };
+              })
+            });
+
+            // 验证更新内容
             if (!(updates !== null && updates !== void 0 && updates.name)) {
-              _context4.next = 9;
+              _context4.next = 10;
               break;
             }
             nameValidation = (0, _validator.validateSchemeName)(updates.name);
             if (nameValidation.valid) {
-              _context4.next = 7;
+              _context4.next = 8;
               break;
             }
             throw new Error(nameValidation.error);
-          case 7:
+          case 8:
             if (!(0, _validator.checkDuplicateName)(updates.name, schemes, currentScheme.id)) {
-              _context4.next = 9;
+              _context4.next = 10;
               break;
             }
             throw new Error('方案名称已存在');
-          case 9:
+          case 10:
             if (!(updates !== null && updates !== void 0 && updates.description)) {
-              _context4.next = 13;
+              _context4.next = 14;
               break;
             }
             descValidation = (0, _validator.validateSchemeDescription)(updates.description);
             if (descValidation.valid) {
-              _context4.next = 13;
+              _context4.next = 14;
               break;
             }
             throw new Error(descValidation.error);
-          case 13:
+          case 14:
             updatedScheme = _objectSpread(_objectSpread(_objectSpread({}, currentScheme), updates), {}, {
               updatedAt: Date.now()
             });
+            console.log('[useColumnSchemes] 准备保存的方案数据:', {
+              schemeId: updatedScheme.id,
+              schemeName: updatedScheme.name,
+              hasColumnConfig: !!updatedScheme.columnConfig,
+              columnConfigLength: ((_updatedScheme$column = updatedScheme.columnConfig) === null || _updatedScheme$column === void 0 ? void 0 : _updatedScheme$column.length) || 0,
+              columnConfigDetail: (_updatedScheme$column2 = updatedScheme.columnConfig) === null || _updatedScheme$column2 === void 0 ? void 0 : _updatedScheme$column2.map(function (item) {
+                return {
+                  type: item.type,
+                  headerName: item.headerName,
+                  field: item.field,
+                  order: item.order,
+                  parentId: item.parentId
+                };
+              })
+            });
             updatedSchemes = schemes.map(function (s) {
               return s.id === currentScheme.id ? updatedScheme : s;
             });
-            _context4.next = 17;
+            _context4.next = 19;
             return saveSchemesToStorage(updatedSchemes);
-          case 17:
+          case 19:
             setCurrentScheme(updatedScheme);
             setIsDirty(false);
+            console.log('[useColumnSchemes] 方案保存完成,当前 currentScheme:', {
+              schemeId: updatedScheme.id,
+              schemeName: updatedScheme.name,
+              hasColumnConfig: !!updatedScheme.columnConfig,
+              columnConfigLength: ((_updatedScheme$column3 = updatedScheme.columnConfig) === null || _updatedScheme$column3 === void 0 ? void 0 : _updatedScheme$column3.length) || 0
+            });
             onSchemeSave === null || onSchemeSave === void 0 || onSchemeSave(updatedScheme);
-          case 20:
+          case 23:
           case "end":
             return _context4.stop();
         }
@@ -289,7 +335,7 @@ function useColumnSchemes(config) {
    * 创建新方案
    */
   var createScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(name, columnState, options) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(name, columnConfig, options) {
       var nameValidation, uniqueName, newScheme, updatedSchemes;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
@@ -315,7 +361,7 @@ function useColumnSchemes(config) {
               name: uniqueName,
               createdAt: Date.now(),
               updatedAt: Date.now(),
-              columnState: columnState
+              columnConfig: columnConfig
             }, options); // 如果设置为默认方案，取消其他方案的默认标记
             updatedSchemes = schemes;
             if (newScheme.isDefault) {

package/dist/cjs/ag-grid-plus/schemes/storage/localStorageAdapter.js

@@ -61,7 +61,7 @@ var LocalStorageAdapter = exports.LocalStorageAdapter = /*#__PURE__*/function ()
     key: "migrateOldData",
     value: (function () {
       var _migrateOldData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(gridId) {
-        var oldKey, oldData, columnState, migratedScheme;
+        var oldKey, oldData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -74,35 +74,21 @@ var LocalStorageAdapter = exports.LocalStorageAdapter = /*#__PURE__*/function ()
               return _context.abrupt("return", []);
             case 4:
               _context.prev = 4;
-              columnState = JSON.parse(oldData); // 创建默认方案
-              migratedScheme = {
-                id: _constants.MIGRATED_DEFAULT_SCHEME_ID,
-                name: _constants.DEFAULT_SCHEME_NAME,
-                isDefault: true,
-                isSystem: true,
-                createdAt: Date.now(),
-                updatedAt: Date.now(),
-                columnState: columnState,
-                description: '由旧版本列配置自动迁移'
-              }; // 保存到新格式
-              _context.next = 9;
-              return this.saveSchemes(gridId, [migratedScheme]);
-            case 9:
-              // 可选：保留旧数据作为备份或删除
-              // localStorage.removeItem(oldKey);
-
-              console.log("[SchemeManager] \u5DF2\u8FC1\u79FB\u65E7\u5217\u914D\u7F6E\u6570\u636E\u5230\u65B9\u6848\u7CFB\u7EDF: ".concat(gridId));
-              return _context.abrupt("return", [migratedScheme]);
-            case 13:
-              _context.prev = 13;
+              // 注意:旧数据已无法自动迁移,因为缺少 columnConfig
+              // 建议手动处理或提示用户重新配置
+              console.warn("[SchemeManager] \u68C0\u6D4B\u5230\u65E7\u683C\u5F0F\u6570\u636E,\u4F46\u65E0\u6CD5\u81EA\u52A8\u8FC1\u79FB: ".concat(gridId));
+              console.warn('[SchemeManager] 请手动重新配置列方案');
+              return _context.abrupt("return", []);
+            case 10:
+              _context.prev = 10;
               _context.t0 = _context["catch"](4);
-              console.error('[SchemeManager] 迁移旧数据失败:', _context.t0);
+              console.error('[SchemeManager] 检查旧数据失败:', _context.t0);
               return _context.abrupt("return", []);
-            case 17:
+            case 14:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[4, 13]]);
+        }, _callee, this, [[4, 10]]);
       }));
       function migrateOldData(_x) {
         return _migrateOldData.apply(this, arguments);
@@ -167,7 +153,7 @@ var LocalStorageAdapter = exports.LocalStorageAdapter = /*#__PURE__*/function ()
             case 9:
               schemes = JSON.parse(data); // 验证数据完整性
               return _context2.abrupt("return", schemes.filter(function (scheme) {
-                return scheme.id && scheme.name && scheme.columnState && Array.isArray(scheme.columnState);
+                return scheme.id && scheme.name && scheme.columnConfig && Array.isArray(scheme.columnConfig);
               }));
             case 13:
               _context2.prev = 13;

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

@@ -1,4 +1,5 @@
 import { ColumnState } from 'ag-grid-community';
+import type { FlatColumnItem } from '../setting/columnGroupTypes';
 /**
  * 列配置方案数据结构
  */
@@ -15,8 +16,10 @@ export interface ColumnScheme {
     createdAt: number;
     /** 更新时间戳 */
     updatedAt: number;
-    /** AG-Grid 列状态数据 */
-    columnState: ColumnState[];
+    /** 完整的列配置数据(包含分组层级结构) */
+    columnConfig: FlatColumnItem[];
+    /** AG-Grid 过滤器模型数据（可选） */
+    filterModel?: any;
     /** 方案描述（可选） */
     description?: string;
     /** 标签分类（可选，扩展功能） */
@@ -106,9 +109,9 @@ export interface UseColumnSchemesReturn {
     /** 保存当前方案（更新现有方案） */
     saveScheme: (updates?: Partial<ColumnScheme>) => Promise<void>;
     /** 创建新方案 */
-    createScheme: (name: string, columnState: ColumnState[], options?: Partial<ColumnScheme>) => Promise<ColumnScheme>;
-    /** 更新方案信息（不影响 columnState） */
-    updateScheme: (schemeId: string, updates: Partial<Omit<ColumnScheme, 'id' | 'columnState'>>) => Promise<void>;
+    createScheme: (name: string, columnConfig: FlatColumnItem[], options?: Partial<ColumnScheme>) => Promise<ColumnScheme>;
+    /** 更新方案信息（不影响 columnConfig） */
+    updateScheme: (schemeId: string, updates: Partial<Omit<ColumnScheme, 'id' | 'columnConfig'>>) => Promise<void>;
     /** 删除方案 */
     deleteScheme: (schemeId: string) => Promise<void>;
     /** 重置到方案原始状态 */

package/dist/cjs/ag-grid-plus/schemes/utils/validator.js

@@ -17,35 +17,31 @@ function validateScheme(scheme, currentColumnDefs) {
   var invalidColumns = [];
   var validatedState = [];
 
-  // 获取当前有效的列 ID 集合
-  var validColIds = new Set(currentColumnDefs.filter(function (col) {
+  // 获取当前有效的列 field 集合
+  var validFields = new Set(currentColumnDefs.filter(function (col) {
     return col.field || col.colId;
   }).map(function (col) {
     return col.field || col.colId;
   }));
 
-  // 验证每个列状态
-  scheme.columnState.forEach(function (columnState) {
-    var colId = columnState.colId;
-    if (!colId) {
-      warnings.push('发现没有 colId 的列状态');
-      return;
+  // 验证每个列配置项
+  scheme.columnConfig.forEach(function (item) {
+    // 只验证列类型(非分组),因为分组没有对应的 field
+    if (item.type === 'column' && item.field) {
+      // 检查列是否仍然存在于表格定义中
+      if (!validFields.has(item.field)) {
+        invalidColumns.push(item.field);
+        warnings.push("\u5217 \"".concat(item.field, "\" \u5728\u5F53\u524D\u8868\u683C\u4E2D\u4E0D\u5B58\u5728"));
+      }
     }
-
-    // 检查列是否仍然存在于表格定义中
-    if (!validColIds.has(colId)) {
-      invalidColumns.push(colId);
-      warnings.push("\u5217 \"".concat(colId, "\" \u5728\u5F53\u524D\u8868\u683C\u4E2D\u4E0D\u5B58\u5728"));
-      return;
-    }
-
-    // 列有效，添加到验证后的状态中
-    validatedState.push(columnState);
   });
   var valid = invalidColumns.length === 0;
   if (!valid) {
     warnings.push("\u5171\u6709 ".concat(invalidColumns.length, " \u4E2A\u5217\u5728\u5F53\u524D\u8868\u683C\u4E2D\u4E0D\u5B58\u5728\uFF0C\u5DF2\u81EA\u52A8\u8FC7\u6EE4"));
   }
+
+  // 注意: validatedState 保持为空数组,因为 columnConfig 不是 ColumnState 格式
+  // 如果需要转换,应在调用方进行
   return {
     valid: valid,
     invalidColumns: invalidColumns,