@nokecy/qc-ui 1.1.18 → 1.1.20

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

@@ -23,7 +23,6 @@ var _excluded = ["createdAt", "updatedAt"],
 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 _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 _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; }
@@ -34,6 +33,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -57,6 +57,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
     columnSchemes = _useGridSchemes.columnSchemes,
     currentSchemes = _useGridSchemes.currentSchemes,
     allColDefs = _useGridSchemes.allColDefs,
+    initialColumnDefs = _useGridSchemes.initialColumnDefs,
     saveColumnScheme = _useGridSchemes.saveColumnScheme,
     deleteColumnScheme = _useGridSchemes.deleteColumnScheme,
     setCurrentColumnScheme = _useGridSchemes.setCurrentColumnScheme;
@@ -104,8 +105,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
     searchText = _useState16[0],
     setSearchText = _useState16[1];
 
-  // 【修复】从 Context 获取原始完整的列定义
-  var originalColumnDefs = allColDefs || undefined;
+  // 【修复】从 Context 获取初始列定义（用于获取原始 headerName）
+  // initialColumnDefs 来自组件初始化时的 props，不会被列方案修改
+  // allColDefs 包含自定义属性（cellRenderer 等），用于方案应用时保留这些属性
+  var originalColumnDefs = initialColumnDefs || allColDefs || undefined;
 
   // 【修复】保存快照用于取消时恢复（改名避免与Context的originalColumnDefs冲突）
   var _useState17 = (0, _react.useState)(null),
