@nokecy/qc-ui 1.0.94 → 1.0.96

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

@@ -14,12 +14,13 @@ var _locale = require("../locale");
 var _core = require("@formily/core");
 var _columnGroupUtils = require("./columnGroupUtils");
 var _ColumnConfigTable = _interopRequireDefault(require("./ColumnConfigTable"));
-var _processColumnGroups = _interopRequireDefault(require("../_utils/processColumnGroups"));
 var _draggableModal = _interopRequireDefault(require("../../draggableModal"));
-var _gridContext = require("../context/gridContext");
+var _useSchemeManager = require("../context/useSchemeManager");
+var _uuid = require("uuid");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -40,14 +41,27 @@ var TextArea = _antd.Input.TextArea;
  * 列方案管理组件 - 集成列配置和列方案管理
  */
 var ColumnSetting = function ColumnSetting(_ref) {
-  var _schemeManager$curren3;
+  var _currentSchemes$gridK3;
   var gridKey = _ref.gridKey,
     gridApi = _ref.gridApi,
     visible = _ref.visible,
     onClose = _ref.onClose,
-    onSaveColumnState = _ref.onSaveColumnState,
-    schemeManager = _ref.schemeManager,
-    type = _ref.type;
+    onSaveColumnState = _ref.onSaveColumnState;
+  // 使用新的集中式方案管理 API（包含状态数据和操作方法）
+  var _useGridSchemes = (0, _useSchemeManager.useGridSchemes)(),
+    columnSchemes = _useGridSchemes.columnSchemes,
+    currentSchemes = _useGridSchemes.currentSchemes,
+    allColDefs = _useGridSchemes.allColDefs,
+    saveColumnScheme = _useGridSchemes.saveColumnScheme,
+    deleteColumnScheme = _useGridSchemes.deleteColumnScheme,
+    setCurrentColumnScheme = _useGridSchemes.setCurrentColumnScheme;
+
+  // 获取当前表格的方案列表
+  var schemes = (columnSchemes === null || columnSchemes === void 0 ? void 0 : columnSchemes[gridKey]) || [];
+  var currentScheme = schemes.find(function (s) {
+    var _currentSchemes$gridK;
+    return s.id === (currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK = currentSchemes[gridKey]) === null || _currentSchemes$gridK === void 0 ? void 0 : _currentSchemes$gridK.columnSchemeId);
+  });
   var _useState = (0, _react.useState)('columns'),
     _useState2 = _slicedToArray(_useState, 2),
     activeTab = _useState2[0],
@@ -86,8 +100,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
     setSearchText = _useState16[1];
 
   // 【修复】从 Context 获取原始完整的列定义
-  var gridPlusContext = (0, _react.useContext)(_gridContext.GridPlusContext);
-  var originalColumnDefs = (gridPlusContext === null || gridPlusContext === void 0 ? void 0 : gridPlusContext.allColDefs) || undefined;
+  var originalColumnDefs = allColDefs || undefined;
 
   // 【修复】保存快照用于取消时恢复（改名避免与Context的originalColumnDefs冲突）
   var _useState17 = (0, _react.useState)(null),
@@ -100,10 +113,9 @@ var ColumnSetting = function ColumnSetting(_ref) {
    * 新版本使用树形结构，兼容旧版本的 groupName 结构
    */
   var getColumnData = (0, _react.useCallback)(function () {
-    var _schemeManager$curren;
     // 优先使用当前方案中保存的完整列配置(包含分组结构)
-    if (schemeManager !== null && schemeManager !== void 0 && (_schemeManager$curren = schemeManager.currentScheme) !== null && _schemeManager$curren !== void 0 && _schemeManager$curren.columnConfig) {
-      return schemeManager.currentScheme.columnConfig;
+    if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig) {
+      return currentScheme.columnConfig;
     }
 
     // 如果方案中没有 columnConfig,则从 Grid 读取
@@ -143,7 +155,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       return item;
     });
     return flatConfig;
-  }, [gridApi, schemeManager]);
+  }, [gridApi, currentScheme]);
 
   // 创建 Formily Form 实例
   var form = (0, _react.useMemo)(function () {
@@ -164,7 +176,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
         items: newData
       });
     }
