@nokecy/qc-ui 1.0.82 → 1.0.84

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

@@ -5,18 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _uniqueId2 = _interopRequireDefault(require("lodash/uniqueId"));
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
-var _antdV = require("@formily/antd-v5");
-var _react2 = require("@formily/react");
 var _core = require("@formily/core");
-var _arrayTable = _interopRequireDefault(require("../../array-table"));
+var _columnGroupUtils = require("./columnGroupUtils");
+var _ColumnConfigTable = _interopRequireDefault(require("./ColumnConfigTable"));
 var _processColumnGroups = _interopRequireDefault(require("../_utils/processColumnGroups"));
+var _draggableModal = _interopRequireDefault(require("../../draggableModal"));
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }); }; }
@@ -33,19 +32,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var TabPane = _antd.Tabs.TabPane;
 var TextArea = _antd.Input.TextArea;
-var SchemaField = (0, _react2.createSchemaField)({
-  components: {
-    FormItem: _antdV.FormItem,
-    FormGrid: _antdV.FormGrid,
-    Space: _antd.Space,
-    Input: _antdV.Input,
-    Select: _antdV.Select,
-    ArrayTable: _arrayTable.default,
-    NumberPicker: _antdV.NumberPicker,
-    Switch: _antdV.Switch
-  }
-});
-
 /**
  * 列方案管理组件 - 集成列配置和列方案管理
  */