@@ -113,6 +116,57 @@ var ColumnSetting = function ColumnSetting(_ref) {
     snapshotColumnDefs = _useState18[0],
     setSnapshotColumnDefs = _useState18[1];
 
+  /**
+   * 修正列配置中的 originalHeaderName
+   * 确保 originalHeaderName 始终从 initialColumnDefs 中获取,而不是使用方案中保存的值
+   */
+  var fixOriginalHeaderName = (0, _react.useCallback)(function (items) {
+    if (!originalColumnDefs || originalColumnDefs.length === 0) {
+      return items;
+    }
+
+    // 递归查找 originalColumnDefs 中指定 field 的 headerName
+    var findOriginalHeaderName = function findOriginalHeaderName(field) {
+      var _iterator = _createForOfIteratorHelper(originalColumnDefs),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var def = _step.value;
+          // 检查分组
+          if ('children' in def && def.children) {
+            for (var _i = 0, _arr = def.children; _i < _arr.length; _i++) {
+              var child = _arr[_i];
+              if (child.field === field) {
+                return child.headerName;
+              }
+            }
+          } else {
+            // 检查普通列
+            if (def.field === field) {
+              return def.headerName;
+            }
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return undefined;
+    };
+    return items.map(function (item) {
+      if (item.type === 'column' && item.field) {
+        var originalHeaderName = findOriginalHeaderName(item.field);
+        if (originalHeaderName) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            originalHeaderName: originalHeaderName
+          });
+        }
+      }
+      return item;
+    });
+  }, [originalColumnDefs]);
+
   /**
    * 获取列数据 - 将 Grid 的列定义转换为扁平化配置
    * 新版本使用树形结构，兼容旧版本的 groupName 结构
@@ -120,15 +174,16 @@ var ColumnSetting = function ColumnSetting(_ref) {
   var getColumnData = (0, _react.useCallback)(function () {
     // 优先使用当前方案中保存的完整列配置(包含分组结构)
     if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig) {
-      return currentScheme.columnConfig;
+      // 【修复】修正 originalHeaderName,确保使用 initialColumnDefs 中的原始值
+      return fixOriginalHeaderName(currentScheme.columnConfig);
     }
 
     // 如果方案中没有 columnConfig,则从 Grid 读取
     var columnDefs = gridApi.getColumnDefs() || [];
     var columnStates = gridApi.getColumnState();
 
-    // 将 Grid 状态转换为扁平化配置
-    var flatConfig = (0, _columnGroupUtils.gridStateToFlatConfig)(columnDefs);
+    // 将 Grid 状态转换为扁平化配置,传入原始列定义以获取 originalHeaderName
+    var flatConfig = (0, _columnGroupUtils.gridStateToFlatConfig)(columnDefs, originalColumnDefs);
 
     // 同步列状态（宽度、隐藏等）
     flatConfig = flatConfig.map(function (item) {
@@ -160,7 +215,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       return item;
     });
     return flatConfig;
-  }, [gridApi, currentScheme]);
+  }, [gridApi, currentScheme, fixOriginalHeaderName, originalColumnDefs]);
 
   // 创建 Formily Form 实例
   var form = (0, _react.useMemo)(function () {
@@ -201,8 +256,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
       items: newItems
     });
 
-    // 2. 【修复】转换为 AG-Grid 列定义，传入原始列定义以保留自定义属性
-    var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(newItems, originalColumnDefs);
+    // 2. 【修复】转换为 AG-Grid 列定义，传入 allColDefs 以保留自定义属性（cellRenderer 等）
+    var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(newItems, allColDefs);
 
     // 3. 立即应用到 Grid(实时预览,不保存到方案)
     // 【修复】同时应用列顺序和状态，确保拖拽排序能够生效
@@ -211,7 +266,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       state: columnState,
       applyOrder: true // 强制应用列顺序
     });
-  }, [form, gridApi, originalColumnDefs]);
+  }, [form, gridApi, allColDefs]);
 
   /**
    * 关闭弹窗处理 - 取消时恢复原始状态
@@ -247,8 +302,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
               _context.next = 12;
               break;
             }
-            // 【关键修复】先更新 columnDefs（处理分组结构）
-            gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, originalColumnDefs);
+            // 【关键修复】先更新 columnDefs（处理分组结构），使用 allColDefs 保留自定义属性
+            gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(scheme.columnConfig, allColDefs);
             gridApi.setGridOption('columnDefs', gridColumnDefs);
 
             // 等待 columnDefs 更新完成
@@ -298,7 +353,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, originalColumnDefs, form, getColumnData, onClose]);
+  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, allColDefs, form, getColumnData, onClose]);
 
   /**
    * 保存列配置
@@ -405,7 +460,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
             _context2.next = 39;
             break;
           }
-          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(savedScheme.columnConfig, originalColumnDefs);
+          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(savedScheme.columnConfig, allColDefs);
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
@@ -452,7 +507,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
           return _context2.stop();
       }
     }, _callee2, null, [[8, 50]]);
-  })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, originalColumnDefs, onClose]);
+  })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, allColDefs, onClose]);
 
   // 保存为新方案
   var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
@@ -474,8 +529,8 @@ var ColumnSetting = function ColumnSetting(_ref) {
           }
           values = form.values;
           columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
-          // 【修复】传入原始列定义以保留自定义属性
-          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(values.items, originalColumnDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
+          // 【修复】传入 allColDefs 以保留自定义属性（cellRenderer 等）
+          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(values.items, allColDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
           gridApi.setGridOption('columnDefs', gridColumnDefs);
 
           // 等待 columnDefs 更新完成
@@ -537,12 +592,12 @@ var ColumnSetting = function ColumnSetting(_ref) {
           return _context3.stop();
       }
     }, _callee3, null, [[3, 30]]);
-  })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, originalColumnDefs]);
+  })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, allColDefs]);
 
   // 设置默认方案
   var handleSetDefault = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
-      var scheme, _iterator, _step, s;
+      var scheme, _iterator2, _step2, s;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -555,15 +610,15 @@ var ColumnSetting = function ColumnSetting(_ref) {
               break;
             }
             // 将其他方案设为非默认
-            _iterator = _createForOfIteratorHelper(schemes);
+            _iterator2 = _createForOfIteratorHelper(schemes);
             _context4.prev = 4;
-            _iterator.s();
+            _iterator2.s();
           case 6:
-            if ((_step = _iterator.n()).done) {
+            if ((_step2 = _iterator2.n()).done) {
               _context4.next = 13;
               break;
             }
-            s = _step.value;
+            s = _step2.value;
             if (!(s.isDefault && s.id !== schemeId)) {
               _context4.next = 11;
               break;
@@ -581,10 +636,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
           case 15:
             _context4.prev = 15;
             _context4.t0 = _context4["catch"](4);
-            _iterator.e(_context4.t0);
+            _iterator2.e(_context4.t0);
           case 18:
             _context4.prev = 18;
-            _iterator.f();
+            _iterator2.f();
             return _context4.finish(18);
           case 21:
             _context4.next = 23;

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

@@ -10,6 +10,7 @@ export declare const DebounceNumberInput: React.FC<{
     min?: number;
     max?: number;
     step?: number;
+    size?: 'large' | 'middle' | 'small';
     style?: React.CSSProperties;
 }>;
 /**

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

@@ -26,6 +26,7 @@ var DebounceNumberInput = exports.DebounceNumberInput = function DebounceNumberI
     min = _ref.min,
     max = _ref.max,
     step = _ref.step,
+    size = _ref.size,
     style = _ref.style;
   var _useState = (0, _react.useState)(value),
     _useState2 = _slicedToArray(_useState, 2),
@@ -61,6 +62,7 @@ var DebounceNumberInput = exports.DebounceNumberInput = function DebounceNumberI
     min: min,
     max: max,
     step: step,
+    size: size,
     style: style || {
       width: '100%'
     }

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

@@ -17,8 +17,10 @@ export interface FlatColumnItem {
     level: number;
     /** 排序序号，用于维护节点顺序 */
     order: number;