-  }, [schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme, visible, form, getColumnData]);
+  }, [currentScheme, visible, form, getColumnData]);
 
   // 【修复】弹窗打开时保存快照,用于取消时恢复
   (0, _react.useEffect)(function () {
@@ -188,34 +200,32 @@ var ColumnSetting = function ColumnSetting(_ref) {
     var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(newItems, originalColumnDefs);
 
     // 3. 立即应用到 Grid(实时预览,不保存到方案)
-    if (type !== 'formArrayTable') {
-      gridApi.setGridOption("columnDefs", gridColumnDefs);
-    }
-  }, [form, gridApi, type, originalColumnDefs]);
+    // 【修复】同时应用列顺序和状态，确保拖拽排序能够生效
+    var columnState = (0, _columnGroupUtils.flatConfigToColumnState)(newItems);
+    gridApi.applyColumnState({
+      state: columnState,
+      applyOrder: true // 强制应用列顺序
+    });
+  }, [form, gridApi, originalColumnDefs]);
 
   /**
    * 关闭弹窗处理 - 取消时恢复原始状态
    * 如果用户取消操作,恢复到打开弹窗前的列定义状态
    */
   var handleClose = (0, _react.useCallback)(function () {
-    // 【修复】如果有保存的快照,恢复它
-    if (snapshotColumnDefs && type !== 'formArrayTable') {
-      gridApi.setGridOption("columnDefs", snapshotColumnDefs);
-    }
-
     // 清空快照
     setSnapshotColumnDefs(null);
 
     // 调用父组件的 onClose
     onClose();
-  }, [snapshotColumnDefs, gridApi, type, onClose]);
+  }, [snapshotColumnDefs, gridApi, onClose]);
 
   /**
    * 保存列配置
    * 将扁平化配置转换回 Grid State 并应用到 AG-Grid
    */
   var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, flatConfig, configToSave, gridColumnDefs;
+    var values, flatConfig, configToSave, gridColumnDefs, columnState;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -234,101 +244,117 @@ var ColumnSetting = function ColumnSetting(_ref) {
           }
 
           // 【修复】转换为 AG-Grid 的列定义，传入原始列定义以保留自定义属性
-          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave, originalColumnDefs); // 先应用列配置到 Grid
-          if (type !== 'formArrayTable') {
-            gridApi.setGridOption("columnDefs", gridColumnDefs);
-          }
+          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
+          console.log('[ColumnSetting] 更新 columnDefs:', gridColumnDefs);
+          gridApi.setGridOption('columnDefs', gridColumnDefs);
 
-          // 应用列状态（应用列定义后，Grid 会自动更新状态）
+          // 等待 columnDefs 更新完成
+          _context2.next = 11;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 100);
+          });
+        case 11:
+          // 【修复】然后应用列状态（宽度、隐藏、顺序等）
+          columnState = (0, _columnGroupUtils.flatConfigToColumnState)(configToSave);
+          gridApi.applyColumnState({
+            state: columnState,
+            applyOrder: true // 强制应用列顺序
+          });
 
           // 等待 Grid 状态更新完成后再保存到方案
           setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var updatedState, filterModel, defaultScheme, newScheme;
+            var filterModel, defaultScheme, newScheme;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  if (!(schemeManager && gridKey)) {
-                    _context.next = 25;
-                    break;
-                  }
-                  _context.prev = 1;
-                  // 从 Grid 获取应用后的最新列状态和过滤器状态
-                  updatedState = gridApi.getColumnState();
+                  _context.prev = 0;
                   filterModel = gridApi.getFilterModel();
-                  if (!schemeManager.currentScheme) {
-                    _context.next = 9;
+                  if (!currentScheme) {
+                    _context.next = 8;
                     break;
                   }
-                  _context.next = 7;
-                  return schemeManager.saveScheme({
+                  _context.next = 5;
+                  return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, currentScheme), {}, {
                     columnConfig: configToSave,
-                    // 保存完整的列配置(包含分组结构)
-                    filterModel: filterModel
-                  });
-                case 7:
-                  _context.next = 20;
+                    filterModel: filterModel,
+                    updatedAt: Date.now()
+                  }));
+                case 5:
+                  _antd.message.success('列配置已保存到方案');
+                  _context.next = 23;
                   break;
