@nokecy/qc-ui-components 0.0.0-stage → 2.0.0-beta.1

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

@@ -0,0 +1,1371 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["createdAt", "updatedAt", "filterModel"],
+  _excluded2 = ["createdAt", "updatedAt", "filterModel"],
+  _excluded3 = ["createdAt", "updatedAt"];
+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; }
+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); }); }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _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); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { sanitizeColDefs } from "../utils/agGridCompat";
+import React, { useState, useCallback, useMemo, useEffect } from 'react';
+import { logger } from "../utils/logger";
+import { Modal, Tabs, Space, Button, Input, message, Popconfirm, Segmented, Tag, Tooltip, Empty, theme } from 'antd';
+import { SaveOutlined, ReloadOutlined, EditOutlined, DeleteOutlined, StarOutlined, StarFilled, SearchOutlined, GlobalOutlined, RollbackOutlined, ClearOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { AgGridReact } from 'ag-grid-react';
+import { useAgGridTheme } from "../theme";
+import { localeText } from "../locale";
+import { createForm, onFormInit } from '@nokecy/formily-core';
+import { gridStateToFlatConfig, flatConfigToGridState, flatConfigToColumnState, dropQueryOnlyItems, excludeQueryOnlyColumns, isOldSchemeData, migrateOldScheme, generateId, getColumnIdentity, getLockedColumnIds, normalizeColumnConfig } from "./columnGroupUtils";
+import ColumnConfigTable from "./ColumnConfigTable";
+import DraggableModal from "../../draggableModal/index";
+import { useGridSchemes } from "../context/useSchemeManager";
+import { v4 as uuidv4 } from 'uuid';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+var TextArea = Input.TextArea;
+/**
+ * 列方案管理组件 - 集成列配置和列方案管理
+ */
+var ColumnSetting = function ColumnSetting(_ref) {
+  var _globalConfigPermissi, _globalConfigPermissi2, _currentSchemes$gridK4;
+  var gridKey = _ref.gridKey,
+    gridApi = _ref.gridApi,
+    visible = _ref.visible,
+    onClose = _ref.onClose,
+    onSaveColumnState = _ref.onSaveColumnState,
+    allColDefsProp = _ref.allColDefs;
+  var gridTheme = useAgGridTheme();
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token; // 颜色取主题 token,跟随亮/暗主题 @author nokecy
+  // 使用新的集中式方案管理 API（包含状态数据和操作方法）
+  var _useGridSchemes = useGridSchemes(),
+    columnSchemes = _useGridSchemes.columnSchemes,
+    currentSchemes = _useGridSchemes.currentSchemes,
+    contextAllColDefs = _useGridSchemes.allColDefs,
+    contextInitialColumnDefs = _useGridSchemes.initialColumnDefs,
+    saveColumnScheme = _useGridSchemes.saveColumnScheme,
+    deleteColumnScheme = _useGridSchemes.deleteColumnScheme,
+    setCurrentColumnScheme = _useGridSchemes.setCurrentColumnScheme,
+    applySchemeToGlobal = _useGridSchemes.applySchemeToGlobal,
+    resetToGlobal = _useGridSchemes.resetToGlobal,
+    resetAllUsers = _useGridSchemes.resetAllUsers,
+    globalConfigPermissions = _useGridSchemes.globalConfigPermissions,
+    isUsingGlobalFallback = _useGridSchemes.isUsingGlobalFallback,
+    density = _useGridSchemes.density,
+    onDensityChange = _useGridSchemes.onDensityChange;
+
+  // 调用方传入的列定义优先：Context 里的属于外层 AgGridPlus 或为空 @author nokecy
+  var allColDefs = allColDefsProp !== null && allColDefsProp !== void 0 ? allColDefsProp : contextAllColDefs;
+  var initialColumnDefs = allColDefsProp !== null && allColDefsProp !== void 0 ? allColDefsProp : contextInitialColumnDefs;
+
+  // 解构权限信息
+  var canApplyToGlobal = (_globalConfigPermissi = globalConfigPermissions === null || globalConfigPermissions === void 0 ? void 0 : globalConfigPermissions.canApplyToGlobal) !== null && _globalConfigPermissi !== void 0 ? _globalConfigPermissi : false;
+  var canResetAllUsers = (_globalConfigPermissi2 = globalConfigPermissions === null || globalConfigPermissions === void 0 ? void 0 : globalConfigPermissions.canResetAllUsers) !== null && _globalConfigPermissi2 !== void 0 ? _globalConfigPermissi2 : false;
+
+  // 获取当前表格的方案列表
+  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 = useState('columns'),
+    _useState2 = _slicedToArray(_useState, 2),
+    activeTab = _useState2[0],
+    setActiveTab = _useState2[1];
+
+  // 方案管理状态
+  var _useState3 = useState(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    editingId = _useState4[0],
+    setEditingId = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    editingName = _useState6[0],
+    setEditingName = _useState6[1];
+  var _useState7 = useState(''),
+    _useState8 = _slicedToArray(_useState7, 2),
+    editingDescription = _useState8[0],
+    setEditingDescription = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    saveSchemeVisible = _useState10[0],
+    setSaveSchemeVisible = _useState10[1];
+  var _useState11 = useState(''),
+    _useState12 = _slicedToArray(_useState11, 2),
+    schemeName = _useState12[0],
+    setSchemeName = _useState12[1];
+  var _useState13 = useState(''),
+    _useState14 = _slicedToArray(_useState13, 2),
+    schemeDescription = _useState14[0],
+    setSchemeDescription = _useState14[1];
+
+  // 搜索状态
+  var _useState15 = useState(''),
+    _useState16 = _slicedToArray(_useState15, 2),
+    searchText = _useState16[0],
+    setSearchText = _useState16[1];
+
+  // 【修复】从 Context 获取初始列定义（用于获取原始 headerName）
+  // initialColumnDefs 来自组件初始化时的 props，不会被列方案修改
+  // allColDefs 包含自定义属性（cellRenderer 等），用于方案应用时保留这些属性
+  var originalColumnDefs = initialColumnDefs || allColDefs || undefined;
+
+  // 业务列（序号等 lockVisible）不可隐藏
+  var lockedColumnIds = useMemo(function () {
+    return getLockedColumnIds(originalColumnDefs);
+  }, [originalColumnDefs]);
+
+  // 【修复】保存快照用于取消时恢复（改名避免与Context的originalColumnDefs冲突）
+  var _useState17 = useState(null),
+    _useState18 = _slicedToArray(_useState17, 2),
+    snapshotColumnDefs = _useState18[0],
+    setSnapshotColumnDefs = _useState18[1];
+
+  /**
+   * 修正列配置中的 originalHeaderName
+   * 确保 originalHeaderName 始终从 initialColumnDefs 中获取,而不是使用方案中保存的值
+   */
+  var fixOriginalHeaderName = useCallback(function (items) {
+    if (!originalColumnDefs || originalColumnDefs.length === 0) {
+      return items;
+    }
+    return normalizeColumnConfig(items, originalColumnDefs);
+  }, [originalColumnDefs]);
+
+  /**
+   * 合并代码中新增的列到配置中
+   * 场景：用户保存列配置后，开发者在代码中新增了列，这些列应该显示在配置表格中
+   * 【修复】只检测并追加新增列到末尾，不改变已保存配置的顺序
+   */
+  var mergeNewColumns = useCallback(function (config, originalDefs) {
+    if (!originalDefs || originalDefs.length === 0) {
+      return config;
+    }
+
+    // 创建 field -> config item 的映射（用于快速查找已保存的列配置）
+    var existingFields = new Set();
+    config.filter(function (item) {
+      return item.type === 'column' && getColumnIdentity(item);
+    }).forEach(function (item) {
+      existingFields.add(getColumnIdentity(item));
+    });
+
+    // 创建 groupId -> config item 的映射（用于快速查找已保存的分组配置）
+    var existingGroupIds = new Set();
+    config.filter(function (item) {
+      return item.type === 'group' && item.groupId;
+    }).forEach(function (item) {
+      existingGroupIds.add(item.groupId);
+    });
+
+    // 收集新增的列（在 originalDefs 中存在但 config 中不存在）
+    var newItems = [];
+    var maxOrder = Math.max.apply(Math, _toConsumableArray(config.map(function (item) {
+      return item.order;
+    })).concat([-1]));
+
+    /**
+     * 递归处理列定义，查找新增的列和分组
+     */
+    var findNewColumns = function findNewColumns(defs, level, parentId) {
+      var _iterator = _createForOfIteratorHelper(defs),
+        _step;
+      try {
+        var _loop = function _loop() {
+          var def = _step.value;
+          // 检查是否是分组
+          if ('children' in def && def.children && def.children.length > 0) {
+            var groupDef = def;
+            var groupIdValue = groupDef.groupId || groupDef.field || generateId();
+            if (!existingGroupIds.has(groupIdValue)) {
+              // 新分组
+              var newGroupId = generateId();
+              newItems.push({
+                id: newGroupId,
+                type: 'group',
+                parentId: parentId,
+                level: level,
+                order: ++maxOrder,
+                headerName: groupDef.headerName || '未命名分组',
+                originalHeaderName: groupDef.headerName || '未命名分组',
+                groupId: groupIdValue,
+                marryChildren: groupDef.marryChildren
+              });
+              // 递归处理子节点（新分组的子节点也都是新的）
+              findNewColumns(groupDef.children, level + 1, newGroupId);
+            } else {
+              // 已存在的分组，但要检查子节点是否有新增
+              var existingGroup = config.find(function (item) {
+                return item.type === 'group' && item.groupId === groupIdValue;
+              });
+              findNewColumns(groupDef.children, level + 1, existingGroup === null || existingGroup === void 0 ? void 0 : existingGroup.id);
+            }
+          } else {
+            // 普通列
+            var colDef = def;
+            var columnId = getColumnIdentity(colDef);
+            if (!columnId) return 1; // continue
+            if (!existingFields.has(columnId)) {
+              // 新列 - 追加到末尾
+              newItems.push({
+                id: generateId(),
+                type: 'column',
+                parentId: parentId,
+                level: level,
+                order: ++maxOrder,
+                field: colDef.field,
+                colId: colDef.colId,
+                headerName: colDef.headerName || colDef.field || '未命名列',
+                originalHeaderName: colDef.headerName || colDef.field || '未命名列',
+                width: colDef.width,
+                hide: colDef.hide,
+                pinned: colDef.pinned === null || colDef.pinned === true || colDef.pinned === false ? 'notPinned' : colDef.pinned,
+                cellClass: colDef.cellClass,
+                flex: colDef.flex,
+                suppressHeaderFilterButton: colDef.suppressHeaderFilterButton
+              });
+            }
+          }
+        };
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          if (_loop()) continue;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    };
+
+    // 从根级别开始查找新增列
+    findNewColumns(originalDefs, 0);
+    if (newItems.length > 0) {
+      logger.debug('[getColumnData] 检测到新增列/分组，已追加到末尾:', newItems.map(function (i) {
+        return i.field || i.groupId;
+      }));
+      return [].concat(_toConsumableArray(config), newItems);
+    }
+    return config;
+  }, []);
+
+  /**
+   * 获取列数据 - 将 Grid 的列定义转换为扁平化配置
+   * 新版本使用树形结构，兼容旧版本的 groupName 结构
+   */
+  var getColumnData = useCallback(function () {
+    // 优先使用当前方案中保存的完整列配置(包含分组结构)
+    if (currentScheme !== null && currentScheme !== void 0 && currentScheme.columnConfig) {
+      // 【修复】修正 originalHeaderName,确保使用 initialColumnDefs 中的原始值
+      var config = fixOriginalHeaderName(currentScheme.columnConfig);
+      // 【修复】检测并追加代码中新增的列到配置末尾
+      // 只做查询条件的列不进列配置：方案里存过的剔除，也不当新增列追加 @author nokecy
+      config = mergeNewColumns(dropQueryOnlyItems(config, originalColumnDefs), excludeQueryOnlyColumns(originalColumnDefs));
+      // 【修复】按 order 字段排序，确保配置弹窗显示的列顺序与保存时一致
+      config = _toConsumableArray(config).sort(function (a, b) {
+        return a.order - b.order;
+      });
+      return config;
+    }
+
+    // 如果方案中没有 columnConfig,则从 Grid 读取
+    var columnDefs = gridApi.getColumnDefs() || [];
+    var columnStates = gridApi.getColumnState();
+
+    // 将 Grid 状态转换为扁平化配置,传入原始列定义以获取 originalHeaderName
+    var flatConfig = gridStateToFlatConfig(columnDefs, originalColumnDefs);
+
+    // 同步列状态（宽度、隐藏等）
+    flatConfig = flatConfig.map(function (item) {
+      if (item.type === 'column' && getColumnIdentity(item)) {
+        var _state = columnStates.find(function (s) {
+          return s.colId === getColumnIdentity(item);
+        });
+        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
+          });
+        }
+      }
+      return item;
+    });
+    return flatConfig;
+  }, [gridApi, currentScheme, fixOriginalHeaderName, originalColumnDefs, mergeNewColumns]);
+
+  // 创建 Formily Form 实例
+  var form = useMemo(function () {
+    return createForm({
+      effects: function effects() {
+        onFormInit(function (form) {
+          form.setInitialValuesIn('items', getColumnData());
+        });
+      }
+    });
+  }, [getColumnData]);
+
+  // 监听当前方案变化,更新表单数据
+  useEffect(function () {
+    if (form && visible) {
+      var newData = getColumnData();
+      form.setValues({
+        items: newData
+      });
+    }
+  }, [currentScheme, visible, form, getColumnData]);
+
+  // 【修复】弹窗打开时保存快照,用于取消时恢复
+  useEffect(function () {
+    if (visible) {
+      var currentDefs = gridApi.getColumnDefs();
+      setSnapshotColumnDefs(currentDefs);
+    }
+  }, [visible, gridApi]);
+
+  /**
+   * 列配置变更处理 - 实时预览
+   * 当用户在配置表格中进行操作时,立即应用到 AG-Grid 以提供实时预览
+   */
+  var handleColumnChange = useCallback(function (newItems) {
+    // 1. 更新表单数据
+    form.setValues({
+      items: newItems
+    });
+
+    // 2. 【修复】转换为 AG-Grid 列定义，传入 allColDefs 以保留自定义属性（cellRenderer 等）
+    var gridColumnDefs = flatConfigToGridState(newItems, allColDefs);
+
+    // 3. 立即应用到 Grid(实时预览,不保存到方案)
+    // 【修复】同时应用列顺序和状态，确保拖拽排序能够生效
+    var columnState = flatConfigToColumnState(newItems, allColDefs);
+    gridApi.applyColumnState({
+      state: columnState,
+      applyOrder: true // 强制应用列顺序
+    });
+  }, [form, gridApi, allColDefs]);
+
+  /**
+   * 恢复默认：列配置还原为列定义里写的初始值（宽度、显隐、固定、顺序），先在表格上预览，保存后才落到方案。
+   * 只动列配置，密度偏好不受影响。
+   */
+  var handleRestoreDefault = useCallback(function () {
+    var _excludeQueryOnlyColu;
+    var defaults = (_excludeQueryOnlyColu = excludeQueryOnlyColumns(originalColumnDefs !== null && originalColumnDefs !== void 0 ? originalColumnDefs : [])) !== null && _excludeQueryOnlyColu !== void 0 ? _excludeQueryOnlyColu : [];
+    if (defaults.length === 0) return;
+    handleColumnChange(normalizeColumnConfig(gridStateToFlatConfig(defaults, originalColumnDefs), originalColumnDefs));
+    message.info('已恢复为默认列配置，点击「保存配置」后生效');
+  }, [originalColumnDefs, handleColumnChange]);
+
+  /**
+   * 关闭弹窗处理 - 取消时恢复原始状态
+   * 如果用户取消操作,恢复到打开弹窗前的列定义状态
+   */
+  var handleClose = useCallback(function () {
+    // 清空快照
+    setSnapshotColumnDefs(null);
+
+    // 调用父组件的 onClose
+    onClose();
+  }, [snapshotColumnDefs, gridApi, onClose]);
+
+  /**
+   * 加载方案
+   * 应用方案到 Grid，并更新表单数据
+   */
+  var handleLoadScheme = useCallback( /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(schemeId) {
+      var scheme, gridColumnDefs, columnState;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            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)) {
+              _context.next = 12;
+              break;
+            }
+            // 【关键修复】先更新 columnDefs（处理分组结构），使用 allColDefs 保留自定义属性
+            gridColumnDefs = flatConfigToGridState(scheme.columnConfig, allColDefs);
+            logger.debug('[ColumnSetting] 加载方案 - 更新 columnDefs');
+            gridApi.setGridOption('columnDefs', sanitizeColDefs(gridColumnDefs));
+
+            // 等待 columnDefs 更新完成
+            _context.next = 10;
+            return new Promise(function (resolve) {
+              return setTimeout(resolve, 100);
+            });
+          case 10:
+            // 【修复】然后应用列状态（宽度、隐藏、顺序等）
+            columnState = flatConfigToColumnState(scheme.columnConfig, allColDefs);
+            gridApi.applyColumnState({
+              state: columnState,
+              applyOrder: true // 强制应用列顺序
+            });
+          case 12:
+            message.success('方案已加载');
+
+            // 等待Grid状态更新后再刷新表单
+            setTimeout(function () {
+              if (form) {
+                var newData = getColumnData();
+                form.setValues({
+                  items: newData
+                });
+              }
+            }, 100);
+
+            // 自动关闭弹窗,让用户看到Grid的变化
+            onClose();
+            _context.next = 20;
+            break;
+          case 17:
+            _context.prev = 17;
+            _context.t0 = _context["catch"](0);
+            message.error(_context.t0.message || '加载方案失败');
+          case 20:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 17]]);
+    }));
+    return function (_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }(), [setCurrentColumnScheme, gridKey, schemes, gridApi, allColDefs, form, getColumnData, onClose]);
+
+  /**
+   * 保存列配置
+   * 优化逻辑：先保存配置到存储，再直接应用到 Grid，不依赖 handleLoadScheme
+   */
+  var handleSaveColumns = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var values, flatConfig, configToSave, invalidColumns, savedScheme, createdAt, updatedAt, _legacyFilter, schemeWithoutTimestamps, defaultScheme, _createdAt, _updatedAt, _legacyFilter2, _schemeWithoutTimestamps, gridColumnDefs, columnState;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          if (form) {
+            _context2.next = 2;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 2:
+          values = form.values;
+          flatConfig = values.items || []; // 检查是否是旧版本数据，如果是则先迁移
+          configToSave = flatConfig;
+          if (isOldSchemeData(flatConfig)) {
+            configToSave = migrateOldScheme(flatConfig);
+            message.info('检测到旧版本配置，已自动迁移到新格式');
+          }
+
+          // 验证数据完整性，过滤掉无效的列配置
+          configToSave = normalizeColumnConfig(configToSave, allColDefs);
+          invalidColumns = configToSave.filter(function (item) {
+            return item.type === 'column' && !getColumnIdentity(item);
+          });
+          if (invalidColumns.length > 0) {
+            message.warning("\u68C0\u6D4B\u5230 ".concat(invalidColumns.length, " \u4E2A\u5217\u7F3A\u5C11\u5217\u6807\u8BC6\uFF0C\u5DF2\u81EA\u52A8\u8FC7\u6EE4"));
+            console.warn('[ColumnSetting] 无效的列配置:', invalidColumns);
+            configToSave = configToSave.filter(function (item) {
+              return item.type === 'group' || item.type === 'column' && getColumnIdentity(item);
+            });
+          }
+          _context2.prev = 9;
+          if (!currentScheme) {
+            _context2.next = 21;
+            break;
+          }
+          if (!(currentScheme.isGlobal && !canApplyToGlobal)) {
+            _context2.next = 14;
+            break;
+          }
+          message.error('没有权限修改全局方案');
+          return _context2.abrupt("return");
+        case 14:
+          // 如果有激活的方案，更新该方案
+          // 列头筛选属于数据而非视图偏好，不随方案保存；同时丢弃旧方案里遗留的 filterModel
+          createdAt = currentScheme.createdAt, updatedAt = currentScheme.updatedAt, _legacyFilter = currentScheme.filterModel, schemeWithoutTimestamps = _objectWithoutProperties(currentScheme, _excluded);
+          savedScheme = _objectSpread(_objectSpread({}, schemeWithoutTimestamps), {}, {
+            columnConfig: configToSave
+            // createdAt 和 updatedAt 由存储适配器自动生成
+          });
+          _context2.next = 18;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
+        case 18:
+          message.success('列配置已保存到方案');
+          _context2.next = 37;
+          break;
+        case 21:
+          // 如果没有激活的方案，自动创建或更新默认方案
+          defaultScheme = schemes.find(function (s) {
+            return s.isDefault;
+          });
+          if (!defaultScheme) {
+            _context2.next = 33;
+            break;
+          }
+          if (!(defaultScheme.isGlobal && !canApplyToGlobal)) {
+            _context2.next = 26;
+            break;
+          }
+          message.error('没有权限修改全局方案');
+          return _context2.abrupt("return");
+        case 26:
+          // 更新默认方案
+          _createdAt = defaultScheme.createdAt, _updatedAt = defaultScheme.updatedAt, _legacyFilter2 = defaultScheme.filterModel, _schemeWithoutTimestamps = _objectWithoutProperties(defaultScheme, _excluded2);
+          savedScheme = _objectSpread(_objectSpread({}, _schemeWithoutTimestamps), {}, {
+            columnConfig: configToSave
+            // createdAt 和 updatedAt 由存储适配器自动生成
+          });
+          _context2.next = 30;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
+        case 30:
+          message.success('列配置已保存到默认方案');
+          _context2.next = 37;
+          break;
+        case 33:
+          // 创建新的默认方案
+          savedScheme = {
+            id: uuidv4(),
+            name: '默认配置',
+            description: '自动创建的默认列配置',
+            columnConfig: configToSave,
+            isDefault: true,
+            isSystem: false
+            // createdAt 和 updatedAt 由存储适配器自动生成
+          };
+          _context2.next = 36;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, savedScheme);
+        case 36:
+          message.success('已创建并保存到默认方案');
+        case 37:
+          _context2.next = 39;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 100);
+          });
+        case 39:
+          // 【关键修复】直接应用方案到 Grid，不通过 handleLoadScheme
+          // 这样可以避免依赖 Context 状态更新的时序问题
+          logger.debug('[ColumnSetting] 保存后直接应用方案到 Grid');
+
+          // 【修复】始终更新 columnDefs，确保 cellClass 等属性能即时生效
+          // 原逻辑只在有分组时才更新 columnDefs，导致对齐方式保存后无法即时生效
+          logger.debug('[ColumnSetting] 更新 columnDefs');
+          gridColumnDefs = flatConfigToGridState(savedScheme.columnConfig, allColDefs);
+          gridApi.setGridOption('columnDefs', sanitizeColDefs(gridColumnDefs));
+
+          // 等待 columnDefs 更新完成
+          _context2.next = 45;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 100);
+          });
+        case 45:
+          // 2. 应用列状态（列顺序、宽度、隐藏、固定等）
+          logger.debug('[ColumnSetting] 应用列状态');
+          columnState = flatConfigToColumnState(savedScheme.columnConfig, allColDefs);
+          gridApi.applyColumnState({
+            state: columnState,
+            applyOrder: true
+          });
+
+          // 4. 设置为当前方案（如果不是当前方案）
+          if (!(!currentScheme || savedScheme.id !== currentScheme.id)) {
+            _context2.next = 51;
+            break;
+          }
+          _context2.next = 51;
+          return setCurrentColumnScheme === null || setCurrentColumnScheme === void 0 ? void 0 : setCurrentColumnScheme(gridKey, savedScheme.id);
+        case 51:
+          _context2.next = 53;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 50);
+          });
+        case 53:
+          // 5. 关闭弹窗
+          onClose();
+          _context2.next = 60;
+          break;
+        case 56:
+          _context2.prev = 56;
+          _context2.t0 = _context2["catch"](9);
+          console.error('保存列配置到方案失败:', _context2.t0);
+          message.error('保存列配置失败');
+        case 60:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[9, 56]]);
+  })), [form, gridApi, saveColumnScheme, setCurrentColumnScheme, currentScheme, schemes, gridKey, allColDefs, onClose]);
+
+  // 保存为新方案
+  var handleSaveScheme = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var columnConfigToSave, values, gridColumnDefs, columnState, _values, newScheme;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          if (schemeName.trim()) {
+            _context3.next = 3;
+            break;
+          }
+          message.warning('请输入方案名称');
+          return _context3.abrupt("return");
+        case 3:
+          _context3.prev = 3;
+          if (!(activeTab === 'columns' && form)) {
+            _context3.next = 18;
+            break;
+          }
+          values = form.values;
+          columnConfigToSave = normalizeColumnConfig(values.items || [], allColDefs);
+          // 【修复】传入 allColDefs 以保留自定义属性（cellRenderer 等）
+          gridColumnDefs = flatConfigToGridState(columnConfigToSave, allColDefs); // 【关键修复】先更新 columnDefs（处理分组结构变化）
+          logger.debug('[ColumnSetting] 另存为方案 - 更新 columnDefs');
+          gridApi.setGridOption('columnDefs', sanitizeColDefs(gridColumnDefs));
+
+          // 等待 columnDefs 更新完成
+          _context3.next = 12;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 100);
+          });
+        case 12:
+          // 【修复】然后应用列状态（宽度、隐藏、顺序等）
+          columnState = flatConfigToColumnState(columnConfigToSave, allColDefs);
+          gridApi.applyColumnState({
+            state: columnState,
+            applyOrder: true // 强制应用列顺序
+          });
+
+          // 等待状态更新
+          _context3.next = 16;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 50);
+          });
+        case 16:
+          _context3.next = 20;
+          break;
+        case 18:
+          // 如果在"方案管理"标签页，使用当前表单数据
+          _values = form === null || form === void 0 ? void 0 : form.values;
+          columnConfigToSave = (_values === null || _values === void 0 ? void 0 : _values.items) || [];
+        case 20:
+          newScheme = {
+            id: uuidv4(),
+            name: schemeName.trim(),
+            description: schemeDescription.trim() || "\u521B\u5EFA\u4E8E ".concat(new Date().toLocaleString()),
+            columnConfig: columnConfigToSave,
+            isDefault: false,
+            isSystem: false
+            // createdAt 和 updatedAt 由存储适配器自动生成
+          };
+          _context3.next = 23;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, newScheme);
+        case 23:
+          message.success('方案保存成功');
+          setSaveSchemeVisible(false);
+          setSchemeName('');
+          setSchemeDescription('');
+
+          // 切换到方案管理标签页,显示新创建的方案
+          setActiveTab('schemes');
+          _context3.next = 33;
+          break;
+        case 30:
+          _context3.prev = 30;
+          _context3.t0 = _context3["catch"](3);
+          message.error(_context3.t0.message || '保存方案失败');
+        case 33:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[3, 30]]);
+  })), [gridApi, saveColumnScheme, gridKey, schemeName, schemeDescription, activeTab, form, allColDefs]);
+
+  // 设置默认方案
+  var handleSetDefault = useCallback( /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(schemeId) {
+      var scheme, _iterator2, _step2, s;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.prev = 0;
+            scheme = schemes.find(function (s) {
+              return s.id === schemeId;
+            });
+            if (!scheme) {
+              _context4.next = 24;
+              break;
+            }
+            // 将其他方案设为非默认
+            _iterator2 = _createForOfIteratorHelper(schemes);
+            _context4.prev = 4;
+            _iterator2.s();
+          case 6:
+            if ((_step2 = _iterator2.n()).done) {
+              _context4.next = 13;
+              break;
+            }
+            s = _step2.value;
+            if (!(s.isDefault && s.id !== schemeId)) {
+              _context4.next = 11;
+              break;
+            }
+            _context4.next = 11;
+            return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, s), {}, {
+              isDefault: false
+            }));
+          case 11:
+            _context4.next = 6;
+            break;
+          case 13:
+            _context4.next = 18;
+            break;
+          case 15:
+            _context4.prev = 15;
+            _context4.t0 = _context4["catch"](4);
+            _iterator2.e(_context4.t0);
+          case 18:
+            _context4.prev = 18;
+            _iterator2.f();
+            return _context4.finish(18);
+          case 21:
+            _context4.next = 23;
+            return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, scheme), {}, {
+              isDefault: true
+            }));
+          case 23:
+            message.success('已设置为默认方案');
+          case 24:
+            _context4.next = 29;
+            break;
+          case 26:
+            _context4.prev = 26;
+            _context4.t1 = _context4["catch"](0);
+            message.error(_context4.t1.message || '设置失败');
+          case 29:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, null, [[0, 26], [4, 15, 18, 21]]);
+    }));
+    return function (_x2) {
+      return _ref5.apply(this, arguments);
+    };
+  }(), [schemes, saveColumnScheme, gridKey]);
+
+  // 删除方案
+  var handleDeleteScheme = useCallback( /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(schemeId, schemeName) {
+      var _currentSchemes$gridK2, isCurrentScheme, defaultScheme;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.prev = 0;
+            // 检查是否删除的是当前方案
+            isCurrentScheme = schemeId === (currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK2 = currentSchemes[gridKey]) === null || _currentSchemes$gridK2 === void 0 ? void 0 : _currentSchemes$gridK2.columnSchemeId); // 查找默认方案
+            defaultScheme = schemes.find(function (s) {
+              return s.isDefault && s.id !== schemeId;
+            });
+            _context5.next = 5;
+            return deleteColumnScheme === null || deleteColumnScheme === void 0 ? void 0 : deleteColumnScheme(gridKey, schemeId);
+          case 5:
+            // 根据情况显示不同的提示消息
+            if (isCurrentScheme && defaultScheme) {
+              message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664\uFF0C\u5DF2\u81EA\u52A8\u5207\u6362\u5230\u9ED8\u8BA4\u65B9\u6848\"").concat(defaultScheme.name, "\""));
+            } else if (isCurrentScheme) {
+              message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664\uFF0C\u5DF2\u91CD\u7F6E\u4E3A\u521D\u59CB\u914D\u7F6E"));
+            } else {
+              message.success("\u65B9\u6848\"".concat(schemeName, "\"\u5DF2\u5220\u9664"));
+            }
+            _context5.next = 11;
+            break;
+          case 8:
+            _context5.prev = 8;
+            _context5.t0 = _context5["catch"](0);
+            message.error(_context5.t0.message || '删除失败');
+          case 11:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5, null, [[0, 8]]);
+    }));
+    return function (_x3, _x4) {
+      return _ref6.apply(this, arguments);
+    };
+  }(), [deleteColumnScheme, gridKey, schemes, currentSchemes]);
+
+  // 编辑方案
+  var handleEditScheme = useCallback(function (scheme) {
+    setEditingId(scheme.id);
+    setEditingName(scheme.name);
+    setEditingDescription(scheme.description || '');
+  }, []);
+
+  // ========== 全局配置操作处理函数 ==========
+
+  /**
+   * 创建带确认弹窗的操作处理器
+   * @author nokecy
+   */
+  var createConfirmHandler = useCallback(function (config) {
+    return function () {
+      Modal.confirm({
+        title: config.title,
+        icon: /*#__PURE__*/_jsx(ExclamationCircleOutlined, {}),
+        content: config.content,
+        okText: config.okText || '确定',
+        okButtonProps: config.danger ? {
+          danger: true
+        } : undefined,
+        cancelText: '取消',
+        onOk: function () {
+          var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+            var _config$onSuccess;
+            return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+              while (1) switch (_context6.prev = _context6.next) {
+                case 0:
+                  _context6.prev = 0;
+                  _context6.next = 3;
+                  return config.action();
+                case 3:
+                  (_config$onSuccess = config.onSuccess) === null || _config$onSuccess === void 0 || _config$onSuccess.call(config);
+                  _context6.next = 8;
+                  break;
+                case 6:
+                  _context6.prev = 6;
+                  _context6.t0 = _context6["catch"](0);
+                case 8:
+                case "end":
+                  return _context6.stop();
+              }
+            }, _callee6, null, [[0, 6]]);
+          }));
+          function onOk() {
+            return _onOk.apply(this, arguments);
+          }
+          return onOk;
+        }()
+      });
+    };
+  }, []);
+
+  // 应用到全局
+  var handleApplyToGlobal = useCallback(function (schemeId) {
+    return createConfirmHandler({
+      title: '应用到全局',
+      content: '确定要将此方案应用为全局默认配置吗？这将影响所有没有个人配置的用户。',
+      action: function action() {
+        var _applySchemeToGlobal;
+        return (_applySchemeToGlobal = applySchemeToGlobal === null || applySchemeToGlobal === void 0 ? void 0 : applySchemeToGlobal(gridKey, schemeId)) !== null && _applySchemeToGlobal !== void 0 ? _applySchemeToGlobal : Promise.resolve();
+      }
+    })();
+  }, [createConfirmHandler, applySchemeToGlobal, gridKey]);
+
+  // 重置为全局配置
+  var handleResetToGlobal = useCallback(function () {
+    return createConfirmHandler({
+      title: '重置为全局配置',
+      content: '确定要删除您的个人配置，使用全局默认配置吗？',
+      action: function action() {
+        var _resetToGlobal;
+        return (_resetToGlobal = resetToGlobal === null || resetToGlobal === void 0 ? void 0 : resetToGlobal(gridKey)) !== null && _resetToGlobal !== void 0 ? _resetToGlobal : Promise.resolve();
+      },
+      onSuccess: onClose
+    })();
+  }, [createConfirmHandler, resetToGlobal, gridKey, onClose]);
+
+  // 重置所有用户配置
+  var handleResetAllUsers = useCallback(function () {
+    return createConfirmHandler({
+      title: '重置所有用户配置',
+      content: /*#__PURE__*/_jsxs("div", {
+        children: [/*#__PURE__*/_jsx("p", {
+          style: {
+            color: token.colorError,
+            fontWeight: 'bold'
+          },
+          children: "\u6B64\u64CD\u4F5C\u4E0D\u53EF\u6062\u590D\uFF01"
+        }), /*#__PURE__*/_jsx("p", {
+          children: "\u786E\u5B9A\u8981\u5220\u9664\u6240\u6709\u7528\u6237\u7684\u4E2A\u4EBA\u5217\u914D\u7F6E\u5417\uFF1F"
+        }), /*#__PURE__*/_jsx("p", {
+          children: "\u6267\u884C\u540E\uFF0C\u6240\u6709\u7528\u6237\u5C06\u4F7F\u7528\u5168\u5C40\u9ED8\u8BA4\u914D\u7F6E\u3002"
+        })]
+      }),
+      okText: '确定重置',
+      danger: true,
+      action: function action() {
+        var _resetAllUsers;
+        return (_resetAllUsers = resetAllUsers === null || resetAllUsers === void 0 ? void 0 : resetAllUsers(gridKey)) !== null && _resetAllUsers !== void 0 ? _resetAllUsers : Promise.resolve();
+      }
+    })();
+  }, [createConfirmHandler, resetAllUsers, gridKey]);
+
+  // 判断是否存在用户个人方案
+  var hasUserSchemes = useMemo(function () {
+    return schemes.some(function (s) {
+      return !s.isGlobal;
+    });
+  }, [schemes]);
+
+  // 保存编辑
+  var handleSaveEdit = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+    var scheme, createdAt, updatedAt, schemeWithoutTimestamps;
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          if (editingId) {
+            _context7.next = 2;
+            break;
+          }
+          return _context7.abrupt("return");
+        case 2:
+          _context7.prev = 2;
+          scheme = schemes.find(function (s) {
+            return s.id === editingId;
+          });
+          if (!scheme) {
+            _context7.next = 10;
+            break;
+          }
+          createdAt = scheme.createdAt, updatedAt = scheme.updatedAt, schemeWithoutTimestamps = _objectWithoutProperties(scheme, _excluded3);
+          _context7.next = 8;
+          return saveColumnScheme === null || saveColumnScheme === void 0 ? void 0 : saveColumnScheme(gridKey, _objectSpread(_objectSpread({}, schemeWithoutTimestamps), {}, {
+            name: editingName.trim(),
+            description: editingDescription.trim() || undefined
+            // createdAt 和 updatedAt 由存储适配器自动生成
+          }));
+        case 8:
+          message.success('更新成功');
+          setEditingId(null);
+        case 10:
+          _context7.next = 15;
+          break;
+        case 12:
+          _context7.prev = 12;
+          _context7.t0 = _context7["catch"](2);
+          message.error(_context7.t0.message || '更新失败');
+        case 15:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7, null, [[2, 12]]);
+  })), [schemes, saveColumnScheme, gridKey, editingId, editingName, editingDescription]);
+
+  // 筛选方案列表
+  var filteredSchemes = useMemo(function () {
+    if (schemes.length === 0) return [];
+    var text = searchText.toLowerCase().trim();
+    if (!text) return schemes;
+    return schemes.filter(function (scheme) {
+      return scheme.name.toLowerCase().includes(text) || scheme.description && scheme.description.toLowerCase().includes(text);
+    });
+  }, [schemes, searchText]);
+
+  // AG-Grid 列定义
+  var schemeColumnDefs = useMemo(function () {
+    return [{
+      headerName: '方案名称',
+      field: 'name',
+      flex: 1,
+      minWidth: 200,
+      cellRenderer: function cellRenderer(params) {
+        var _currentSchemes$gridK3;
+        var record = params.data;
+        if (!record) return null;
+        if (editingId === record.id) {
+          return /*#__PURE__*/_jsx(Input, {
+            value: editingName,
+            onChange: function onChange(e) {
+              return setEditingName(e.target.value);
+            },
+            onPressEnter: handleSaveEdit,
+            size: "small",
+            style: {
+              width: '100%'
+            }
+          });
+        }
+        return /*#__PURE__*/_jsxs(Space, {
+          size: "small",
+          children: [/*#__PURE__*/_jsx("span", {
+            children: record.name
+          }), record.isGlobal ? /*#__PURE__*/_jsx(Tag, {
+            color: "purple",
+            children: "\u5168\u5C40"
+          }) : /*#__PURE__*/_jsx(Tag, {
+            color: "cyan",
+            children: "\u4E2A\u4EBA"
+          }), record.isDefault && /*#__PURE__*/_jsx(Tag, {
+            color: "blue",
+            children: "\u9ED8\u8BA4"
+          }), record.id === (currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK3 = currentSchemes[gridKey]) === null || _currentSchemes$gridK3 === void 0 ? void 0 : _currentSchemes$gridK3.columnSchemeId) && /*#__PURE__*/_jsx(Tag, {
+            color: "green",
+            children: "\u5F53\u524D"
+          })]
+        });
+      }
+    }, {
+      headerName: '描述',
+      field: 'description',
+      flex: 1,
+      minWidth: 200,
+      cellRenderer: function cellRenderer(params) {
+        var record = params.data;
+        if (!record) return null;
+        if (editingId === record.id) {
+          return /*#__PURE__*/_jsx(Input, {
+            value: editingDescription,
+            onChange: function onChange(e) {
+              return setEditingDescription(e.target.value);
+            },
+            onPressEnter: handleSaveEdit,
+            size: "small",
+            style: {
+              width: '100%'
+            }
+          });
+        }
+        return record.description || '-';
+      }
+    }, {
+      headerName: '更新时间',
+      field: 'updatedAt',
+      width: 180,
+      valueFormatter: function valueFormatter(params) {
+        if (!params.value) return '';
+        return new Date(params.value).toLocaleString();
+      }
+    }, {
+      headerName: '操作',
+      colId: 'actions',
+      width: 280,
+      // 加宽以容纳新按钮
+      cellRenderer: function cellRenderer(params) {
+        var record = params.data;
+        if (!record) return null;
+        if (editingId === record.id) {
+          return /*#__PURE__*/_jsxs(Space, {
+            size: "small",
+            children: [/*#__PURE__*/_jsx(Button, {
+              size: "small",
+              type: "link",
+              onClick: handleSaveEdit,
+              children: "\u4FDD\u5B58"
+            }), /*#__PURE__*/_jsx(Button, {
+              size: "small",
+              type: "link",
+              onClick: function onClick() {
+                return setEditingId(null);
+              },
+              children: "\u53D6\u6D88"
+            })]
+          });
+        }
+        return /*#__PURE__*/_jsxs(Space, {
+          size: "small",
+          children: [/*#__PURE__*/_jsx(Tooltip, {
+            title: "\u52A0\u8F7D\u65B9\u6848",
+            children: /*#__PURE__*/_jsx(Button, {
+              type: "link",
+              size: "small",
+              icon: /*#__PURE__*/_jsx(ReloadOutlined, {}),
+              onClick: function onClick() {
+                return handleLoadScheme(record.id);
+              },
+              children: "\u52A0\u8F7D"
+            })
+          }), /*#__PURE__*/_jsx(Tooltip, {
+            title: record.isDefault ? '取消默认' : '设为默认',
+            children: /*#__PURE__*/_jsx(Button, {
+              type: "link",
+              size: "small",
+              icon: record.isDefault ? /*#__PURE__*/_jsx(StarFilled, {}) : /*#__PURE__*/_jsx(StarOutlined, {}),
+              onClick: function onClick() {
+                return handleSetDefault(record.id);
+              }
+            })
+          }), !record.isGlobal && canApplyToGlobal && /*#__PURE__*/_jsx(Tooltip, {
+            title: "\u5E94\u7528\u5230\u5168\u5C40",
+            children: /*#__PURE__*/_jsx(Button, {
+              type: "link",
+              size: "small",
+              icon: /*#__PURE__*/_jsx(GlobalOutlined, {}),
+              onClick: function onClick() {
+                return handleApplyToGlobal(record.id);
+              }
+            })
+          }), (!record.isGlobal || canApplyToGlobal) && /*#__PURE__*/_jsx(Tooltip, {
+            title: "\u7F16\u8F91",
+            children: /*#__PURE__*/_jsx(Button, {
+              type: "link",
+              size: "small",
+              icon: /*#__PURE__*/_jsx(EditOutlined, {}),
+              onClick: function onClick() {
+                return handleEditScheme(record);
+              }
+            })
+          }), (!record.isGlobal || canApplyToGlobal) && /*#__PURE__*/_jsx(Popconfirm, {
+            title: record.isGlobal ? "确定要删除此全局方案吗？这将影响所有用户！" : "确定要删除此方案吗?",
+            onConfirm: function onConfirm() {
+              return handleDeleteScheme(record.id, record.name);
+            },
+            okText: "\u786E\u5B9A",
+            cancelText: "\u53D6\u6D88",
+            children: /*#__PURE__*/_jsx(Tooltip, {
+              title: "\u5220\u9664",
+              children: /*#__PURE__*/_jsx(Button, {
+                type: "link",
+                size: "small",
+                danger: true,
+                icon: /*#__PURE__*/_jsx(DeleteOutlined, {})
+              })
+            })
+          })]
+        });
+      }
+    }];
+  }, [editingId, editingName, editingDescription, currentSchemes === null || currentSchemes === void 0 || (_currentSchemes$gridK4 = currentSchemes[gridKey]) === null || _currentSchemes$gridK4 === void 0 ? void 0 : _currentSchemes$gridK4.columnSchemeId, handleSaveEdit, handleLoadScheme, handleSetDefault, handleEditScheme, handleDeleteScheme]);
+
+  // 使用 useMemo 稳定传递给 ColumnConfigTable 的 items prop
+  var memoizedColumnData = useMemo(function () {
+    return form.values.items || [];
+  }, [form.values.items]);
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(DraggableModal, {
+      title: /*#__PURE__*/_jsxs("span", {
+        children: ["\u5217\u65B9\u6848\u7BA1\u7406", currentScheme && /*#__PURE__*/_jsxs("span", {
+          style: {
+            marginLeft: 16,
+            fontSize: 14,
+            fontWeight: 'normal',
+            color: token.colorPrimary
+          },
+          children: ["- \u5F53\u524D\u65B9\u6848: ", currentScheme.name, isUsingGlobalFallback && currentScheme.isGlobal && /*#__PURE__*/_jsx(Tag, {
+            color: "orange",
+            style: {
+              marginLeft: 8
+            },
+            children: "\u81EA\u52A8\u4F7F\u7528\u5168\u5C40"
+          })]
+        })]
+      }),
+      open: visible,
+      onCancel: handleClose,
+      width: 1100,
+      footer: null,
+      destroyOnHidden: true,
+      children: /*#__PURE__*/_jsx(Tabs, {
+        activeKey: activeTab,
+        onChange: setActiveTab,
+        tabBarExtraContent: activeTab === 'columns' ? /*#__PURE__*/_jsxs(Space, {
+          children: [/*#__PURE__*/_jsx(Button, {
+            onClick: onClose,
+            children: "\u53D6\u6D88"
+          }), /*#__PURE__*/_jsx(Button, {
+            onClick: handleSaveColumns,
+            children: "\u4FDD\u5B58\u914D\u7F6E"
+          }), /*#__PURE__*/_jsx(Button, {
+            type: "primary",
+            icon: /*#__PURE__*/_jsx(SaveOutlined, {}),
+            onClick: function onClick() {
+              return setSaveSchemeVisible(true);
+            },
+            children: "\u53E6\u5B58\u4E3A\u65B9\u6848"
+          })]
+        }) : /*#__PURE__*/_jsxs(Space, {
+          children: [hasUserSchemes && /*#__PURE__*/_jsx(Button, {
+            icon: /*#__PURE__*/_jsx(RollbackOutlined, {}),
+            onClick: handleResetToGlobal,
+            children: "\u91CD\u7F6E\u4E3A\u5168\u5C40\u914D\u7F6E"
+          }), canResetAllUsers && /*#__PURE__*/_jsx(Button, {
+            danger: true,
+            icon: /*#__PURE__*/_jsx(ClearOutlined, {}),
+            onClick: handleResetAllUsers,
+            children: "\u91CD\u7F6E\u6240\u6709\u7528\u6237"
+          }), /*#__PURE__*/_jsx(Button, {
+            type: "primary",
+            icon: /*#__PURE__*/_jsx(SaveOutlined, {}),
+            onClick: function onClick() {
+              return setSaveSchemeVisible(true);
+            },
+            children: "\u4FDD\u5B58\u4E3A\u65B0\u65B9\u6848"
+          })]
+        }),
+        items: [{
+          key: 'columns',
+          label: '列配置',
+          children: /*#__PURE__*/_jsxs(_Fragment, {
+            children: [/*#__PURE__*/_jsxs("div", {
+              style: {
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'space-between',
+                marginBottom: 12
+              },
+              children: [density && onDensityChange ? /*#__PURE__*/_jsx(Segmented, {
+                "aria-label": "\u8868\u683C\u5BC6\u5EA6",
+                value: density,
+                onChange: function onChange(value) {
+                  return onDensityChange(value);
+                },
+                options: [{
+                  label: '舒适',
+                  value: 'comfort'
+                }, {
+                  label: '紧凑',
+                  value: 'compact'
+                }, {
+                  label: '高密',
+                  value: 'dense'
+                }]
+              }) : /*#__PURE__*/_jsx("span", {}), /*#__PURE__*/_jsx(Button, {
+                type: "link",
+                size: "small",
+                onClick: handleRestoreDefault,
+                children: "\u6062\u590D\u9ED8\u8BA4"
+              })]
+            }), /*#__PURE__*/_jsx(ColumnConfigTable, {
+              items: memoizedColumnData,
+              onChange: handleColumnChange,
+              simple: false,
+              lockedColumnIds: lockedColumnIds
+            })]
+          })
+        }, {
+          key: 'schemes',
+          label: '方案管理',
+          children: /*#__PURE__*/_jsxs(_Fragment, {
+            children: [/*#__PURE__*/_jsx("div", {
+              style: {
+                marginBottom: 16
+              },
+              children: /*#__PURE__*/_jsx(Input, {
+                placeholder: "\u641C\u7D22\u65B9\u6848\u540D\u79F0\u6216\u63CF\u8FF0...",
+                prefix: /*#__PURE__*/_jsx(SearchOutlined, {}),
+                value: searchText,
+                onChange: function onChange(e) {
+                  return setSearchText(e.target.value);
+                },
+                style: {
+                  width: 300
+                },
+                allowClear: true
+              })
+            }), /*#__PURE__*/_jsx("div", {
+              style: {
+                height: 400,
+                width: '100%'
+              },
+              children: filteredSchemes.length === 0 ? /*#__PURE__*/_jsx(Empty, {
+                description: "\u6682\u65E0\u65B9\u6848,\u8BF7\u5148\u4FDD\u5B58\u4E00\u4E2A\u65B9\u6848",
+                style: {
+                  marginTop: 100
+                }
+              }) : /*#__PURE__*/_jsx(AgGridReact, {
+                theme: gridTheme,
+                localeText: localeText,
+                rowData: filteredSchemes,
+                columnDefs: schemeColumnDefs,
+                defaultColDef: {
+                  sortable: false,
+                  filter: false,
+                  resizable: true,
+                  suppressHeaderMenuButton: true
+                },
+                rowSelection: {
+                  mode: 'singleRow',
+                  checkboxes: false,
+                  enableClickSelection: true
+                },
+                animateRows: true,
+                suppressCellFocus: true,
+                getRowId: function getRowId(params) {
+                  return String(params.data.id);
+                }
+              })
+            })]
+          })
+        }]
+      })
+    }), /*#__PURE__*/_jsxs(Modal, {
+      title: "\u4FDD\u5B58\u4E3A\u65B0\u65B9\u6848",
+      open: saveSchemeVisible,
+      onOk: handleSaveScheme,
+      onCancel: function onCancel() {
+        setSaveSchemeVisible(false);
+        setSchemeName('');
+        setSchemeDescription('');
+      },
+      okText: "\u4FDD\u5B58",
+      cancelText: "\u53D6\u6D88",
+      destroyOnHidden: true,
+      children: [/*#__PURE__*/_jsxs("div", {
+        style: {
+          marginBottom: 16
+        },
+        children: [/*#__PURE__*/_jsx("div", {
+          style: {
+            marginBottom: 8
+          },
+          children: "\u65B9\u6848\u540D\u79F0 *"
+        }), /*#__PURE__*/_jsx(Input, {
+          placeholder: "\u8BF7\u8F93\u5165\u65B9\u6848\u540D\u79F0",
+          value: schemeName,
+          onChange: function onChange(e) {
+            return setSchemeName(e.target.value);
+          },
+          onPressEnter: handleSaveScheme
+        })]
+      }), /*#__PURE__*/_jsxs("div", {
+        children: [/*#__PURE__*/_jsx("div", {
+          style: {
+            marginBottom: 8
+          },
+          children: "\u65B9\u6848\u63CF\u8FF0"
+        }), /*#__PURE__*/_jsx(TextArea, {
+          placeholder: "\u8BF7\u8F93\u5165\u65B9\u6848\u63CF\u8FF0(\u53EF\u9009)",
+          value: schemeDescription,
+          onChange: function onChange(e) {
+            return setSchemeDescription(e.target.value);
+          },
+          rows: 3
+        })]
+      })]
+    })]
+  });
+};
+export default ColumnSetting;