@@ -98,39 +84,66 @@ var ColumnSetting = function ColumnSetting(_ref) {
     viewMode = _useState18[0],
     setViewMode = _useState18[1];
 
-  // 获取列数据 - 优先从当前方案获取,否则从 Grid 当前状态获取
+  // 保存原始列定义,用于取消时恢复
+  var _useState19 = (0, _react.useState)(null),
+    _useState20 = _slicedToArray(_useState19, 2),
+    originalColumnDefs = _useState20[0],
+    setOriginalColumnDefs = _useState20[1];
+
+  /**
+   * 获取列数据 - 将 Grid 的列定义转换为扁平化配置
+   * 新版本使用树形结构，兼容旧版本的 groupName 结构
+   */
   var getColumnData = (0, _react.useCallback)(function () {
     var _schemeManager$curren;
-    // 优先使用当前方案的列状态,如果没有则使用 Grid 当前状态
-    var columnStates = (schemeManager === null || schemeManager === void 0 || (_schemeManager$curren = schemeManager.currentScheme) === null || _schemeManager$curren === void 0 ? void 0 : _schemeManager$curren.columnState) || gridApi.getColumnState();
+    // 优先使用当前方案中保存的完整列配置(包含分组结构)
+    if (schemeManager !== null && schemeManager !== void 0 && (_schemeManager$curren = schemeManager.currentScheme) !== null && _schemeManager$curren !== void 0 && _schemeManager$curren.columnConfig) {
+      console.log('[ColumnSetting] 使用方案中保存的 columnConfig:', schemeManager.currentScheme.columnConfig);
+      return schemeManager.currentScheme.columnConfig;
+    }
+
+    // 如果方案中没有 columnConfig,则从 Grid 读取
     var columnDefs = gridApi.getColumnDefs() || [];
-    var columnRowData = [];
-    var processColumns = function processColumns(columns, parentGroup) {
-      columns.forEach(function (column) {
-        if (column.children && column.children.length > 0) {
-          processColumns(column.children, column.headerName);
-        } else {
-          var columnState = columnStates.find(function (state) {
-            return state.colId === column.field;
-          });
-          if (columnState) {
-            columnRowData.push(_objectSpread({
-              id: (0, _uniqueId2.default)(),
-              field: column.field,
-              headerName: column.headerName,
-              width: columnState.width,
-              hide: columnState.hide,
-              cellClass: column.cellClass,
-              suppressHeaderFilterButton: !column.suppressHeaderFilterButton,
-              groupName: parentGroup
-            }, columnState));
+    var columnStates = gridApi.getColumnState();
+    console.log('[ColumnSetting] 从 Grid 读取列配置:', {
+      columnDefs: columnDefs,
+      columnStates: columnStates
+    });
+
+    // 将 Grid 状态转换为扁平化配置
+    var flatConfig = (0, _columnGroupUtils.gridStateToFlatConfig)(columnDefs);
+
+    // 同步列状态（宽度、隐藏等）
+    flatConfig = flatConfig.map(function (item) {
+      if (item.type === 'column' && item.field) {
+        var _state = columnStates.find(function (s) {
+          return s.colId === item.field;
+        });
+        if (_state) {
+          // 处理 pinned: 可能是 true/false/null/'left'/'right'
+          var pinnedValue = 'notPinned';
+          if (_state.pinned === 'left') {
+            pinnedValue = 'left';
+          } else if (_state.pinned === 'right') {
+            pinnedValue = 'right';
+          } else if (_state.pinned === true) {
+            // true 表示左固定
+            pinnedValue = 'left';
           }
+          // null, false, undefined 都表示不固定,默认值已经是 'notPinned'
+
+          return _objectSpread(_objectSpread({}, item), {}, {
+            width: _state.width,
+            hide: _state.hide === true,
+            // 转换为 boolean
+            pinned: pinnedValue
+          });
         }
-      });
-    };
-    processColumns(columnDefs);
-    return columnRowData;
-  }, [gridApi, schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme]);
+      }
+      return item;
+    });
+    return flatConfig;
+  }, [gridApi, schemeManager]);
 
   // 创建 Formily Form 实例
   var form = (0, _react.useMemo)(function () {
@@ -153,9 +166,56 @@ var ColumnSetting = function ColumnSetting(_ref) {
     }
   }, [schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.currentScheme, visible, form, getColumnData]);
 
-  // 保存列配置
+  // 弹窗打开时保存原始列定义,用于取消时恢复
+  (0, _react.useEffect)(function () {
+    if (visible) {
+      var currentDefs = gridApi.getColumnDefs();
+      setOriginalColumnDefs(currentDefs);
+    }
+  }, [visible, gridApi]);
+
+  /**
+   * 列配置变更处理 - 实时预览
+   * 当用户在配置表格中进行操作时,立即应用到 AG-Grid 以提供实时预览
+   */
+  var handleColumnChange = (0, _react.useCallback)(function (newItems) {
+    // 1. 更新表单数据
+    form.setValues({
+      items: newItems
+    });
+
+    // 2. 转换为 AG-Grid 列定义
+    var gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(newItems);
+
+    // 3. 立即应用到 Grid(实时预览,不保存到方案)
+    if (type !== 'formArrayTable') {
+      gridApi.setGridOption("columnDefs", gridColumnDefs);
+    }
+  }, [form, gridApi, type]);
+
+  /**
+   * 关闭弹窗处理 - 取消时恢复原始状态
+   * 如果用户取消操作,恢复到打开弹窗前的列定义状态
+   */
+  var handleClose = (0, _react.useCallback)(function () {
+    // 如果有保存的原始状态,恢复它
+    if (originalColumnDefs && type !== 'formArrayTable') {
+      gridApi.setGridOption("columnDefs", originalColumnDefs);
+    }
+
+    // 清空备份
+    setOriginalColumnDefs(null);
+
+    // 调用父组件的 onClose
+    onClose();
+  }, [originalColumnDefs, gridApi, type, onClose]);
+
+  /**
+   * 保存列配置
+   * 将扁平化配置转换回 Grid State 并应用到 AG-Grid
+   */
   var handleSaveColumns = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var values, processedColumns;
+    var values, flatConfig, configToSave, gridColumnDefs;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -166,87 +226,122 @@ var ColumnSetting = function ColumnSetting(_ref) {
           return _context2.abrupt("return");
         case 2:
           values = form.values;
-          onSaveColumnState && onSaveColumnState(values.items);
-          processedColumns = (0, _processColumnGroups.default)(values.items); // 先应用列配置到 Grid
-          if (type !== 'formArrayTable') {
-            gridApi.setGridOption("columnDefs", processedColumns);
+          flatConfig = values.items || []; // 检查是否是旧版本数据，如果是则先迁移
+          configToSave = flatConfig;
+          if ((0, _columnGroupUtils.isOldSchemeData)(flatConfig)) {
+            configToSave = (0, _columnGroupUtils.migrateOldScheme)(flatConfig);
+            _antd.message.info('检测到旧版本配置，已自动迁移到新格式');
           }
 
-          // 应用列状态（包括顺序、宽度、隐藏等）
-          gridApi.applyColumnState({
-            state: processedColumns,
-            applyOrder: true
+          // 转换为 AG-Grid 的列定义
+          gridColumnDefs = (0, _columnGroupUtils.flatConfigToGridState)(configToSave);
+          console.log('[ColumnSetting] 保存列配置:', {
+            flatConfig: configToSave,
+            gridColumnDefs: gridColumnDefs
           });
 
+          // 先应用列配置到 Grid
+          if (type !== 'formArrayTable') {
+            gridApi.setGridOption("columnDefs", gridColumnDefs);
+          }
+
+          // 应用列状态（应用列定义后，Grid 会自动更新状态）
+
           // 等待 Grid 状态更新完成后再保存到方案
           setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var updatedState, defaultScheme, newScheme;
+            var updatedState, filterModel, defaultScheme, newScheme;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   if (!(schemeManager && gridKey)) {
-                    _context.next = 26;
+                    _context.next = 28;
                     break;
                   }
                   _context.prev = 1;
-                  // 从 Grid 获取应用后的最新列状态
+                  // 从 Grid 获取应用后的最新列状态和过滤器状态
                   updatedState = gridApi.getColumnState();
+                  filterModel = gridApi.getFilterModel();
+                  console.log('[ColumnSetting] 准备保存到方案:', {
+                    columnConfig: configToSave,
+                    columnConfigLength: configToSave.length,
+                    columnConfigDetail: configToSave.map(function (item, idx) {
+                      return {
+                        index: idx,
+                        type: item.type,
+                        headerName: item.headerName,
+                        field: item.field,
+                        order: item.order,
+                        parentId: item.parentId
+                      };
+                    }),
+                    filterModel: filterModel
+                  });
                   if (!schemeManager.currentScheme) {
-                    _context.next = 8;
+                    _context.next = 10;
                     break;
                   }
-                  _context.next = 6;
+                  _context.next = 8;
                   return schemeManager.saveScheme({
-                    columnState: updatedState
+                    columnConfig: configToSave,
+                    // 保存完整的列配置(包含分组结构)
+                    filterModel: filterModel
                   });
-                case 6:
-                  _context.next = 21;
-                  break;
                 case 8:
+                  _context.next = 23;
+                  break;
+                case 10:
                   // 如果没有激活的方案，查找或创建"默认配置"方案
                   defaultScheme = schemeManager.schemes.find(function (s) {
                     return s.isDefault;
                   });
                   if (!defaultScheme) {
-                    _context.next = 16;
+                    _context.next = 18;
                     break;
                   }
-                  _context.next = 12;
-                  return schemeManager.loadScheme(defaultScheme.id);
-                case 12:
                   _context.next = 14;
+                  return schemeManager.loadScheme(defaultScheme.id);
+                case 14:
+                  _context.next = 16;
                   return schemeManager.saveScheme({
-                    columnState: updatedState
+                    columnConfig: configToSave,
+                    // 保存完整的列配置(包含分组结构)
+                    filterModel: filterModel
                   });
-                case 14:
-                  _context.next = 21;
-                  break;
                 case 16:
-                  _context.next = 18;
-                  return schemeManager.createScheme('默认配置', updatedState, {
+                  _context.next = 23;
+                  break;
+                case 18:
+                  _context.next = 20;
+                  return schemeManager.createScheme('默认配置', configToSave,
+                  // 使用 columnConfig 而不是 columnState
+                  {
                     isDefault: true,
-                    description: '自动保存的默认列配置'
+                    description: '自动保存的默认列配置',
+                    filterModel: filterModel
                   });
-                case 18:
+                case 20:
                   newScheme = _context.sent;
-                  _context.next = 21;
+                  _context.next = 23;
                   return schemeManager.loadScheme(newScheme.id);
-                case 21:
-                  _context.next = 26;
-                  break;
                 case 23:
-                  _context.prev = 23;
+                  _context.next = 28;
+                  break;
+                case 25:
+                  _context.prev = 25;
                   _context.t0 = _context["catch"](1);
                   console.error('[ColumnSetting] 保存列配置到方案失败:', _context.t0);
-                case 26:
+                case 28:
                 case "end":
                   return _context.stop();
               }
-            }, _callee, null, [[1, 23]]);
+            }, _callee, null, [[1, 25]]);
           })), 50);