-                case 9:
-                  // 如果没有激活的方案，查找或创建"默认配置"方案
-                  defaultScheme = schemeManager.schemes.find(function (s) {
+                case 8:
+                  // 如果没有激活的方案，自动创建默认方案
+                  defaultScheme = schemes.find(function (s) {
                     return s.isDefault;
                   });
                   if (!defaultScheme) {
                     _context.next = 17;
                     break;
                   }
-                  _context.next = 13;
-                  return schemeManager.loadScheme(defaultScheme.id);
-                case 13:
-                  _context.next = 15;
-                  return schemeManager.saveScheme({
+                  _context.next = 12;
+                  return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, defaultScheme), {}, {
                     columnConfig: configToSave,
-                    // 保存完整的列配置(包含分组结构)
-                    filterModel: filterModel
-                  });
-                case 15:
-                  _context.next = 20;
+                    filterModel: filterModel,
+                    updatedAt: Date.now()
+                  }));
+                case 12:
+                  _context.next = 14;
+                  return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, defaultScheme.id);
+                case 14:
+                  _antd.message.success('列配置已保存到默认方案');
+                  _context.next = 23;
                   break;
                 case 17:
-                  _context.next = 19;
-                  return schemeManager.createScheme('默认配置', configToSave,
-                  // 使用 columnConfig 而不是 columnState
-                  {
-                    isDefault: true,
-                    description: '自动保存的默认列配置',
+                  // 创建新的默认方案并激活
+                  newScheme = {
+                    id: (0, _uuid.v4)(),
+                    name: '默认配置',
+                    description: '自动创建的默认列配置',
+                    columnConfig: configToSave,
                     filterModel: filterModel,
-                    activate: true // 立即激活该方案
-                  });
-                case 19:
-                  newScheme = _context.sent;
+                    isDefault: true,
+                    isSystem: false,
+                    createdAt: Date.now(),
+                    updatedAt: Date.now()
+                  };
+                  _context.next = 20;
+                  return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
                 case 20:
-                  _context.next = 25;
-                  break;
+                  _context.next = 22;
+                  return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, newScheme.id);
                 case 22:
-                  _context.prev = 22;
-                  _context.t0 = _context["catch"](1);
-                  console.error('保存列配置到方案失败:', _context.t0);
+                  _antd.message.success('已创建并保存到默认方案');
+                case 23:
+                  _context.next = 29;
+                  break;
                 case 25:
+                  _context.prev = 25;
+                  _context.t0 = _context["catch"](0);
+                  console.error('保存列配置到方案失败:', _context.t0);
+                  _antd.message.error('保存列配置失败');
+                case 29:
                 case "end":
                   return _context.stop();
               }
-            }, _callee, null, [[1, 22]]);
+            }, _callee, null, [[0, 25]]);
           })), 50);
 
           // 【修复】保存成功后清除快照
           setSnapshotColumnDefs(null);
-          _antd.message.success('列配置已保存');
+
+          // message.success 已经在上面的逻辑中处理了
           onClose();
-        case 12:
+        case 16:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
-  })), [form, gridApi, onSaveColumnState, type, onClose, schemeManager, gridKey, originalColumnDefs]);
+  })), [form, gridApi, onSaveColumnState, onClose, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, originalColumnDefs]);
 
   // 保存为新方案
   var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var columnConfigToSave, values, processedColumns, _values, filterModel, newScheme;
+    var columnConfigToSave, values, gridColumnDefs, columnState, _values, filterModel, newScheme;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -341,39 +367,58 @@ var ColumnSetting = function ColumnSetting(_ref) {
         case 3:
           _context3.prev = 3;
           if (!(activeTab === 'columns' && form)) {
-            _context3.next = 13;
+            _context3.next = 18;
             break;
           }
           values = form.values;
           columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
           // 【修复】传入原始列定义以保留自定义属性
-          processedColumns = (0, _processColumnGroups.default)(values.items, originalColumnDefs); // 先应用到 Grid
-          if (type !== 'formArrayTable') {
-            gridApi.setGridOption("columnDefs", processedColumns);
-          }
+          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(values.items, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
+          console.log('[ColumnSetting] 另存为方案 - 更新 columnDefs');
+          gridApi.setGridOption('columnDefs', gridColumnDefs);
+
+          // 等待 columnDefs 更新完成
+          _context3.next = 12;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 100);
+          });
+        case 12:
+          // 【修复】然后应用列状态（宽度、隐藏、顺序等）
+          columnState = (0, _columnGroupUtils.flatConfigToColumnState)(values.items);
+          gridApi.applyColumnState({
+            state: columnState,
+            applyOrder: true // 强制应用列顺序
+          });
 
           // 等待状态更新
-          _context3.next = 11;
+          _context3.next = 16;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
-        case 11:
-          _context3.next = 15;
+        case 16:
+          _context3.next = 20;
           break;
-        case 13:
+        case 18:
           // 如果在"方案管理"标签页，使用当前表单数据
           _values = form === null || form === void 0 ? void 0 : form.values;
           columnConfigToSave = (_values === null || _values === void 0 ? void 0 : _values.items) || [];