-    /** 显示名称 */
+    /** 显示名称 (当前值，可被用户修改) */
     headerName: string;
+    /** 原始显示名称 (用于对比和重置) */
+    originalHeaderName?: string;
     /** AG-Grid 分组标识（仅分组类型） */
     groupId?: string;
     /** 子列是否必须保持一起（仅分组类型） */

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

@@ -13,9 +13,10 @@ export declare const generateId: () => string;
  * 将 AG-Grid 的树形结构转换为扁平化数组，用于 UI 展示和编辑
  *
  * @param columnDefs AG-Grid 列定义数组
+ * @param originalColumnDefs 原始列定义数组(可选),用于获取 originalHeaderName
  * @returns 扁平化配置数组
  */
-export declare function gridStateToFlatConfig(columnDefs: (ColDef | ColGroupDef)[]): FlatColumnItem[];
+export declare function gridStateToFlatConfig(columnDefs: (ColDef | ColGroupDef)[], originalColumnDefs?: (ColDef | ColGroupDef)[]): FlatColumnItem[];
 /**
  * 扁平化配置 → Grid State
  * 将扁平化数组重建为 AG-Grid 的树形结构

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

@@ -40,12 +40,44 @@ var generateId = exports.generateId = function generateId() {
  * 将 AG-Grid 的树形结构转换为扁平化数组，用于 UI 展示和编辑
  *
  * @param columnDefs AG-Grid 列定义数组
+ * @param originalColumnDefs 原始列定义数组(可选),用于获取 originalHeaderName
  * @returns 扁平化配置数组
  */