+
+          // 保存成功后清除备份
+          setOriginalColumnDefs(null);
           _antd.message.success('列配置已保存');
           onClose();
-        case 10:
+        case 13:
         case "end":
           return _context2.stop();
       }
@@ -255,7 +350,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
   // 保存为新方案
   var handleSaveScheme = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var columnStateToSave, values, processedColumns, newScheme;
+    var columnConfigToSave, values, processedColumns, _values, filterModel, newScheme;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -268,37 +363,37 @@ var ColumnSetting = function ColumnSetting(_ref) {
         case 3:
           _context3.prev = 3;
           if (!(activeTab === 'columns' && form)) {
-            _context3.next = 14;
+            _context3.next = 13;
             break;
           }
           values = form.values;
+          columnConfigToSave = values.items; // 直接使用 FlatColumnItem[] 数据
           processedColumns = (0, _processColumnGroups.default)(values.items); // 先应用到 Grid
           if (type !== 'formArrayTable') {
             gridApi.setGridOption("columnDefs", processedColumns);
           }
-          gridApi.applyColumnState({
-            state: processedColumns,
-            applyOrder: true
-          });
 
-          // 等待状态更新，然后获取最新状态
+          // 等待状态更新
           _context3.next = 11;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 50);
           });
         case 11:
-          columnStateToSave = gridApi.getColumnState();
           _context3.next = 15;
           break;