-        case 15:
+        case 20:
           // 获取过滤器模型
           filterModel = gridApi.getFilterModel();
-          _context3.next = 18;
-          return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.createScheme(schemeName.trim(), columnConfigToSave, {
+          newScheme = {
+            id: (0, _uuid.v4)(),
+            name: schemeName.trim(),
             description: schemeDescription.trim() || "\u521B\u5EFA\u4E8E ".concat(new Date().toLocaleString()),
-            filterModel: filterModel
-          });
-        case 18:
-          newScheme = _context3.sent;
+            columnConfig: columnConfigToSave,
+            filterModel: filterModel,
+            isDefault: false,
+            isSystem: false,
+            createdAt: Date.now(),
+            updatedAt: Date.now()
+          };
+          _context3.next = 24;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
+        case 24:
           _antd.message.success('方案保存成功');
           setSaveSchemeVisible(false);
           setSchemeName('');
@@ -381,29 +426,61 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 切换到方案管理标签页,显示新创建的方案
           setActiveTab('schemes');
-          _context3.next = 29;
+          _context3.next = 34;
           break;
-        case 26:
-          _context3.prev = 26;
+        case 31:
+          _context3.prev = 31;
           _context3.t0 = _context3["catch"](3);
           _antd.message.error(_context3.t0.message || '保存方案失败');
-        case 29:
+        case 34:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[3, 26]]);
-  })), [gridApi, schemeManager, schemeName, schemeDescription, activeTab, form, type]);
+    }, _callee3, null, [[3, 31]]);
+  })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, originalColumnDefs]);
 
   // 加载方案
   var handleLoadScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
+      var scheme, gridColumnDefs, columnState;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _context4.prev = 0;
             _context4.next = 3;
-            return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.loadScheme(schemeId);
+            return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, schemeId);
           case 3:
+            // 应用方案到 Grid
+            scheme = schemes.find(function (s) {
+              return s.id === schemeId;
+            });
+            if (!(scheme && gridApi)) {
+              _context4.next = 13;
+              break;
+            }
+            // 【关键修复】先更新 columnDefs（处理分组结构）
+            gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, originalColumnDefs);
+            console.log('[ColumnSetting] 加载方案 - 更新 columnDefs');
+            gridApi.setGridOption('columnDefs', gridColumnDefs);
+
+            // 等待 columnDefs 更新完成
+            _context4.next = 10;
+            return new Promise(function (resolve) {
+              return setTimeout(resolve, 100);
+            });
+          case 10:
+            // 【修复】然后应用列状态（宽度、隐藏、顺序等）
+            columnState = (0, _columnGroupUtils.flatConfigToColumnState)(scheme.columnConfig);
+            gridApi.applyColumnState({
+              state: columnState,
+              applyOrder: true // 强制应用列顺序
+            });
+
+            // 应用过滤器
+            if (scheme.filterModel) {
+              gridApi.setFilterModel(scheme.filterModel);
+            }
+          case 13:
             _antd.message.success('方案已加载');
 
             // 等待Grid状态更新后再刷新表单
@@ -418,50 +495,96 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
             // 自动关闭弹窗,让用户看到Grid的变化
             onClose();
-            _context4.next = 11;
+            _context4.next = 21;
             break;
-          case 8:
-            _context4.prev = 8;
+          case 18:
+            _context4.prev = 18;
             _context4.t0 = _context4["catch"](0);
             _antd.message.error(_context4.t0.message || '加载方案失败');
-          case 11:
+          case 21:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[0, 8]]);
+      }, _callee4, null, [[0, 18]]);
     }));
     return function (_x) {
       return _ref5.apply(this, arguments);
     };