-function gridStateToFlatConfig(columnDefs) {
+function gridStateToFlatConfig(columnDefs, originalColumnDefs) {
   var result = [];
   var order = 0;
 
+  /**
+   * 从原始列定义中查找指定字段的原始 headerName
+   */
+  function findOriginalHeaderName(field, defs) {
+    if (!defs || !field) return undefined;
+    var _iterator = _createForOfIteratorHelper(defs),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var def = _step.value;
+        // 检查是否是分组
+        if ('children' in def && def.children) {
+          // 递归查找分组内的列
+          var found = findOriginalHeaderName(field, def.children);
+          if (found) return found;
+        } else {
+          // 检查是否是目标列
+          var colDef = def;
+          if (colDef.field === field) {
+            return colDef.headerName;
+          }
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return undefined;
+  }
+
   /**
    * 递归遍历列定义树
    */
@@ -54,13 +86,16 @@ function gridStateToFlatConfig(columnDefs) {
       if (item.children && item.children.length > 0) {
         // 这是一个分组节点
         var groupId = generateId();
+        var headerName = item.headerName || '未命名分组';
         result.push({
           id: groupId,
           type: 'group',
           parentId: parentId,
           level: level,
           order: order++,
-          headerName: item.headerName || '未命名分组',
+          headerName: headerName,
+          originalHeaderName: headerName,
+          // 保存原始 headerName
           groupId: item.groupId || item.field || generateId(),
           marryChildren: item.marryChildren
         });
@@ -68,6 +103,9 @@ function gridStateToFlatConfig(columnDefs) {
         traverse(item.children, level + 1, groupId);
       } else {
         // 这是一个列节点
+        var _headerName = item.headerName || item.field || '未命名列';
+        // 从原始列定义中获取 originalHeaderName,如果没有则使用当前 headerName
+        var originalHeaderName = item.field ? findOriginalHeaderName(item.field, originalColumnDefs) || _headerName : _headerName;
         result.push({
           id: generateId(),
           type: 'column',
@@ -75,7 +113,9 @@ function gridStateToFlatConfig(columnDefs) {
           level: level,
           order: order++,
           field: item.field,
-          headerName: item.headerName || item.field || '未命名列',
+          headerName: _headerName,
+          originalHeaderName: originalHeaderName,
+          // 从原始定义获取,或使用当前值
           width: item.width,
           hide: item.hide,
           pinned: item.pinned === null ? 'notPinned' : item.pinned,
@@ -107,11 +147,11 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
    */
   function findOriginalColDef(field, defs) {
     if (!defs) return undefined;
-    var _iterator = _createForOfIteratorHelper(defs),
-      _step;
+    var _iterator2 = _createForOfIteratorHelper(defs),
+      _step2;
     try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var def = _step.value;
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var def = _step2.value;
         // 检查是否是分组
         if ('children' in def && def.children) {
           // 递归查找分组内的列
@@ -126,9 +166,9 @@ function flatConfigToGridState(flatConfig, originalColumnDefs) {
         }
       }
     } catch (err) {
-      _iterator.e(err);
+      _iterator2.e(err);
     } finally {
-      _iterator.f();
+      _iterator2.f();
     }
     return undefined;
   }

package/dist/cjs/draggableModal/index.js

@@ -206,7 +206,8 @@ var DraggableModal = function DraggableModal(props) {
   return /*#__PURE__*/_react.default.createElement(_antd.Modal, _extends({
     maskClosable: false,
     width: width,
-    open: open
+    open: open,
+    destroyOnClose: true
   }, restProps, {
     wrapClassName: mergedWrapClassName,
     title: /*#__PURE__*/_react.default.createElement("div", {

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

@@ -93,6 +93,10 @@ function AgGridPlus(props) {
   var apiRef = useRef();
   var allColDefsRef = useRef([]);
 
+  // 【新增】缓存初始的 columnDefs，用于保留原始 headerName
+  // 这个值在组件生命周期中保持不变，不会被列方案修改
+  var initialColumnDefsRef = useRef([]);
+
   // 【新增】用于缓存每个数据对象的唯一 ID（降级方案）
   var rowIdCacheRef = useRef(new WeakMap());
   var rowIdCounterRef = useRef(0);
@@ -582,6 +586,21 @@ function AgGridPlus(props) {
     var cols = getTableColumns([dataForTypeInference]);
     allColDefsRef.current = cols; // 同步更新 ref
 
+    // 【新增】首次初始化时缓存初始列定义（浅拷贝即可，只需要保留 headerName）
+    if (initialColumnDefsRef.current.length === 0) {
+      initialColumnDefsRef.current = cols.map(function (col) {
+        // 递归处理分组的 children
+        if ('children' in col && col.children) {
+          return _objectSpread(_objectSpread({}, col), {}, {
+            children: col.children.map(function (child) {
+              return _objectSpread({}, child);
+            })
+          });
+        }
+        // 普通列只需要浅拷贝
+        return _objectSpread({}, col);
+      });
+    }
     return cols;
   }, [React.Children.count(children), props.columnDefs, extensibleColumns, gridKey]);
 
@@ -1109,6 +1128,8 @@ function AgGridPlus(props) {
       columnState: gridPlusColumnState,
       allColDefs: allColDefsRef.current,
       // 【修复】传入原始完整的列定义
+      initialColumnDefs: initialColumnDefsRef.current,
+      // 【新增】传入初始列定义（用于获取原始 headerName）
       onSaveColumnState: onSaveColumnState,
       applyToGlobal: applyToGlobal,
       resetCurrent: resetCurrent,
@@ -1135,6 +1156,8 @@ function AgGridPlus(props) {
     };
   }, [extensibleColumns, gridPlusColumnState, allColDefsRef.current,
   // 【修复】添加到依赖数组
+  initialColumnDefsRef.current,
+  // 【新增】添加初始列定义到依赖数组
   onSaveColumnState, applyToGlobal, resetCurrent, resetAll, currentQueryScheme, queryItemsOrder, queryFormItems,
   // 方案管理依赖
   columnSchemes, querySchemes, currentSchemes, schemesLoading, lastSyncTime, saveColumnScheme, deleteColumnScheme, saveQueryScheme, deleteQueryScheme, setCurrentColumnScheme, setCurrentQueryScheme, refreshSchemes, getColumnSchemes, getQuerySchemes, getCurrentScheme]);

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

@@ -100,6 +100,11 @@ export interface GridPlusContextValue extends SchemeManagementAPI {
      * 用于列方案应用时保留这些属性
      */
     allColDefs?: import('../types').ExtendedColDef[];
+    /**
+     * 初始列定义（从 props 传入的原始值，不会被列方案修改）
+     * 用于获取原始 headerName，以便显示修改状态
+     */
+    initialColumnDefs?: import('../types').ExtendedColDef[];
     /**
      * 保存当前表格的列状态到服务器（仅保存当前表格）
      * @param gridKey 表格唯一标识

package/dist/esm/ag-grid-plus/index.less

@@ -35,3 +35,16 @@
   width: 18px !important;
   height: 18px !important;
 }
+
+// 列内容对齐方式样式
+.custom-cell-left {
+  text-align: left !important;
+}
+
+.custom-cell-centered {
+  text-align: center !important;
+}
+
+.custom-cell-right {
+  text-align: right !important;
+}