-        case 14:
-          // 如果在"方案管理"标签页，直接获取当前 Grid 状态
-          columnStateToSave = gridApi.getColumnState();
+        case 13:
+          // 如果在"方案管理"标签页，使用当前表单数据
+          _values = form === null || form === void 0 ? void 0 : form.values;
+          columnConfigToSave = (_values === null || _values === void 0 ? void 0 : _values.items) || [];
         case 15:
-          _context3.next = 17;
-          return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.createScheme(schemeName.trim(), columnStateToSave, {
-            description: schemeDescription.trim() || "\u521B\u5EFA\u4E8E ".concat(new Date().toLocaleString())
+          // 获取过滤器模型
+          filterModel = gridApi.getFilterModel();
+          _context3.next = 18;
+          return schemeManager === null || schemeManager === void 0 ? void 0 : schemeManager.createScheme(schemeName.trim(), columnConfigToSave, {
+            description: schemeDescription.trim() || "\u521B\u5EFA\u4E8E ".concat(new Date().toLocaleString()),
+            filterModel: filterModel
           });
-        case 17:
+        case 18:
           newScheme = _context3.sent;
           _antd.message.success('方案保存成功');
           setSaveSchemeVisible(false);
@@ -307,17 +402,17 @@ var ColumnSetting = function ColumnSetting(_ref) {
 
           // 切换到方案管理标签页,显示新创建的方案
           setActiveTab('schemes');
-          _context3.next = 28;
+          _context3.next = 29;
           break;
-        case 25:
-          _context3.prev = 25;
+        case 26:
+          _context3.prev = 26;
           _context3.t0 = _context3["catch"](3);
           _antd.message.error(_context3.t0.message || '保存方案失败');
-        case 28:
+        case 29:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[3, 25]]);
+    }, _callee3, null, [[3, 26]]);
   })), [gridApi, schemeManager, schemeName, schemeDescription, activeTab, form, type]);
 
   // 加载方案
@@ -575,13 +670,10 @@ var ColumnSetting = function ColumnSetting(_ref) {
       }))));
     }
   }];