-  }(), [schemeManager, form, getColumnData, onClose]);
+  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, originalColumnDefs, form, getColumnData, onClose]);
 
   // 设置默认方案
   var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId) {
+      var scheme, _iterator, _step, s;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
             _context5.prev = 0;
-            _context5.next = 3;
-            return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.setDefaultScheme(schemeId);
-          case 3:
+            scheme = schemes.find(function (s) {
+              return s.id === schemeId;
+            });
+            if (!scheme) {
+              _context5.next = 24;
+              break;
+            }
+            // 将其他方案设为非默认
+            _iterator = _createForOfIteratorHelper(schemes);
+            _context5.prev = 4;
+            _iterator.s();
+          case 6:
+            if ((_step = _iterator.n()).done) {
+              _context5.next = 13;
+              break;
+            }
+            s = _step.value;
+            if (!(s.isDefault && s.id !== schemeId)) {
+              _context5.next = 11;
+              break;
+            }
+            _context5.next = 11;
+            return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, s), {}, {
+              isDefault: false,
+              updatedAt: Date.now()
+            }));
+          case 11:
+            _context5.next = 6;
+            break;
+          case 13:
+            _context5.next = 18;
+            break;
+          case 15:
+            _context5.prev = 15;
+            _context5.t0 = _context5["catch"](4);
+            _iterator.e(_context5.t0);
+          case 18:
+            _context5.prev = 18;
+            _iterator.f();
+            return _context5.finish(18);
+          case 21:
+            _context5.next = 23;
+            return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
+              isDefault: true,
+              updatedAt: Date.now()
+            }));
+          case 23:
             _antd.message.success('已设置为默认方案');
-            _context5.next = 9;
+          case 24:
+            _context5.next = 29;
             break;
-          case 6:
-            _context5.prev = 6;
-            _context5.t0 = _context5["catch"](0);
-            _antd.message.error(_context5.t0.message || '设置失败');
-          case 9:
+          case 26:
+            _context5.prev = 26;
+            _context5.t1 = _context5["catch"](0);
+            _antd.message.error(_context5.t1.message || '设置失败');
+          case 29:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, null, [[0, 6]]);
+      }, _callee5, null, [[0, 26], [4, 15, 18, 21]]);
     }));
     return function (_x2) {
       return _ref6.apply(this, arguments);
     };
-  }(), [schemeManager]);
+  }(), [schemes, saveColumnScheme, gridKey]);
 
   // 删除方案
   var handleDeleteScheme = (0, _react.useCallback)( /*#__PURE__*/function () {
@@ -471,7 +594,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
           case 0:
             _context6.prev = 0;
             _context6.next = 3;
-            return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.deleteScheme(schemeId);
+            return deleteColumnScheme === null || deleteColumnScheme === void 0 ? void 0 : deleteColumnScheme(gridKey, schemeId);
           case 3:
             _antd.message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664"));
             _context6.next = 9;
@@ -489,7 +612,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
     return function (_x3, _x4) {
       return _ref7.apply(this, arguments);
     };
-  }(), [schemeManager]);
+  }(), [deleteColumnScheme, gridKey]);
 
   // 编辑方案
   var handleEditScheme = (0, _react.useCallback)(function (scheme) {
@@ -500,6 +623,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
   // 保存编辑
   var handleSaveEdit = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+    var scheme;
     return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
@@ -510,36 +634,45 @@ var ColumnSetting = function ColumnSetting(_ref) {
           return _context7.abrupt("return");
         case 2:
           _context7.prev = 2;
-          _context7.next = 5;
-          return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.updateScheme(editingId, {
-            name: editingName.trim(),
-            description: editingDescription.trim() || undefined
+          scheme = schemes.find(function (s) {
+            return s.id === editingId;
           });
-        case 5:
+          if (!scheme) {
+            _context7.next = 9;
+            break;
+          }
+          _context7.next = 7;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
+            name: editingName.trim(),
+            description: editingDescription.trim() || undefined,
+            updatedAt: Date.now()
+          }));
+        case 7:
           _antd.message.success('更新成功');
           setEditingId(null);
-          _context7.next = 12;
-          break;
         case 9:
-          _context7.prev = 9;
+          _context7.next = 14;
+          break;
+        case 11:
+          _context7.prev = 11;
           _context7.t0 = _context7["catch"](2);
           _antd.message.error(_context7.t0.message || '更新失败');
-        case 12:
+        case 14:
         case "end":
           return _context7.stop();
       }
-    }, _callee7, null, [[2, 9]]);
-  })), [schemeManager, editingId, editingName, editingDescription]);
+    }, _callee7, null, [[2, 11]]);
+  })), [schemes, saveColumnScheme, gridKey, editingId, editingName, editingDescription]);
 
   // 筛选方案列表
   var filteredSchemes = (0, _react.useMemo)(function () {
-    if (!schemeManager) return [];
+    if (schemes.length === 0) return [];
     var text = searchText.toLowerCase().trim();
-    if (!text) return schemeManager.schemes;
-    return schemeManager.schemes.filter(function (scheme) {
+    if (!text) return schemes;
+    return schemes.filter(function (scheme) {
       return scheme.name.toLowerCase().includes(text) || scheme.description && scheme.description.toLowerCase().includes(text);
     });
-  }, [schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.schemes, searchText]);
+  }, [schemes, searchText]);
 
   // AG-Grid 列定义
   var schemeColumnDefs = (0, _react.useMemo)(function () {
@@ -549,7 +682,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       flex: 1,
       minWidth: 200,
       cellRenderer: function cellRenderer(params) {
-        var _schemeManager$curren2;
+        var _currentSchemes$gridK2;
         var record = params.data;
         if (!record) return null;
         if (editingId === record.id) {
@@ -569,7 +702,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
           size: "small"
         }, /*#__PURE__*/_react.default.createElement("span", null, record.name), record.isDefault && /*#__PURE__*/_react.default.createElement(_antd.Tag, {
           color: "blue"
-        }, "\u9ED8\u8BA4"), record.id === (schemeManager === null || schemeManager === void 0 || (_schemeManager$curren2 = schemeManager.currentScheme) === null || _schemeManager$curren2 === void 0 ? void 0 : _schemeManager$curren2.id) && /*#__PURE__*/_react.default.createElement(_antd.Tag, {
+        }, "\u9ED8\u8BA4"), record.id === (currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK2 = currentSchemes[gridKey]) === null || _currentSchemes$gridK2 === void 0 ? void 0 : _currentSchemes$gridK2.columnSchemeId) && /*#__PURE__*/_react.default.createElement(_antd.Tag, {
           color: "green"
         }, "\u5F53\u524D"));
       }