-  var tableProps = {
-    onRowDrag: true
-  };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_draggableModal.default, {
     title: "\u5217\u65B9\u6848\u7BA1\u7406",
     open: visible,
-    onCancel: onClose,
+    onCancel: handleClose,
     width: 1100,
     footer: null,
     destroyOnClose: true
@@ -592,7 +684,7 @@ var ColumnSetting = function ColumnSetting(_ref) {
       onClick: onClose
     }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_antd.Button, {
       onClick: handleSaveColumns
-    }, "\u4FDD\u5B58\u914D\u7F6E"), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }, "\u4FDD\u5B58\u914D\u7F6E"), (type !== 'formArrayTable' || schemeManager) && /*#__PURE__*/_react.default.createElement(_antd.Button, {
       type: "primary",
       icon: /*#__PURE__*/_react.default.createElement(_icons.SaveOutlined, null),
       onClick: function onClick() {
@@ -632,143 +724,11 @@ var ColumnSetting = function ColumnSetting(_ref) {
     style: {
       color: '#666'
     }
-  }, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u9ED8\u8BA4\u914D\u7F6E")), /*#__PURE__*/_react.default.createElement(_antdV.Form, {
-    form: form
-  }, /*#__PURE__*/_react.default.createElement(_antdV.FormLayout, null, /*#__PURE__*/_react.default.createElement(SchemaField, null, /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "FormGrid",
-    "x-component-props": {
-      maxColumns: [1, 3],
-      strictAutoFit: true
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.Array, {
-    name: "items",
-    title: "",
-    "x-component": "ArrayTable",
-    "x-component-props": tableProps,
-    "x-decorator": "FormItem",
-    "x-decorator-props": {
-      gridSpan: 3
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.Object, null, /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 80,
-      title: '排序'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-decorator": "FormItem",
-    required: true,
-    "x-component": "ArrayTable.SortHandle"
-  })), /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 180,
-      title: '列名'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.String, {
-    name: "headerName",
-    "x-decorator": "FormItem",
-    "x-component": "Input",
-    "x-read-pretty": true
-  })), /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 120,
-      title: '分组名称'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.String, {
-    name: "groupName",
-    "x-decorator": "FormItem",
-    "x-component": "Input"
-  })), /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 80,
-      title: '列过滤'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.String, {
-    name: "suppressHeaderFilterButton",
-    "x-decorator": "FormItem",
-    "x-component": "Switch"
-  })), /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 120,
-      title: '内容布局'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.String, {
-    name: "cellClass",
-    "x-decorator": "FormItem",
-    "x-component": "Select",
-    default: "custom-cell-left",
-    enum: [{
-      value: 'custom-cell-left',
-      label: '左对齐'
-    }, {
-      value: 'custom-cell-right',
-      label: '右对齐'
-    }, {
-      value: 'custom-cell-centered',
-      label: '居中对齐'
-    }]
-  })), /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 100,
-      title: '宽度'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.String, {
-    name: "width",
-    "x-decorator": "FormItem",
-    "x-component": "NumberPicker"
-  })), /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 100,
-      title: '占满'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.String, {
-    name: "flex",
-    "x-decorator": "FormItem",
-    "x-component": "Select",
-    enum: [{
-      value: 1,
-      label: '占满'
-    }, {
-      value: 0,
-      label: '不占满'
-    }]
-  })), /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 100,
-      title: '固定位置'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.String, {
-    name: "pinned",
-    "x-decorator": "FormItem",
-    "x-component": "Select",
-    enum: [{
-      value: 'left',
-      label: '左固定'
-    }, {
-      value: 'right',
-      label: '右固定'
-    }, {
-      value: 'notPinned',
-      label: '不固定'
-    }]
-  })), /*#__PURE__*/_react.default.createElement(SchemaField.Void, {
-    "x-component": "ArrayTable.Column",
-    "x-component-props": {
-      width: 100,
-      title: '隐藏'
-    }
-  }, /*#__PURE__*/_react.default.createElement(SchemaField.String, {
-    name: "hide",
-    "x-decorator": "FormItem",
-    "x-component": "Switch"
-  }))))))))), schemeManager && /*#__PURE__*/_react.default.createElement(TabPane, {
+  }, "\u672A\u9009\u62E9\u65B9\u6848 - \u4F7F\u7528\u9ED8\u8BA4\u914D\u7F6E")), /*#__PURE__*/_react.default.createElement(_ColumnConfigTable.default, {
+    items: form.values.items || [],
+    onChange: handleColumnChange,
+    simple: type === 'formArrayTable'
+  })), schemeManager && type !== 'formArrayTable' && /*#__PURE__*/_react.default.createElement(TabPane, {
     tab: "\u65B9\u6848\u7BA1\u7406",
     key: "schemes"
   }, /*#__PURE__*/_react.default.createElement("div", {

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

@@ -0,0 +1,15 @@
+/**
+ * 移动节点弹窗组件
+ * 用于选择目标父节点,支持移动到根级别或其他分组下
+ */
+import React from 'react';
+import type { FlatColumnItem } from './columnGroupTypes';
+interface MoveNodeModalProps {
+    visible: boolean;
+    currentNode: FlatColumnItem | null;
+    allItems: FlatColumnItem[];
+    onCancel: () => void;
+    onConfirm: (targetParentId: string | undefined) => void;
+}
+declare const MoveNodeModal: React.FC<MoveNodeModalProps>;
+export default MoveNodeModal;