@@ -672,16 +805,16 @@ var ColumnSetting = function ColumnSetting(_ref) {
         }))));
       }
     }];
-  }, [editingId, editingName, editingDescription, schemeManager === null || schemeManager === void 0 || (_schemeManager$curren3 = schemeManager.currentScheme) === null || _schemeManager$curren3 === void 0 ? void 0 : _schemeManager$curren3.id, handleSaveEdit, handleLoadScheme, handleSetDefault, handleEditScheme, handleDeleteScheme]);
+  }, [editingId, editingName, editingDescription, currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK3 = currentSchemes[gridKey]) === null || _currentSchemes$gridK3 === void 0 ? void 0 : _currentSchemes$gridK3.columnSchemeId, handleSaveEdit, handleLoadScheme, handleSetDefault, handleEditScheme, handleDeleteScheme]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_draggableModal.default, {
-    title: /*#__PURE__*/_react.default.createElement("span", null, "\u5217\u65B9\u6848\u7BA1\u7406", (schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme) && /*#__PURE__*/_react.default.createElement("span", {
+    title: /*#__PURE__*/_react.default.createElement("span", null, "\u5217\u65B9\u6848\u7BA1\u7406", currentScheme && /*#__PURE__*/_react.default.createElement("span", {
       style: {
         marginLeft: 16,
         fontSize: 14,
         fontWeight: 'normal',
         color: '#1890ff'
       }
-    }, "- \u5F53\u524D\u65B9\u6848: ", schemeManager.currentScheme.name)),
+    }, "- \u5F53\u524D\u65B9\u6848: ", currentScheme.name)),
     open: visible,
     onCancel: handleClose,
     width: 1100,
@@ -694,7 +827,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       onClick: onClose
     }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_antd.Button, {
       onClick: handleSaveColumns
-    }, "\u4FDD\u5B58\u914D\u7F6E"), (type !== 'formArrayTable' || schemeManager) && /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }, "\u4FDD\u5B58\u914D\u7F6E"), /*#__PURE__*/_react.default.createElement(_antd.Button, {
       type: "primary",
       icon: /*#__PURE__*/_react.default.createElement(_icons.SaveOutlined, null),
       onClick: function onClick() {
@@ -713,8 +846,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_ColumnConfigTable.default, {
     items: form.values.items || [],
     onChange: handleColumnChange,
-    simple: type === 'formArrayTable'
-  })), schemeManager && type !== 'formArrayTable' && /*#__PURE__*/_react.default.createElement(TabPane, {
+    simple: false
+  })), /*#__PURE__*/_react.default.createElement(TabPane, {
     tab: "\u65B9\u6848\u7BA1\u7406",
     key: "schemes"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -767,7 +900,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
       setSchemeDescription('');
     },
     okText: "\u4FDD\u5B58",
-    cancelText: "\u53D6\u6D88"
+    cancelText: "\u53D6\u6D88",
+    destroyOnClose: true
   }, /*#__PURE__*/_react.default.createElement("div", {
     style: {
       marginBottom: 16